svn commit: r359501 - head/sys/kern
Author: jah
Date: Wed Apr 1 04:51:39 2020
New Revision: 359501
URL: https://svnweb.freebsd.org/changeset/base/359501
Log:
deadlkres: include thread name in panic messages
Reviewed by: markj
MFC after:1 week
Differential Revision:https://reviews.freebsd.org/D24235
Modified:
head/sys/kern/kern_clock.c
Modified: head/sys/kern/kern_clock.c
==
--- head/sys/kern/kern_clock.c Wed Apr 1 03:27:47 2020(r359500)
+++ head/sys/kern/kern_clock.c Wed Apr 1 04:51:39 2020(r359501)
@@ -205,8 +205,9 @@ deadlres_td_on_lock(struct proc *p, struct thread *td,
* Accordingly with provided thresholds, this thread is stuck
* for too long on a turnstile.
*/
- panic("%s: possible deadlock detected for %p, "
- "blocked for %d ticks\n", __func__, td, tticks);
+ panic("%s: possible deadlock detected for %p (%s), "
+ "blocked for %d ticks\n", __func__,
+ td, sched_tdname(td), tticks);
}
static void
@@ -239,8 +240,9 @@ deadlres_td_sleep_q(struct proc *p, struct thread *td,
if (!strcmp(blessed[i], td->td_wmesg))
return;
- panic("%s: possible deadlock detected for %p, "
- "blocked for %d ticks\n", __func__, td, tticks);
+ panic("%s: possible deadlock detected for %p (%s), "
+ "blocked for %d ticks\n", __func__,
+ td, sched_tdname(td), tticks);
}
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359500 - head/sys/dev/ahci
Author: mav
Date: Wed Apr 1 03:27:47 2020
New Revision: 359500
URL: https://svnweb.freebsd.org/changeset/base/359500
Log:
Add support for AHCI BIOS/OS Handoff.
This allows clean handoff from BIOS implementing some asynchronous I/O to
the OS AHCI driver. During attach driver declares OS ownership request
and waits from 25ms to 2s for BIOS to complete operation and release the
hardware.
MFC after:2 weeks
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci.h
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cWed Apr 1 03:19:42 2020(r359499)
+++ head/sys/dev/ahci/ahci.cWed Apr 1 03:27:47 2020(r359500)
@@ -141,7 +141,27 @@ int
ahci_ctlr_reset(device_t dev)
{
struct ahci_controller *ctlr = device_get_softc(dev);
+ uint32_t v;
int timeout;
+
+ /* BIOS/OS Handoff */
+ if ((ATA_INL(ctlr->r_mem, AHCI_VS) >= 0x00010200) &&
+ (ATA_INL(ctlr->r_mem, AHCI_CAP2) & AHCI_CAP2_BOH) &&
+ ((v = ATA_INL(ctlr->r_mem, AHCI_BOHC)) & AHCI_BOHC_OOS) == 0) {
+
+ /* Request OS ownership. */
+ ATA_OUTL(ctlr->r_mem, AHCI_BOHC, v | AHCI_BOHC_OOS);
+
+ /* Wait up to 2s for BIOS ownership release. */
+ for (timeout = 0; timeout < 80; timeout++) {
+ DELAY(25000);
+ v = ATA_INL(ctlr->r_mem, AHCI_BOHC);
+ if ((v & AHCI_BOHC_BOS) == 0)
+ break;
+ if ((v & AHCI_BOHC_BB) == 0)
+ break;
+ }
+ }
/* Enable AHCI mode */
ATA_OUTL(ctlr->r_mem, AHCI_GHC, AHCI_GHC_AE);
Modified: head/sys/dev/ahci/ahci.h
==
--- head/sys/dev/ahci/ahci.hWed Apr 1 03:19:42 2020(r359499)
+++ head/sys/dev/ahci/ahci.hWed Apr 1 03:27:47 2020(r359500)
@@ -214,6 +214,13 @@
#defineAHCI_CAP2_SADM 0x0010
#defineAHCI_CAP2_DESO 0x0020
+#define AHCI_BOHC 0x28
+#defineAHCI_BOHC_BOS 0x0001
+#defineAHCI_BOHC_OOS 0x0002
+#defineAHCI_BOHC_SOOE 0x0004
+#defineAHCI_BOHC_OOC 0x0008
+#defineAHCI_BOHC_BB0x0010
+
#define AHCI_VSCAP 0xa4
#define AHCI_OFFSET 0x100
#define AHCI_STEP 0x80
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359499 - head/sys/dev/ahci
-Original Message-
From: on behalf of Alexander Motin
Date: 2020-03-31, Tuesday at 20:19
To: , ,
Subject: svn commit: r359499 - head/sys/dev/ahci
Author: mav
Date: Wed Apr 1 03:19:42 2020
New Revision: 359499
URL: https://svnweb.freebsd.org/changeset/base/359499
Log:
Add ID for JMicron JMB582/JMB585 AHCI controller.
JMB582 has 2 6Gbps SATA ports and PCIe 3.0 x1.
JMB585 has 5 6Gbps SATA ports and PCIe 3.0 x2.
Both chips support AHCI v1.31, Port Multiplier with FBS and 8 MSI vectors.
Hi Alexander,
The second line of diff seems unrelated...?
Thanks,
Ravi (rpokala@)
MFC after:2 weeks
Modified:
head/sys/dev/ahci/ahci_pci.c
Modified: head/sys/dev/ahci/ahci_pci.c
==
--- head/sys/dev/ahci/ahci_pci.cWed Apr 1 02:13:01 2020
(r359498)
+++ head/sys/dev/ahci/ahci_pci.cWed Apr 1 03:19:42 2020
(r359499)
@@ -247,6 +247,7 @@ static const struct {
{0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
{0x2368197b, 0x00, "JMicron JMB368",AHCI_Q_NOFORCE},
+ {0x0585197b, 0x00, "JMicron JMB58x",0},
{0x61ab, 0x00, "Marvell 88SE6111", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
AHCI_Q_1CH | AHCI_Q_EDGEIS},
{0x612111ab, 0x00, "Marvell 88SE6121", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
@@ -399,6 +400,7 @@ ahci_probe(device_t dev)
!(ahci_ids[i].quirks & AHCI_Q_NOFORCE {
/* Do not attach JMicrons with single PCI function. */
if (pci_get_vendor(dev) == 0x197b &&
+ (ahci_ids[i].quirks & AHCI_Q_NOFORCE) &&
(pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
return (ENXIO);
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359499 - head/sys/dev/ahci
Author: mav
Date: Wed Apr 1 03:19:42 2020
New Revision: 359499
URL: https://svnweb.freebsd.org/changeset/base/359499
Log:
Add ID for JMicron JMB582/JMB585 AHCI controller.
JMB582 has 2 6Gbps SATA ports and PCIe 3.0 x1.
JMB585 has 5 6Gbps SATA ports and PCIe 3.0 x2.
Both chips support AHCI v1.31, Port Multiplier with FBS and 8 MSI vectors.
MFC after:2 weeks
Modified:
head/sys/dev/ahci/ahci_pci.c
Modified: head/sys/dev/ahci/ahci_pci.c
==
--- head/sys/dev/ahci/ahci_pci.cWed Apr 1 02:13:01 2020
(r359498)
+++ head/sys/dev/ahci/ahci_pci.cWed Apr 1 03:19:42 2020
(r359499)
@@ -247,6 +247,7 @@ static const struct {
{0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
{0x2368197b, 0x00, "JMicron JMB368",AHCI_Q_NOFORCE},
+ {0x0585197b, 0x00, "JMicron JMB58x",0},
{0x61ab, 0x00, "Marvell 88SE6111", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
AHCI_Q_1CH | AHCI_Q_EDGEIS},
{0x612111ab, 0x00, "Marvell 88SE6121", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
@@ -399,6 +400,7 @@ ahci_probe(device_t dev)
!(ahci_ids[i].quirks & AHCI_Q_NOFORCE {
/* Do not attach JMicrons with single PCI function. */
if (pci_get_vendor(dev) == 0x197b &&
+ (ahci_ids[i].quirks & AHCI_Q_NOFORCE) &&
(pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
return (ENXIO);
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359498 - head/sys/netinet6
Author: ae
Date: Wed Apr 1 02:13:01 2020
New Revision: 359498
URL: https://svnweb.freebsd.org/changeset/base/359498
Log:
Ignore ND6 neighbor advertisement received for static link-layer entries.
Previously such NA could override manually created LLE.
Reported by: Martin Beran
Reviewed by: melifaro
MFC after:10 days
Modified:
head/sys/netinet6/nd6_nbr.c
Modified: head/sys/netinet6/nd6_nbr.c
==
--- head/sys/netinet6/nd6_nbr.c Tue Mar 31 22:41:57 2020(r359497)
+++ head/sys/netinet6/nd6_nbr.c Wed Apr 1 02:13:01 2020(r359498)
@@ -754,6 +754,12 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
goto freeit;
}
+ /*
+* Do not try to override static entry.
+*/
+ if (ln->la_flags & LLE_STATIC)
+ goto freeit;
+
if (ln->ln_state == ND6_LLINFO_INCOMPLETE) {
/*
* If the link-layer has address, and no lladdr option came,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359494 - in head: . share/man/man7
Author: imp
Date: Tue Mar 31 22:41:43 2020
New Revision: 359494
URL: https://svnweb.freebsd.org/changeset/base/359494
Log:
Make universe configuration more consistent with rest of system
Add 'WITHOUT_WORLDS' and 'WITHOUT_KERNELS' as aliases for the inconsistently
named MAKE_JUST_KERNELS and MAKE_JUST_WORLDS respectively. I always forget the
MAKE_ part (or is it BUILD_), and it's inconsistent with everything
else. Document the new things, but leave speculation of any eventual
MAKE_JUST_*
deprecation out of the manuals and comments.
Reviewed by: brooks, bdrewery, emaste (LGTM)
MFC After: 3 days
Differential Revision: https://reviews.freebsd.org/D24212
Modified:
head/Makefile
head/share/man/man7/build.7
Modified: head/Makefile
==
--- head/Makefile Tue Mar 31 20:09:20 2020(r359493)
+++ head/Makefile Tue Mar 31 22:41:43 2020(r359494)
@@ -5,10 +5,12 @@
#
# universe- *Really* build *everything* (buildworld and
# all kernels on all architectures). Define
-# MAKE_JUST_KERNELS to only build kernels,
-# MAKE_JUST_WORLDS to only build userland.
+# MAKE_JUST_KERNELS or WITHOUT_WORLDS to only build
kernels,
+# MAKE_JUST_WORLDS or WITHOUT_KERNELS to only build
userland.
# tinderbox - Same as universe, but presents a list of failed build
# targets and exits with an error if there were any.
+# worlds - Same as universe, except just makes the worlds.
+# kernels- Same as universe, except just makes the kernels.
# buildworld - Rebuild *everything*, including glue to help do
# upgrades.
# installworld- Install everything built by "buildworld".
@@ -104,6 +106,15 @@
# For more information, see the build(7) manual page.
#
+.if defined(UNIVERSE_TARGET) || defined(MAKE_JUST_WORLDS) ||
defined(WITHOUT_KERNELS)
+__DO_KERNELS=no
+.endif
+.if defined(MAKE_JUST_KERNELS) || defined(WITHOUT_WORLDS)
+__DO_WORLDS=no
+.endif
+__DO_WORLDS?=yes
+__DO_KERNELS?=yes
+
# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
# can be cached for sub-makes. We can't do this while still running on the
# old fmake from FreeBSD 9.x or older, so avoid including it then to avoid
@@ -521,11 +532,7 @@ universe_${toolchain}_skip: universe_prologue .PHONY
.endif
.endfor
-.if defined(UNIVERSE_TARGET)
-MAKE_JUST_WORLDS= YES
-.else
UNIVERSE_TARGET?= buildworld
-.endif
KERNSRCDIR?= ${.CURDIR}/sys
targets: .PHONY
@@ -634,7 +641,7 @@ MAKE_PARAMS_${target}+= \
.endfor
.endif # !make(targets)
-.if !defined(MAKE_JUST_KERNELS)
+.if ${__DO_WORLDS} == "yes"
universe_${target}_done: universe_${target}_worlds .PHONY
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}_worlds: universe_${target}_${target_arch} .PHONY
@@ -658,9 +665,9 @@ universe_${target}_${target_arch}: universe_${target}_
${MAKEFAIL}))
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on
`LC_ALL=C date`"
.endfor
-.endif # !MAKE_JUST_KERNELS
+.endif # ${__DO_WORLDS} == "yes"
-.if !defined(MAKE_JUST_WORLDS)
+.if ${__DO_KERNELS} == "yes"
universe_${target}_done: universe_${target}_kernels .PHONY
universe_${target}_kernels: universe_${target}_worlds .PHONY
universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
@@ -673,7 +680,7 @@ universe_${target}_kernels: universe_${target}_prologu
fi
@cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
universe_kernels
-.endif # !MAKE_JUST_WORLDS
+.endif # ${__DO_KERNELS} == "yes"
# Tell the user the worlds and kernels have completed
universe_${target}: universe_${target}_done
Modified: head/share/man/man7/build.7
==
--- head/share/man/man7/build.7 Tue Mar 31 20:09:20 2020(r359493)
+++ head/share/man/man7/build.7 Tue Mar 31 22:41:43 2020(r359494)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 3, 2018
+.Dd March 29, 2020
.Dt BUILD 7
.Os
.Sh NAME
@@ -775,11 +775,17 @@ while still building each architecture serially.
Only build kernels for each supported architecture.
.It Va MAKE_JUST_WORLDS
Only build worlds for each supported architecture.
+.It Va WITHOUT_WORLDS
+Only build kernels for each supported architecture.
+.It Va WITHOUT_KERNELS
+Only build worlds for each supported architecture.
.It Va UNIVERSE_TARGET
Execute the specified
.Xr make 1
target for each supported architecture instead of the default action of
building a world and one or more kernels.
+This variable implies
+.Va WITHOUT_KERNELS .
.El
.Sh FILES
.Bl -tag -width ".Pa /usr/share/examples/etc/make.conf" -compact
___
sv
svn commit: r359497 - head
Author: imp
Date: Tue Mar 31 22:41:57 2020
New Revision: 359497
URL: https://svnweb.freebsd.org/changeset/base/359497
Log:
Add powerpcspe to the EXTRA_TARGETS
Currently, powerpcspe is broken with clang. Add it to the EXTRA_TARGETS until
that's fixed.
Reviewed by: brooks, bdrewery, emaste (LGTM)
MFC After: 3 days
Differential Revision: https://reviews.freebsd.org/D24212
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Mar 31 22:41:53 2020(r359496)
+++ head/Makefile Tue Mar 31 22:41:57 2020(r359497)
@@ -494,19 +494,20 @@ worlds: .PHONY
.if make(universe) || make(universe_kernels) || make(tinderbox) || \
make(targets) || make(universe-toolchain)
#
-# Don't build rarely used architectures unless requested.
+# Don't build rarely used, semi-supported architectures unless requested.
#
.if defined(EXTRA_TARGETS)
EXTRA_ARCHES_mips= mipsel mipshf mipselhf mips64el mips64hf mips64elhf
EXTRA_ARCHES_mips+=mipsn32
+# powerpcspe excluded from main list until clang fixed
+EXTRA_ARCHES_powerpc= powerpcspe
.endif
TARGETS?=amd64 arm arm64 i386 mips powerpc riscv
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?=armv6 armv7
TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mips mips64 ${EXTRA_ARCHES_mips}
-# powerpcspe excluded until clang fixed
-TARGET_ARCHES_powerpc?=powerpc powerpc64
+TARGET_ARCHES_powerpc?=powerpc powerpc64 ${EXTRA_ARCHES_powerpc}
TARGET_ARCHES_riscv?= riscv64 riscv64sf
.for target in ${TARGETS}
TARGET_ARCHES_${target}?= ${target}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359496 - head/share/man/man7
Author: imp Date: Tue Mar 31 22:41:53 2020 New Revision: 359496 URL: https://svnweb.freebsd.org/changeset/base/359496 Log: Document universe better Document the kernels and worlds targets. Document the TARGETS and EXTRA_TARGETS variables. Reviewed by: brooks, bdrewery, emaste (LGTM) MFC After: 3 days Differential Revision: https://reviews.freebsd.org/D24212 Modified: head/share/man/man7/build.7 Modified: head/share/man/man7/build.7 == --- head/share/man/man7/build.7 Tue Mar 31 22:41:48 2020(r359495) +++ head/share/man/man7/build.7 Tue Mar 31 22:41:53 2020(r359496) @@ -289,6 +289,18 @@ for all kernels for that architecture, including .Pa LINT . This command takes a long time. +.It Cm kernels +Like +.Cm universe +with +.Va WITHOUT_WORLDS +defined so only the kernels for each architecture are built. +.It Cm worlds +Like +.Cm universe +with +.Va WITHOUT_KERNELS +defined so only the worlds for each architecture are built. .It Cm update Get updated sources as configured in .Xr make.conf 5 . @@ -761,7 +773,7 @@ The default action is to build documentation for all l .Pp Builds using the .Cm universe -target are influenced by the following +and related targets are influenced by the following .Xr make 1 variables: .Bl -tag -width ".Va MAKE_JUST_KERNELS" @@ -786,6 +798,15 @@ target for each supported architecture instead of the building a world and one or more kernels. This variable implies .Va WITHOUT_KERNELS . +.It Va TARGETS +Only build the listed targets instead of each supported architecture. +.It Va EXTRA_TARGETS +In addition to the supported architectures, build the semi-supported +architectures. +A semi-supported architecture has build support in the +.Fx +tree, but receives significantly less testing and is generally for +fringe uses that do not have a wide appeal. .El .Sh FILES .Bl -tag -width ".Pa /usr/share/examples/etc/make.conf" -compact ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359495 - head
Author: imp
Date: Tue Mar 31 22:41:48 2020
New Revision: 359495
URL: https://svnweb.freebsd.org/changeset/base/359495
Log:
Fix make kernels to match original commit message
make kernels was originally documented (in commit r295099) as the same as make
universe -DJUST_BUILD_KERNELS. However, it used the
UNIVERSE_TARGET=buildkernel
which is subtly different in that it also builds the toolchains and doesn't
build the LINT modules unless they happened to already exist in the tree. This
unbreaks POLA and just builds the kernels, including LINT, now rather than all
that other stuff as well. When the commit originally happened, the two just
differed by the LINT bug. r335711 introduced the universe dependency on the
toolchain that wasn't present before, which diverged the two further. This
restores the original intent of r295099.
Reviewed by: brooks, bdrewery, emaste (LGTM)
MFC After: 3 days
Differential Revision: https://reviews.freebsd.org/D24212
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Mar 31 22:41:43 2020(r359494)
+++ head/Makefile Tue Mar 31 22:41:48 2020(r359495)
@@ -479,7 +479,7 @@ kernel-toolchains: .PHONY
@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
kernels: .PHONY
- @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe
+ @cd ${.CURDIR}; ${SUB_MAKE} universe -DWITHOUT_WORLDS
worlds: .PHONY
@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359493 - head/sys/mips/nlm/dev/net
Author: rpokala
Date: Tue Mar 31 20:09:20 2020
New Revision: 359493
URL: https://svnweb.freebsd.org/changeset/base/359493
Log:
Fix build for mips.XLP64 kernel, by re-ordering headers
The log for the failure contained errors like this:
| In file included from ${SRCTOP}/sys/mips/nlm/dev/net/xlpge.c:34:
| In file included from ${SRCTOP}/sys/sys/systm.h:44:
| In file included from ./machine/atomic.h:849:
| ${SRCTOP}/sys/sys/_atomic_subword.h:222:37: error: unknown type name
'u_long'; did you mean 'long'?
| atomic_testandset_acq_long(volatile u_long *p, u_int v)
| ^~
| long
And similar "unknown type name" errors for u_int, not recognizing bool as a
type, etc.
This was caused by including too far down; move it up where it
belongs.
While here, add a blank line after '__FBSDID()', in keeping with convention.
Reviewed by: emaste
Sponsored by: Panasas
Differential Revision:https://reviews.freebsd.org/D24242
Modified:
head/sys/mips/nlm/dev/net/xlpge.c
Modified: head/sys/mips/nlm/dev/net/xlpge.c
==
--- head/sys/mips/nlm/dev/net/xlpge.c Tue Mar 31 17:57:11 2020
(r359492)
+++ head/sys/mips/nlm/dev/net/xlpge.c Tue Mar 31 20:09:20 2020
(r359493)
@@ -30,10 +30,11 @@
#include
__FBSDID("$FreeBSD$");
+
+#include
#include
#include
#include
-#include
#include
#include
#include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359489 - head/usr.sbin/valectl
Author: vmaffione Date: Tue Mar 31 16:47:15 2020 New Revision: 359489 URL: https://svnweb.freebsd.org/changeset/base/359489 Log: valectl: fix typo in man page Submitted by: Jose Luis Duran MFC after:3 days Modified: head/usr.sbin/valectl/valectl.8 Modified: head/usr.sbin/valectl/valectl.8 == --- head/usr.sbin/valectl/valectl.8 Tue Mar 31 15:59:29 2020 (r359488) +++ head/usr.sbin/valectl/valectl.8 Tue Mar 31 16:47:15 2020 (r359489) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 26, 2019 +.Dd March 31, 2020 .Dt VALECTL 8 .Os .Sh NAME @@ -95,7 +95,7 @@ Create a new persistent VALE port with name .Ar interface . The name must be different from any other network interface already present in the system. -.It Fl d Ar interface +.It Fl r Ar interface Destroy the persistent VALE port with name .Ar inteface . .It Fl l Ar valeSSS:PPP ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359487 - in head: share/man/man4 sys/netinet sys/netinet/tcp_stacks
Author: tuexen
Date: Tue Mar 31 15:54:54 2020
New Revision: 359487
URL: https://svnweb.freebsd.org/changeset/base/359487
Log:
Allow the TCP backhole detection to be disabled at all, enabled only
for IPv4, enabled only for IPv6, and enabled for IPv4 and IPv6.
The current blackhole detection might classify a temporary outage as
an MTU issue and reduces permanently the MSS. Since the consequences of
such a reduction due to a misclassification are much more drastically
for IPv4 than for IPv6, allow the administrator to enable it for IPv6 only.
Reviewed by: bcr@ (man page), Richard Scheffenegger
Sponsored by: Netflix, Inc.
Differential Revision:https://reviews.freebsd.org/D24219
Modified:
head/share/man/man4/tcp.4
head/sys/netinet/tcp_stacks/bbr.c
head/sys/netinet/tcp_stacks/rack.c
head/sys/netinet/tcp_timer.c
Modified: head/share/man/man4/tcp.4
==
--- head/share/man/man4/tcp.4 Tue Mar 31 15:47:55 2020(r359486)
+++ head/share/man/man4/tcp.4 Tue Mar 31 15:54:54 2020(r359487)
@@ -34,7 +34,7 @@
.\" From: @(#)tcp.48.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd March 29, 2020
+.Dd March 31, 2020
.Dt TCP 4
.Os
.Sh NAME
@@ -628,21 +628,31 @@ specific connection.
This is needed to help with connection establishment
when a broken firewall is in the network path.
.It Va pmtud_blackhole_detection
-Turn on automatic path MTU blackhole detection.
-In case of retransmits OS will
-lower the MSS to check if it's MTU problem.
-If current MSS is greater than
-configured value to try
+Enable automatic path MTU blackhole detection.
+In case of retransmits of MSS sized segments,
+the OS will lower the MSS to check if it's an MTU problem.
+If the current MSS is greater than the configured value to try
.Po Va net.inet.tcp.pmtud_blackhole_mss
and
.Va net.inet.tcp.v6pmtud_blackhole_mss
.Pc ,
it will be set to this value, otherwise,
-MSS will be set to default values
+the MSS will be set to the default values
.Po Va net.inet.tcp.mssdflt
and
.Va net.inet.tcp.v6mssdflt
.Pc .
+Settings:
+.Bl -tag -compact
+.It 0
+Disable path MTU blackhole detection.
+.It 1
+Enable path MTU blackhole detection for IPv4 and IPv6.
+.It 2
+Enable path MTU blackhole detection only for IPv4.
+.It 3
+Enable path MTU blackhole detection only for IPv6.
+.El
.It Va pmtud_blackhole_mss
MSS to try for IPv4 if PMTU blackhole detection is turned on.
.It Va v6pmtud_blackhole_mss
Modified: head/sys/netinet/tcp_stacks/bbr.c
==
--- head/sys/netinet/tcp_stacks/bbr.c Tue Mar 31 15:47:55 2020
(r359486)
+++ head/sys/netinet/tcp_stacks/bbr.c Tue Mar 31 15:54:54 2020
(r359487)
@@ -5041,6 +5041,7 @@ bbr_timeout_rxt(struct tcpcb *tp, struct tcp_bbr *bbr,
{
int32_t rexmt;
int32_t retval = 0;
+ bool isipv6;
bbr->r_ctl.rc_hpts_flags &= ~PACE_TMR_RXT;
if (bbr->rc_all_timers_stopped) {
@@ -5127,11 +5128,16 @@ bbr_timeout_rxt(struct tcpcb *tp, struct tcp_bbr *bbr,
* of packets and process straight to FIN. In that case we won't
* catch ESTABLISHED state.
*/
- if (V_tcp_pmtud_blackhole_detect && (((tp->t_state == TCPS_ESTABLISHED))
- || (tp->t_state == TCPS_FIN_WAIT_1))) {
#ifdef INET6
- int32_t isipv6;
+ isipv6 = (tp->t_inpcb->inp_vflag & INP_IPV6) ? true : false;
+#else
+ isipv6 = false;
#endif
+ if (((V_tcp_pmtud_blackhole_detect == 1) ||
+ (V_tcp_pmtud_blackhole_detect == 2 && !isipv6) ||
+ (V_tcp_pmtud_blackhole_detect == 3 && isipv6)) &&
+ ((tp->t_state == TCPS_ESTABLISHED) ||
+ (tp->t_state == TCPS_FIN_WAIT_1))) {
/*
* Idea here is that at each stage of mtu probe (usually,
Modified: head/sys/netinet/tcp_stacks/rack.c
==
--- head/sys/netinet/tcp_stacks/rack.c Tue Mar 31 15:47:55 2020
(r359486)
+++ head/sys/netinet/tcp_stacks/rack.c Tue Mar 31 15:54:54 2020
(r359487)
@@ -3123,6 +3123,7 @@ rack_timeout_rxt(struct tcpcb *tp, struct tcp_rack *ra
int32_t rexmt;
struct inpcb *inp;
int32_t retval = 0;
+ bool isipv6;
inp = tp->t_inpcb;
if (tp->t_timers->tt_flags & TT_STOPPED) {
@@ -3209,11 +3210,16 @@ rack_timeout_rxt(struct tcpcb *tp, struct tcp_rack *ra
* of packets and process straight to FIN. In that case we won't
* catch ESTABLISHED state.
*/
- if (V_tcp_pmtud_blackhole_detect && (((tp->t_state == TCPS_ESTABLISHED))
- || (tp->t_state == TCPS_FIN_WAIT_1))) {
#ifdef INET6
- int32_t isipv6;
+ isipv6 = (tp->t_inpcb->inp_vflag & INP_IPV6) ? true : false;
+#else
+ isipv6 = false;
#endif
+ if (((V_tcp_pmtud_blac
svn commit: r359488 - head/share/mk
Author: sjg
Date: Tue Mar 31 15:59:29 2020
New Revision: 359488
URL: https://svnweb.freebsd.org/changeset/base/359488
Log:
Include ${.CURDIR}/local.init.mk if it exists
This is handy for making local hacks to an app
(eg to build it as tool for non-BSD host)
without making a mess of the code base.
Reviewed by: bdrewery
MFC after:1 week
Differential Revision: https://reviews.freebsd.org//D24101
Modified:
head/share/mk/local.init.mk
Modified: head/share/mk/local.init.mk
==
--- head/share/mk/local.init.mk Tue Mar 31 15:54:54 2020(r359487)
+++ head/share/mk/local.init.mk Tue Mar 31 15:59:29 2020(r359488)
@@ -1,5 +1,8 @@
# $FreeBSD$
+.if !target(__${_this}__)
+__${_this}__:
+
.if ${.MAKE.MODE:Mmeta*} != ""
.if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) &&
${.MAKE.MAKEFILES:M*bsd.prog.mk} == ""
.if ${.MAKE.MODE:Mleaf*} != ""
@@ -33,3 +36,5 @@ CFLAGS+= ${HOST_CFLAGS}
.endif
.-include "src.init.mk"
+.-include "${.CURDIR}/local.init.mk"
+.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359436 - in head/sys: kern net sys
On 31 Mar 2020, at 17:28, Kristof Provost wrote: On 31 Mar 2020, at 17:17, Mark Johnston wrote: On Tue, Mar 31, 2020 at 03:51:27PM +0800, Li-Wen Hsu wrote: On Tue, Mar 31, 2020 at 3:00 PM Kristof Provost wrote: On 31 Mar 2020, at 7:56, Li-Wen Hsu wrote: On Tue, Mar 31, 2020 at 10:55 AM Mark Johnston wrote: It seems could be triggered by sys.netinet6.frag6.* sys.netpfil.common.* sbin.pfctl.pfctl_test.* tests, and there are lots of test cases timed out. Can you help check these? I see, it is actually caused by r359438. I'm looking at it now. I verified that the netpfil and netinet6 tests pass with r359477. Thanks for the fixing, the latest test panics at epair_qflush: https://ci.freebsd.org/job/FreeBSD-head-amd64-test/14747/consoleFull while executing sys.netpfil.pf.* tests. I'm not sure if this is related or because of previous commits (I suspect the later). I'll look into this. That’s a know issue with epair (since EPOCH, I believe). A number of the pf tests are disabled due to this. See 238870. I also think so, btw, currently every test run panics so I am afraid that the recent commits might make status worse (or say, make the issue easier to reproduce?) I haven't been able to reproduce any panics or test failures so far. Once you disable the ‘atf_skip’ lines in the pf tests a simple `sudo kldload pfsync && cd /usr/tests/sys/netpfil/pf && sudo kyua test` is likely sufficient. The names:names test is a great candidate for this. Remove the `atf_skip …` line in /usr/tests/sys/netpfil/pf/names and run that a few times. It’s not 100% reliable, but the test is very fast and will likely panic every other run or more. Example backtrace: panic: epair_qflush: ifp=0xf800079c9000, epair_softc gone? sc=0 cpuid = 1 time = 1585666518 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfe001bd7e790 vpanic() at vpanic+0x182/frame 0xfe001bd7e7e0 panic() at panic+0x43/frame 0xfe001bd7e840 epair_qflush() at epair_qflush+0x1a8/frame 0xfe001bd7e890 if_down() at if_down+0x12d/frame 0xfe001bd7e8c0 if_detach_internal() at if_detach_internal+0x2ee/frame 0xfe001bd7e920 if_vmove() at if_vmove+0x3c/frame 0xfe001bd7e970 vnet_if_return() at vnet_if_return+0x50/frame 0xfe001bd7e990 vnet_destroy() at vnet_destroy+0x130/frame 0xfe001bd7e9c0 prison_deref() at prison_deref+0x29d/frame 0xfe001bd7ea00 taskqueue_run_locked() at taskqueue_run_locked+0xaa/frame 0xfe001bd7ea80 taskqueue_thread_loop() at taskqueue_thread_loop+0x94/frame 0xfe001bd7eab0 fork_exit() at fork_exit+0x80/frame 0xfe001bd7eaf0 fork_trampoline() at fork_trampoline+0xe/frame 0xfe001bd7eaf0 --- trap 0, rip = 0, rsp = 0, rbp = 0 --- KDB: enter: panic [ thread pid 0 tid 100014 ] Stopped at kdb_enter+0x37: movq$0,0x10927a6(%rip) db> You might see different panics too. The epair teardown flow is complex, and broken. Best regards, Kristof ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359486 - in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/bn crypto/openssl/crypto/conf crypto/openssl/crypto/err crypto/openssl/crypto/pkcs12 cr...
Author: jkim Date: Tue Mar 31 15:47:55 2020 New Revision: 359486 URL: https://svnweb.freebsd.org/changeset/base/359486 Log: Merge OpenSSL 1.1.1f. Modified: head/crypto/openssl/CHANGES head/crypto/openssl/NEWS head/crypto/openssl/README head/crypto/openssl/apps/rehash.c head/crypto/openssl/apps/s_server.c head/crypto/openssl/crypto/bn/bn_local.h head/crypto/openssl/crypto/bn/bn_prime.c head/crypto/openssl/crypto/conf/conf_lib.c head/crypto/openssl/crypto/err/openssl.txt head/crypto/openssl/crypto/ex_data.c head/crypto/openssl/crypto/pkcs12/p12_crt.c head/crypto/openssl/crypto/ts/ts_rsp_sign.c head/crypto/openssl/crypto/ts/ts_rsp_verify.c head/crypto/openssl/crypto/x509/x509_cmp.c head/crypto/openssl/crypto/x509/x509_trs.c head/crypto/openssl/crypto/x509/x509_vfy.c head/crypto/openssl/crypto/x509/x_all.c head/crypto/openssl/crypto/x509/x_crl.c head/crypto/openssl/crypto/x509v3/v3_purp.c head/crypto/openssl/doc/man3/BN_generate_prime.pod head/crypto/openssl/doc/man3/SSL_get_error.pod head/crypto/openssl/doc/man3/X509_get_extension_flags.pod head/crypto/openssl/include/openssl/opensslv.h head/crypto/openssl/include/openssl/sslerr.h head/crypto/openssl/ssl/record/rec_layer_s3.c head/crypto/openssl/ssl/ssl_err.c head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/man/man3/ADMISSIONS.3 head/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 head/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 head/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 head/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 head/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 head/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 head/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 head/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 head/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 head/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 head/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 head/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 head/secure/lib/libcrypto/man/man3/BF_encrypt.3 head/secure/lib/libcrypto/man/man3/BIO_ADDR.3 head/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 head/secure/lib/libcrypto/man/man3/BIO_connect.3 head/secure/lib/libcrypto/man/man3/BIO_ctrl.3 head/secure/lib/libcrypto/man/man3/BIO_f_base64.3 head/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 head/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 head/secure/lib/libcrypto/man/man3/BIO_f_md.3 head/secure/lib/libcrypto/man/man3/BIO_f_null.3 head/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 head/secure/lib/libcrypto/man/man3/BIO_find_type.3 head/secure/lib/libcrypto/man/man3/BIO_get_data.3 head/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 head/secure/lib/libcrypto/man/man3/BIO_meth_new.3 head/secure/lib/libcrypto/man/man3/BIO_new.3 head/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 head/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 head/secure/lib/libcrypto/man/man3/BIO_printf.3 head/secure/lib/libcrypto/man/man3/BIO_push.3 head/secure/lib/libcrypto/man/man3/BIO_read.3 head/secure/lib/libcrypto/man/man3/BIO_s_accept.3 head/secure/lib/libcrypto/man/man3/BIO_s_bio.3 head/secure/lib/libcrypto/man/man3/BIO_s_connect.3 head/secure/lib/libcrypto/man/man3/BIO_s_fd.3 head/secure/lib/libcrypto/man/man3/BIO_s_file.3 head/secure/lib/libcrypto/man/man3/BIO_s_mem.3 head/secure/lib/libcrypto/man/man3/BIO_s_null.3 head/secure/lib/libcrypto/man/man3/BIO_s_socket.3 head/secure/lib/libcrypto/man/man3/BIO_set_callback.3 head/secure/lib/libcrypto/man/man3/BIO_should_retry.3 head/secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 head/secure/lib/libcrypto/man/man3/BN_CTX_new.3 head/secure/lib/libcrypto/man/man3/BN_CTX_start.3 head/secure/lib/libcrypto/man/man3/BN_add.3 head/secure/lib/libcrypto/man/man3/BN_add_word.3 head/secure/lib/libcrypto/man/man3/BN_bn2bin.3 head/secure/lib/libcrypto/man/man3/BN_cmp.3 head/secure/lib/libcrypto/man/man3/BN_copy.3 head/secure/lib/libcrypto/man/man3/BN_generate_prime.3 head/secure/lib/libcrypto/man/man3/BN_mod_inverse.3 head/secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 head/secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 head/secure/lib/libcrypto/man/man3/BN_new.3 head/secure/lib/libcrypto/man/man3/BN_num_bytes.3 head/secure/lib/libcrypto/man/man3/BN_rand.3 head/secure/lib/libcrypto/man/man3/BN_security_bits.3 head/secure/lib/libcrypto/man/man3/BN_set_bit.3 head/secure/lib/libcrypto/man/man3/BN_swap.3 head/secure/lib/libcrypto/man/man3/BN_zero.3 head/secure/lib/libcrypto/man/man3/BUF_MEM_new.3 head/secure/lib/libcrypto/man/man3/CMS_add0_cert.3 head/secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 head/secure/lib/libcrypto/man/man3/CMS_add1_signer.3 head/secure/lib/libcrypto/man/man3/CMS_compress.3 head/secure/lib/libcrypto/man/man3/CMS_decrypt.3 head/secure/lib/libcrypto/man/man3/CMS_encrypt.3 hea
Re: svn commit: r359436 - in head/sys: kern net sys
On 31 Mar 2020, at 17:17, Mark Johnston wrote: On Tue, Mar 31, 2020 at 03:51:27PM +0800, Li-Wen Hsu wrote: On Tue, Mar 31, 2020 at 3:00 PM Kristof Provost wrote: On 31 Mar 2020, at 7:56, Li-Wen Hsu wrote: On Tue, Mar 31, 2020 at 10:55 AM Mark Johnston wrote: It seems could be triggered by sys.netinet6.frag6.* sys.netpfil.common.* sbin.pfctl.pfctl_test.* tests, and there are lots of test cases timed out. Can you help check these? I see, it is actually caused by r359438. I'm looking at it now. I verified that the netpfil and netinet6 tests pass with r359477. Thanks for the fixing, the latest test panics at epair_qflush: https://ci.freebsd.org/job/FreeBSD-head-amd64-test/14747/consoleFull while executing sys.netpfil.pf.* tests. I'm not sure if this is related or because of previous commits (I suspect the later). I'll look into this. That’s a know issue with epair (since EPOCH, I believe). A number of the pf tests are disabled due to this. See 238870. I also think so, btw, currently every test run panics so I am afraid that the recent commits might make status worse (or say, make the issue easier to reproduce?) I haven't been able to reproduce any panics or test failures so far. Once you disable the ‘atf_skip’ lines in the pf tests a simple `sudo kldload pfsync && cd /usr/tests/sys/netpfil/pf && sudo kyua test` is likely sufficient. There’s a complex race around tearing down epair interfaces and moving them back to their home vnet that’s proven very tricky to resolve. Best regards, Kristof ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359436 - in head/sys: kern net sys
On Tue, Mar 31, 2020 at 03:51:27PM +0800, Li-Wen Hsu wrote: > On Tue, Mar 31, 2020 at 3:00 PM Kristof Provost wrote: > > > > On 31 Mar 2020, at 7:56, Li-Wen Hsu wrote: > > > On Tue, Mar 31, 2020 at 10:55 AM Mark Johnston wrote: > > It seems could be triggered by sys.netinet6.frag6.* > > sys.netpfil.common.* sbin.pfctl.pfctl_test.* tests, and there are lots > > of test cases timed out. > > > > Can you help check these? > > >>> > > >>> I see, it is actually caused by r359438. I'm looking at it now. > > >> > > >> I verified that the netpfil and netinet6 tests pass with r359477. > > > > > > Thanks for the fixing, the latest test panics at epair_qflush: > > > > > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/14747/consoleFull > > > > > > while executing sys.netpfil.pf.* tests. I'm not sure if this is > > > related or because of previous commits (I suspect the later). I'll > > > look into this. > > > > > That’s a know issue with epair (since EPOCH, I believe). > > A number of the pf tests are disabled due to this. See 238870. > > I also think so, btw, currently every test run panics so I am afraid > that the recent commits might make status worse (or say, make the > issue easier to reproduce?) I haven't been able to reproduce any panics or test failures so far. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359481 - head/contrib/jemalloc/include/jemalloc
Author: trasz Date: Tue Mar 31 13:48:06 2020 New Revision: 359481 URL: https://svnweb.freebsd.org/changeset/base/359481 Log: Make jemalloc(3) default to retain:true on 64-bit platforms, like it already does on Linux and OSX. This results in significantly fewer calls to mmap(2). This should result in a small reduction in system CPU time and improved superpage usage. Reviewed by: markj Tested by:markj MFC after:2 weeks Sponsored by: DARPA Differential Revision:https://reviews.freebsd.org/D23874 Modified: head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Modified: head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h == --- head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Tue Mar 31 13:43:09 2020(r359480) +++ head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Tue Mar 31 13:48:06 2020(r359481) @@ -72,6 +72,10 @@ # define LG_SIZEOF_PTR3 #endif +#if LG_VADDR > 32 +# define JEMALLOC_RETAIN +#endif + #ifndef JEMALLOC_TLS_MODEL # define JEMALLOC_TLS_MODEL /* Default. */ #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r359480 - head/usr.sbin/ctld
Author: trasz
Date: Tue Mar 31 13:43:09 2020
New Revision: 359480
URL: https://svnweb.freebsd.org/changeset/base/359480
Log:
Add 'ctld -t', to test configuration file validity.
Reviewed by: mav, allanjude, bcr (man pages)
MFC after:2 weeks
Sponsored by: Klara Inc.
Differential Revision:https://reviews.freebsd.org/D23792
Modified:
head/usr.sbin/ctld/ctld.8
head/usr.sbin/ctld/ctld.c
Modified: head/usr.sbin/ctld/ctld.8
==
--- head/usr.sbin/ctld/ctld.8 Tue Mar 31 06:25:43 2020(r359479)
+++ head/usr.sbin/ctld/ctld.8 Tue Mar 31 13:43:09 2020(r359480)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 23, 2018
+.Dd March 31, 2020
.Dt CTLD 8
.Os
.Sh NAME
@@ -38,6 +38,10 @@
.Op Fl d
.Op Fl f Ar config-file
.Op Fl u
+.Nm
+.Fl t
+.Op Fl f Ar config-file
+.Op Fl u
.Sh DESCRIPTION
The
.Nm
@@ -90,6 +94,8 @@ The daemon sends verbose debug output to standard erro
put itself in the background.
The daemon will also not fork and will exit after processing one connection.
This option is only intended for debugging the target.
+.It Fl t
+Test the configuration file for validity and exit.
.It Fl u
Use UCL configuration file format instead of the traditional non-UCL format.
.El
Modified: head/usr.sbin/ctld/ctld.c
==
--- head/usr.sbin/ctld/ctld.c Tue Mar 31 06:25:43 2020(r359479)
+++ head/usr.sbin/ctld/ctld.c Tue Mar 31 13:43:09 2020(r359480)
@@ -69,6 +69,7 @@ usage(void)
{
fprintf(stderr, "usage: ctld [-d][-u][-f config-file]\n");
+ fprintf(stderr, " ctld -t [-u][-f config-file]\n");
exit(1);
}
@@ -2663,14 +2664,18 @@ main(int argc, char **argv)
const char *config_path = DEFAULT_CONFIG_PATH;
int debug = 0, ch, error;
bool dont_daemonize = false;
+ bool test_config = false;
bool use_ucl = false;
- while ((ch = getopt(argc, argv, "duf:R")) != -1) {
+ while ((ch = getopt(argc, argv, "dtuf:R")) != -1) {
switch (ch) {
case 'd':
dont_daemonize = true;
debug++;
break;
+ case 't':
+ test_config = true;
+ break;
case 'u':
use_ucl = true;
break;
@@ -2701,6 +2706,10 @@ main(int argc, char **argv)
if (newconf == NULL)
log_errx(1, "configuration error; exiting");
+
+ if (test_config)
+ return (0);
+
if (debug > 0) {
oldconf->conf_debug = debug;
newconf->conf_debug = debug;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359436 - in head/sys: kern net sys
On Tue, Mar 31, 2020 at 3:00 PM Kristof Provost wrote: > > On 31 Mar 2020, at 7:56, Li-Wen Hsu wrote: > > On Tue, Mar 31, 2020 at 10:55 AM Mark Johnston wrote: > It seems could be triggered by sys.netinet6.frag6.* > sys.netpfil.common.* sbin.pfctl.pfctl_test.* tests, and there are lots > of test cases timed out. > > Can you help check these? > >>> > >>> I see, it is actually caused by r359438. I'm looking at it now. > >> > >> I verified that the netpfil and netinet6 tests pass with r359477. > > > > Thanks for the fixing, the latest test panics at epair_qflush: > > > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/14747/consoleFull > > > > while executing sys.netpfil.pf.* tests. I'm not sure if this is > > related or because of previous commits (I suspect the later). I'll > > look into this. > > > That’s a know issue with epair (since EPOCH, I believe). > A number of the pf tests are disabled due to this. See 238870. I also think so, btw, currently every test run panics so I am afraid that the recent commits might make status worse (or say, make the issue easier to reproduce?) Best, Li-Wen ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r359436 - in head/sys: kern net sys
On 31 Mar 2020, at 7:56, Li-Wen Hsu wrote: > On Tue, Mar 31, 2020 at 10:55 AM Mark Johnston wrote: It seems could be triggered by sys.netinet6.frag6.* sys.netpfil.common.* sbin.pfctl.pfctl_test.* tests, and there are lots of test cases timed out. Can you help check these? >>> >>> I see, it is actually caused by r359438. I'm looking at it now. >> >> I verified that the netpfil and netinet6 tests pass with r359477. > > Thanks for the fixing, the latest test panics at epair_qflush: > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/14747/consoleFull > > while executing sys.netpfil.pf.* tests. I'm not sure if this is > related or because of previous commits (I suspect the later). I'll > look into this. > That’s a know issue with epair (since EPOCH, I believe). A number of the pf tests are disabled due to this. See 238870. Best regards, Kristof ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
