Re: svn commit: r343774 - in vendor-crypto/openssh/dist: . contrib/redhat contrib/suse openbsd-compat regress regress/misc/fuzz-harness regress/unittests/sshkey regress/unittests/sshkey/testdata re
In message <201902051503.x15f3rmn050...@repo.freebsd.org>, =?UTF-8?Q?Dag-Erling _Sm=c3=b8rgrav?= writes: > Author: des > Date: Tue Feb 5 15:03:53 2019 > New Revision: 343774 > URL: https://svnweb.freebsd.org/changeset/base/343774 > > Log: > Vendor import of OpenSSH 7.9p1. > Hi des@, Are there plans to merge this into head? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r353365 - head/usr.bin/procstat
> On Thu, Oct 10, 2019 at 11:27 PM Rodney W. Grimes
> wrote:
> >
> > > Author: jlh
> > > Date: Wed Oct 9 20:05:14 2019
> > > New Revision: 353365
> > > URL: https://svnweb.freebsd.org/changeset/base/353365
> > >
> > > Log:
> > > Add a missing macro for the previous commit (IS_INADDR_ANY()).
> >
> > Can we write it the same was as it is 100+ other places?
> > 1022}# find . -type f | xargs grep "== INADDR_ANY" | wc
> > 131 7819607
>
> Done in r353768. Thanks!
Thank you.
> > > Modified:
> > > head/usr.bin/procstat/procstat_files.c
> > >
> > > Modified: head/usr.bin/procstat/procstat_files.c
> > > ==
> > > --- head/usr.bin/procstat/procstat_files.cWed Oct 9 20:01:23 2019
> > > (r353364)
> > > +++ head/usr.bin/procstat/procstat_files.cWed Oct 9 20:05:14 2019
> > > (r353365)
> > > @@ -94,6 +94,7 @@ addr_to_string(struct sockaddr_storage *ss, char *buff
> > > struct sockaddr_in6 *sin6;
> > > struct sockaddr_in *sin;
> > > struct sockaddr_un *sun;
> > > +#define IS_INADDR_ANY(x) ((x).s_addr == INADDR_ANY)
> > >
> > > switch (ss->ss_family) {
> > > case AF_LOCAL:
> > >
> >
> > --
> > Rod Grimes
> > rgri...@freebsd.org
>
>
>
> --
> Jeremie Le Hen
> j...@freebsd.org
>
--
Rod Grimes rgri...@freebsd.org
___
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: r353771 - head/share/mk
Author: bdrewery
Date: Sat Oct 19 21:44:33 2019
New Revision: 353771
URL: https://svnweb.freebsd.org/changeset/base/353771
Log:
Fix spelling of DPSRCS.
Submitted by: vangyzen
Sponsored by: DellEMC
MFC after:2 weeks
Modified:
head/share/mk/bsd.dep.mk
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkSat Oct 19 20:48:53 2019(r353770)
+++ head/share/mk/bsd.dep.mkSat Oct 19 21:44:33 2019(r353771)
@@ -195,7 +195,7 @@ DEPEND_FILTER= C,/,_,g
DEPENDOBJS+= ${OBJS}
.else
DEPENDSRCS+= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
-DEPENDSRCS+= ${DPSRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
+DEPENDSRCS+= ${DPSRCS:M*.[cSC]} ${DPSRCS:M*.cxx} ${DPSRCS:M*.cpp}
${DPSRCS:M*.cc}
.if !empty(DEPENDSRCS)
DEPENDOBJS+= ${DEPENDSRCS:${OBJS_SRCS_FILTER:ts:}:S,$,.o,}
.endif
___
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: r353770 - in head/sys: net netinet/netdump
Author: tuexen
Date: Sat Oct 19 20:48:53 2019
New Revision: 353770
URL: https://svnweb.freebsd.org/changeset/base/353770
Log:
Fix compile issues when building a kernel without the VIMAGE option.
Thanks to cem@ for discussing the issue which resulted in this patch.
Reviewed by: cem@
Sponsored by: Netflix, Inc.
Differential Revision:https://reviews.freebsd.org/D22089
Modified:
head/sys/net/debugnet.c
head/sys/netinet/netdump/netdump_client.c
Modified: head/sys/net/debugnet.c
==
--- head/sys/net/debugnet.c Sat Oct 19 19:52:19 2019(r353769)
+++ head/sys/net/debugnet.c Sat Oct 19 20:48:53 2019(r353770)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
Modified: head/sys/netinet/netdump/netdump_client.c
==
--- head/sys/netinet/netdump/netdump_client.c Sat Oct 19 19:52:19 2019
(r353769)
+++ head/sys/netinet/netdump/netdump_client.c Sat Oct 19 20:48:53 2019
(r353770)
@@ -409,20 +409,13 @@ static int
netdump_configure(struct diocskerneldump_arg *conf, struct thread *td)
{
struct ifnet *ifp;
- struct vnet *vnet;
NETDUMP_ASSERT_WLOCKED();
if (conf->kda_iface[0] != 0) {
- if (td != NULL)
- vnet = TD_TO_VNET(td);
- else
- vnet = vnet0;
- CURVNET_SET(vnet);
- if (td != NULL && !IS_DEFAULT_VNET(curvnet)) {
- CURVNET_RESTORE();
+ if (td != NULL && !IS_DEFAULT_VNET(TD_TO_VNET(td)))
return (EINVAL);
- }
+ CURVNET_SET(vnet0);
ifp = ifunit_ref(conf->kda_iface);
CURVNET_RESTORE();
} else
___
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: r353769 - head/usr.bin/fstat
Author: jlh
Date: Sat Oct 19 19:52:19 2019
New Revision: 353769
URL: https://svnweb.freebsd.org/changeset/base/353769
Log:
Add the fstat -s option to display socket information.
Reviewed by: jilles
MFC after:1 week
Relnotes: yes
Differential Revision:https://reviews.freebsd.org/D21880
Modified:
head/usr.bin/fstat/fstat.1
head/usr.bin/fstat/fstat.c
Modified: head/usr.bin/fstat/fstat.1
==
--- head/usr.bin/fstat/fstat.1 Sat Oct 19 19:38:53 2019(r353768)
+++ head/usr.bin/fstat/fstat.1 Sat Oct 19 19:52:19 2019(r353769)
@@ -28,7 +28,7 @@
.\" @(#)fstat.18.3 (Berkeley) 2/25/94
.\" $FreeBSD$
.\"
-.Dd September 28, 2011
+.Dd October 19, 2019
.Dt FSTAT 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd identify active files
.Sh SYNOPSIS
.Nm
-.Op Fl fmnv
+.Op Fl fmnsv
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl p Ar pid
@@ -85,6 +85,8 @@ in
and print the mode of the file in octal instead of symbolic form.
.It Fl p
Report all files open by the specified process.
+.It Fl s
+Print socket endpoint information.
.It Fl u
Report all files open by the specified user.
.It Fl v
@@ -199,9 +201,6 @@ For tcp, it is the address of the tcpcb, and for udp,
For unix domain sockets, its the address of the socket pcb and the address
of the connected pcb (if connected).
Otherwise the protocol number and address of the socket itself are printed.
-The attempt is to make enough information available to
-permit further analysis without duplicating
-.Xr netstat 1 .
.Pp
For example, the addresses mentioned above are the addresses which the
.Dq Li netstat -A
@@ -211,6 +210,15 @@ connected unix domain stream socket.
A unidirectional unix domain socket indicates the direction of flow with
an arrow (``<-'' or ``->''), and a full duplex socket shows a double arrow
(``<->'').
+.Pp
+When the
+.Fl s
+flag is used, socket endpoint information is shown after the address of the
+socket.
+For internet sockets the local and remote address are shown, separated with
+a double arrow (``<->'').
+For unix/local sockets either the local or remote address is shown, depending
+on which one is available.
.Sh SEE ALSO
.Xr netstat 1 ,
.Xr nfsstat 1 ,
Modified: head/usr.bin/fstat/fstat.c
==
--- head/usr.bin/fstat/fstat.c Sat Oct 19 19:38:53 2019(r353768)
+++ head/usr.bin/fstat/fstat.c Sat Oct 19 19:52:19 2019(r353769)
@@ -40,9 +40,12 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
+#include
+
#include
#include
#include
@@ -61,6 +64,7 @@ __FBSDID("$FreeBSD$");
static int fsflg, /* show files on same filesystem as file(s) argument */
pflg, /* show files open by a particular pid */
+ sflg, /* show socket details */
uflg; /* show files open by a particular (effective) user */
static int checkfile; /* restrict to particular files or filesystems */
static int nflg; /* (numerical) display f.s. and rdev as dev_t */
@@ -108,7 +112,7 @@ do_fstat(int argc, char **argv)
arg = 0;
what = KERN_PROC_PROC;
nlistf = memf = NULL;
- while ((ch = getopt(argc, argv, "fmnp:u:vN:M:")) != -1)
+ while ((ch = getopt(argc, argv, "fmnp:su:vN:M:")) != -1)
switch((char)ch) {
case 'f':
fsflg = 1;
@@ -135,6 +139,9 @@ do_fstat(int argc, char **argv)
what = KERN_PROC_PID;
arg = atoi(optarg);
break;
+ case 's':
+ sflg = 1;
+ break;
case 'u':
if (uflg++)
usage();
@@ -314,6 +321,55 @@ print_file_info(struct procstat *procstat, struct file
putchar('\n');
}
+static char *
+addr_to_string(struct sockaddr_storage *ss, char *buffer, int buflen)
+{
+ char buffer2[INET6_ADDRSTRLEN];
+ struct sockaddr_in6 *sin6;
+ struct sockaddr_in *sin;
+ struct sockaddr_un *sun;
+
+ switch (ss->ss_family) {
+ case AF_LOCAL:
+ sun = (struct sockaddr_un *)ss;
+ if (strlen(sun->sun_path) == 0)
+ strlcpy(buffer, "-", buflen);
+ else
+ strlcpy(buffer, sun->sun_path, buflen);
+ break;
+
+ case AF_INET:
+ sin = (struct sockaddr_in *)ss;
+ if (sin->sin_addr.s_addr == INADDR_ANY)
+ snprintf(buffer, buflen, "%s:%d", "*",
+ ntohs(sin->sin_port));
+ else if (inet_ntop(AF_INET, >sin_addr, buffer2,
+ sizeof(buffer2)) != NULL)
+ snprintf(buffer, buflen, "%s:%d", buffer2,
+
Re: svn commit: r353365 - head/usr.bin/procstat
On Thu, Oct 10, 2019 at 11:27 PM Rodney W. Grimes
wrote:
>
> > Author: jlh
> > Date: Wed Oct 9 20:05:14 2019
> > New Revision: 353365
> > URL: https://svnweb.freebsd.org/changeset/base/353365
> >
> > Log:
> > Add a missing macro for the previous commit (IS_INADDR_ANY()).
>
> Can we write it the same was as it is 100+ other places?
> 1022}# find . -type f | xargs grep "== INADDR_ANY" | wc
> 131 7819607
Done in r353768. Thanks!
>
> >
> > Modified:
> > head/usr.bin/procstat/procstat_files.c
> >
> > Modified: head/usr.bin/procstat/procstat_files.c
> > ==
> > --- head/usr.bin/procstat/procstat_files.cWed Oct 9 20:01:23 2019
> > (r353364)
> > +++ head/usr.bin/procstat/procstat_files.cWed Oct 9 20:05:14 2019
> > (r353365)
> > @@ -94,6 +94,7 @@ addr_to_string(struct sockaddr_storage *ss, char *buff
> > struct sockaddr_in6 *sin6;
> > struct sockaddr_in *sin;
> > struct sockaddr_un *sun;
> > +#define IS_INADDR_ANY(x) ((x).s_addr == INADDR_ANY)
> >
> > switch (ss->ss_family) {
> > case AF_LOCAL:
> >
>
> --
> Rod Grimes rgri...@freebsd.org
--
Jeremie Le Hen
j...@freebsd.org
___
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: r353768 - head/usr.bin/procstat
Author: jlh
Date: Sat Oct 19 19:38:53 2019
New Revision: 353768
URL: https://svnweb.freebsd.org/changeset/base/353768
Log:
Remove IS_INADDR_ANY().
Requested by rgrimes@ in
https://lists.freebsd.org/pipermail/svn-src-head/2019-October/129784.html
Modified:
head/usr.bin/procstat/procstat_files.c
Modified: head/usr.bin/procstat/procstat_files.c
==
--- head/usr.bin/procstat/procstat_files.c Sat Oct 19 16:37:49 2019
(r353767)
+++ head/usr.bin/procstat/procstat_files.c Sat Oct 19 19:38:53 2019
(r353768)
@@ -94,7 +94,6 @@ addr_to_string(struct sockaddr_storage *ss, char *buff
struct sockaddr_in6 *sin6;
struct sockaddr_in *sin;
struct sockaddr_un *sun;
-#define IS_INADDR_ANY(x) ((x).s_addr == INADDR_ANY)
switch (ss->ss_family) {
case AF_LOCAL:
@@ -107,7 +106,7 @@ addr_to_string(struct sockaddr_storage *ss, char *buff
case AF_INET:
sin = (struct sockaddr_in *)ss;
- if (IS_INADDR_ANY(sin->sin_addr))
+ if (sin->sin_addr.s_addr == INADDR_ANY)
snprintf(buffer, buflen, "%s:%d", "*",
ntohs(sin->sin_port));
else if (inet_ntop(AF_INET, >sin_addr, buffer2,
___
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: r353767 - head/sys/x86/x86
Author: cem Date: Sat Oct 19 16:37:49 2019 New Revision: 353767 URL: https://svnweb.freebsd.org/changeset/base/353767 Log: hw.intrbalance: Make sysctl tunable This allows specifying a boot-time preference in loader.conf. Modified: head/sys/x86/x86/intr_machdep.c Modified: head/sys/x86/x86/intr_machdep.c == --- head/sys/x86/x86/intr_machdep.c Sat Oct 19 16:09:06 2019 (r353766) +++ head/sys/x86/x86/intr_machdep.c Sat Oct 19 16:37:49 2019 (r353767) @@ -83,7 +83,7 @@ static struct intsrc **interrupt_sources; #ifdef SMP static struct intsrc **interrupt_sorted; static int intrbalance; -SYSCTL_INT(_hw, OID_AUTO, intrbalance, CTLFLAG_RW, , 0, +SYSCTL_INT(_hw, OID_AUTO, intrbalance, CTLFLAG_RWTUN, , 0, "Interrupt auto-balance interval (seconds). Zero disables."); static struct timeout_task intrbalance_task; #endif ___ 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: r353766 - head/sys/powerpc/booke
Author: jhibbits
Date: Sat Oct 19 16:09:06 2019
New Revision: 353766
URL: https://svnweb.freebsd.org/changeset/base/353766
Log:
powerpc/booke pmap: Fix printf format type warnings
Modified:
head/sys/powerpc/booke/pmap.c
Modified: head/sys/powerpc/booke/pmap.c
==
--- head/sys/powerpc/booke/pmap.c Sat Oct 19 15:58:20 2019
(r353765)
+++ head/sys/powerpc/booke/pmap.c Sat Oct 19 16:09:06 2019
(r353766)
@@ -3511,8 +3511,8 @@ mmu_booke_mapdev_attr(mmu_t mmu, vm_paddr_t pa, vm_siz
} while (va % sz != 0);
}
if (bootverbose)
- printf("Wiring VA=%lx to PA=%jx (size=%lx)\n",
- va, (uintmax_t)pa, sz);
+ printf("Wiring VA=%p to PA=%jx (size=%lx)\n",
+ (void *)va, (uintmax_t)pa, (long)sz);
if (tlb1_set_entry(va, pa, sz,
_TLB_ENTRY_SHARED | tlb_calc_wimg(pa, ma)) < 0)
return (NULL);
@@ -4298,9 +4298,9 @@ tlb_print_entry(int i, uint32_t mas1, uint32_t mas2, u
size = tsize2size(tsize);
printf("%3d: (%s) [AS=%d] "
- "sz = 0x%08x tsz = %d tid = %d mas1 = 0x%08x "
+ "sz = 0x%jx tsz = %d tid = %d mas1 = 0x%08x "
"mas2(va) = 0x%"PRI0ptrX" mas3(pa) = 0x%08x mas7 = 0x%08x\n",
- i, desc, as, size, tsize, tid, mas1, mas2, mas3, mas7);
+ i, desc, as, (uintmax_t)size, tsize, tid, mas1, mas2, mas3, mas7);
}
DB_SHOW_COMMAND(tlb0, tlb0_print_tlbentries)
___
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: r353765 - in stable: 11/usr.bin/clang/lld 12/usr.bin/clang/lld
Author: dim
Date: Sat Oct 19 15:58:20 2019
New Revision: 353765
URL: https://svnweb.freebsd.org/changeset/base/353765
Log:
MFC r353655:
Ensure lld respects the WITH/WITHOUT_SHARED_TOOLCHAIN option
Traditionally, toolchain components such as cc, as, and ld have been
built as static executables. The WITH_SHARED_TOOLCHAIN option from
src.conf(5) is meant to link these as regular executables, e.g. using
shared libraries.
The build of ld.lld did not yet check this option. Fix the Makefile so
it will do so now.
Reported by: Mike Cui
PR: 241257
Modified:
stable/11/usr.bin/clang/lld/Makefile
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/usr.bin/clang/lld/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/usr.bin/clang/lld/Makefile
==
--- stable/11/usr.bin/clang/lld/MakefileSat Oct 19 14:56:44 2019
(r353764)
+++ stable/11/usr.bin/clang/lld/MakefileSat Oct 19 15:58:20 2019
(r353765)
@@ -14,6 +14,10 @@ SYMLINKS=${PROG_CXX} ${BINDIR}/ld
MLINKS=ld.lld.1 ld.1
.endif
+.if ${MK_SHARED_TOOLCHAIN} == "no"
+NO_SHARED?= yes
+.endif
+
CFLAGS+= -I${LLD_SRCS}/ELF
CFLAGS+= -I${LLD_SRCS}/include
CFLAGS+= -I${.OBJDIR}
___
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: r353765 - in stable: 11/usr.bin/clang/lld 12/usr.bin/clang/lld
Author: dim
Date: Sat Oct 19 15:58:20 2019
New Revision: 353765
URL: https://svnweb.freebsd.org/changeset/base/353765
Log:
MFC r353655:
Ensure lld respects the WITH/WITHOUT_SHARED_TOOLCHAIN option
Traditionally, toolchain components such as cc, as, and ld have been
built as static executables. The WITH_SHARED_TOOLCHAIN option from
src.conf(5) is meant to link these as regular executables, e.g. using
shared libraries.
The build of ld.lld did not yet check this option. Fix the Makefile so
it will do so now.
Reported by: Mike Cui
PR: 241257
Modified:
stable/12/usr.bin/clang/lld/Makefile
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/usr.bin/clang/lld/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/usr.bin/clang/lld/Makefile
==
--- stable/12/usr.bin/clang/lld/MakefileSat Oct 19 14:56:44 2019
(r353764)
+++ stable/12/usr.bin/clang/lld/MakefileSat Oct 19 15:58:20 2019
(r353765)
@@ -15,6 +15,10 @@ SYMLINKS=${PROG_CXX} ${BINDIR}/ld
MLINKS=ld.lld.1 ld.1
.endif
+.if ${MK_SHARED_TOOLCHAIN} == "no"
+NO_SHARED?= yes
+.endif
+
CFLAGS+= -I${LLD_SRCS}/ELF
CFLAGS+= -I${LLD_SRCS}/include
CFLAGS+= -I${.OBJDIR}
___
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: r353764 - in head: sys/contrib/dev/acpica sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/components/disa...
Author: jkim Date: Sat Oct 19 14:56:44 2019 New Revision: 353764 URL: https://svnweb.freebsd.org/changeset/base/353764 Log: Merge ACPICA 20191018. Added: head/sys/contrib/dev/acpica/compiler/dtcompilerparser.l - copied, changed from r351127, vendor-sys/acpica/dist/source/compiler/dtcompilerparser.l head/sys/contrib/dev/acpica/compiler/dtcompilerparser.y - copied, changed from r351127, vendor-sys/acpica/dist/source/compiler/dtcompilerparser.y Modified: head/sys/contrib/dev/acpica/acpica_prep.sh head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/acgetline.c head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/adwalk.c head/sys/contrib/dev/acpica/common/dmrestag.c head/sys/contrib/dev/acpica/common/dmtables.c head/sys/contrib/dev/acpica/common/dmtbdump1.c head/sys/contrib/dev/acpica/common/dmtbdump2.c head/sys/contrib/dev/acpica/common/dmtbdump3.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslbtypes.c head/sys/contrib/dev/acpica/compiler/aslcache.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/asldebug.c head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslhelp.c head/sys/contrib/dev/acpica/compiler/aslkeywords.y head/sys/contrib/dev/acpica/compiler/asllength.c head/sys/contrib/dev/acpica/compiler/asllistsup.c head/sys/contrib/dev/acpica/compiler/aslload.c head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmessages.c head/sys/contrib/dev/acpica/compiler/aslmessages.h head/sys/contrib/dev/acpica/compiler/aslmethod.c head/sys/contrib/dev/acpica/compiler/aslnamesp.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslparseop.c head/sys/contrib/dev/acpica/compiler/aslprepkg.c head/sys/contrib/dev/acpica/compiler/aslresource.c head/sys/contrib/dev/acpica/compiler/aslrestype2.c head/sys/contrib/dev/acpica/compiler/aslrestype2s.c head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/asltransform.c head/sys/contrib/dev/acpica/compiler/asltypes.h head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/aslxrefout.c head/sys/contrib/dev/acpica/compiler/cvdisasm.c head/sys/contrib/dev/acpica/compiler/cvparser.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtfield.c head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dtparser.l head/sys/contrib/dev/acpica/compiler/dttable2.c head/sys/contrib/dev/acpica/compiler/dttemplate.c head/sys/contrib/dev/acpica/compiler/prmacros.c head/sys/contrib/dev/acpica/compiler/prscan.c head/sys/contrib/dev/acpica/components/debugger/dbconvert.c head/sys/contrib/dev/acpica/components/debugger/dbdisply.c head/sys/contrib/dev/acpica/components/debugger/dbfileio.c head/sys/contrib/dev/acpica/components/debugger/dbhistry.c head/sys/contrib/dev/acpica/components/debugger/dbinput.c head/sys/contrib/dev/acpica/components/debugger/dbmethod.c head/sys/contrib/dev/acpica/components/debugger/dbnames.c head/sys/contrib/dev/acpica/components/debugger/dbobject.c head/sys/contrib/dev/acpica/components/debugger/dbstats.c head/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c head/sys/contrib/dev/acpica/components/disassembler/dmresrc.c head/sys/contrib/dev/acpica/components/disassembler/dmwalk.c head/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c head/sys/contrib/dev/acpica/components/events/evgpe.c head/sys/contrib/dev/acpica/components/events/evgpeblk.c head/sys/contrib/dev/acpica/components/events/evgpeinit.c head/sys/contrib/dev/acpica/components/events/evmisc.c head/sys/contrib/dev/acpica/components/events/evregion.c head/sys/contrib/dev/acpica/components/events/evrgnini.c head/sys/contrib/dev/acpica/components/events/evxfgpe.c head/sys/contrib/dev/acpica/components/executer/exdump.c head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c head/sys/contrib/dev/acpica/components/namespace/nsaccess.c head/sys/contrib/dev/acpica/components/namespace/nsalloc.c head/sys/contrib/dev/acpica/components/namespace/nsconvert.c head/sys/contrib/dev/acpica/components/namespace/nsdump.c head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c head/sys/contrib/dev/acpica/components/namespace/nsxfname.c head/sys/contrib/dev/acpica/components/parser/psobject.c head/sys/contrib/dev/acpica/components/resources/rscreate.c head/sys/contrib/dev/acpica/components/tables/tbdata.c
svn commit: r353760 - stable/12/sys/mips/include
Author: avg Date: Sat Oct 19 08:22:51 2019 New Revision: 353760 URL: https://svnweb.freebsd.org/changeset/base/353760 Log: MFC r353166: add atomic_load_64 for mipsn32 Modified: stable/12/sys/mips/include/atomic.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/mips/include/atomic.h == --- stable/12/sys/mips/include/atomic.h Sat Oct 19 08:19:49 2019 (r353759) +++ stable/12/sys/mips/include/atomic.h Sat Oct 19 08:22:51 2019 (r353760) @@ -343,6 +343,10 @@ ATOMIC_STORE_LOAD(32) ATOMIC_STORE_LOAD(64) #undef ATOMIC_STORE_LOAD +#ifdef __mips_n32 +#defineatomic_load_64 atomic_load_acq_64 +#endif + /* * Atomically compare the value stored at *p with cmpval and if the * two values are equal, update the value of *p with newval. Returns ___ 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: r353759 - in stable/11: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/commo...
Author: avg
Date: Sat Oct 19 08:19:49 2019
New Revision: 353759
URL: https://svnweb.freebsd.org/changeset/base/353759
Log:
MFC r353037: ZFS: add bookmark renaming
Modified:
stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8Sat Oct 19 08:19:31
2019(r353758)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8Sat Oct 19 08:19:49
2019(r353759)
@@ -104,6 +104,9 @@
.Ar snapshot snapshot
.Nm
.Cm rename
+.Ar bookmark bookmark
+.Nm
+.Cm rename
.Fl u
.Op Fl p
.Ar filesystem filesystem
@@ -2086,6 +2089,16 @@ flag.
.Pp
Recursively rename the snapshots of all descendent datasets. Snapshots are the
only dataset that can be renamed recursively.
+.It Xo
+.Nm
+.Cm rename
+.Ar bookmark bookmark
+.Xc
+.Pp
+Renames the given bookmark.
+Bookmarks can only be renamed within the parent file system or volume.
+When renaming a bookmark, the parent file system or volume of the bookmark
+does not need to be specified as part of the second argument.
.It Xo
.Nm
.Cm list
Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 19
08:19:31 2019(r353758)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 19
08:19:49 2019(r353759)
@@ -283,6 +283,7 @@ get_usage(zfs_help_t idx)
"\n"
"\trename [-f] -p \n"
"\trename -r \n"
+ "\trename \n"
"\trename -u [-p] "));
case HELP_ROLLBACK:
return (gettext("\trollback [-rRf] \n"));
@@ -3253,6 +3254,7 @@ zfs_do_list(int argc, char **argv)
* zfs rename [-f]
* zfs rename [-f] -p
* zfs rename -r
+ * zfs rename
* zfs rename -u [-p]
*
* Renames the given dataset to another of the same type.
@@ -3269,6 +3271,7 @@ zfs_do_rename(int argc, char **argv)
int ret = 0;
int types;
boolean_t parents = B_FALSE;
+ boolean_t bookmarks = B_FALSE;
char *snapshot = NULL;
/* check options */
@@ -3319,7 +3322,7 @@ zfs_do_rename(int argc, char **argv)
usage(B_FALSE);
}
- if (flags.recurse && strchr(argv[0], '@') == 0) {
+ if (flags.recurse && strchr(argv[0], '@') == NULL) {
(void) fprintf(stderr, gettext("source dataset for recursive "
"rename must be a snapshot\n"));
usage(B_FALSE);
@@ -3331,10 +3334,22 @@ zfs_do_rename(int argc, char **argv)
usage(B_FALSE);
}
+ if (strchr(argv[0], '#') != NULL)
+ bookmarks = B_TRUE;
+
+ if (bookmarks && (flags.nounmount || flags.recurse ||
+ flags.forceunmount || parents)) {
+ (void) fprintf(stderr, gettext("options are not supported "
+ "for renaming bookmarks\n"));
+ usage(B_FALSE);
+ }
+
if (flags.nounmount)
types = ZFS_TYPE_FILESYSTEM;
else if (parents)
types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
+ else if (bookmarks)
+ types = ZFS_TYPE_BOOKMARK;
else
types = ZFS_TYPE_DATASET;
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Sat Oct 19 08:19:31 2019(r353758)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Sat Oct 19 08:19:49 2019(r353759)
@@ -4286,17 +4286,18 @@ zfs_rename(zfs_handle_t *zhp, const char *source, cons
/*
* Make sure the target name is valid
*/
- if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT) {
- if ((strchr(target, '@') == NULL) ||
- *target == '@') {
+ if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT ||
+ zhp->zfs_type == ZFS_TYPE_BOOKMARK) {
+ const char sep = zhp->zfs_type == ZFS_TYPE_SNAPSHOT ? '@' : '#';
+
+ if ((strchr(target, sep) == NULL) || *target == sep) {
/*
* Snapshot target name is abbreviated,
* reconstruct full dataset name
svn commit: r353758 - in stable/12: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/commo...
Author: avg
Date: Sat Oct 19 08:19:31 2019
New Revision: 353758
URL: https://svnweb.freebsd.org/changeset/base/353758
Log:
MFC r353037: ZFS: add bookmark renaming
Modified:
stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h
stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs.8Sat Oct 19 08:08:06
2019(r353757)
+++ stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs.8Sat Oct 19 08:19:31
2019(r353758)
@@ -105,6 +105,9 @@
.Ar snapshot snapshot
.Nm
.Cm rename
+.Ar bookmark bookmark
+.Nm
+.Cm rename
.Fl u
.Op Fl p
.Ar filesystem filesystem
@@ -2090,6 +2093,16 @@ flag.
.Pp
Recursively rename the snapshots of all descendent datasets. Snapshots are the
only dataset that can be renamed recursively.
+.It Xo
+.Nm
+.Cm rename
+.Ar bookmark bookmark
+.Xc
+.Pp
+Renames the given bookmark.
+Bookmarks can only be renamed within the parent file system or volume.
+When renaming a bookmark, the parent file system or volume of the bookmark
+does not need to be specified as part of the second argument.
.It Xo
.Nm
.Cm list
Modified: stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 19
08:08:06 2019(r353757)
+++ stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 19
08:19:31 2019(r353758)
@@ -284,6 +284,7 @@ get_usage(zfs_help_t idx)
"\n"
"\trename [-f] -p \n"
"\trename -r \n"
+ "\trename \n"
"\trename -u [-p] "));
case HELP_ROLLBACK:
return (gettext("\trollback [-rRf] \n"));
@@ -3254,6 +3255,7 @@ zfs_do_list(int argc, char **argv)
* zfs rename [-f]
* zfs rename [-f] -p
* zfs rename -r
+ * zfs rename
* zfs rename -u [-p]
*
* Renames the given dataset to another of the same type.
@@ -3270,6 +3272,7 @@ zfs_do_rename(int argc, char **argv)
int ret = 0;
int types;
boolean_t parents = B_FALSE;
+ boolean_t bookmarks = B_FALSE;
char *snapshot = NULL;
/* check options */
@@ -3320,7 +3323,7 @@ zfs_do_rename(int argc, char **argv)
usage(B_FALSE);
}
- if (flags.recurse && strchr(argv[0], '@') == 0) {
+ if (flags.recurse && strchr(argv[0], '@') == NULL) {
(void) fprintf(stderr, gettext("source dataset for recursive "
"rename must be a snapshot\n"));
usage(B_FALSE);
@@ -3332,10 +3335,22 @@ zfs_do_rename(int argc, char **argv)
usage(B_FALSE);
}
+ if (strchr(argv[0], '#') != NULL)
+ bookmarks = B_TRUE;
+
+ if (bookmarks && (flags.nounmount || flags.recurse ||
+ flags.forceunmount || parents)) {
+ (void) fprintf(stderr, gettext("options are not supported "
+ "for renaming bookmarks\n"));
+ usage(B_FALSE);
+ }
+
if (flags.nounmount)
types = ZFS_TYPE_FILESYSTEM;
else if (parents)
types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
+ else if (bookmarks)
+ types = ZFS_TYPE_BOOKMARK;
else
types = ZFS_TYPE_DATASET;
Modified: stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==
--- stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Sat Oct 19 08:08:06 2019(r353757)
+++ stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Sat Oct 19 08:19:31 2019(r353758)
@@ -4291,17 +4291,18 @@ zfs_rename(zfs_handle_t *zhp, const char *source, cons
/*
* Make sure the target name is valid
*/
- if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT) {
- if ((strchr(target, '@') == NULL) ||
- *target == '@') {
+ if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT ||
+ zhp->zfs_type == ZFS_TYPE_BOOKMARK) {
+ const char sep = zhp->zfs_type == ZFS_TYPE_SNAPSHOT ? '@' : '#';
+
+ if ((strchr(target, sep) == NULL) || *target == sep) {
/*
* Snapshot target name is abbreviated,
* reconstruct full dataset name
svn commit: r353757 - head/stand/libsa/zfs
Author: tsoome
Date: Sat Oct 19 08:08:06 2019
New Revision: 353757
URL: https://svnweb.freebsd.org/changeset/base/353757
Log:
loader: zfs_fmtdev can crash when pool discovery did fail and we have no spa
When zfs probe did fail and no spa was created, but zfs_fmtdev() is called,
we will crash while dereferencing spa (NULL pointer dereference).
MFC after:1 week
Modified:
head/stand/libsa/zfs/zfs.c
Modified: head/stand/libsa/zfs/zfs.c
==
--- head/stand/libsa/zfs/zfs.c Sat Oct 19 07:53:20 2019(r353756)
+++ head/stand/libsa/zfs/zfs.c Sat Oct 19 08:08:06 2019(r353757)
@@ -769,11 +769,16 @@ zfs_fmtdev(void *vdev)
if (dev->dd.d_dev->dv_type != DEVT_ZFS)
return (buf);
- if (dev->pool_guid == 0) {
- spa = STAILQ_FIRST(_pools);
+ /* Do we have any pools? */
+ spa = STAILQ_FIRST(_pools);
+ if (spa == NULL)
+ return (buf);
+
+ if (dev->pool_guid == 0)
dev->pool_guid = spa->spa_guid;
- } else
+ else
spa = spa_find_by_guid(dev->pool_guid);
+
if (spa == NULL) {
printf("ZFS: can't find pool by guid\n");
return (buf);
___
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: r353756 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common
Author: avg
Date: Sat Oct 19 07:53:20 2019
New Revision: 353756
URL: https://svnweb.freebsd.org/changeset/base/353756
Log:
MFC r353343: zfs: remove gratuitous divergence from other openzfs flavours
Modified:
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Sat Oct 19 07:51:49 2019(r353755)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Sat Oct 19 07:53:20 2019(r353756)
@@ -1206,7 +1206,6 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
boolean_t isfromsnap, istosnap, fromorigin;
boolean_t exclude = B_FALSE;
FILE *fout = sdd->std_out ? stdout : stderr;
- uint64_t size = 0;
err = 0;
thissnap = strchr(zhp->zfs_name, '@') + 1;
@@ -1282,6 +1281,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
(sdd->fromorigin || sdd->replicate);
if (sdd->verbose || sdd->progress) {
+ uint64_t size = 0;
char fromds[ZFS_MAX_DATASET_NAME_LEN];
if (sdd->prevsnap[0] != '\0') {
___
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: r353755 - stable/12/cddl/contrib/opensolaris/lib/libzfs/common
Author: avg
Date: Sat Oct 19 07:51:49 2019
New Revision: 353755
URL: https://svnweb.freebsd.org/changeset/base/353755
Log:
MFC r353343: zfs: remove gratuitous divergence from other openzfs flavours
Modified:
stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==
--- stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Sat Oct 19 07:47:28 2019(r353754)
+++ stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Sat Oct 19 07:51:49 2019(r353755)
@@ -1206,7 +1206,6 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
boolean_t isfromsnap, istosnap, fromorigin;
boolean_t exclude = B_FALSE;
FILE *fout = sdd->std_out ? stdout : stderr;
- uint64_t size = 0;
err = 0;
thissnap = strchr(zhp->zfs_name, '@') + 1;
@@ -1282,6 +1281,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
(sdd->fromorigin || sdd->replicate);
if (sdd->verbose || sdd->progress) {
+ uint64_t size = 0;
char fromds[ZFS_MAX_DATASET_NAME_LEN];
if (sdd->prevsnap[0] != '\0') {
___
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: r353754 - stable/12/cddl/contrib/opensolaris/cmd/zpool
Author: avg Date: Sat Oct 19 07:47:28 2019 New Revision: 353754 URL: https://svnweb.freebsd.org/changeset/base/353754 Log: MFC r353341,r353342: zfs: document large_dnode feature Modified: stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Directory Properties: stable/12/ (props changed) Modified: stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 == --- stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sat Oct 19 07:45:11 2019(r353753) +++ stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sat Oct 19 07:47:28 2019(r353754) @@ -527,6 +527,30 @@ Please note that booting from datasets that have recor supported by the .Fx boot loader. +.It Sy large_dnode +.Bl -column "READ\-ONLY COMPATIBLE" "org.zfsonlinux:large_dnode" +.It GUID Ta org.zfsonlinux:large_dnode +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta extensible_dataset +.El +.Pp +The +.Sy large_dnode +feature allows the size of dnodes in a dataset to be set larger than 512B. +.Pp +This feature becomes +.Sy active +once a dataset contains an object with a dnode larger than 512B, +which occurs as a result of setting the +.Sy dnodesize +dataset property to a value other than +.Sy legacy . +The feature will return to being +.Sy enabled +once all filesystems that have ever contained a dnode larger than 512B are +destroyed. +Large dnodes allow more data to be stored in the bonus buffer, thus potentially +improving performance by avoiding the use of spill blocks. .It Sy sha512 .Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:sha512" .It GUID Ta org.illumos:sha512 ___ 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: r353753 - stable/11/share/man/man4
Author: avg Date: Sat Oct 19 07:45:11 2019 New Revision: 353753 URL: https://svnweb.freebsd.org/changeset/base/353753 Log: MFC r353434: man4/Makefile: fix sorting for some entries starting with 'v' Modified: stable/11/share/man/man4/Makefile Modified: stable/11/share/man/man4/Makefile == --- stable/11/share/man/man4/Makefile Sat Oct 19 07:41:22 2019 (r353752) +++ stable/11/share/man/man4/Makefile Sat Oct 19 07:45:11 2019 (r353753) @@ -845,6 +845,13 @@ _nvd.4=nvd.4 _nvme.4= nvme.4 _nvram.4= nvram.4 _nxge.4= nxge.4 +_padlock.4=padlock.4 +_rr232x.4= rr232x.4 +_speaker.4=speaker.4 +_spkr.4= spkr.4 +_tpm.4=tpm.4 +_urtw.4= urtw.4 +_viawd.4= viawd.4 _virtio.4= virtio.4 _virtio_balloon.4=virtio_balloon.4 _virtio_blk.4= virtio_blk.4 @@ -854,13 +861,6 @@ _virtio_scsi.4= virtio_scsi.4 _vmx.4=vmx.4 _vtnet.4= vtnet.4 _vxge.4= vxge.4 -_padlock.4=padlock.4 -_rr232x.4= rr232x.4 -_speaker.4=speaker.4 -_spkr.4= spkr.4 -_tpm.4=tpm.4 -_urtw.4= urtw.4 -_viawd.4= viawd.4 _wbwd.4= wbwd.4 _wpi.4=wpi.4 _xen.4=xen.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: r353752 - stable/12/share/man/man4
Author: avg Date: Sat Oct 19 07:41:22 2019 New Revision: 353752 URL: https://svnweb.freebsd.org/changeset/base/353752 Log: MFC r353434: man4/Makefile: fix sorting for some entries starting with 'v' Modified: stable/12/share/man/man4/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/Makefile == --- stable/12/share/man/man4/Makefile Sat Oct 19 07:38:02 2019 (r353751) +++ stable/12/share/man/man4/Makefile Sat Oct 19 07:41:22 2019 (r353752) @@ -826,6 +826,13 @@ _nfsmb.4= nfsmb.4 _nvd.4=nvd.4 _nvme.4= nvme.4 _nvram.4= nvram.4 +_padlock.4=padlock.4 +_rr232x.4= rr232x.4 +_speaker.4=speaker.4 +_spkr.4= spkr.4 +_tpm.4=tpm.4 +_urtw.4= urtw.4 +_viawd.4= viawd.4 _virtio.4= virtio.4 _virtio_balloon.4=virtio_balloon.4 _virtio_blk.4= virtio_blk.4 @@ -834,13 +841,6 @@ _virtio_random.4= virtio_random.4 _virtio_scsi.4= virtio_scsi.4 _vmx.4=vmx.4 _vtnet.4= vtnet.4 -_padlock.4=padlock.4 -_rr232x.4= rr232x.4 -_speaker.4=speaker.4 -_spkr.4= spkr.4 -_tpm.4=tpm.4 -_urtw.4= urtw.4 -_viawd.4= viawd.4 _wbwd.4= wbwd.4 _wpi.4=wpi.4 _xen.4=xen.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: r353751 - stable/11/cddl/contrib/opensolaris/cmd/zfs
Author: avg Date: Sat Oct 19 07:38:02 2019 New Revision: 353751 URL: https://svnweb.freebsd.org/changeset/base/353751 Log: MFC r353649: fix section number in zfs-program.8 Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 == --- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8Sat Oct 19 07:37:18 2019(r353750) +++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8Sat Oct 19 07:38:02 2019(r353751) @@ -11,7 +11,7 @@ .\" Copyright (c) 2016, 2017 by Delphix. All rights reserved. .\" .Dd October 02, 2017 -.Dt ZFS-PROGRAM 1M +.Dt ZFS-PROGRAM 8 .Os .Sh NAME .Nm zfs program ___ 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: r353750 - stable/12/cddl/contrib/opensolaris/cmd/zfs
Author: avg Date: Sat Oct 19 07:37:18 2019 New Revision: 353750 URL: https://svnweb.freebsd.org/changeset/base/353750 Log: MFC r353649: fix section number in zfs-program.8 Modified: stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 == --- stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8Sat Oct 19 07:16:20 2019(r353749) +++ stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8Sat Oct 19 07:37:18 2019(r353750) @@ -12,7 +12,7 @@ .\" Copyright (c) 2018 Datto Inc. .\" .Dd October 02, 2017 -.Dt ZFS-PROGRAM 1M +.Dt ZFS-PROGRAM 8 .Os .Sh NAME .Nm zfs program ___ 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: r353742 - in head/sys: conf net
On Fri, 18 Oct 2019 22:03:37 + (UTC)
Conrad Meyer wrote:
> Author: cem
> Date: Fri Oct 18 22:03:36 2019
> New Revision: 353742
> URL: https://svnweb.freebsd.org/changeset/base/353742
>
> Log:
> Fix debugnet(4) link/build fallout on some configurations
>
> Introduced in r353685 (sys/conf/files), r353694 (debugnet.c
> db_printf).
> Submitted by: kevans
> Reported by:cy
> X-MFC-With: r353685, r353694
>
> Modified:
> head/sys/conf/files
> head/sys/net/debugnet.c
>
> Modified: head/sys/conf/files
> ==
> --- head/sys/conf/files Fri Oct 18 21:53:27 2019
> (r353741) +++ head/sys/conf/files Fri Oct 18 22:03:36
> 2019 (r353742) @@ -4298,7 +4298,7 @@
> netinet/libalias/alias_mod.c optional libalias | netgr
> netinet/libalias/alias_proxy.coptional libalias inet |
> netgraph_nat inet netinet/libalias/alias_util.c optional
> libalias inet | netgraph_nat inet
> netinet/libalias/alias_sctp.c optional libalias inet |
> netgraph_nat inet -netinet/netdump/netdump_client.c optional inet
> netdump +netinet/netdump/netdump_client.c optional inet debugnet
> netdump netinet6/dest6.c optional inet6
> netinet6/frag6.c optional inet6
> netinet6/icmp6.c optional inet6
>
> Modified: head/sys/net/debugnet.c
> ==
> --- head/sys/net/debugnet.c Fri Oct 18 21:53:27 2019
> (r353741) +++ head/sys/net/debugnet.c Fri Oct 18 22:03:36
> 2019 (r353742) @@ -659,7 +659,7 @@ debugnet_connect(const
> struct debugnet_conn_params *dc CURVNET_RESTORE();
>
> if (dest_rt == NULL) {
> - db_printf("%s: Could not get route for that
> server.\n",
> + printf("%s: Could not get route for that
> server.\n", __func__);
> error = ENOENT;
> goto cleanup;
> ___
> svn-src-h...@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"
Thank you.
oh
pgp_6pVdRBqiT.pgp
Description: OpenPGP digital signature
svn commit: r353749 - head
Author: avg
Date: Sat Oct 19 07:16:20 2019
New Revision: 353749
URL: https://svnweb.freebsd.org/changeset/base/353749
Log:
buildkernel: always add standard kernel configuration include path
This should change nothing for kernel configurations at the standard
locations in the source tree. However, if KERNCONFDIR is used to
specify a custom location for a kernel configuration file (e.g., out of
tree), then both the custom location and the standard location, in this
order, will be used as include paths for config(8). This will allow the
kernel configuration to include files from both locations.
Reviewed by: bdrewery
MFC after:16 days
Differential Revision: https://reviews.freebsd.org/D22057
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sat Oct 19 07:13:15 2019(r353748)
+++ head/Makefile.inc1 Sat Oct 19 07:16:20 2019(r353749)
@@ -1653,7 +1653,8 @@ buildkernel: .MAKE .PHONY
cd ${KRNLCONFDIR}; \
PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
- -I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
+ -I '${KERNCONFDIR}' -I '${KRNLCONFDIR}' \
+ '${KERNCONFDIR}/${_kernel}'
.endif
.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
@echo
___
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: r353748 - head/sys/x86/x86
Author: avg
Date: Sat Oct 19 07:13:15 2019
New Revision: 353748
URL: https://svnweb.freebsd.org/changeset/base/353748
Log:
remove wmb() call from x86 cpu_reset()
The rationale is pretty much the same as in r353747.
There is no subsequent dependent store.
The store is to the regular (TSO) memory anyway.
MFC after:23 days
Modified:
head/sys/x86/x86/cpu_machdep.c
Modified: head/sys/x86/x86/cpu_machdep.c
==
--- head/sys/x86/x86/cpu_machdep.c Sat Oct 19 07:10:15 2019
(r353747)
+++ head/sys/x86/x86/cpu_machdep.c Sat Oct 19 07:13:15 2019
(r353748)
@@ -390,7 +390,6 @@ cpu_reset(void)
mb = _find(0)->pc_monitorbuf;
atomic_store_int(>stop_state,
MONITOR_STOPSTATE_RUNNING);
- wmb();
cnt = 0;
while (cpu_reset_proxy_active == 0 && cnt < 1000) {
___
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: r353747 - head/sys/amd64/vmm
Author: avg
Date: Sat Oct 19 07:10:15 2019
New Revision: 353747
URL: https://svnweb.freebsd.org/changeset/base/353747
Log:
vmm: remove a wmb() call
After removing wmb(), vm_set_rendezvous_func() became super trivial, so
there was no point in keeping it.
The wmb (sfence on amd64, lock nop on i386) was not needed. This can be
explained from several points of view.
First, wmb() is used for store-store ordering (although, the primitive
is undocumented). There was no obvious subsequent store that needed the
barrier.
Second, x86 has a memory model with strong ordering including total
store order. An explicit store barrier may be needed only when working
with special memory (device, special caching mode) or using special
instructions (non-temporal stores). That was not the case for this
code.
Third, I believe that there is a misconception that sfence "flushes" the
store buffer in a sense that it speeds up the propagation of stores from
the store buffer to the global visibility. I think that such
propagation always happens as fast as possible. sfence only makes
subsequent stores wait for that propagation to complete. So, sfence is
only useful for ordering of stores and only in the situations described
above.
Reviewed by: jhb
MFC after:23 days
Differential Revision: https://reviews.freebsd.org/D21978
Modified:
head/sys/amd64/vmm/vmm.c
Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cSat Oct 19 02:47:32 2019(r353746)
+++ head/sys/amd64/vmm/vmm.cSat Oct 19 07:10:15 2019(r353747)
@@ -1235,22 +1235,6 @@ vcpu_require_state_locked(struct vm *vm, int vcpuid, e
panic("Error %d setting state to %d", error, newstate);
}
-static void
-vm_set_rendezvous_func(struct vm *vm, vm_rendezvous_func_t func)
-{
-
- KASSERT(mtx_owned(>rendezvous_mtx), ("rendezvous_mtx not locked"));
-
- /*
-* Update 'rendezvous_func' and execute a write memory barrier to
-* ensure that it is visible across all host cpus. This is not needed
-* for correctness but it does ensure that all the vcpus will notice
-* that the rendezvous is requested immediately.
-*/
- vm->rendezvous_func = func;
- wmb();
-}
-
#defineRENDEZVOUS_CTR0(vm, vcpuid, fmt)
\
do {\
if (vcpuid >= 0)\
@@ -1281,7 +1265,7 @@ vm_handle_rendezvous(struct vm *vm, int vcpuid)
if (CPU_CMP(>rendezvous_req_cpus,
>rendezvous_done_cpus) == 0) {
VCPU_CTR0(vm, vcpuid, "Rendezvous completed");
- vm_set_rendezvous_func(vm, NULL);
+ vm->rendezvous_func = NULL;
wakeup(>rendezvous_func);
break;
}
@@ -2535,7 +2519,7 @@ restart:
vm->rendezvous_req_cpus = dest;
CPU_ZERO(>rendezvous_done_cpus);
vm->rendezvous_arg = arg;
- vm_set_rendezvous_func(vm, func);
+ vm->rendezvous_func = func;
mtx_unlock(>rendezvous_mtx);
/*
___
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"
