svn commit: r366623 - head/sys/netinet
Author: bz
Date: Sun Oct 11 00:01:00 2020
New Revision: 366623
URL: https://svnweb.freebsd.org/changeset/base/366623
Log:
ip_mroute: fix the viftable export sysctl
It seems that in r354857 I got more than one thing wrong.
Convert the SYSCTL_OPAQUE to a SYSCTL_PROC to properly export the these
days allocated and not longer static per-vnet viftable array.
This fixes a problem with netstat -g which would show bogus information
for the IPv4 Virtual Interface Table.
PR: 246626
Reported by: Ozkan KIRIK (ozkan.kirik gmail.com)
MFC after:3 days
Modified:
head/sys/netinet/ip_mroute.c
Modified: head/sys/netinet/ip_mroute.c
==
--- head/sys/netinet/ip_mroute.cSat Oct 10 21:52:00 2020
(r366622)
+++ head/sys/netinet/ip_mroute.cSun Oct 11 00:01:00 2020
(r366623)
@@ -181,13 +181,6 @@ VNET_DEFINE_STATIC(vifi_t, numvifs);
#defineV_numvifs VNET(numvifs)
VNET_DEFINE_STATIC(struct vif *, viftable);
#defineV_viftable VNET(viftable)
-/*
- * No one should be able to "query" this before initialisation happened in
- * vnet_mroute_init(), so we should still be fine.
- */
-SYSCTL_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_VNET | CTLFLAG_RD,
-_NAME(viftable), sizeof(*V_viftable) * MAXVIFS, "S,vif[MAXVIFS]",
-"IPv4 Multicast Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)");
static struct mtx vif_mtx;
#defineVIF_LOCK() mtx_lock(_mtx)
@@ -2805,6 +2798,30 @@ static SYSCTL_NODE(_net_inet_ip, OID_AUTO, mfctable,
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_mfctable,
"IPv4 Multicast Forwarding Table "
"(struct *mfc[mfchashsize], netinet/ip_mroute.h)");
+
+static int
+sysctl_viflist(SYSCTL_HANDLER_ARGS)
+{
+ int error;
+
+ if (req->newptr)
+ return (EPERM);
+ if (V_viftable == NULL) /* XXX unlocked */
+ return (0);
+ error = sysctl_wire_old_buffer(req, sizeof(*V_viftable) * MAXVIFS);
+ if (error)
+ return (error);
+
+ VIF_LOCK();
+ error = SYSCTL_OUT(req, V_viftable, sizeof(*V_viftable) * MAXVIFS);
+ VIF_UNLOCK();
+ return (error);
+}
+
+SYSCTL_PROC(_net_inet_ip, OID_AUTO, viftable,
+CTLTYPE_OPAQUE | CTLFLAG_VNET | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+sysctl_viflist, "S,vif[MAXVIFS]",
+"IPv4 Multicast Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)");
static void
vnet_mroute_init(const void *unused __unused)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366622 - in head: lib/libc/gen sys/amd64/amd64 sys/arm/arm sys/arm64/arm64 sys/compat/ia32 sys/dev/random/fenestrasX sys/i386/i386 sys/kern sys/mips/mips sys/powerpc/powerpc sys/riscv/...
Author: cem
Date: Sat Oct 10 21:52:00 2020
New Revision: 366622
URL: https://svnweb.freebsd.org/changeset/base/366622
Log:
random(4) FenestrasX: Push root seed version to arc4random(3)
Push the root seed version to userspace through the VDSO page, if
the RANDOM_FENESTRASX algorithm is enabled. Otherwise, there is no
functional change. The mechanism can be disabled with
debug.fxrng_vdso_enable=0.
arc4random(3) obtains a pointer to the root seed version published by
the kernel in the shared page at allocation time. Like arc4random(9),
it maintains its own per-process copy of the seed version corresponding
to the root seed version at the time it last rekeyed. On read requests,
the process seed version is compared with the version published in the
shared page; if they do not match, arc4random(3) reseeds from the
kernel before providing generated output.
This change does not implement the FenestrasX concept of PCPU userspace
generators seeded from a per-process base generator. That change is
left for future discussion/work.
Reviewed by: kib (previous version)
Approved by: csprng (me -- only touching FXRNG here)
Differential Revision:https://reviews.freebsd.org/D22839
Modified:
head/lib/libc/gen/arc4random.c
head/lib/libc/gen/arc4random.h
head/lib/libc/gen/auxv.c
head/sys/amd64/amd64/elf_machdep.c
head/sys/arm/arm/elf_machdep.c
head/sys/arm64/arm64/elf32_machdep.c
head/sys/arm64/arm64/elf_machdep.c
head/sys/compat/ia32/ia32_sysvec.c
head/sys/dev/random/fenestrasX/fx_brng.c
head/sys/dev/random/fenestrasX/fx_main.c
head/sys/i386/i386/elf_machdep.c
head/sys/kern/imgact_elf.c
head/sys/kern/kern_sharedpage.c
head/sys/mips/mips/elf_machdep.c
head/sys/mips/mips/freebsd32_machdep.c
head/sys/powerpc/powerpc/elf32_machdep.c
head/sys/powerpc/powerpc/elf64_machdep.c
head/sys/riscv/riscv/elf_machdep.c
head/sys/sys/elf_common.h
head/sys/sys/sysent.h
head/sys/sys/vdso.h
Modified: head/lib/libc/gen/arc4random.c
==
--- head/lib/libc/gen/arc4random.c Sat Oct 10 21:48:06 2020
(r366621)
+++ head/lib/libc/gen/arc4random.c Sat Oct 10 21:52:00 2020
(r366622)
@@ -27,6 +27,9 @@
__FBSDID("$FreeBSD$");
#include "namespace.h"
+#if defined(__FreeBSD__)
+#include
+#endif
#include
#include
#include
@@ -68,6 +71,9 @@ static struct _rs {
static struct _rsx {
chacha_ctx rs_chacha; /* chacha context for random keystream
*/
u_char rs_buf[RSBUFSZ];/* keystream blocks */
+#ifdef __FreeBSD__
+ uint32_trs_seed_generation; /* 32-bit userspace RNG version
*/
+#endif
} *rsx;
static inline int _rs_allocate(struct _rs **, struct _rsx **);
@@ -96,11 +102,43 @@ _rs_stir(void)
{
u_char rnd[KEYSZ + IVSZ];
+#if defined(__FreeBSD__)
+ bool need_init;
+
+ /*
+* De-couple allocation (which locates the vdso_fxrngp pointer in
+* auxinfo) from initialization. This allows us to read the root seed
+* version before we fetch system entropy, maintaining the invariant
+* that the PRF was seeded with entropy from rs_seed_generation or a
+* later generation. But never seeded from an earlier generation.
+* This invariant prevents us from missing a root reseed event.
+*/
+ need_init = false;
+ if (rs == NULL) {
+ if (_rs_allocate(, ) == -1)
+ abort();
+ need_init = true;
+ }
+ /*
+* Transition period: new userspace on old kernel. This should become
+* a hard error at some point, if the scheme is adopted.
+*/
+ if (vdso_fxrngp != NULL)
+ rsx->rs_seed_generation =
+ fxrng_load_acq_generation(_fxrngp->fx_generation32);
+#endif
+
if (getentropy(rnd, sizeof rnd) == -1)
_getentropy_fail();
+#if !defined(__FreeBSD__)
if (!rs)
_rs_init(rnd, sizeof(rnd));
+#else /* __FreeBSD__ */
+ assert(rs != NULL);
+ if (need_init)
+ _rs_init(rnd, sizeof(rnd));
+#endif
else
_rs_rekey(rnd, sizeof(rnd));
explicit_bzero(rnd, sizeof(rnd)); /* discard source seed */
Modified: head/lib/libc/gen/arc4random.h
==
--- head/lib/libc/gen/arc4random.h Sat Oct 10 21:48:06 2020
(r366621)
+++ head/lib/libc/gen/arc4random.h Sat Oct 10 21:52:00 2020
(r366622)
@@ -24,10 +24,34 @@
/*
* Stub functions for portability.
*/
+#include
+#include
#include
+#include /* for sys/vdso.h only. */
+#include
+#include
+#include
+#include
#include
+#include
+#include
+/*
+ * The kernel root seed version is a 64-bit counter, but we truncate it to a
+ * 32-bit value in userspace for the convenience of
svn commit: r366621 - in head/sys: dev/random dev/random/fenestrasX libkern sys
Author: cem
Date: Sat Oct 10 21:48:06 2020
New Revision: 366621
URL: https://svnweb.freebsd.org/changeset/base/366621
Log:
arc4random(9): Integrate with RANDOM_FENESTRASX push-reseed
There is no functional change for the existing Fortuna random(4)
implementation, which remains the default in GENERIC.
In the FenestrasX model, when the root CSPRNG is reseeded from pools due to
an (infrequent) timer, child CSPRNGs can cheaply detect this condition and
reseed. To do so, they just need to track an additional 64-bit value in the
associated state, and compare it against the root seed version (generation)
on random reads.
This revision integrates arc4random(9) into that model without substantially
changing the design or implementation of arc4random(9). The motivation is
that arc4random(9) is immediately reseeded when the backing random(4)
implementation has additional entropy. This is arguably most important
during boot, when fenestrasX is reseeding at 1, 3, 9, 27, etc., second
intervals. Today, arc4random(9) has a hardcoded 300 second reseed window.
Without this mechanism, if arc4random(9) gets weak entropy during initial
seed (and arc4random(9) is used early in boot, so this is quite possible),
it may continue to emit poorly seeded output for 5 minutes. The FenestrasX
push-reseed scheme corrects consumers, like arc4random(9), as soon as
possible.
Reviewed by: markm
Approved by: csprng (markm)
Differential Revision:https://reviews.freebsd.org/D22838
Added:
head/sys/dev/random/fenestrasX/fx_pub.h (contents, props changed)
Modified:
head/sys/dev/random/fenestrasX/fx_brng.c
head/sys/dev/random/fenestrasX/fx_main.c
head/sys/dev/random/fenestrasX/fx_pool.c
head/sys/dev/random/fenestrasX/fx_priv.h
head/sys/dev/random/randomdev.c
head/sys/libkern/arc4random.c
head/sys/sys/libkern.h
Modified: head/sys/dev/random/fenestrasX/fx_brng.c
==
--- head/sys/dev/random/fenestrasX/fx_brng.cSat Oct 10 21:45:59 2020
(r366620)
+++ head/sys/dev/random/fenestrasX/fx_brng.cSat Oct 10 21:48:06 2020
(r366621)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
/*
Modified: head/sys/dev/random/fenestrasX/fx_main.c
==
--- head/sys/dev/random/fenestrasX/fx_main.cSat Oct 10 21:45:59 2020
(r366620)
+++ head/sys/dev/random/fenestrasX/fx_main.cSat Oct 10 21:48:06 2020
(r366621)
@@ -88,7 +88,6 @@
* a while).
*
* Not yet implemented, not in scope, or todo:
- * - arc4random(9) injection/replacement
* - Userspace portions -- shared page, like timehands vdso?
*/
@@ -125,6 +124,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
struct fxrng_buffered_rng fxrng_root;
@@ -142,7 +142,7 @@ DPCPU_DEFINE_STATIC(struct fxrng_buffered_rng *, fxrng
* the root generation number >0.
*/
static void
-fxrng_alg_read(uint8_t *output, size_t nbytes)
+_fxrng_alg_read(uint8_t *output, size_t nbytes, uint64_t *seed_version_out)
{
struct fxrng_buffered_rng **pcpu_brng_p, *rng, *tmp;
struct pcpu *pcpu;
@@ -248,8 +248,30 @@ fxrng_alg_read(uint8_t *output, size_t nbytes)
have_valid_rng:
/* At this point we have a valid, initialized and seeded rng pointer. */
FXRNG_BRNG_LOCK(rng);
+ if (seed_version_out != NULL)
+ *seed_version_out = rng->brng_generation;
fxrng_brng_read(rng, output, nbytes);
FXRNG_BRNG_ASSERT_NOT(rng);
+}
+
+static void
+fxrng_alg_read(uint8_t *output, size_t nbytes)
+{
+ _fxrng_alg_read(output, nbytes, NULL);
+}
+
+/*
+ * External API for arc4random(9) to fetch new key material and associated seed
+ * version in chacha20_randomstir().
+ */
+void
+read_random_key(void *output, size_t nbytes, uint64_t *seed_version_out)
+{
+ /* Ensure _fxrng_alg_read invariant. */
+ if (__predict_false(atomic_load_acq_64(_root_generation) == 0))
+ (void)fxrng_alg_seeded();
+
+ _fxrng_alg_read(output, nbytes, seed_version_out);
}
static void
Modified: head/sys/dev/random/fenestrasX/fx_pool.c
==
--- head/sys/dev/random/fenestrasX/fx_pool.cSat Oct 10 21:45:59 2020
(r366620)
+++ head/sys/dev/random/fenestrasX/fx_pool.cSat Oct 10 21:48:06 2020
(r366621)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
/*
* Timer-based reseed interval growth factor and limit in seconds. (ยง 3.2)
Modified: head/sys/dev/random/fenestrasX/fx_priv.h
==
--- head/sys/dev/random/fenestrasX/fx_priv.hSat Oct 10 21:45:59 2020
(r366620)
+++ head/sys/dev/random/fenestrasX/fx_priv.hSat Oct 10
svn commit: r366620 - in head/sys: conf dev/random/fenestrasX
Author: cem
Date: Sat Oct 10 21:45:59 2020
New Revision: 366620
URL: https://svnweb.freebsd.org/changeset/base/366620
Log:
Add "Fenestras X" alternative /dev/random implementation
Fortuna remains the default; no functional change to GENERIC.
Big picture:
- Scalable entropy generation with per-CPU, buffered local generators.
- "Push" system for reseeding child generators when root PRNG is
reseeded. (Design can be extended to arc4random(9) and userspace
generators.)
- Similar entropy pooling system to Fortuna, but starts with a single
pool to quickly bootstrap as much entropy as possible early on.
- Reseeding from pooled entropy based on time schedule. The time
interval starts small and grows exponentially until reaching a cap.
Again, the goal is to have the RNG state depend on as much entropy as
possible quickly, but still periodically incorporate new entropy for
the same reasons as Fortuna.
Notable design choices in this implementation that differ from those
specified in the whitepaper:
- Blake2B instead of SHA-2 512 for entropy pooling
- Chacha20 instead of AES-CTR DRBG
- Initial seeding. We support more platforms and not all of them use
loader(8). So we have to grab the initial entropy sources in kernel
mode instead, as much as possible. Fortuna didn't have any mechanism
for this aside from the special case of loader-provided previous-boot
entropy, so most of these sources remain TODO after this commit.
Reviewed by: markm
Approved by: csprng (markm)
Differential Revision:https://reviews.freebsd.org/D22837
Added:
head/sys/dev/random/fenestrasX/
head/sys/dev/random/fenestrasX/fx_brng.c (contents, props changed)
head/sys/dev/random/fenestrasX/fx_brng.h (contents, props changed)
head/sys/dev/random/fenestrasX/fx_hash.h (contents, props changed)
head/sys/dev/random/fenestrasX/fx_main.c (contents, props changed)
head/sys/dev/random/fenestrasX/fx_pool.c (contents, props changed)
head/sys/dev/random/fenestrasX/fx_pool.h (contents, props changed)
head/sys/dev/random/fenestrasX/fx_priv.h (contents, props changed)
head/sys/dev/random/fenestrasX/fx_rng.c (contents, props changed)
head/sys/dev/random/fenestrasX/fx_rng.h (contents, props changed)
Modified:
head/sys/conf/NOTES
head/sys/conf/files
head/sys/conf/options
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Sat Oct 10 18:22:12 2020(r366619)
+++ head/sys/conf/NOTES Sat Oct 10 21:45:59 2020(r366620)
@@ -2772,6 +2772,8 @@ options RCTL
optionsMAXFILES=999
# Random number generator
+# Alternative algorithm.
+#options RANDOM_FENESTRASX
# Allow the CSPRNG algorithm to be loaded as a module.
#options RANDOM_LOADABLE
# Select this to allow high-rate but potentially expensive
Modified: head/sys/conf/files
==
--- head/sys/conf/files Sat Oct 10 18:22:12 2020(r366619)
+++ head/sys/conf/files Sat Oct 10 21:45:59 2020(r366620)
@@ -722,7 +722,7 @@ contrib/zstd/lib/decompress/zstd_decompress_block.c op
compile-with "${ZSTD_C} ${ZSTD_DECOMPRESS_BLOCK_FLAGS}"
contrib/zstd/lib/decompress/huf_decompress.c optional zstdio compile-with
${ZSTD_C}
# Blake 2
-contrib/libb2/blake2b-ref.coptional crypto | ipsec | ipsec_support \
+contrib/libb2/blake2b-ref.coptional crypto | ipsec | ipsec_support |
!random_loadable random_fenestrasx \
compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual
-DSUFFIX=_ref -Wno-unused-function"
contrib/libb2/blake2s-ref.coptional crypto | ipsec | ipsec_support \
compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual
-DSUFFIX=_ref -Wno-unused-function"
@@ -2820,7 +2820,14 @@ rt2860.fwoptional rt2860fw |
ralfw \
dev/random/random_infra.c standard
dev/random/random_harvestq.c standard
dev/random/randomdev.c optional !random_loadable
-dev/random/fortuna.c optional !random_loadable
+dev/random/fenestrasX/fx_brng.coptional !random_loadable
random_fenestrasx
+dev/random/fenestrasX/fx_main.coptional !random_loadable
random_fenestrasx \
+ compile-with "${NORMAL_C} -I$S/crypto/blake2"
+dev/random/fenestrasX/fx_pool.coptional !random_loadable
random_fenestrasx \
+ compile-with "${NORMAL_C} -I$S/crypto/blake2"
+dev/random/fenestrasX/fx_rng.c optional !random_loadable random_fenestrasx \
+ compile-with "${NORMAL_C} -I$S/crypto/blake2"
+dev/random/fortuna.c optional !random_loadable !random_fenestrasx
dev/random/hash.c optional !random_loadable
dev/rccgpio/rccgpio.c optional rccgpio gpio
dev/re/if_re.c optional re
Modified: head/sys/conf/options
svn commit: r366619 - in stable/11/sys: amd64/include x86/include
Author: kib Date: Sat Oct 10 18:22:12 2020 New Revision: 366619 URL: https://svnweb.freebsd.org/changeset/base/366619 Log: MFC r366415: Move ctx_switch_xsave declaration to amd64 md_var.h. Modified: stable/11/sys/amd64/include/md_var.h stable/11/sys/x86/include/x86_var.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/include/md_var.h == --- stable/11/sys/amd64/include/md_var.hSat Oct 10 18:18:08 2020 (r366618) +++ stable/11/sys/amd64/include/md_var.hSat Oct 10 18:22:12 2020 (r366619) @@ -35,6 +35,7 @@ #include extern uint64_t*vm_page_dump; +extern charctx_switch_xsave[]; extern int hw_lower_amd64_sharedpage; extern int hw_ibrs_disable; extern int hw_ssb_disable; Modified: stable/11/sys/x86/include/x86_var.h == --- stable/11/sys/x86/include/x86_var.h Sat Oct 10 18:18:08 2020 (r366618) +++ stable/11/sys/x86/include/x86_var.h Sat Oct 10 18:22:12 2020 (r366619) @@ -66,7 +66,6 @@ externu_int cpu_mon_mwait_flags; extern u_int cpu_mon_min_size; extern u_int cpu_mon_max_size; extern u_int cpu_maxphyaddr; -extern charctx_switch_xsave[]; extern u_int hv_high; extern charhv_vendor[]; extern charkstack[]; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366618 - stable/11/sys/net
Author: kib
Date: Sat Oct 10 18:18:08 2020
New Revision: 366618
URL: https://svnweb.freebsd.org/changeset/base/366618
Log:
MFC r366514:
Fix typo.
Modified:
stable/11/sys/net/if.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/net/if.h
==
--- stable/11/sys/net/if.h Sat Oct 10 14:38:01 2020(r366617)
+++ stable/11/sys/net/if.h Sat Oct 10 18:18:08 2020(r366618)
@@ -205,7 +205,7 @@ struct if_data {
* contains the enabled optional feature & capabilites that can be used
* individually per packet and are specified in the mbuf pkthdr.csum_flags
* field. IFCAP_* and CSUM_* do not match one to one and CSUM_* may be
- * more detailed or differenciated than IFCAP_*.
+ * more detailed or differentiated than IFCAP_*.
* Hwassist features are defined CSUM_* in sys/mbuf.h
*
* Capabilities that cannot be arbitrarily changed with ifconfig/ioctl
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient
On Sat, Oct 10, 2020 at 09:02:50AM -0500, Mike Karels wrote: > > Date: Sat, 10 Oct 2020 15:28:29 +0200 > > From: Gordon Bergling > > On Sat, Oct 10, 2020 at 08:12:43AM -0500, Mike Karels wrote: > > > > Author: gbe (doc committer) > > > > Date: Sat Oct 10 09:52:41 2020 > > > > New Revision: 366608 > > > > URL: https://svnweb.freebsd.org/changeset/base/366608 > > > > > > > Log: > > > > MFC r366407, r366403 > > > > > > > > ls(1): Bugfix for an issue reported by mandoc > > > > dhclient(8): Bugfixes for some issues reported by mandoc > > > > > > > > - no blank before trailing delimiter > > > > - new sentence, new line > > > > > > > Modified: > > > > stable/12/bin/ls/ls.1 > > > > stable/12/sbin/dhclient/dhclient.leases.5 > > > > stable/12/sbin/dhclient/dhcp-options.5 > > > > Directory Properties: > > > > stable/12/ (props changed) > > > > > > > Modified: stable/12/bin/ls/ls.1 > > > > == > > > > --- stable/12/bin/ls/ls.1 Sat Oct 10 09:50:09 2020 > > > > (r366607) > > > > +++ stable/12/bin/ls/ls.1 Sat Oct 10 09:52:41 2020 > > > > (r366608) > > > > @@ -40,7 +40,7 @@ > > > > .Nd list directory contents > > > > .Sh SYNOPSIS > > > > .Nm > > > > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, > > > > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , > > > > .Op Fl -color Ns = Ns Ar when > > > > .Op Fl D Ar format > > > > .Op Ar > > > > > > This change is wrong, and should not have been MFC'd. It should be fixed > > > correctly instead. The comma is not a delimiter, it is an option; it > > > should > > > appear inside the brackets, not after. The warning can be fixed by adding > > > \& after the comma rather than inserting a space. > > > > > > Mike > > > Hello Mike, > > > if this change is wrong I'll correct it in head and MFC it afterwards. > > The output of ls(1) is still the same as it was before, checked via mandoc > > and > > man. > > > --Gordon > > In my testing, the comma is inside the brackets in the original version: > > ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [--color=when] [-D format] > [file ...] > > > It is outside the brackets with this change: > > ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1], [--color=when] [-D format] > [file ...] > > The former is correct. Caveat, I'm running mandoc on 12.1. > > Mike That is strange, maybe an localisation problem. I am also running my local tests on 12.2-STABLE. I followed your suggestion in r366613 [1] and MFC it tomorrow. --Gordon [1] https://svnweb.freebsd.org/base?view=revision=366613 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366617 - head/usr.sbin/pnfsdsfile
Author: gbe (doc committer) Date: Sat Oct 10 14:38:01 2020 New Revision: 366617 URL: https://svnweb.freebsd.org/changeset/base/366617 Log: pnfsdsfile(8): Remove dublicate word 'the' MFC after:1 week Modified: head/usr.sbin/pnfsdsfile/pnfsdsfile.8 Modified: head/usr.sbin/pnfsdsfile/pnfsdsfile.8 == --- head/usr.sbin/pnfsdsfile/pnfsdsfile.8 Sat Oct 10 14:36:16 2020 (r366616) +++ head/usr.sbin/pnfsdsfile/pnfsdsfile.8 Sat Oct 10 14:38:01 2020 (r366617) @@ -117,7 +117,7 @@ After being re-enabled, the command with the .Dq -r option -will be used to copy the the file's data to this repaired DS and then update the +will be used to copy the file's data to this repaired DS and then update the extended attribute to use it. .Pp A typical use of this will be within a ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366616 - head/usr.sbin/cxgbetool
Author: gbe (doc committer) Date: Sat Oct 10 14:36:16 2020 New Revision: 366616 URL: https://svnweb.freebsd.org/changeset/base/366616 Log: cxgbetool(8): Remove dublicate word 'whether' MFC after:1 week Modified: head/usr.sbin/cxgbetool/cxgbetool.8 Modified: head/usr.sbin/cxgbetool/cxgbetool.8 == --- head/usr.sbin/cxgbetool/cxgbetool.8 Sat Oct 10 14:20:07 2020 (r366615) +++ head/usr.sbin/cxgbetool/cxgbetool.8 Sat Oct 10 14:36:16 2020 (r366616) @@ -547,7 +547,7 @@ There is an implicit rule that disables offload for co match anything in the policy. .Pp Each rule consists of a filter part, which determines what connections the -rule applies to, and a settings part, which determines whether whether matching +rule applies to, and a settings part, which determines whether matching connections will be offloaded and, if so, with what settings. The general form of a rule is .Bl -ohang -offset indent ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366615 - head/share/man/man5
Author: gbe (doc committer) Date: Sat Oct 10 14:20:07 2020 New Revision: 366615 URL: https://svnweb.freebsd.org/changeset/base/366615 Log: man5: Fix a few typos spotted by igor - fstab(5): conjuction -> conjunction - mount.conf(5): repeated 'the' - periodic.conf(5): Partion -> Partition MFC after:1 week Modified: head/share/man/man5/fstab.5 head/share/man/man5/mount.conf.5 head/share/man/man5/periodic.conf.5 Modified: head/share/man/man5/fstab.5 == --- head/share/man/man5/fstab.5 Sat Oct 10 13:46:48 2020(r366614) +++ head/share/man/man5/fstab.5 Sat Oct 10 14:20:07 2020(r366615) @@ -205,7 +205,7 @@ is applied automatically. .Pp The .Dq update -option is typically used in conjuction with two +option is typically used in conjunction with two .Nm files. The first Modified: head/share/man/man5/mount.conf.5 == --- head/share/man/man5/mount.conf.5Sat Oct 10 13:46:48 2020 (r366614) +++ head/share/man/man5/mount.conf.5Sat Oct 10 14:20:07 2020 (r366615) @@ -123,8 +123,7 @@ is performed. When the kernel processes this line, a .Li mountroot> command-line prompt is displayed. -At this prompt, the operator can enter the -the root mount. +At this prompt, the operator can enter the root mount. .It Ic .md Ar file Create a memory backed .Xr md 4 Modified: head/share/man/man5/periodic.conf.5 == --- head/share/man/man5/periodic.conf.5 Sat Oct 10 13:46:48 2020 (r366614) +++ head/share/man/man5/periodic.conf.5 Sat Oct 10 14:20:07 2020 (r366615) @@ -256,7 +256,7 @@ as configured in .Pq Vt bool Set to .Dq Li YES -to create backup of EFI System Partion (ESP). +to create backup of EFI System Partition (ESP). .It Va daily_backup_gpart_enable .Pq Vt bool Set to ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient
> Date: Sat, 10 Oct 2020 15:28:29 +0200 > From: Gordon Bergling > On Sat, Oct 10, 2020 at 08:12:43AM -0500, Mike Karels wrote: > > > Author: gbe (doc committer) > > > Date: Sat Oct 10 09:52:41 2020 > > > New Revision: 366608 > > > URL: https://svnweb.freebsd.org/changeset/base/366608 > > > > > Log: > > > MFC r366407, r366403 > > > > > > ls(1): Bugfix for an issue reported by mandoc > > > dhclient(8): Bugfixes for some issues reported by mandoc > > > > > > - no blank before trailing delimiter > > > - new sentence, new line > > > > > Modified: > > > stable/12/bin/ls/ls.1 > > > stable/12/sbin/dhclient/dhclient.leases.5 > > > stable/12/sbin/dhclient/dhcp-options.5 > > > Directory Properties: > > > stable/12/ (props changed) > > > > > Modified: stable/12/bin/ls/ls.1 > > > == > > > --- stable/12/bin/ls/ls.1 Sat Oct 10 09:50:09 2020(r366607) > > > +++ stable/12/bin/ls/ls.1 Sat Oct 10 09:52:41 2020(r366608) > > > @@ -40,7 +40,7 @@ > > > .Nd list directory contents > > > .Sh SYNOPSIS > > > .Nm > > > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, > > > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , > > > .Op Fl -color Ns = Ns Ar when > > > .Op Fl D Ar format > > > .Op Ar > > > > This change is wrong, and should not have been MFC'd. It should be fixed > > correctly instead. The comma is not a delimiter, it is an option; it should > > appear inside the brackets, not after. The warning can be fixed by adding > > \& after the comma rather than inserting a space. > > > > Mike > Hello Mike, > if this change is wrong I'll correct it in head and MFC it afterwards. > The output of ls(1) is still the same as it was before, checked via mandoc and > man. > --Gordon In my testing, the comma is inside the brackets in the original version: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [--color=when] [-D format] [file ...] It is outside the brackets with this change: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1], [--color=when] [-D format] [file ...] The former is correct. Caveat, I'm running mandoc on 12.1. Mike ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366614 - in stable/12/sys/amd64: amd64 include
Author: kib
Date: Sat Oct 10 13:46:48 2020
New Revision: 366614
URL: https://svnweb.freebsd.org/changeset/base/366614
Log:
MFC r366417:
amd64: Store full 64bit of FIP/FDP for 64bit processes when using XSAVE.
PR: 250043
Modified:
stable/12/sys/amd64/amd64/cpu_switch.S
stable/12/sys/amd64/amd64/fpu.c
stable/12/sys/amd64/include/md_var.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/amd64/amd64/cpu_switch.S
==
--- stable/12/sys/amd64/amd64/cpu_switch.S Sat Oct 10 13:39:13 2020
(r366613)
+++ stable/12/sys/amd64/amd64/cpu_switch.S Sat Oct 10 13:46:48 2020
(r366614)
@@ -128,22 +128,25 @@ done_store_dr:
/* have we used fp, and need a save? */
cmpq%rdi,PCPU(FPCURTHREAD)
- jne 2f
- movqPCB_SAVEFPU(%r8),%r8
+ jne ctx_switch_fpusave_done
+ movqPCB_SAVEFPU(%r8),%r9
clts
cmpl$0,use_xsave(%rip)
jne 1f
- fxsave (%r8)
- jmp 2f
+ fxsave (%r9)
+ jmp ctx_switch_fpusave_done
1: movq%rdx,%rcx
movlxsave_mask,%eax
movlxsave_mask+4,%edx
+ testl $PCB_32BIT,PCB_FLAGS(%r8)
+ jne ctx_switch_xsave32
.globl ctx_switch_xsave
ctx_switch_xsave:
/* This is patched to xsaveopt if supported, see fpuinit_bsp1() */
- xsave (%r8)
+ xsave64 (%r9)
+ctx_switch_xsave_done:
movq%rcx,%rdx
-2:
+ctx_switch_fpusave_done:
/* Save is done. Now fire up new thread. Leave old vmspace. */
movq%rsi,%r12
movq%rdi,%r13
@@ -306,6 +309,11 @@ do_ldt:movqPCPU(LDT),%rax
movq%rdx,8(%rax)
movl$LDTSEL,%eax
jmp ld_ldt
+
+ .globl ctx_switch_xsave32
+ctx_switch_xsave32:
+ xsave (%r9)
+ jmp ctx_switch_xsave_done
END(cpu_switch)
/*
Modified: stable/12/sys/amd64/amd64/fpu.c
==
--- stable/12/sys/amd64/amd64/fpu.c Sat Oct 10 13:39:13 2020
(r366613)
+++ stable/12/sys/amd64/amd64/fpu.c Sat Oct 10 13:46:48 2020
(r366614)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -80,7 +81,7 @@ __FBSDID("$FreeBSD$");
#definestmxcsr(addr) __asm __volatile("stmxcsr %0" : : "m"
(*(addr)))
static __inline void
-xrstor(char *addr, uint64_t mask)
+xrstor32(char *addr, uint64_t mask)
{
uint32_t low, hi;
@@ -90,27 +91,59 @@ xrstor(char *addr, uint64_t mask)
}
static __inline void
-xsave(char *addr, uint64_t mask)
+xrstor64(char *addr, uint64_t mask)
{
uint32_t low, hi;
low = mask;
hi = mask >> 32;
+ __asm __volatile("xrstor64 %0" : : "m" (*addr), "a" (low), "d" (hi));
+}
+
+static __inline void
+xsave32(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
__asm __volatile("xsave %0" : "=m" (*addr) : "a" (low), "d" (hi) :
"memory");
}
static __inline void
-xsaveopt(char *addr, uint64_t mask)
+xsave64(char *addr, uint64_t mask)
{
uint32_t low, hi;
low = mask;
hi = mask >> 32;
+ __asm __volatile("xsave64 %0" : "=m" (*addr) : "a" (low), "d" (hi) :
+ "memory");
+}
+
+static __inline void
+xsaveopt32(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
__asm __volatile("xsaveopt %0" : "=m" (*addr) : "a" (low), "d" (hi) :
"memory");
}
+static __inline void
+xsaveopt64(char *addr, uint64_t mask)
+{
+ uint32_t low, hi;
+
+ low = mask;
+ hi = mask >> 32;
+ __asm __volatile("xsaveopt64 %0" : "=m" (*addr) : "a" (low), "d" (hi) :
+ "memory");
+}
+
#else /* !(__GNUCLIKE_ASM && !lint) */
void fldcw(u_short cw);
@@ -122,9 +155,12 @@ void fxsave(caddr_t addr);
void fxrstor(caddr_t addr);
void ldmxcsr(u_int csr);
void stmxcsr(u_int *csr);
-void xrstor(char *addr, uint64_t mask);
-void xsave(char *addr, uint64_t mask);
-void xsaveopt(char *addr, uint64_t mask);
+void xrstor32(char *addr, uint64_t mask);
+void xrstor64(char *addr, uint64_t mask);
+void xsave32(char *addr, uint64_t mask);
+void xsave64(char *addr, uint64_t mask);
+void xsaveopt32(char *addr, uint64_t mask);
+void xsaveopt64(char *addr, uint64_t mask);
#endif /* __GNUCLIKE_ASM && !lint */
@@ -170,24 +206,48 @@ struct xsave_area_elm_descr {
} *xsave_area_desc;
static void
-fpusave_xsaveopt(void *addr)
+fpusave_xsaveopt64(void *addr)
{
+ xsaveopt64((char *)addr, xsave_mask);
+}
- xsaveopt((char *)addr, xsave_mask);
+static void
+fpusave_xsaveopt3264(void *addr)
+{
+ if (SV_CURPROC_FLAG(SV_ILP32))
+ xsaveopt32((char *)addr, xsave_mask);
+
svn commit: r366613 - head/bin/ls
Author: gbe (doc committer) Date: Sat Oct 10 13:39:13 2020 New Revision: 366613 URL: https://svnweb.freebsd.org/changeset/base/366613 Log: ls(1): Use \& as an escape character for the ',' option Reported by: karels@, xtouqh at hotmail dot com MFC after:1 day Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 == --- head/bin/ls/ls.1Sat Oct 10 13:33:57 2020(r366612) +++ head/bin/ls/ls.1Sat Oct 10 13:39:13 2020(r366613) @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1\&, .Op Fl -color Ns = Ns Ar when .Op Fl D Ar format .Op Ar ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366612 - stable/12/sys/net
Author: kib
Date: Sat Oct 10 13:33:57 2020
New Revision: 366612
URL: https://svnweb.freebsd.org/changeset/base/366612
Log:
MFC r366514:
Fix typo.
Modified:
stable/12/sys/net/if.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/net/if.h
==
--- stable/12/sys/net/if.h Sat Oct 10 13:01:04 2020(r366611)
+++ stable/12/sys/net/if.h Sat Oct 10 13:33:57 2020(r366612)
@@ -210,7 +210,7 @@ struct if_data {
* contains the enabled optional feature & capabilites that can be used
* individually per packet and are specified in the mbuf pkthdr.csum_flags
* field. IFCAP_* and CSUM_* do not match one to one and CSUM_* may be
- * more detailed or differenciated than IFCAP_*.
+ * more detailed or differentiated than IFCAP_*.
* Hwassist features are defined CSUM_* in sys/mbuf.h
*
* Capabilities that cannot be arbitrarily changed with ifconfig/ioctl
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient
On Sat, Oct 10, 2020 at 08:12:43AM -0500, Mike Karels wrote: > > Author: gbe (doc committer) > > Date: Sat Oct 10 09:52:41 2020 > > New Revision: 366608 > > URL: https://svnweb.freebsd.org/changeset/base/366608 > > > Log: > > MFC r366407, r366403 > > > > ls(1): Bugfix for an issue reported by mandoc > > dhclient(8): Bugfixes for some issues reported by mandoc > > > > - no blank before trailing delimiter > > - new sentence, new line > > > Modified: > > stable/12/bin/ls/ls.1 > > stable/12/sbin/dhclient/dhclient.leases.5 > > stable/12/sbin/dhclient/dhcp-options.5 > > Directory Properties: > > stable/12/ (props changed) > > > Modified: stable/12/bin/ls/ls.1 > > == > > --- stable/12/bin/ls/ls.1 Sat Oct 10 09:50:09 2020(r366607) > > +++ stable/12/bin/ls/ls.1 Sat Oct 10 09:52:41 2020(r366608) > > @@ -40,7 +40,7 @@ > > .Nd list directory contents > > .Sh SYNOPSIS > > .Nm > > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, > > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , > > .Op Fl -color Ns = Ns Ar when > > .Op Fl D Ar format > > .Op Ar > > This change is wrong, and should not have been MFC'd. It should be fixed > correctly instead. The comma is not a delimiter, it is an option; it should > appear inside the brackets, not after. The warning can be fixed by adding > \& after the comma rather than inserting a space. > > Mike Hello Mike, if this change is wrong I'll correct it in head and MFC it afterwards. The output of ls(1) is still the same as it was before, checked via mandoc and man. --Gordon ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366608 - in stable/12: bin/ls sbin/dhclient
> Author: gbe (doc committer) > Date: Sat Oct 10 09:52:41 2020 > New Revision: 366608 > URL: https://svnweb.freebsd.org/changeset/base/366608 > Log: > MFC r366407, r366403 > > ls(1): Bugfix for an issue reported by mandoc > dhclient(8): Bugfixes for some issues reported by mandoc > > - no blank before trailing delimiter > - new sentence, new line > Modified: > stable/12/bin/ls/ls.1 > stable/12/sbin/dhclient/dhclient.leases.5 > stable/12/sbin/dhclient/dhcp-options.5 > Directory Properties: > stable/12/ (props changed) > Modified: stable/12/bin/ls/ls.1 > == > --- stable/12/bin/ls/ls.1 Sat Oct 10 09:50:09 2020(r366607) > +++ stable/12/bin/ls/ls.1 Sat Oct 10 09:52:41 2020(r366608) > @@ -40,7 +40,7 @@ > .Nd list directory contents > .Sh SYNOPSIS > .Nm > -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, > +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , > .Op Fl -color Ns = Ns Ar when > .Op Fl D Ar format > .Op Ar This change is wrong, and should not have been MFC'd. It should be fixed correctly instead. The comma is not a delimiter, it is an option; it should appear inside the brackets, not after. The warning can be fixed by adding \& after the comma rather than inserting a space. Mike ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366611 - head/usr.bin/cpuset
Author: gbe (doc committer) Date: Sat Oct 10 13:01:04 2020 New Revision: 366611 URL: https://svnweb.freebsd.org/changeset/base/366611 Log: cpuset(1): Fix a typo - 'at at' -> 'at a' MFC after:1 week Modified: head/usr.bin/cpuset/cpuset.1 Modified: head/usr.bin/cpuset/cpuset.1 == --- head/usr.bin/cpuset/cpuset.1Sat Oct 10 12:06:39 2020 (r366610) +++ head/usr.bin/cpuset/cpuset.1Sat Oct 10 13:01:04 2020 (r366611) @@ -152,7 +152,7 @@ Ranges may be specified as in Valid policies include first-touch (ft), round-robin (rr), prefer and interleave (il). First-touch allocates on the local domain when memory is available. -Round-robin alternates between every possible domain page at at time. +Round-robin alternates between every possible domain page at a time. The prefer policy accepts only a single domain in the set. The parent of the set is consulted if the preferred domain is unavailable. Interleave operates like round-robin with an implementation defined stripe ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366610 - head/share/man/man3
Author: gbe (doc committer) Date: Sat Oct 10 12:06:39 2020 New Revision: 366610 URL: https://svnweb.freebsd.org/changeset/base/366610 Log: sigevent(3): Fix a typo - asychronous -> asynchronous MFC after:1 week Modified: head/share/man/man3/sigevent.3 Modified: head/share/man/man3/sigevent.3 == --- head/share/man/man3/sigevent.3 Sat Oct 10 12:05:54 2020 (r366609) +++ head/share/man/man3/sigevent.3 Sat Oct 10 12:06:39 2020 (r366610) @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In signal.h .Sh DESCRIPTION -Some operations permit threads to request asychronous notification of events +Some operations permit threads to request asynchronous notification of events via a .Vt struct sigevent structure. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366609 - head/share/man/man4
Author: gbe (doc committer) Date: Sat Oct 10 12:05:54 2020 New Revision: 366609 URL: https://svnweb.freebsd.org/changeset/base/366609 Log: dtrace_audit(4): Fix a typo - asynchonously -> asynchronously MFC after:1 week Modified: head/share/man/man4/dtrace_audit.4 Modified: head/share/man/man4/dtrace_audit.4 == --- head/share/man/man4/dtrace_audit.4 Sat Oct 10 09:52:41 2020 (r366608) +++ head/share/man/man4/dtrace_audit.4 Sat Oct 10 12:05:54 2020 (r366609) @@ -119,7 +119,7 @@ remains available for capture by the script. .Pp The .Fn audit:event:aue_*:bsm -probes fire asynchonously from system-call return, following BSM conversion +probes fire asynchronously from system-call return, following BSM conversion and just prior to being written to disk, giving access to four arguments: a .Vt char * audit event name, the ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366608 - in stable/12: bin/ls sbin/dhclient
Author: gbe (doc committer) Date: Sat Oct 10 09:52:41 2020 New Revision: 366608 URL: https://svnweb.freebsd.org/changeset/base/366608 Log: MFC r366407, r366403 ls(1): Bugfix for an issue reported by mandoc dhclient(8): Bugfixes for some issues reported by mandoc - no blank before trailing delimiter - new sentence, new line Modified: stable/12/bin/ls/ls.1 stable/12/sbin/dhclient/dhclient.leases.5 stable/12/sbin/dhclient/dhcp-options.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/ls/ls.1 == --- stable/12/bin/ls/ls.1 Sat Oct 10 09:50:09 2020(r366607) +++ stable/12/bin/ls/ls.1 Sat Oct 10 09:52:41 2020(r366608) @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1 , .Op Fl -color Ns = Ns Ar when .Op Fl D Ar format .Op Ar Modified: stable/12/sbin/dhclient/dhclient.leases.5 == --- stable/12/sbin/dhclient/dhclient.leases.5 Sat Oct 10 09:50:09 2020 (r366607) +++ stable/12/sbin/dhclient/dhclient.leases.5 Sat Oct 10 09:52:41 2020 (r366608) @@ -54,7 +54,7 @@ the last one in the file is used. The file is written as a log, so this is not an unusual occurrence. .Pp The lease file is named -.Pa dhclient.leases. Ns Ar IFNAME , +.Pa dhclient.leases . Ns Ar IFNAME , where .Ar IFNAME represents the network interface the DHCP client acquired the lease on. @@ -70,7 +70,7 @@ The format of the lease declarations is described in .Xr dhclient.conf 5 . .Sh FILES .Bl -tag -width ".Pa /var/db/dhclient.leases. Ns Ar IFNAME" -.It Pa /var/db/dhclient.leases. Ns Ar IFNAME +.It Pa /var/db/dhclient.leases . Ns Ar IFNAME Current lease file. .El .Sh SEE ALSO Modified: stable/12/sbin/dhclient/dhcp-options.5 == --- stable/12/sbin/dhclient/dhcp-options.5 Sat Oct 10 09:50:09 2020 (r366607) +++ stable/12/sbin/dhclient/dhcp-options.5 Sat Oct 10 09:52:41 2020 (r366608) @@ -267,8 +267,8 @@ This option specifies the domain name that the client resolving hostnames via the Domain Name System. .It Ic option domain-search Ar string ; This option specifies a list of domain names that the client should use -when resolving hostnames via the Domain Name System. This option is -defined in RFC 3397. +when resolving hostnames via the Domain Name System. +This option is defined in RFC 3397. .It Ic option swap-server Ar ip-address ; This specifies the IP address of the client's swap server. .It Ic option root-path Ar string ; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366607 - in stable/12/sbin: devd fsdb mdmfs
Author: gbe (doc committer) Date: Sat Oct 10 09:50:09 2020 New Revision: 366607 URL: https://svnweb.freebsd.org/changeset/base/366607 Log: MFC r366408, r366410, r366405 fsdb(8): Fix an issue reported by mandoc mdmfs(8): Fix an issue reported by mandoc devd.conf(5): Bugfix for an issue reported by mandoc - whitespace at end of input line Modified: stable/12/sbin/devd/devd.conf.5 stable/12/sbin/fsdb/fsdb.8 stable/12/sbin/mdmfs/mdmfs.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/devd/devd.conf.5 == --- stable/12/sbin/devd/devd.conf.5 Sat Oct 10 09:44:56 2020 (r366606) +++ stable/12/sbin/devd/devd.conf.5 Sat Oct 10 09:50:09 2020 (r366607) @@ -532,7 +532,7 @@ keyboard has been pressed. A brightness level change has been requested. Direction is in the $notify variable. .It Li PMU Ta Li keys Ta mute Ta -The mute key +The mute key .It Li PMU Ta Li keys Ta volume Ta A volume level change has been requested. Direction is in the $notify variable. Modified: stable/12/sbin/fsdb/fsdb.8 == --- stable/12/sbin/fsdb/fsdb.8 Sat Oct 10 09:44:56 2020(r366606) +++ stable/12/sbin/fsdb/fsdb.8 Sat Oct 10 09:50:09 2020(r366607) @@ -251,7 +251,7 @@ appeared in written by .An John T. Kohl . It first appeared in -.Fx 2.1.5 +.Fx 2.1.5 ported by Peter Wemm. .Sh BUGS Manipulation of ``short'' symlinks has no effect. Modified: stable/12/sbin/mdmfs/mdmfs.8 == --- stable/12/sbin/mdmfs/mdmfs.8Sat Oct 10 09:44:56 2020 (r366606) +++ stable/12/sbin/mdmfs/mdmfs.8Sat Oct 10 09:50:09 2020 (r366607) @@ -70,7 +70,7 @@ Based on .Ar md-device , the .Nm -utility either creates a +utility either creates a .Xr tmpfs 5 filesystem, or it configures an .Xr md 4 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366606 - stable/12/sbin/gvinum
Author: gbe (doc committer) Date: Sat Oct 10 09:44:56 2020 New Revision: 366606 URL: https://svnweb.freebsd.org/changeset/base/366606 Log: MFC r366411: gvinum(8): Fix an issue reported by mandoc - new sentence, new line Modified: stable/12/sbin/gvinum/gvinum.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/gvinum/gvinum.8 == --- stable/12/sbin/gvinum/gvinum.8 Sat Oct 10 09:43:35 2020 (r366605) +++ stable/12/sbin/gvinum/gvinum.8 Sat Oct 10 09:44:56 2020 (r366606) @@ -202,8 +202,8 @@ Terminate access to the objects, or stop .Nm if no parameters are specified. .It Ic stripe Oo Fl fv Oc Oo Fl n Ar name Oc Ar drives -Create a striped volume from the specified drives. If no name is specified, -a unique name will be set by +Create a striped volume from the specified drives. +If no name is specified, a unique name will be set by .Ic gvinum . This organization requires at least two drives. .El ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366605 - stable/12/bin/cp
Author: gbe (doc committer) Date: Sat Oct 10 09:43:35 2020 New Revision: 366605 URL: https://svnweb.freebsd.org/changeset/base/366605 Log: MFC 366404: cp(1): Bugfixes for some issues reported by mandoc - no blank before trailing delimiter Modified: stable/12/bin/cp/cp.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/cp/cp.1 == --- stable/12/bin/cp/cp.1 Sat Oct 10 09:42:24 2020(r366604) +++ stable/12/bin/cp/cp.1 Sat Oct 10 09:43:35 2020(r366605) @@ -300,9 +300,9 @@ differ as they copy special files as normal files while recreating a hierarchy. .Pp The -.Fl l, -.Fl s, -.Fl v, +.Fl l , +.Fl s , +.Fl v , .Fl x and .Fl n ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366604 - stable/12/sbin/veriexec
Author: gbe (doc committer) Date: Sat Oct 10 09:42:24 2020 New Revision: 366604 URL: https://svnweb.freebsd.org/changeset/base/366604 Log: MFC r366409: veriexec(8): Bugfix for an issue reported by mandoc - consider using OS macro: Nx Modified: stable/12/sbin/veriexec/veriexec.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/veriexec/veriexec.8 == --- stable/12/sbin/veriexec/veriexec.8 Sat Oct 10 09:41:20 2020 (r366603) +++ stable/12/sbin/veriexec/veriexec.8 Sat Oct 10 09:42:24 2020 (r366604) @@ -138,9 +138,8 @@ they are provided for the use of other .Xr mac 4 modules. .Sh HISTORY -The Verified Exec system first appeared in NetBSD. +The Verified Exec system first appeared in +.Nx . This utility derrives from the one found in Junos. The key difference is the requirement that manifest files be digitally signed. - - ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366603 - stable/12/sbin/camcontrol
Author: gbe (doc committer) Date: Sat Oct 10 09:41:20 2020 New Revision: 366603 URL: https://svnweb.freebsd.org/changeset/base/366603 Log: MFC r366406: camcontrol(8): Bugfixes for some issues reported by mandoc - new sentence, new line Modified: stable/12/sbin/camcontrol/camcontrol.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/camcontrol/camcontrol.8 == --- stable/12/sbin/camcontrol/camcontrol.8 Sat Oct 10 09:40:03 2020 (r366602) +++ stable/12/sbin/camcontrol/camcontrol.8 Sat Oct 10 09:41:20 2020 (r366603) @@ -1511,10 +1511,10 @@ user. This option can be combined with other options such as .Fl e Em pwd .Pp -A master password may be set in a addition to the user password. The purpose of -the master password is to allow an administrator to establish a password that -is kept secret from the user, and which may be used to unlock the device if the -user password is lost. +A master password may be set in a addition to the user password. +The purpose of the master password is to allow an administrator to establish +a password that is kept secret from the user, and which may be used to unlock +the device if the user password is lost. .Pp .Em Note: Setting the master password does not enable device security. @@ -2528,7 +2528,8 @@ whether it is enabled and what the timer value is. .It Ic timestamp Issue REPORT TIMESTAMP or SET TIMESTAMP .Tn SCSI -commands. Either the +commands. +Either the .Fl r option or the .Fl s @@ -2552,7 +2553,8 @@ time, but override the system time zone and use UTC in .El .Bl -tag -width 6n .It Fl s -Set the device's timestamp. Either the +Set the device's timestamp. +Either the .Fl f and .Fl T ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366602 - stable/12/usr.bin/cpuset
Author: gbe (doc committer) Date: Sat Oct 10 09:40:03 2020 New Revision: 366602 URL: https://svnweb.freebsd.org/changeset/base/366602 Log: MFC r366414: cpuset(1): Fix some issues reported by mandoc - whitespace at end of input line - new sentence, new line Modified: stable/12/usr.bin/cpuset/cpuset.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/cpuset/cpuset.1 == --- stable/12/usr.bin/cpuset/cpuset.1 Sat Oct 10 08:02:23 2020 (r366601) +++ stable/12/usr.bin/cpuset/cpuset.1 Sat Oct 10 09:40:03 2020 (r366602) @@ -34,24 +34,24 @@ .Sh SYNOPSIS .Nm .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl s Ar setid .Ar cmd ... .Nm .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl s Ar setid .Fl p Ar pid .Nm .Op Fl c .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Fl C .Fl p Ar pid .Nm .Op Fl c .Op Fl l Ar cpu-list -.Op Fl n Ar policy:domain-list +.Op Fl n Ar policy:domain-list .Op Fl j Ar jail | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq .Nm .Fl g @@ -97,8 +97,8 @@ This last set is the list of all possible CPUs in the queried using .Fl r . .Pp -Most sets include NUMA memory domain and policy information. This can be -inspected with +Most sets include NUMA memory domain and policy information. +This can be inspected with .Fl g and set with .Fl n . @@ -124,8 +124,8 @@ Create a new cpuset and assign the target process to t The requested operation should reference the cpuset available via the target specifier. .It Fl d Ar domain -Specifies a NUMA domain id as the target of the operation. This can only -be used to query the cpus visible in each numberd domain. +Specifies a NUMA domain id as the target of the operation. +This can only be used to query the cpus visible in each numberd domain. .It Fl g Causes .Nm @@ -146,8 +146,8 @@ A special list of .Dq all may be specified in which case the list includes all CPUs from the root set. .It Fl n Ar policy:domain-list -Specifies a list of domains and allocation policy to apply to a target. Ranges -may be specified as in +Specifies a list of domains and allocation policy to apply to a target. +Ranges may be specified as in .Fl l . Valid policies include first-touch (ft), round-robin (rr), prefer and interleave (il). ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366600 - head/sys/arm/arm
Author: manu
Date: Sat Oct 10 07:20:59 2020
New Revision: 366600
URL: https://svnweb.freebsd.org/changeset/base/366600
Log:
arm: Check dtb version against the one we're expecting to find
Reviewed by: imp, emaste, mmel
Differential Revision:https://reviews.freebsd.org/D26725
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Sat Oct 10 07:18:51 2020(r366599)
+++ head/sys/arm/arm/machdep.c Sat Oct 10 07:20:59 2020(r366600)
@@ -,6 +,8 @@ initarm(struct arm_boot_params *abp)
char *env;
void *kmdp;
int err_devmap, mem_regions_sz;
+ phandle_t root;
+ char dts_version[255];
#ifdef EFI
struct efi_map_header *efihdr;
#endif
@@ -1272,6 +1274,18 @@ initarm(struct arm_boot_params *abp)
err_devmap);
platform_late_init();
+
+ root = OF_finddevice("/");
+ if (OF_getprop(root, "freebsd,dts-version", dts_version,
sizeof(dts_version)) > 0) {
+ if (strcmp(LINUX_DTS_VERSION, dts_version) != 0)
+ printf("WARNING: DTB version is %s while kernel expects
%s, "
+ "please update the DTB in the ESP\n",
+ dts_version,
+ LINUX_DTS_VERSION);
+ } else {
+ printf("WARNING: Cannot find freebsd,dts-version property, "
+ "cannot check DTB compliance\n");
+ }
/*
* We must now clean the cache again
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366599 - in head/sys: conf dts gnu/dts tools/fdt
Author: manu
Date: Sat Oct 10 07:18:51 2020
New Revision: 366599
URL: https://svnweb.freebsd.org/changeset/base/366599
Log:
Brand our DTS with the Linux version it was imported from
DTS must be synced with the kernel, add a freebsd,dts-version string in
the root node of each DTS that we compile so we can later in the kernel
check that it contain a correct value.
Reviewed by: imp, mmel
Differential Revision:https://reviews.freebsd.org/D26724
Added:
head/sys/dts/freebsd-compatible.dts (contents, props changed)
head/sys/gnu/dts/Makefile (contents, props changed)
Modified:
head/sys/conf/Makefile.arm
head/sys/tools/fdt/make_dtb.sh
Modified: head/sys/conf/Makefile.arm
==
--- head/sys/conf/Makefile.arm Sat Oct 10 04:18:49 2020(r366598)
+++ head/sys/conf/Makefile.arm Sat Oct 10 07:18:51 2020(r366599)
@@ -32,6 +32,9 @@ S=../../..
INCLUDES+= -I$S/contrib/libfdt -I$S/gnu/dts/include
+LINUX_DTS_VERSION!= make -C $S/gnu/dts/ -V LINUX_DTS_VERSION
+CFLAGS += -DLINUX_DTS_VERSION=\"${LINUX_DTS_VERSION}\"
+
.if !defined(DEBUG) && !defined(PROFLEVEL)
STRIP_FLAGS = -S
.endif
Added: head/sys/dts/freebsd-compatible.dts
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dts/freebsd-compatible.dts Sat Oct 10 07:18:51 2020
(r366599)
@@ -0,0 +1,3 @@
+/ {
+ freebsd,dts-version = LINUX_DTS_VERSION;
+};
Added: head/sys/gnu/dts/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/gnu/dts/Makefile Sat Oct 10 07:18:51 2020(r366599)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+LINUX_DTS_VERSION=5.8
Modified: head/sys/tools/fdt/make_dtb.sh
==
--- head/sys/tools/fdt/make_dtb.sh Sat Oct 10 04:18:49 2020
(r366598)
+++ head/sys/tools/fdt/make_dtb.sh Sat Oct 10 07:18:51 2020
(r366599)
@@ -20,9 +20,11 @@ fi
: "${ECHO:=echo}"
: "${CPP:=cpp}"
+LINUX_DTS_VERSION=$(make -C $S/gnu/dts -V LINUX_DTS_VERSION)
+
for d in ${dts}; do
dtb="${dtb_path}/$(basename "$d" .dts).dtb"
${ECHO} "converting $d -> $dtb"
-${CPP} -P -x assembler-with-cpp -I "$S/gnu/dts/include" -I
"$S/dts/${MACHINE}" -I "$S/gnu/dts/${MACHINE}" -I "$S/gnu/dts/" -include "$d"
/dev/null |
+${CPP} -DLINUX_DTS_VERSION=\"${LINUX_DTS_VERSION}\" -P -x
assembler-with-cpp -I "$S/gnu/dts/include" -I "$S/dts/${MACHINE}" -I
"$S/gnu/dts/${MACHINE}" -I "$S/gnu/dts/" -include "$d" -include
"$S/dts/freebsd-compatible.dts" /dev/null |
${DTC} -@ -O dtb -o "$dtb" -b 0 -p 1024 -i "$S/dts/${MACHINE}" -i
"$S/gnu/dts/${MACHINE}" -i "$S/gnu/dts/"
done
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
