svn commit: r359288 - head/sys/netinet
Author: tuexen
Date: Tue Mar 24 23:04:07 2020
New Revision: 359288
URL: https://svnweb.freebsd.org/changeset/base/359288
Log:
Only call panic when building with INVARIANTS.
MFC after:1 week
Modified:
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Tue Mar 24 22:44:36 2020(r359287)
+++ head/sys/netinet/sctputil.c Tue Mar 24 23:04:07 2020(r359288)
@@ -2015,7 +2015,11 @@ sctp_timeout_handler(void *t)
sctp_delete_prim_timer(inp, stcb);
break;
default:
+#ifdef INVARIANTS
panic("Unknown timer type %d", type);
+#else
+ goto get_out;
+#endif
}
#ifdef SCTP_AUDITING_ENABLED
sctp_audit_log(0xF1, (uint8_t)type);
@@ -2434,7 +2438,11 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
to_ticks = MSEC_TO_TICKS(stcb->asoc.initial_rto);
break;
default:
+#ifdef INVARIANTS
panic("Unknown timer type %d", t_type);
+#else
+ return;
+#endif
}
KASSERT(tmr != NULL, ("tmr is NULL for timer type %d", t_type));
KASSERT(to_ticks > 0, ("to_ticks == 0 for timer type %d", t_type));
@@ -2715,7 +2723,11 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, st
tmr = >asoc.delete_prim_timer;
break;
default:
+#ifdef INVARIANTS
panic("Unknown timer type %d", t_type);
+#else
+ return;
+#endif
}
KASSERT(tmr != NULL, ("tmr is NULL for timer type %d", t_type));
if ((tmr->type != SCTP_TIMER_TYPE_NONE) &&
___
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: r359295 - head/lib/libpmc
Author: manu
Date: Wed Mar 25 02:28:47 2020
New Revision: 359295
URL: https://svnweb.freebsd.org/changeset/base/359295
Log:
libpmc: Always add the full include path for libpmcstat
Previously it was only added for aarch64, amd64 and i386
Modified:
head/lib/libpmc/Makefile
Modified: head/lib/libpmc/Makefile
==
--- head/lib/libpmc/MakefileWed Mar 25 01:36:23 2020(r359294)
+++ head/lib/libpmc/MakefileWed Mar 25 02:28:47 2020(r359295)
@@ -5,6 +5,8 @@ LIB=pmc
SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
INCS= pmc.h pmclog.h pmcformat.h
+CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
+
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386"
@@ -15,8 +17,6 @@ EVENT_ARCH="x86"
.elif ${MACHINE_ARCH} == "powerpc"
EVENT_ARCH="powerpc"
.endif
-
-CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
.if ${MK_DIRDEPS_BUILD} == "yes"
# avoid circular dependency
___
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: r359168 - head
> On Mar 24, 2020, at 3:57 PM, Scott Long wrote: > > On Tue, Mar 24, 2020, at 3:45 PM, Gleb Smirnoff wrote: >> On Fri, Mar 20, 2020 at 04:02:46PM +, Ed Maste wrote: >> E> Author: emaste >> E> Date: Fri Mar 20 16:02:45 2020 >> E> New Revision: 359168 >> E> URL: https://svnweb.freebsd.org/changeset/base/359168 >> E> >> E> Log: >> E> remove ancient pre-2000 ObsoleteFiles.inc entries >> E> >> E> We support 10.3 as the minimum version to install from, which was >> E> released in the mid-2010s. There's a lot of ancient ObsoleteFiles.inc >> E> history that serves no purpose today; start by removing entries from >> E> 1999 and earlier. >> >> I understand that rationale is to speedup 'make delete-old' times, and >> trimming the default file definitely makes sense. However, what about >> keeping the full ObsoleteFiles.inc version, at least for documenting >> purposes? >> > > This is what SCM history is for, IMHO. The historical entries serve little > purpose outside of that. Moreover, splitting them up into separate files will make merges more difficult than they need to be/already are. Cheers, -Enji ___ 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: r359294 - in head/libexec/rc: . rc.d
Author: manu
Date: Wed Mar 25 01:36:23 2020
New Revision: 359294
URL: https://svnweb.freebsd.org/changeset/base/359294
Log:
pkgbase: Stop threating rc files as config files
rc scripts arent configuration files so use FILES instead of CONFS.
While here put rc scripts into related package (sendmail in the
FreeBSD-sendmail
package, wpa_supplicant in the FreeBSD-wpa etc ...)
Reviewed by: bapt, emaste
Differential Revision:https://reviews.freebsd.org/D24177
Modified:
head/libexec/rc/Makefile
head/libexec/rc/rc.d/Makefile
Modified: head/libexec/rc/Makefile
==
--- head/libexec/rc/MakefileWed Mar 25 01:35:13 2020(r359293)
+++ head/libexec/rc/MakefileWed Mar 25 01:36:23 2020(r359294)
@@ -2,25 +2,28 @@
.include
-CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS
-CONFETCDIR=/etc
-CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown
rc.bsdextended
-CONFETCPACKAGE=rc
+BINDIR=/etc
+FILESGROUPS= RCETC RCETCEXEC RCETCDEFAULTS
+RCETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended
+RCETCPACKAGE= rc
.if ${MK_IPFW} != "no"
-CONFETC+= rc.firewall
+FILESGROUPS+= RCIPFW
+RCIPFW+= rc.firewall
+RCIPFWPACKAGE= ipfw
.endif
.if ${MK_SENDMAIL} != "no"
-CONFETC+= rc.sendmail
+FILESGROUPS+= RCSENDMAIL
+RCSENDMAIL+= rc.sendmail
+RCSENDMAILPACKAGE= sendmail
.endif
-CONFETCMODE= 644
-CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend
-CONFETCEXECDIR=/etc
-CONFETCEXECMODE= 755
-CONFETCEXECPACKAGE=rc
-CONFETCDEFAULTSDIR=/etc/defaults
-CONFETCDEFAULTS= rc.conf
-CONFETCDEFAULTSPACKAGE=rc
+RCETCMODE= 644
+RCETCEXEC= netstart pccard_ether rc.resume rc.suspend
+RCETCEXECMODE= 755
+RCETCEXECPACKAGE= rc
+RCETCDEFAULTSDIR= /etc/defaults
+RCETCDEFAULTS= rc.conf
+RCETCDEFAULTSPACKAGE= rc
SUBDIR+= rc.d
Modified: head/libexec/rc/rc.d/Makefile
==
--- head/libexec/rc/rc.d/Makefile Wed Mar 25 01:35:13 2020
(r359293)
+++ head/libexec/rc/rc.d/Makefile Wed Mar 25 01:36:23 2020
(r359294)
@@ -2,11 +2,11 @@
.include
-CONFDIR= /etc/rc.d
-CONFGROUPS=CONFS
-CONFSPACKAGE= rc
+BINDIR=/etc/rc.d
+FILESGROUPS= BASERC
+BASERCPACKAGE= rc
-CONFS= DAEMON \
+BASERC=DAEMON \
FILESYSTEMS \
LOGIN \
NETWORKING \
@@ -115,7 +115,7 @@ CONFS= DAEMON \
watchdogd
.if ${MK_NIS} != "no"
-CONFS+=ypbind \
+BASERC+= ypbind \
ypldap \
yppasswdd \
ypserv \
@@ -125,23 +125,23 @@ CONFS+= ypbind \
.endif
.if ${MK_ACCT} != "no"
-CONFGROUPS+= ACCT
+FILESGROUPS+= ACCT
ACCT+= accounting
ACCTPACKAGE= acct
.endif
.if ${MK_ACPI} != "no"
-CONFGROUPS+= ACPI
+FILESGROUPS+= ACPI
ACPI= power_profile
ACPIPACKAGE= acpi
.endif
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
-CONFS+=powerd
+BASERC+= powerd
.endif
.if ${MK_APM} != "no"
-CONFGROUPS+= APM
+FILESGROUPS+= APM
APM+= apm
.if ${MACHINE} == "i386"
APM+= apmd
@@ -150,15 +150,17 @@ APMPACKAGE= apm
.endif
.if ${MK_AUDIT} != "no"
-CONFGROUPS+= AUDIT
+FILESGROUPS+= AUDIT
AUDIT+=auditd
AUDIT+=auditdistd
.endif
.if ${MK_AUTOFS} != "no"
-CONFS+=automount
-CONFS+=automountd
-CONFS+=autounmountd
+FILESGROUPS+= AUFOFS
+AUTOFS+= automount
+AUTOFS+= automountd
+AUTOFS+= autounmountd
+AUTOFSPACKAGE= autofs
.endif
.if ${MK_BLACKLIST} != "no"
@@ -166,7 +168,7 @@ _blacklistd+= blacklistd
.endif
.if ${MK_BLUETOOTH} != "no"
-CONFGROUPS+= BLUETOOTH
+FILESGROUPS+= BLUETOOTH
BLUETOOTH+=bluetooth \
bthidd \
hcsecd \
@@ -177,71 +179,79 @@ BLUETOOTHPACKAGE= bluetooth
.endif
.if ${MK_BOOTPARAMD} != "no"
-CONFS+=bootparams
+BASERC+= bootparams
.endif
.if ${MK_BSNMP} != "no"
-CONFGROUPS+= BSNMP
+FILESGROUPS+= BSNMP
BSNMP+=bsnmpd
BSNMPPACKAGE= bsnmp
.endif
.if ${MK_CCD} != "no"
-CONFS+=ccd
+FILESGROUPS+= CCD
+CCD+= ccd
+CCDPACKAGE=ccdconfig
.endif
.if ${MK_FTP} != "no"
-CONFS+=ftpd
+BASERC+= ftpd
.endif
.if ${MK_HAST} != "no"
-CONFGROUPS+= HAST
+FILESGROUPS+= HAST
HAST= hastd
HASTPACKAGE= hast
.endif
.if ${MK_INETD} != "no"
-CONFS+=inetd
+BASERC+= inetd
.endif
.if ${MK_IPFILTER} != "no"
-CONFS+=ipfilter \
- ipfs \
- ipmon \
- ipnat \
- ippool
+FILESGROUPS+= IPFILTER
+IPFILTER+= ipfilter \
+ ipfs \
+ ipmon \
+ ipnat \
+ ippool
svn commit: r359293 - in head: . share/mk
Author: manu
Date: Wed Mar 25 01:35:13 2020
New Revision: 359293
URL: https://svnweb.freebsd.org/changeset/base/359293
Log:
Re-apply r359267 now that tools are using the proper include path
Original commit message:
bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
f we're building an internal lib do not bother including bsd.incs.mk so we
will not install the headers.
This also "solves" a problem with pkgbase where a libXXX-development package
is created and due to how packages are created we add a dependency to a
libXXX package that doesn't exists.
Modified:
head/ObsoleteFiles.inc
head/share/mk/bsd.lib.mk
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Wed Mar 25 01:32:16 2020(r359292)
+++ head/ObsoleteFiles.inc Wed Mar 25 01:35:13 2020(r359293)
@@ -36,6 +36,11 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20200323: INTERNALLIB don't install headers anymore
+OLD_FILES+=usr/include/libelftc.h
+OLD_FILES+=usr/include/libifconfig.h
+OLD_FILES+=usr/include/libpmcstat.h
+
# 20200320: cx and ctau drivers retired
OLD_FILES+=usr/share/man/man4/ctau.4.gz
OLD_FILES+=usr/share/man/man4/cx.4.gz
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkWed Mar 25 01:32:16 2020(r359292)
+++ head/share/mk/bsd.lib.mkWed Mar 25 01:35:13 2020(r359293)
@@ -489,7 +489,10 @@ _libinstall:
.include
.include
.include
+#No need to install header for INTERNALLIB
+.if !defined(INTERNALLIB)
.include
+.endif
.endif
LINKOWN?= ${LIBOWN}
___
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: r359292 - in head: lib/libpmc lib/libpmcstat usr.sbin/pmc usr.sbin/pmcstat
Author: manu
Date: Wed Mar 25 01:32:16 2020
New Revision: 359292
URL: https://svnweb.freebsd.org/changeset/base/359292
Log:
pmc: Add include path for libpmcstat as it is an internallib
Reviewed by: bapt
Differential Revision:https://reviews.freebsd.org/D24173
Modified:
head/lib/libpmc/Makefile
head/lib/libpmcstat/Makefile
head/usr.sbin/pmc/Makefile
head/usr.sbin/pmcstat/Makefile
Modified: head/lib/libpmc/Makefile
==
--- head/lib/libpmc/MakefileWed Mar 25 01:31:26 2020(r359291)
+++ head/lib/libpmc/MakefileWed Mar 25 01:32:16 2020(r359292)
@@ -16,9 +16,10 @@ EVENT_ARCH="x86"
EVENT_ARCH="powerpc"
.endif
+CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
+
.if ${MK_DIRDEPS_BUILD} == "yes"
# avoid circular dependency
-CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
.else
Modified: head/lib/libpmcstat/Makefile
==
--- head/lib/libpmcstat/MakefileWed Mar 25 01:31:26 2020
(r359291)
+++ head/lib/libpmcstat/MakefileWed Mar 25 01:32:16 2020
(r359292)
@@ -10,6 +10,8 @@ SRCS= \
libpmcstat_process.c\
libpmcstat_string.c \
libpmcstat_symbol.c
-INCS= libpmcstat.h
+
+# If libpmcstat becomes public uncomment this line
+#INCS= libpmcstat.h
.include
Modified: head/usr.sbin/pmc/Makefile
==
--- head/usr.sbin/pmc/Makefile Wed Mar 25 01:31:26 2020(r359291)
+++ head/usr.sbin/pmc/Makefile Wed Mar 25 01:32:16 2020(r359292)
@@ -9,6 +9,7 @@ WARNS?= 3
CXXFLAGS+= -O0
CXXSTD= c++14
CWARNFLAGS.gcc+= -Wno-redundant-decls
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
LIBADD=kvm pmc m ncursesw pmcstat elf
Modified: head/usr.sbin/pmcstat/Makefile
==
--- head/usr.sbin/pmcstat/Makefile Wed Mar 25 01:31:26 2020
(r359291)
+++ head/usr.sbin/pmcstat/Makefile Wed Mar 25 01:32:16 2020
(r359292)
@@ -5,6 +5,7 @@
PROG_CXX= pmcstat
MAN= pmcstat.8
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
LIBADD=kvm pmc m ncursesw pmcstat elf
SRCS= pmcstat.c pmcstat.h pmcstat_log.c \
___
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: r359291 - in head: lib/libifconfig usr.sbin/wlandebug
Author: manu
Date: Wed Mar 25 01:31:26 2020
New Revision: 359291
URL: https://svnweb.freebsd.org/changeset/base/359291
Log:
wlandebug: Add include path for libifconfig as it is a internallib
Reviewed by: bapt
Differential Revision:https://reviews.freebsd.org/D24172
Modified:
head/lib/libifconfig/Makefile
head/usr.sbin/wlandebug/Makefile
Modified: head/lib/libifconfig/Makefile
==
--- head/lib/libifconfig/Makefile Wed Mar 25 00:31:42 2020
(r359290)
+++ head/lib/libifconfig/Makefile Wed Mar 25 01:31:26 2020
(r359291)
@@ -10,8 +10,9 @@ SRCS= libifconfig.c libifconfig_carp.c libifconfig_in
SRCS+= libifconfig_inet6.c libifconfig_internal.c libifconfig_lagg.c
SRCS+= libifconfig_media.c
-INCSDIR= ${INCLUDEDIR}
-INCS= libifconfig.h
+# If libifconfig become public uncomment those two lines
+#INCSDIR= ${INCLUDEDIR}
+#INCS= libifconfig.h
#MAN= libifconfig.3
Modified: head/usr.sbin/wlandebug/Makefile
==
--- head/usr.sbin/wlandebug/MakefileWed Mar 25 00:31:42 2020
(r359290)
+++ head/usr.sbin/wlandebug/MakefileWed Mar 25 01:31:26 2020
(r359291)
@@ -3,6 +3,7 @@
PROG= wlandebug
MAN= wlandebug.8
+CFLAGS+= -I${SRCTOP}/lib/libifconfig
LIBADD+= ifconfig
WARNS?=2
___
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: r359290 - in stable: 11/usr.bin/hexdump/tests 12/usr.bin/hexdump/tests
Author: kevans Date: Wed Mar 25 00:31:42 2020 New Revision: 359290 URL: https://svnweb.freebsd.org/changeset/base/359290 Log: MFC r358553: hexdump: tests: take into account byte order Hexdump test was failling on big endian systems when testing decimal, octal and hexa outputs as the tests were designed on a little endian system. This revision adds the two distinct flavors of output expected and determines at runtime which to compare against. Added: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out Deleted: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c.out Modified: stable/12/usr.bin/hexdump/tests/Makefile stable/12/usr.bin/hexdump/tests/hexdump_test.sh Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out
svn commit: r359290 - in stable: 11/usr.bin/hexdump/tests 12/usr.bin/hexdump/tests
Author: kevans Date: Wed Mar 25 00:31:42 2020 New Revision: 359290 URL: https://svnweb.freebsd.org/changeset/base/359290 Log: MFC r358553: hexdump: tests: take into account byte order Hexdump test was failling on big endian systems when testing decimal, octal and hexa outputs as the tests were designed on a little endian system. This revision adds the two distinct flavors of output expected and determines at runtime which to compare against. Added: stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out Deleted: stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c.out Modified: stable/11/usr.bin/hexdump/tests/Makefile stable/11/usr.bin/hexdump/tests/hexdump_test.sh Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Added: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out
Re: svn commit: r359168 - head
On Tue, Mar 24, 2020 at 4:58 PM Scott Long wrote: > > > On Tue, Mar 24, 2020, at 3:45 PM, Gleb Smirnoff wrote: > > On Fri, Mar 20, 2020 at 04:02:46PM +, Ed Maste wrote: > > E> Author: emaste > > E> Date: Fri Mar 20 16:02:45 2020 > > E> New Revision: 359168 > > E> URL: https://svnweb.freebsd.org/changeset/base/359168 > > E> > > E> Log: > > E> remove ancient pre-2000 ObsoleteFiles.inc entries > > E> > > E> We support 10.3 as the minimum version to install from, which was > > E> released in the mid-2010s. There's a lot of ancient > ObsoleteFiles.inc > > E> history that serves no purpose today; start by removing entries from > > E> 1999 and earlier. > > > > I understand that rationale is to speedup 'make delete-old' times, and > > trimming the default file definitely makes sense. However, what about > > keeping the full ObsoleteFiles.inc version, at least for documenting > > purposes? > > > > This is what SCM history is for, IMHO. The historical entries serve little > purpose outside of that. > We only support upgrading so far into the past. Farther than we can build, sure, but it's still limited. If you have systems older than that, or that haven't been preened, you can get the the last release's tree and do a cleaning. There's no more reason to retain this stuff than there is to retain ancient version compat code in drivers, etc. So while it seems like a good idea to have this back to dirt, in reality it would get little use and the data can be found easily enough now, and in the future. That's why I advised Ed to just delete the entries > 20 years old... Warner ___ 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: r359168 - head
On Fri, Mar 20, 2020 at 04:02:46PM +, Ed Maste wrote: E> Author: emaste E> Date: Fri Mar 20 16:02:45 2020 E> New Revision: 359168 E> URL: https://svnweb.freebsd.org/changeset/base/359168 E> E> Log: E> remove ancient pre-2000 ObsoleteFiles.inc entries E> E> We support 10.3 as the minimum version to install from, which was E> released in the mid-2010s. There's a lot of ancient ObsoleteFiles.inc E> history that serves no purpose today; start by removing entries from E> 1999 and earlier. I understand that rationale is to speedup 'make delete-old' times, and trimming the default file definitely makes sense. However, what about keeping the full ObsoleteFiles.inc version, at least for documenting purposes? -- Gleb Smirnoff ___ 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: r359289 - head
Author: mhorne
Date: Tue Mar 24 23:25:54 2020
New Revision: 359289
URL: https://svnweb.freebsd.org/changeset/base/359289
Log:
Makefile.inc1: override MACHINE for native-xtools
For the final step of the native-xtools target, "everything" is built
with TARGET and TARGET_ARCH set to the architecture we wish to
cross-build for. However, CROSSENV overwrites the values of MACHINE and
MACHINE_ARCH, setting them to be identical to TARGET and TARGET_ARCH.
For native-xtools this is undesirable since we are building binaries to
run on the host architecture, that can cross compile for the target
architecture.
When building native-xtools for RISC-V, this issue manifests as an invalid
argument for "-march". The compiler is invoked with the target triple of the
host architecture, but the CFLAGS inherited from bsd.cpu.mk are that of the
target architecture.
Reviewed by: imp, bdrewery
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D23838
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Mar 24 23:04:07 2020(r359288)
+++ head/Makefile.inc1 Tue Mar 24 23:25:54 2020(r359289)
@@ -2650,6 +2650,7 @@ NXBMAKE+= XCC="${NXBOBJTOP}/tmp/usr/bin/cc" \
XCPP="${NXBOBJTOP}/tmp/usr/bin/cpp"
.endif
NXBMAKE+= ${NXBMAKEENV} ${MAKE} -f Makefile.inc1 ${NXBMAKEARGS} \
+ MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
TARGET=${NXB_TARGET} TARGET_ARCH=${NXB_TARGET_ARCH} \
TARGET_TRIPLE=${MACHINE_TRIPLE:Q}
# NXBDIRS is improperly based on MACHINE rather than NXB_TARGET. Need 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: r359168 - head
On Tue, Mar 24, 2020, at 3:45 PM, Gleb Smirnoff wrote: > On Fri, Mar 20, 2020 at 04:02:46PM +, Ed Maste wrote: > E> Author: emaste > E> Date: Fri Mar 20 16:02:45 2020 > E> New Revision: 359168 > E> URL: https://svnweb.freebsd.org/changeset/base/359168 > E> > E> Log: > E> remove ancient pre-2000 ObsoleteFiles.inc entries > E> > E> We support 10.3 as the minimum version to install from, which was > E> released in the mid-2010s. There's a lot of ancient ObsoleteFiles.inc > E> history that serves no purpose today; start by removing entries from > E> 1999 and earlier. > > I understand that rationale is to speedup 'make delete-old' times, and > trimming the default file definitely makes sense. However, what about > keeping the full ObsoleteFiles.inc version, at least for documenting > purposes? > This is what SCM history is for, IMHO. The historical entries serve little purpose outside of that. Scott ___ 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: r359287 - head/sys/netinet
Author: tuexen
Date: Tue Mar 24 22:44:36 2020
New Revision: 359287
URL: https://svnweb.freebsd.org/changeset/base/359287
Log:
Another cleanup of the timer code. Also be more pedantic about the
parameters of the timer start and stop routines. Several inconsistencies
have been fixed in earlier commits. Now they will be catched when running
an INVARIANTS system.
MFC after:1 week
Modified:
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Tue Mar 24 21:37:34 2020(r359286)
+++ head/sys/netinet/sctputil.c Tue Mar 24 22:44:36 2020(r359287)
@@ -1601,10 +1601,36 @@ sctp_handle_addr_wq(void)
}
}
+/*-
+ * The following table shows which pointers for the inp, stcb, or net are
+ * stored for each timer after it was started.
+ *
+ *|Name |Timer|inp |stcb|net |
+ *|-|-||||
+ *|SCTP_TIMER_TYPE_SEND |net->rxt_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_INIT |net->rxt_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_RECV |stcb->asoc.dack_timer|Yes |Yes |No |
+ *|SCTP_TIMER_TYPE_SHUTDOWN |net->rxt_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_HEARTBEAT|net->hb_timer|Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_COOKIE |net->rxt_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_NEWCOOKIE|inp->sctp_ep.signature_change|Yes |No |No |
+ *|SCTP_TIMER_TYPE_PATHMTURAISE |net->pmtu_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_SHUTDOWNACK |net->rxt_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_ASCONF |stcb->asoc.asconf_timer |Yes |Yes |Yes |
+ *|SCTP_TIMER_TYPE_SHUTDOWNGUARD|stcb->asoc.shut_guard_timer |Yes |Yes |No |
+ *|SCTP_TIMER_TYPE_AUTOCLOSE|stcb->asoc.autoclose_timer |Yes |Yes |No |
+ *|SCTP_TIMER_TYPE_STRRESET |stcb->asoc.strreset_timer|Yes |Yes |No |
+ *|SCTP_TIMER_TYPE_INPKILL |inp->sctp_ep.signature_change|Yes |No |No |
+ *|SCTP_TIMER_TYPE_ASOCKILL |stcb->asoc.strreset_timer|Yes |Yes |No |
+ *|SCTP_TIMER_TYPE_ADDR_WQ |SCTP_BASE_INFO(addr_wq_timer)|No |No |No |
+ *|SCTP_TIMER_TYPE_PRIM_DELETED |stcb->asoc.delete_prim_timer |Yes |Yes |No |
+ */
+
void
sctp_timeout_handler(void *t)
{
struct epoch_tracker et;
+ struct timeval tv;
struct sctp_inpcb *inp;
struct sctp_tcb *stcb;
struct sctp_nets *net;
@@ -1615,6 +1641,7 @@ sctp_timeout_handler(void *t)
#endif
int did_output;
int type;
+ int i, secret;
tmr = (struct sctp_timer *)t;
inp = (struct sctp_inpcb *)tmr->ep;
@@ -1629,48 +1656,31 @@ sctp_timeout_handler(void *t)
#endif
/* sanity checks... */
- if (tmr->self != (void *)tmr) {
- /*
-* SCTP_PRINTF("Stale SCTP timer fired (%p), ignoring...\n",
-* (void *)tmr);
-*/
- CURVNET_RESTORE();
- return;
- }
+ KASSERT(tmr->self == tmr, ("tmr->self corrupted"));
+ KASSERT(SCTP_IS_TIMER_TYPE_VALID(tmr->type), ("Invalid timer type %d",
tmr->type));
+ type = tmr->type;
tmr->stopped_from = 0xa001;
- if (!SCTP_IS_TIMER_TYPE_VALID(tmr->type)) {
- /*
-* SCTP_PRINTF("SCTP timer fired with invalid type: 0x%x\n",
-* tmr->type);
-*/
- CURVNET_RESTORE();
- return;
- }
- tmr->stopped_from = 0xa002;
- if ((tmr->type != SCTP_TIMER_TYPE_ADDR_WQ) && (inp == NULL)) {
- CURVNET_RESTORE();
- return;
- }
- /* if this is an iterator timeout, get the struct and clear inp */
- tmr->stopped_from = 0xa003;
if (inp) {
SCTP_INP_INCR_REF(inp);
if ((inp->sctp_socket == NULL) &&
- ((tmr->type != SCTP_TIMER_TYPE_INPKILL) &&
- (tmr->type != SCTP_TIMER_TYPE_INIT) &&
- (tmr->type != SCTP_TIMER_TYPE_SEND) &&
- (tmr->type != SCTP_TIMER_TYPE_RECV) &&
- (tmr->type != SCTP_TIMER_TYPE_HEARTBEAT) &&
- (tmr->type != SCTP_TIMER_TYPE_SHUTDOWN) &&
- (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNACK) &&
- (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNGUARD) &&
- (tmr->type != SCTP_TIMER_TYPE_ASOCKILL))) {
+ ((type != SCTP_TIMER_TYPE_INPKILL) &&
+ (type != SCTP_TIMER_TYPE_INIT) &&
+ (type != SCTP_TIMER_TYPE_SEND) &&
+ (type != SCTP_TIMER_TYPE_RECV) &&
+ (type != SCTP_TIMER_TYPE_HEARTBEAT) &&
+ (type != SCTP_TIMER_TYPE_SHUTDOWN) &&
+ (type !=
Re: svn commit: r359168 - head
Wouldn't there been a better way to split up the global obsoletefiles.inc file and put them in to specific components directory or at least split them up by release basis to easier the future deletions? On Tuesday, March 24, 2020, Gleb Smirnoff wrote: > On Fri, Mar 20, 2020 at 04:02:46PM +, Ed Maste wrote: > E> Author: emaste > E> Date: Fri Mar 20 16:02:45 2020 > E> New Revision: 359168 > E> URL: https://svnweb.freebsd.org/changeset/base/359168 > E> > E> Log: > E> remove ancient pre-2000 ObsoleteFiles.inc entries > E> > E> We support 10.3 as the minimum version to install from, which was > E> released in the mid-2010s. There's a lot of ancient ObsoleteFiles.inc > E> history that serves no purpose today; start by removing entries from > E> 1999 and earlier. > > I understand that rationale is to speedup 'make delete-old' times, and > trimming the default file definitely makes sense. However, what about > keeping the full ObsoleteFiles.inc version, at least for documenting > purposes? > > -- > Gleb Smirnoff > ___ > 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" > ___ 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: r359286 - head
Author: emaste
Date: Tue Mar 24 21:37:34 2020
New Revision: 359286
URL: https://svnweb.freebsd.org/changeset/base/359286
Log:
Makefile.inc1: remove old (2018) stale dependency hacks
We handle a number of stale dependency issues on an ad-hoc basis, in
order to support ongoing NO_CLEAN builds. These hacks do not need to
be maintained indefinitely; now remove those for issues that are more
than a year old.
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Mar 24 21:28:48 2020(r359285)
+++ head/Makefile.inc1 Tue Mar 24 21:37:34 2020(r359286)
@@ -962,9 +962,8 @@ _cleanobj_fast_depend_hack: .PHONY
fi
.endif
.endfor
-# 20180604 r334626 brk sbrk
# 20190916 r352703 shm_open
-.for f in brk sbrk shm_open
+.for f in shm_open
@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
egrep -qw '${f}\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
echo "Removing stale dependencies for ${f} syscall wrappers"; \
@@ -972,37 +971,6 @@ _cleanobj_fast_depend_hack: .PHONY
${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
fi
.endfor
-# 20181013 r339348 bcopy reimplemented as .c
-.for f in bcopy memcpy memmove
- @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
- egrep -qw 'bcopy\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
- echo "Removing stale dependencies for bcopy"; \
- rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \
- ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
- fi
-.endfor
-# 20181115 r340463 bzero reimplemented as .c
- @if [ -e "${OBJTOP}/lib/libc/.depend.bzero.o" ] && \
- egrep -qw 'bzero\.[sS]' ${OBJTOP}/lib/libc/.depend.bzero.o; then \
- echo "Removing stale dependencies for bzero"; \
- rm -f ${OBJTOP}/lib/libc/.depend.bzero.* \
- ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.bzero.*};
\
- fi
-# 20181009 track migration from ntp's embedded libevent to updated one
- @if [ -e
"${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \
- egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \
- ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ;
then \
- echo "Removing stale libevent dependencies"; \
- rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \
- fi
-
-# 20181209 r341759 track migration across wpa update
- @if [ -e "${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o" ] && \
- egrep -q 'src/ap/rrm.c' \
- ${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o; then \
- echo "Removing stale wpa dependencies"; \
- rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \
- fi
_worldtmp: .PHONY
@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: r359285 - head/sys/dev/ichwd
Author: jhibbits
Date: Tue Mar 24 21:28:48 2020
New Revision: 359285
URL: https://svnweb.freebsd.org/changeset/base/359285
Log:
ichwd: Add Atom C3000 watchdog ID.
MFC after:3 days
Sponsored by: Juniper Networks, Inc
Modified:
head/sys/dev/ichwd/ichwd.c
head/sys/dev/ichwd/ichwd.h
Modified: head/sys/dev/ichwd/ichwd.c
==
--- head/sys/dev/ichwd/ichwd.c Tue Mar 24 19:33:21 2020(r359284)
+++ head/sys/dev/ichwd/ichwd.c Tue Mar 24 21:28:48 2020(r359285)
@@ -297,6 +297,7 @@ static struct ichwd_device ichwd_devices[] = {
static struct ichwd_device ichwd_smb_devices[] = {
{ DEVICEID_LEWISBURG_SMB, "Lewisburg watchdog timer", 10, 4 },
{ DEVICEID_SRPTLP_SMB,"Sunrise Point-LP watchdog timer",10, 4 },
+ { DEVICEID_C3000, "Intel Atom C3000 watchdog timer",10, 4 },
{ 0, NULL, 0, 0 },
};
Modified: head/sys/dev/ichwd/ichwd.h
==
--- head/sys/dev/ichwd/ichwd.h Tue Mar 24 19:33:21 2020(r359284)
+++ head/sys/dev/ichwd/ichwd.h Tue Mar 24 21:28:48 2020(r359285)
@@ -67,6 +67,7 @@ struct ichwd_softc {
#defineVENDORID_INTEL 0x8086
#defineDEVICEID_BAYTRAIL 0x0f1c
+#defineDEVICEID_C3000 0x19df
#defineDEVICEID_CPT0 0x1c40
#defineDEVICEID_CPT1 0x1c41
#defineDEVICEID_CPT2 0x1c42
___
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: r359284 - in head/lib/libc: gen sys
Author: imp
Date: Tue Mar 24 19:33:21 2020
New Revision: 359284
URL: https://svnweb.freebsd.org/changeset/base/359284
Log:
exec{l,v}{e,p} arrived in 7th Edition research Unix to support the Bourne
Shell
which introduced environment variables. Document that here. Verified by
consulting the TUHS archive.
Modified:
head/lib/libc/gen/exec.3
head/lib/libc/sys/execve.2
Modified: head/lib/libc/gen/exec.3
==
--- head/lib/libc/gen/exec.3Tue Mar 24 19:20:10 2020(r359283)
+++ head/lib/libc/gen/exec.3Tue Mar 24 19:33:21 2020(r359284)
@@ -322,6 +322,14 @@ and
functions appeared in
.At v2 .
The
+.Fn execlp ,
+.Fn execle ,
+.Fn execve ,
+and
+.Fn execvp
+functions appeared in
+.At v7 .
+The
.Fn execvP
function first appeared in
.Fx 5.2 .
Modified: head/lib/libc/sys/execve.2
==
--- head/lib/libc/sys/execve.2 Tue Mar 24 19:20:10 2020(r359283)
+++ head/lib/libc/sys/execve.2 Tue Mar 24 19:33:21 2020(r359284)
@@ -346,7 +346,7 @@ system call conforms to The Open Group Extended API Se
The
.Fn execve
system call appeared in
-.Bx 4.2 .
+.At V7 .
The
.Fn fexecve
system call appeared in
___
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: r359276 - head/usr.sbin/newsyslog
Author: markj
Date: Tue Mar 24 18:16:36 2020
New Revision: 359276
URL: https://svnweb.freebsd.org/changeset/base/359276
Log:
newsyslog: Fix stack corruption when initializing a zipwork structure.
This happens when compressing a previously uncompressed already-rotated
file, as happens when handling the 'p' flag in newsyslog.conf. The file
name is stored in a flexible array member, so these structures cannot be
stack allocated.
Also make sure that we call change_attrs() and do_zipwork() in dry-run
mode; they handle this properly, contrary to the commit log message for
r327451.
CID: 1008168
Github PR:https://github.com/freebsd/freebsd/pull/427
MFC after:2 weeks
Submitted by: Radek Brich (original version)
Modified:
head/usr.sbin/newsyslog/newsyslog.c
Modified: head/usr.sbin/newsyslog/newsyslog.c
==
--- head/usr.sbin/newsyslog/newsyslog.c Tue Mar 24 18:16:02 2020
(r359275)
+++ head/usr.sbin/newsyslog/newsyslog.c Tue Mar 24 18:16:36 2020
(r359276)
@@ -1829,17 +1829,23 @@ do_rotate(const struct conf_entry *ent)
else {
/* XXX - Ought to be checking for failure! */
(void)rename(zfile1, zfile2);
- change_attrs(zfile2, ent);
- if (ent->compress && !strlen(logfile_suffix)) {
- /* compress old rotation */
- struct zipwork_entry zwork;
+ }
+ change_attrs(zfile2, ent);
+ if (ent->compress && strlen(logfile_suffix) == 0) {
+ /* compress old rotation */
+ struct zipwork_entry *zwork;
+ size_t sz;
- memset(, 0, sizeof(zwork));
- zwork.zw_conf = ent;
- zwork.zw_fsize = sizefile(zfile2);
- strcpy(zwork.zw_fname, zfile2);
- do_zipwork();
- }
+ sz = sizeof(*zwork) + strlen(zfile2) + 1;
+ zwork = calloc(1, sz);
+ if (zwork == NULL)
+ err(1, "calloc");
+
+ zwork->zw_conf = ent;
+ zwork->zw_fsize = sizefile(zfile2);
+ strcpy(zwork->zw_fname, zfile2);
+ do_zipwork(zwork);
+ free(zwork);
}
}
___
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: r359283 - head/sys/net
Author: cem
Date: Tue Mar 24 19:20:10 2020
New Revision: 359283
URL: https://svnweb.freebsd.org/changeset/base/359283
Log:
Fix PNP matching for iflib NIC drivers
The previous descriptor string specified that all fields were significant for
match. However, the only significant fields for in-tree drivers are
vendor:devid, and the fictitious zero values constructed by PVID() did not
match real subvendor, subdevice, revision, and/or class values, resulting in
no
automatic probe.
If a future iflib driver needs to match on other criteria, the descriptor
string can be updated accordingly. (E.g., "V32" and ~0 for unspecified values
in PVID().)
Reported by: mav
Sponsored by: Dell EMC Isilon
Modified:
head/sys/net/iflib.h
Modified: head/sys/net/iflib.h
==
--- head/sys/net/iflib.hTue Mar 24 19:12:28 2020(r359282)
+++ head/sys/net/iflib.hTue Mar 24 19:20:10 2020(r359283)
@@ -173,8 +173,9 @@ typedef struct pci_vendor_info {
#define PVID_OEM(vendor, devid, svid, sdevid, revid, name) {vendor, devid,
svid, sdevid, revid, 0, name}
#define PVID_END {0, 0, 0, 0, 0, 0, NULL}
-#define IFLIB_PNP_DESCR "U32:vendor;U32:device;U32:subvendor;U32:subdevice;" \
-"U32:revision;U32:class;D:#"
+/* No drivers in tree currently match on anything except vendor:device. */
+#define IFLIB_PNP_DESCR "U32:vendor;U32:device;U32:#;U32:#;" \
+"U32:#;U32:#;D:#"
#define IFLIB_PNP_INFO(b, u, t) \
MODULE_PNP_INFO(IFLIB_PNP_DESCR, b, u, t, nitems(t) - 1)
___
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: r359282 - head/usr.sbin/ypldap
Author: carlavilla (doc committer) Date: Tue Mar 24 19:12:28 2020 New Revision: 359282 URL: https://svnweb.freebsd.org/changeset/base/359282 Log: Correct path in EXAMPLES ypldap.conf.5 PR: 244743 Submitted by: a...@i.org.ua Patch by: a...@i.org.ua Approved by: bcr@(mentor), 0mp MFC after:1 day Differential Revision:https://reviews.freebsd.org/D24144 Modified: head/usr.sbin/ypldap/ypldap.conf.5 Modified: head/usr.sbin/ypldap/ypldap.conf.5 == --- head/usr.sbin/ypldap/ypldap.conf.5 Tue Mar 24 19:09:37 2020 (r359281) +++ head/usr.sbin/ypldap/ypldap.conf.5 Tue Mar 24 19:12:28 2020 (r359282) @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 13 2016 $ +.Dd $Mdocdate: March 22 2020 $ .Dt YPLDAP.CONF 5 .Os .Sh NAME @@ -155,7 +155,7 @@ Use the supplied LDAP filter to retrieve password entr .It Pa /etc/ypldap.conf .Xr ypldap 8 configuration file. -.It Pa /usr/share/example/ypldap/ypldap.conf +.It Pa /usr/share/examples/ypldap/ypldap.conf .Xr ypldap 8 configuration file example. .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: r359281 - stable/12/lib/libc/gen
Author: carlavilla (doc committer) Date: Tue Mar 24 19:09:37 2020 New Revision: 359281 URL: https://svnweb.freebsd.org/changeset/base/359281 Log: MFC r359210: Add HISTORY section to exec(3) Submitted by: gbergl...@gmail.com Approved by: bcr@(mentor) Modified: stable/12/lib/libc/gen/exec.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/gen/exec.3 == --- stable/12/lib/libc/gen/exec.3 Tue Mar 24 18:43:23 2020 (r359280) +++ stable/12/lib/libc/gen/exec.3 Tue Mar 24 19:09:37 2020 (r359281) @@ -28,7 +28,7 @@ .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 .\" $FreeBSD$ .\" -.Dd July 28, 2018 +.Dd March 22, 2020 .Dt EXEC 3 .Os .Sh NAME @@ -310,6 +310,11 @@ and functions conform to .St -p1003.1-88 . +.Sh HISTORY +The +.Fn exec +function appeared in +.At v1 . The .Fn execvP function first appeared in ___ 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: r359280 - in head/sys: arm64/arm64 riscv/riscv
Author: markj
Date: Tue Mar 24 18:43:23 2020
New Revision: 359280
URL: https://svnweb.freebsd.org/changeset/base/359280
Log:
Remove the secondary_stacks array in arm64 and riscv kernels.
Instead, dynamically allocate a page for the boot stack of each AP when
starting them up, like we do on x86. This shrinks the bss by
MAXCPU*KSTACK_PAGES pages, which corresponds to 4MB on arm64 and 256KB
on riscv.
Duplicate the logic used on x86 to free the bootstacks, by using a
sysinit to wait for each AP to switch to a thread before freeing its
stack.
While here, mark some static MD variables as such.
Reviewed by: kib
MFC after:1 month
Sponsored by: Juniper Networks, Klara Inc.
Differential Revision:https://reviews.freebsd.org/D24158
Modified:
head/sys/arm64/arm64/locore.S
head/sys/arm64/arm64/mp_machdep.c
head/sys/riscv/riscv/locore.S
head/sys/riscv/riscv/mp_machdep.c
Modified: head/sys/arm64/arm64/locore.S
==
--- head/sys/arm64/arm64/locore.S Tue Mar 24 18:35:33 2020
(r359279)
+++ head/sys/arm64/arm64/locore.S Tue Mar 24 18:43:23 2020
(r359280)
@@ -214,11 +214,10 @@ ENTRY(mpentry)
br x15
mp_virtdone:
- ldr x4, =secondary_stacks
- mov x5, #(PAGE_SIZE * KSTACK_PAGES)
- mul x5, x0, x5
- add sp, x4, x5
-
+ /* Start using the AP boot stack */
+ ldr x4, =bootstack
+ ldr x4, [x4]
+ mov sp, x4
b init_secondary
END(mpentry)
#endif
Modified: head/sys/arm64/arm64/mp_machdep.c
==
--- head/sys/arm64/arm64/mp_machdep.c Tue Mar 24 18:35:33 2020
(r359279)
+++ head/sys/arm64/arm64/mp_machdep.c Tue Mar 24 18:43:23 2020
(r359280)
@@ -123,7 +123,6 @@ static void ipi_preempt(void *);
static void ipi_rendezvous(void *);
static void ipi_stop(void *);
-struct mtx ap_boot_mtx;
struct pcb stoppcbs[MAXCPU];
/*
@@ -136,10 +135,18 @@ static int cpu0 = -1;
void mpentry(unsigned long cpuid);
void init_secondary(uint64_t);
-uint8_t secondary_stacks[MAXCPU - 1][PAGE_SIZE * KSTACK_PAGES] __aligned(16);
+/* Synchronize AP startup. */
+static struct mtx ap_boot_mtx;
+/* Stacks for AP initialization, discarded once idle threads are started. */
+void *bootstack;
+static void *bootstacks[MAXCPU];
+
+/* Count of started APs, used to synchronize access to bootstack. */
+static volatile int aps_started;
+
/* Set to 1 once we're ready to let the APs out of the pen. */
-volatile int aps_ready = 0;
+static volatile int aps_ready;
/* Temporary variables for init_secondary() */
void *dpcpu[MAXCPU - 1];
@@ -205,14 +212,14 @@ init_secondary(uint64_t cpu)
"mov x18, %0 \n"
"msr tpidr_el1, %0" :: "r"(pcpup));
- /* Spin until the BSP releases the APs */
- while (!aps_ready)
+ /* Signal the BSP and spin until it has released all APs. */
+ atomic_add_int(_started, 1);
+ while (!atomic_load_int(_ready))
__asm __volatile("wfe");
/* Initialize curthread */
KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
pcpup->pc_curthread = pcpup->pc_idlethread;
- pcpup->pc_curpcb = pcpup->pc_idlethread->td_pcb;
/* Initialize curpmap to match TTBR0's current setting. */
pmap0 = vmspace_pmap();
@@ -250,6 +257,11 @@ init_secondary(uint64_t cpu)
kcsan_cpu_init(cpu);
+ /*
+* Assert that smp_after_idle_runnable condition is reasonable.
+*/
+ MPASS(PCPU_GET(curpcb) == NULL);
+
/* Enter the scheduler */
sched_throw(NULL);
@@ -257,6 +269,24 @@ init_secondary(uint64_t cpu)
/* NOTREACHED */
}
+static void
+smp_after_idle_runnable(void *arg __unused)
+{
+ struct pcpu *pc;
+ int cpu;
+
+ for (cpu = 1; cpu < mp_ncpus; cpu++) {
+ if (bootstacks[cpu] != NULL) {
+ pc = pcpu_find(cpu);
+ while (atomic_load_ptr(>pc_curpcb) == NULL)
+ cpu_spinwait();
+ kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE);
+ }
+ }
+}
+SYSINIT(smp_after_idle_runnable, SI_SUB_SMP, SI_ORDER_ANY,
+smp_after_idle_runnable, NULL);
+
/*
* Send IPI thru interrupt controller.
*/
@@ -391,7 +421,7 @@ start_cpu(u_int id, uint64_t target_cpu)
struct pcpu *pcpup;
vm_paddr_t pa;
u_int cpuid;
- int err;
+ int err, naps;
/* Check we are able to start this cpu */
if (id > mp_maxid)
@@ -405,7 +435,7 @@ start_cpu(u_int id, uint64_t target_cpu)
/*
* Rotate the CPU IDs to put the boot CPU as CPU 0. We keep the other
-* CPUs ordered as the are likely grouped into clusters so it can be
+* CPUs ordered as they are likely
svn commit: r359279 - head/sys/dev/ismt
Author: jhibbits
Date: Tue Mar 24 18:35:33 2020
New Revision: 359279
URL: https://svnweb.freebsd.org/changeset/base/359279
Log:
ismt: Fix ISMT_DESC_ADDR_RW macro, slave addresses are already left-shifted
Reverts r293369. The macro was orginally correct, since our SMBus
framework, unlike i2c, already requires addresses to be 8-bit, LSB-cleared.
MFC after:3 days
Sponsored by: Juniper Networks, Inc
Modified:
head/sys/dev/ismt/ismt.c
Modified: head/sys/dev/ismt/ismt.c
==
--- head/sys/dev/ismt/ismt.cTue Mar 24 18:17:10 2020(r359278)
+++ head/sys/dev/ismt/ismt.cTue Mar 24 18:35:33 2020(r359279)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
#define ISMT_DESC_LPR 0x80/* Large Packet Received */
/* Macros */
-#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr << 1) | (is_read))
+#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr) | (is_read))
/* iSMT General Register address offsets (SMBBAR + ) */
#define ISMT_GR_GCTRL 0x000 /* General Control */
___
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: r359278 - head/usr.sbin/newsyslog
Author: markj Date: Tue Mar 24 18:17:10 2020 New Revision: 359278 URL: https://svnweb.freebsd.org/changeset/base/359278 Log: newsyslog: Add fallthrough comments to appease Coverity. CID: 1008165, 1008166, 1008167 MFC after:1 week Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/newsyslog/ptimes.c Modified: head/usr.sbin/newsyslog/ptimes.c == --- head/usr.sbin/newsyslog/ptimes.cTue Mar 24 18:16:56 2020 (r359277) +++ head/usr.sbin/newsyslog/ptimes.cTue Mar 24 18:17:10 2020 (r359278) @@ -147,18 +147,22 @@ parse8601(struct ptime_data *ptime, const char *s) case 8: tm.tm_year = ((l / 100) - 19) * 100; l = l % 100; + /* FALLTHROUGH */ case 6: ptime->tmspec |= TSPEC_YEAR; tm.tm_year -= tm.tm_year % 100; tm.tm_year += l / 1; l = l % 1; + /* FALLTHROUGH */ case 4: ptime->tmspec |= TSPEC_MONTHOFYEAR; tm.tm_mon = (l / 100) - 1; l = l % 100; + /* FALLTHROUGH */ case 2: ptime->tmspec |= TSPEC_DAYOFMONTH; tm.tm_mday = l; + /* FALLTHROUGH */ case 0: break; default: @@ -180,12 +184,15 @@ parse8601(struct ptime_data *ptime, const char *s) case 6: tm.tm_sec = l % 100; l /= 100; + /* FALLTHROUGH */ case 4: tm.tm_min = l % 100; l /= 100; + /* FALLTHROUGH */ case 2: ptime->tmspec |= TSPEC_HOUROFDAY; tm.tm_hour = l; + /* FALLTHROUGH */ case 0: break; default: ___ 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: r359277 - head/usr.sbin/newsyslog/tests
Author: markj
Date: Tue Mar 24 18:16:56 2020
New Revision: 359277
URL: https://svnweb.freebsd.org/changeset/base/359277
Log:
Add regression tests for newsyslog.conf's p flag.
While here do a bit of cleanup:
- declare local variables as such,
- make tmpdir_create() clean up logfile directories, to handle a
previously interrupt test run more gracefully.
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/newsyslog/tests/legacy_test.sh
Modified: head/usr.sbin/newsyslog/tests/legacy_test.sh
==
--- head/usr.sbin/newsyslog/tests/legacy_test.shTue Mar 24 18:16:36
2020(r359276)
+++ head/usr.sbin/newsyslog/tests/legacy_test.shTue Mar 24 18:16:56
2020(r359277)
@@ -194,7 +194,8 @@ ckstr()
tmpdir_create()
{
- mkdir -p ${TMPDIR}/log ${TMPDIR}/alog
+ rm -rf ${TMPDIR}/log ${TMPDIR}/alog
+ mkdir ${TMPDIR}/log ${TMPDIR}/alog
cd ${TMPDIR}/log
}
@@ -211,6 +212,8 @@ run_newsyslog()
}
tests_normal_rotate() {
+ local dir ext name_postfix newsyslog_args
+
ext="$1"
dir="$2"
@@ -286,6 +289,8 @@ tests_normal_rotate() {
}
tests_normal_rotate_keepn() {
+ local cnt dir ext name_postfix newsyslog_args
+
cnt="$1"
ext="$2"
dir="$3"
@@ -354,6 +359,8 @@ tests_normal_rotate_keepn() {
}
tests_time_rotate() {
+ local dir ext name_postfix newsyslog_args
+
ext="$1"
dir="$2"
@@ -413,6 +420,8 @@ tests_time_rotate() {
}
tests_rfc5424() {
+ local dir ext name_postfix newsyslog_args
+
ext="$1"
dir="$2"
@@ -451,7 +460,73 @@ tests_rfc5424() {
tmpdir_clean
}
-echo 1..180
+tests_p_flag_rotate() {
+ local ext
+
+ ext="$1"
+
+ tmpdir_create
+
+ begin "create file"
+ run_newsyslog -C
+ ckfe $LOGFNAME
+ cknt ${LOGFNAME}.0
+ cknt ${LOGFNAME}.0${ext}
+ end
+
+ begin "rotate p flag 1 ${ext}"
+ run_newsyslog
+ ckfe $LOGFNAME
+ ckfe ${LOGFNAME}.0
+ cknt ${LOGFNAME}.0${ext}
+ run_newsyslog
+ ckfe $LOGFNAME
+ ckfe ${LOGFNAME}.0
+ cknt ${LOGFNAME}.0${ext}
+ ckfe ${LOGFNAME}.1${ext}
+ run_newsyslog
+ ckfe $LOGFNAME
+ ckfe ${LOGFNAME}.0
+ cknt ${LOGFNAME}.0${ext}
+ ckfe ${LOGFNAME}.1${ext}
+ ckfe ${LOGFNAME}.2${ext}
+ end
+
+ tmpdir_clean
+}
+
+tests_normal_rotate_recompress() {
+ local ext
+
+ ext=".gz"
+
+ tmpdir_create
+
+ begin "create file recompress"
+ run_newsyslog -C
+ ckfe $LOGFNAME
+ cknt ${LOGFNAME}.0${ext}
+ end
+
+ begin "rotate normal 1"
+ run_newsyslog
+ ckfe $LOGFNAME
+ ckfe ${LOGFNAME}.0${ext}
+ cknt ${LOGFNAME}.1${ext}
+ end
+
+ begin "rotate recompress 1"
+ gunzip ${LOGFNAME}.0${ext}
+ ckfe ${LOGFNAME}.0
+ cknt ${LOGFNAME}.0${ext}
+ run_newsyslog
+ ckfe $LOGFNAME
+ ckfe ${LOGFNAME}.0${ext}
+ ckfe ${LOGFNAME}.1${ext}
+ end
+}
+
+echo 1..185
mkdir -p ${TMPDIR}
cd ${TMPDIR}
@@ -556,5 +631,11 @@ tests_time_rotate "zst" "${TMPDIR}/alog/"
echo "$LOGFPATH5424640 3 *@T00 NCT" > newsyslog.conf
echo "$LOGFPATH640 3 *@T00 NC" >> newsyslog.conf
tests_rfc5424
+
+echo "$LOGFPATH 640 3 *@T00 NCpZ" > newsyslog.conf
+tests_p_flag_rotate ".gz"
+
+echo "$LOGFPATH 640 3 *@T00 NCZ" > newsyslog.conf
+tests_normal_rotate_recompress
rm -rf "${TMPDIR}"
___
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: r359275 - head
Author: jhb
Date: Tue Mar 24 18:16:02 2020
New Revision: 359275
URL: https://svnweb.freebsd.org/changeset/base/359275
Log:
Disable rarely used architecture variants in make universe by default.
If EXTRA_TARGETS is defined, build all supported architecture
variants. By default, build architecture variants needed to provide
code coverage or that are commonly used.
Use this to disable building of all the hard-float and little-endian
MIPS architecture variants along with n32 by default.
Reviewed by: rpokala
Discussed with: imp, emaste
Differential Revision:https://reviews.freebsd.org/D24178
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Tue Mar 24 17:54:34 2020(r359274)
+++ head/Makefile Tue Mar 24 18:16:02 2020(r359275)
@@ -483,16 +483,17 @@ worlds: .PHONY
.if make(universe) || make(universe_kernels) || make(tinderbox) || \
make(targets) || make(universe-toolchain)
#
-# Always build architectures supported by clang. Only build architectures
-# only supported by GCC if a suitable toolchain is present or enabled.
-# In all cases, if the user specifies TARGETS on the command line,
-# honor that most of all.
+# Don't build rarely used architectures unless requested.
#
+.if defined(EXTRA_TARGETS)
+EXTRA_ARCHES_mips= mipsel mipshf mipselhf mips64el mips64hf mips64elhf
+EXTRA_ARCHES_mips+=mipsn32
+.endif
TARGETS?=amd64 arm arm64 i386 mips powerpc riscv
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?=armv6 armv7
TARGET_ARCHES_arm64?= aarch64
-TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipselhf mipshf
mips64elhf mips64hf
+TARGET_ARCHES_mips?= mips mips64 ${EXTRA_ARCHES_mips}
# powerpcspe excluded until clang fixed
TARGET_ARCHES_powerpc?=powerpc powerpc64
TARGET_ARCHES_riscv?= riscv64 riscv64sf
___
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: r359274 - head/sys/net
Author: emaste
Date: Tue Mar 24 17:54:34 2020
New Revision: 359274
URL: https://svnweb.freebsd.org/changeset/base/359274
Log:
iflib: simplify MPASS assertion
Submitted by: andrew
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==
--- head/sys/net/iflib.cTue Mar 24 17:25:56 2020(r359273)
+++ head/sys/net/iflib.cTue Mar 24 17:54:34 2020(r359274)
@@ -6193,14 +6193,8 @@ iflib_rx_intr_deferred(if_ctx_t ctx, int rxqid)
void
iflib_admin_intr_deferred(if_ctx_t ctx)
{
-#ifdef INVARIANTS
- struct grouptask *gtask;
- gtask = >ifc_admin_task;
- MPASS(gtask != NULL);
- MPASS(gtask->gt_taskqueue != NULL);
-#endif
-
+ MPASS(ctx->ifc_admin_task.gt_taskqueue != NULL);
GROUPTASK_ENQUEUE(>ifc_admin_task);
}
___
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: r359272 - head/sys/kern
Author: kib
Date: Tue Mar 24 17:16:52 2020
New Revision: 359272
URL: https://svnweb.freebsd.org/changeset/base/359272
Log:
kern_copy_file_range(): check the file type.
The syscall can only operate on valid vnode types.
Reported and tested by: pho
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/kern/vfs_syscalls.c
Modified: head/sys/kern/vfs_syscalls.c
==
--- head/sys/kern/vfs_syscalls.cTue Mar 24 12:27:02 2020
(r359271)
+++ head/sys/kern/vfs_syscalls.cTue Mar 24 17:16:52 2020
(r359272)
@@ -4735,9 +4735,25 @@ kern_copy_file_range(struct thread *td, int infd, off_
error = fget_read(td, infd, _read_rights, );
if (error != 0)
goto out;
+ if (infp->f_ops == ) {
+ error = EBADF;
+ goto out;
+ }
+ if (infp->f_vnode == NULL) {
+ error = EINVAL;
+ goto out;
+ }
error = fget_write(td, outfd, _write_rights, );
if (error != 0)
goto out;
+ if (outfp->f_ops == ) {
+ error = EBADF;
+ goto out;
+ }
+ if (outfp->f_vnode == NULL) {
+ error = EINVAL;
+ goto out;
+ }
/* Set the offset pointers to the correct place. */
if (inoffp == NULL)
___
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: r359273 - head/sys/net
Author: emaste Date: Tue Mar 24 17:25:56 2020 New Revision: 359273 URL: https://svnweb.freebsd.org/changeset/base/359273 Log: iflib: split compound assertion ThunderX cluster systems are panicking on boot with a failed assertion MPASS(gtask != NULL && gtask->gt_taskqueue != NULL). Split the assertion so that it's clear which part is failing. Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c == --- head/sys/net/iflib.cTue Mar 24 17:16:52 2020(r359272) +++ head/sys/net/iflib.cTue Mar 24 17:25:56 2020(r359273) @@ -6197,7 +6197,8 @@ iflib_admin_intr_deferred(if_ctx_t ctx) struct grouptask *gtask; gtask = >ifc_admin_task; - MPASS(gtask != NULL && gtask->gt_taskqueue != NULL); + MPASS(gtask != NULL); + MPASS(gtask->gt_taskqueue != NULL); #endif GROUPTASK_ENQUEUE(>ifc_admin_task); ___ 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: r359271 - head/sbin/ipfw
Author: ae
Date: Tue Mar 24 12:27:02 2020
New Revision: 359271
URL: https://svnweb.freebsd.org/changeset/base/359271
Log:
Use IP_FW_NAT44_DESTROY opcode for IP_FW3 socket option to destroy
NAT instance.
The NAT44 group of opcodes for IP_FW3 socket option is modern way
to control NAT instances and this method can be used in future to
switch from numeric to named NAT instances, like was done for ipfw
tables.
The IP_FW_NAT_DEL opcode is the last remnant of old ipfw_ctl control
plane that doesn't support versioned operations. This interface will
be retired soon.
Reviewed by: melifaro
MFC after:10 days
Sponsored by: Yandex LLC
Modified:
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/ipfw2.h
head/sbin/ipfw/nat.c
Modified: head/sbin/ipfw/ipfw2.c
==
--- head/sbin/ipfw/ipfw2.c Tue Mar 24 07:08:39 2020(r359270)
+++ head/sbin/ipfw/ipfw2.c Tue Mar 24 12:27:02 2020(r359271)
@@ -3328,13 +3328,7 @@ ipfw_delete(char *av[])
j = strtol(sep + 1, NULL, 10);
av++;
if (co.do_nat) {
- exitval = do_cmd(IP_FW_NAT_DEL, , sizeof i);
- if (exitval) {
- exitval = EX_UNAVAILABLE;
- if (co.do_quiet)
- continue;
- warn("nat %u not available", i);
- }
+ exitval = ipfw_delete_nat(i);
} else if (co.do_pipe) {
exitval = ipfw_delete_pipe(co.do_pipe, i);
} else {
Modified: head/sbin/ipfw/ipfw2.h
==
--- head/sbin/ipfw/ipfw2.h Tue Mar 24 07:08:39 2020(r359270)
+++ head/sbin/ipfw/ipfw2.h Tue Mar 24 12:27:02 2020(r359271)
@@ -387,6 +387,7 @@ extern int resvd_set_number;
/* first-level command handlers */
void ipfw_add(char *av[]);
void ipfw_show_nat(int ac, char **av);
+int ipfw_delete_nat(int i);
void ipfw_config_pipe(int ac, char **av);
void ipfw_config_nat(int ac, char **av);
void ipfw_sets_handler(char *av[]);
Modified: head/sbin/ipfw/nat.c
==
--- head/sbin/ipfw/nat.cTue Mar 24 07:08:39 2020(r359270)
+++ head/sbin/ipfw/nat.cTue Mar 24 12:27:02 2020(r359271)
@@ -939,6 +939,34 @@ ipfw_config_nat(int ac, char **av)
}
}
+static void
+nat_fill_ntlv(ipfw_obj_ntlv *ntlv, int i)
+{
+
+ ntlv->head.type = IPFW_TLV_EACTION_NAME(1); /* it doesn't matter */
+ ntlv->head.length = sizeof(ipfw_obj_ntlv);
+ ntlv->idx = 1;
+ ntlv->set = 0; /* not yet */
+ snprintf(ntlv->name, sizeof(ntlv->name), "%d", i);
+}
+
+int
+ipfw_delete_nat(int i)
+{
+ ipfw_obj_header oh;
+ int ret;
+
+ memset(, 0, sizeof(oh));
+ nat_fill_ntlv(, i);
+ ret = do_set3(IP_FW_NAT44_DESTROY, , sizeof(oh));
+ if (ret == -1) {
+ if (!co.do_quiet)
+ warn("nat %u not available", i);
+ return (EX_UNAVAILABLE);
+ }
+ return (EX_OK);
+}
+
struct nat_list_arg {
uint16_tcmd;
int is_all;
___
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: r359270 - head/usr.sbin/auditdistd
Author: manu Date: Tue Mar 24 07:08:39 2020 New Revision: 359270 URL: https://svnweb.freebsd.org/changeset/base/359270 Log: auditdistd: Remove useless linking with libl Modified: head/usr.sbin/auditdistd/Makefile Modified: head/usr.sbin/auditdistd/Makefile == --- head/usr.sbin/auditdistd/Makefile Tue Mar 24 07:08:02 2020 (r359269) +++ head/usr.sbin/auditdistd/Makefile Tue Mar 24 07:08:39 2020 (r359270) @@ -21,7 +21,7 @@ SRCS+=sandbox.c sender.c subr.c SRCS+= token.l trail.c MAN= auditdistd.8 auditdistd.conf.5 -LIBADD+= l pthread util crypto ssl +LIBADD+= pthread util crypto ssl YFLAGS+=-v ___ 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: r359269 - head/rescue/rescue
Author: manu Date: Tue Mar 24 07:08:02 2020 New Revision: 359269 URL: https://svnweb.freebsd.org/changeset/base/359269 Log: rescue: Remove useless linking with libl Modified: head/rescue/rescue/Makefile Modified: head/rescue/rescue/Makefile == --- head/rescue/rescue/Makefile Tue Mar 24 01:29:18 2020(r359268) +++ head/rescue/rescue/Makefile Tue Mar 24 07:08:02 2020(r359269) @@ -55,7 +55,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh sleep stty \ sync test -CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ltermcapw -lutil -lxo CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs ___ 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: r359267 - in head: . share/mk
24 mars 2020 02:24:21 Bryan Drewery :
> On 3/23/2020 6:09 PM, Emmanuel Vadot wrote:
>
> > Author: manu
> > Date: Tue Mar 24 01:09:04 2020
> > New Revision: 359267
> > URL: https://svnweb.freebsd.org/changeset/base/359267
> >
> > Log:
> > bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
> >
> > If we're building an internal lib do not bother including bsd.incs.mk so we
> > will not install the headers.
> > This also "solves" a problem with pkgbase where a libXXX-development package
> > is created and due to how packages are created we add a dependency to a
> > libXXX package that doesn't exists.
> >
> > Reported by: pizzamig
> > Reviewed by: pizzamig bapt emaste
> > Differential Revision: https://reviews.freebsd.org/D24166
> >
> > Modified:
> > head/ObsoleteFiles.inc
> > head/share/mk/bsd.lib.mk
> >
> > Modified: head/ObsoleteFiles.inc
> > ==
> > --- head/ObsoleteFiles.inc Tue Mar 24 01:08:06 2020 (r359266)
> > +++ head/ObsoleteFiles.inc Tue Mar 24 01:09:04 2020 (r359267)
> > @@ -36,6 +36,11 @@
> > # xargs -n1 | sort | uniq -d;
> > # done
> >
> > +# 20200323: INTERNALLIB don't install headers anymore
> > +OLD_FILES+=/usr/include/libelftc.h
> > +OLD_FILES+=/usr/include/libifconfig.h
> > +OLD_FILES+=/usr/include/libpmcstat.h
> > +
> >
>
> lib/libelftc/Makefile:INCS= libelftc.h
> lib/libifconfig/Makefile:INCSDIR= ${INCLUDEDIR}
> lib/libifconfig/Makefile:INCS= libifconfig.h
> lib/libpmcstat/Makefile:INCS= libpmcstat.h
>
> This commit seems incomplete or wrong due to the leftover logic.
>
>
This is on purpose so if anyone wants to promote those from internallib to
something else, they can
They just have to remove INTERNALLIB
Best regards,
Bapt
___
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"
