svn commit: r338128 - in head: cddl/lib/libzpool cddl/usr.bin/ztest cddl/usr.sbin/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys sys/conf sys/modules/zfs
Author: mmacy
Date: Tue Aug 21 03:45:09 2018
New Revision: 338128
URL: https://svnweb.freebsd.org/changeset/base/338128
Log:
Make dnode definition uniform on !x86
gcc4 requires -fms-extensions to accept anonymous union members
Modified:
head/cddl/lib/libzpool/Makefile
head/cddl/usr.bin/ztest/Makefile
head/cddl/usr.sbin/zdb/Makefile
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
head/sys/conf/kern.pre.mk
head/sys/modules/zfs/Makefile
Modified: head/cddl/lib/libzpool/Makefile
==
--- head/cddl/lib/libzpool/Makefile Tue Aug 21 03:33:54 2018
(r338127)
+++ head/cddl/lib/libzpool/Makefile Tue Aug 21 03:45:09 2018
(r338128)
@@ -61,6 +61,7 @@ CFLAGS+= -DWANTS_MUTEX_OWNED
CFLAGS+= -I${SRCTOP}/lib/libpthread/thread
CFLAGS+= -I${SRCTOP}/lib/libpthread/sys
CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include
+CFLAGS.gcc+= -fms-extensions
LIBADD=md pthread z nvpair avl umem
Modified: head/cddl/usr.bin/ztest/Makefile
==
--- head/cddl/usr.bin/ztest/MakefileTue Aug 21 03:33:54 2018
(r338127)
+++ head/cddl/usr.bin/ztest/MakefileTue Aug 21 03:45:09 2018
(r338128)
@@ -24,6 +24,7 @@ CSTD= c99
# Since there are many asserts in this program, it makes no sense to compile
# it without debugging.
CFLAGS+= -g -DDEBUG=1 -Wno-format
+CFLAGS.gcc+= -fms-extensions
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
Modified: head/cddl/usr.sbin/zdb/Makefile
==
--- head/cddl/usr.sbin/zdb/Makefile Tue Aug 21 03:33:54 2018
(r338127)
+++ head/cddl/usr.sbin/zdb/Makefile Tue Aug 21 03:45:09 2018
(r338128)
@@ -25,6 +25,7 @@ CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
LIBADD=nvpair umem uutil zfs zpool
+CFLAGS.gcc+= -fms-extensions
# Since there are many asserts in this program, it makes no sense to compile
# it without debugging.
CFLAGS+= -g -DDEBUG=1
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h Tue Aug
21 03:33:54 2018(r338127)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h Tue Aug
21 03:45:09 2018(r338128)
@@ -185,7 +185,6 @@ typedef struct dnode_phys {
* | dn_blkptr[0] | dn_bonus[0..191] | dn_spill |
* +---+---+---+
*/
-#if defined(__i386__) || defined(__amd64__)
union {
blkptr_t dn_blkptr[1+DN_OLD_MAX_BONUSLEN/sizeof (blkptr_t)];
struct {
@@ -199,11 +198,6 @@ typedef struct dnode_phys {
blkptr_t dn_spill;
};
};
-#else
- blkptr_t dn_blkptr[1];
- uint8_t dn_bonus[DN_OLD_MAX_BONUSLEN - sizeof (blkptr_t)];
- blkptr_t dn_spill;
-#endif
} dnode_phys_t;
#defineDN_SPILL_BLKPTR(dnp)(blkptr_t *)((char *)(dnp) + \
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Tue Aug 21 03:33:54 2018(r338127)
+++ head/sys/conf/kern.pre.mk Tue Aug 21 03:45:09 2018(r338128)
@@ -89,6 +89,7 @@ CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=10
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
CFLAGS.gcc+= --param
large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH}
+CFLAGS.gcc+= -fms-extensions
.if defined(CFLAGS_ARCH_PARAMS)
CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
.endif
Modified: head/sys/modules/zfs/Makefile
==
--- head/sys/modules/zfs/Makefile Tue Aug 21 03:33:54 2018
(r338127)
+++ head/sys/modules/zfs/Makefile Tue Aug 21 03:45:09 2018
(r338128)
@@ -95,6 +95,7 @@ CFLAGS+=-I${SYSDIR}
CFLAGS+=-I${SUNW}/common/zfs
CFLAGS+=-I${SUNW}/common
CFLAGS+=-DBUILDING_ZFS
+CFLAGS.gcc+=-fms-extensions
.if ${MACHINE_ARCH} == "powerpc64"
CFLAGS.gcc+=-mminimal-toc
___
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: r338127 - head/sys/sys
Author: mmacy
Date: Tue Aug 21 03:33:54 2018
New Revision: 338127
URL: https://svnweb.freebsd.org/changeset/base/338127
Log:
Make epoch KBI consistent between INVARIANTS and non-INVARIANTS
move extra fields under EPOCH_TRACKER_DEBUG
Reported by: hps
Modified:
head/sys/sys/epoch.h
head/sys/sys/epoch_private.h
Modified: head/sys/sys/epoch.h
==
--- head/sys/sys/epoch.hTue Aug 21 02:38:07 2018(r338126)
+++ head/sys/sys/epoch.hTue Aug 21 03:33:54 2018(r338127)
@@ -52,7 +52,7 @@ typedef struct epoch_context *epoch_context_t;
struct epoch_tracker {
void *datap[3];
-#ifdef INVARIANTS
+#ifdef EPOCH_TRACKER_DEBUG
int datai[5];
#else
int datai[1];
Modified: head/sys/sys/epoch_private.h
==
--- head/sys/sys/epoch_private.hTue Aug 21 02:38:07 2018
(r338126)
+++ head/sys/sys/epoch_private.hTue Aug 21 03:33:54 2018
(r338127)
@@ -76,13 +76,13 @@ critical_exit_sa(void *tdarg)
}
typedef struct epoch_thread {
-#ifdef INVARIANTS
+#ifdef EPOCH_TRACKER_DEBUG
uint64_t et_magic_pre;
#endif
TAILQ_ENTRY(epoch_thread) et_link; /* Epoch queue. */
struct thread *et_td; /* pointer to thread in section */
ck_epoch_section_t et_section; /* epoch section object */
-#ifdef INVARIANTS
+#ifdef EPOCH_TRACKER_DEBUG
uint64_t et_magic_post;
#endif
} *epoch_thread_t;
@@ -124,8 +124,8 @@ epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et)
MPASS(cold || epoch != NULL);
INIT_CHECK(epoch);
etd = (void *)et;
-#ifdef INVARIANTS
MPASS(epoch->e_flags & EPOCH_PREEMPT);
+#ifdef EPOCH_TRACKER_DEBUG
etd->et_magic_pre = EPOCH_MAGIC0;
etd->et_magic_post = EPOCH_MAGIC1;
#endif
@@ -174,15 +174,15 @@ epoch_exit_preempt(epoch_t epoch, epoch_tracker_t et)
er = epoch_currecord(epoch);
MPASS(epoch->e_flags & EPOCH_PREEMPT);
etd = (void *)et;
-#ifdef INVARIANTS
MPASS(etd != NULL);
MPASS(etd->et_td == (struct thread *)td);
+#ifdef EPOCH_TRACKER_DEBUG
MPASS(etd->et_magic_pre == EPOCH_MAGIC0);
MPASS(etd->et_magic_post == EPOCH_MAGIC1);
etd->et_magic_pre = 0;
etd->et_magic_post = 0;
- etd->et_td = (void*)0xDEADBEEF;
#endif
+ etd->et_td = (void*)0xDEADBEEF;
ck_epoch_end(>er_record,
(ck_epoch_section_t *)>et_section);
TAILQ_REMOVE(>er_tdlist, etd, et_link);
___
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: r338059 - in head: . contrib/ntp/lib/isc contrib/ntp/sntp/libevent crypto/heimdal/lib/roken crypto/openssh include lib/libc/gen lib/libc/include sys/crypto/chacha20
On 8/19/18 12:12, Xin Li wrote: > On 8/19/18 11:27, Ian Lepore wrote: >> On Sun, 2018-08-19 at 17:40 +, Xin LI wrote: >>> Author: delphij >>> Date: Sun Aug 19 17:40:50 2018 >>> New Revision: 338059 >>> URL: https://svnweb.freebsd.org/changeset/base/338059 >>> >>> Log: >>> Update userland arc4random() with OpenBSD's Chacha20 based >>> arc4random(). >>> >>> ObsoleteFiles.inc: >>> >>> Remove manual pages for arc4random_addrandom(3) and >>> arc4random_stir(3). >>> >>> contrib/ntp/lib/isc/random.c: >>> contrib/ntp/sntp/libevent/evutil_rand.c: >>> >>> Eliminate in-tree usage of arc4random_addrandom(). >>> >> >> If we don't feed changes for this back upstream, we're going to have to > > I'll send these to upstream. Filed as NTP bug 3525. Cheers, signature.asc Description: OpenPGP digital signature
svn commit: r338126 - in head: contrib/ntp contrib/ntp/html contrib/ntp/include contrib/ntp/libntp contrib/ntp/ntpd contrib/ntp/ntpdate contrib/ntp/ntpdc contrib/ntp/ntpq contrib/ntp/ntpsnmpd contr...
Author: delphij Date: Tue Aug 21 02:38:07 2018 New Revision: 338126 URL: https://svnweb.freebsd.org/changeset/base/338126 Log: MFV r338092: ntp 4.2.8p12. Relnotes: yes Modified: head/contrib/ntp/ChangeLog head/contrib/ntp/NEWS head/contrib/ntp/config.h.in head/contrib/ntp/configure head/contrib/ntp/configure.ac head/contrib/ntp/html/authentic.html head/contrib/ntp/html/authopt.html head/contrib/ntp/html/confopt.html head/contrib/ntp/html/keygen.html head/contrib/ntp/html/ntpdate.html head/contrib/ntp/include/ntp.h head/contrib/ntp/include/ntp_md5.h head/contrib/ntp/libntp/a_md5encrypt.c head/contrib/ntp/libntp/ntp_calendar.c head/contrib/ntp/libntp/prettydate.c head/contrib/ntp/libntp/ssl_init.c head/contrib/ntp/libntp/syssignal.c head/contrib/ntp/libntp/work_fork.c head/contrib/ntp/libntp/work_thread.c head/contrib/ntp/ntpd/complete.conf.in head/contrib/ntp/ntpd/invoke-ntp.conf.texi head/contrib/ntp/ntpd/invoke-ntp.keys.texi head/contrib/ntp/ntpd/invoke-ntpd.texi head/contrib/ntp/ntpd/ntp.conf.5man head/contrib/ntp/ntpd/ntp.conf.5mdoc head/contrib/ntp/ntpd/ntp.conf.def head/contrib/ntp/ntpd/ntp.conf.html head/contrib/ntp/ntpd/ntp.conf.man.in head/contrib/ntp/ntpd/ntp.conf.mdoc.in head/contrib/ntp/ntpd/ntp.keys.5man head/contrib/ntp/ntpd/ntp.keys.5mdoc head/contrib/ntp/ntpd/ntp.keys.def head/contrib/ntp/ntpd/ntp.keys.html head/contrib/ntp/ntpd/ntp.keys.man.in head/contrib/ntp/ntpd/ntp.keys.mdoc.in head/contrib/ntp/ntpd/ntp_config.c head/contrib/ntp/ntpd/ntp_control.c head/contrib/ntp/ntpd/ntp_io.c head/contrib/ntp/ntpd/ntp_loopfilter.c head/contrib/ntp/ntpd/ntp_parser.c head/contrib/ntp/ntpd/ntp_parser.h head/contrib/ntp/ntpd/ntp_proto.c head/contrib/ntp/ntpd/ntp_refclock.c head/contrib/ntp/ntpd/ntp_request.c head/contrib/ntp/ntpd/ntpd-opts.c head/contrib/ntp/ntpd/ntpd-opts.h head/contrib/ntp/ntpd/ntpd.1ntpdman head/contrib/ntp/ntpd/ntpd.1ntpdmdoc head/contrib/ntp/ntpd/ntpd.c head/contrib/ntp/ntpd/ntpd.html head/contrib/ntp/ntpd/ntpd.man.in head/contrib/ntp/ntpd/ntpd.mdoc.in head/contrib/ntp/ntpd/rc_cmdlength.c head/contrib/ntp/ntpd/refclock_datum.c head/contrib/ntp/ntpd/refclock_gpsdjson.c head/contrib/ntp/ntpd/refclock_jupiter.c head/contrib/ntp/ntpd/refclock_shm.c head/contrib/ntp/ntpd/refclock_true.c head/contrib/ntp/ntpdate/ntpdate.c head/contrib/ntp/ntpdc/invoke-ntpdc.texi head/contrib/ntp/ntpdc/ntpdc-opts.c head/contrib/ntp/ntpdc/ntpdc-opts.h head/contrib/ntp/ntpdc/ntpdc.1ntpdcman head/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc head/contrib/ntp/ntpdc/ntpdc.c head/contrib/ntp/ntpdc/ntpdc.html head/contrib/ntp/ntpdc/ntpdc.man.in head/contrib/ntp/ntpdc/ntpdc.mdoc.in head/contrib/ntp/ntpq/invoke-ntpq.texi head/contrib/ntp/ntpq/ntpq-opts.c head/contrib/ntp/ntpq/ntpq-opts.h head/contrib/ntp/ntpq/ntpq-subs.c head/contrib/ntp/ntpq/ntpq.1ntpqman head/contrib/ntp/ntpq/ntpq.1ntpqmdoc head/contrib/ntp/ntpq/ntpq.c head/contrib/ntp/ntpq/ntpq.html head/contrib/ntp/ntpq/ntpq.man.in head/contrib/ntp/ntpq/ntpq.mdoc.in head/contrib/ntp/ntpq/ntpq.texi head/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi head/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c head/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h head/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman head/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc head/contrib/ntp/ntpsnmpd/ntpsnmpd.html head/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in head/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in head/contrib/ntp/packageinfo.sh head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in head/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in head/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi head/contrib/ntp/scripts/invoke-plot_summary.texi head/contrib/ntp/scripts/invoke-summary.texi head/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi head/contrib/ntp/scripts/ntp-wait/ntp-wait-opts head/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman head/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc head/contrib/ntp/scripts/ntp-wait/ntp-wait.html head/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in head/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in head/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi head/contrib/ntp/scripts/ntpsweep/ntpsweep-opts head/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman head/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc head/contrib/ntp/scripts/ntpsweep/ntpsweep.html head/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in head/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in head/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi head/contrib/ntp/scripts/ntptrace/ntptrace-opts head/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
svn commit: r338125 - head/lib/libthr/thread
Author: pfg
Date: Tue Aug 21 01:33:25 2018
New Revision: 338125
URL: https://svnweb.freebsd.org/changeset/base/338125
Log:
libthr: minor spacing cleanup.
No functional change.
X-MFC with: r337992
Modified:
head/lib/libthr/thread/thr_attr.c
Modified: head/lib/libthr/thread/thr_attr.c
==
--- head/lib/libthr/thread/thr_attr.c Tue Aug 21 01:17:28 2018
(r338124)
+++ head/lib/libthr/thread/thr_attr.c Tue Aug 21 01:33:25 2018
(r338125)
@@ -199,8 +199,8 @@ _pthread_attr_getdetachstate(const pthread_attr_t *att
__weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize);
int
-_pthread_attr_getguardsize(const pthread_attr_t *__restrict attr,
-size_t *__restrict guardsize)
+_pthread_attr_getguardsize(const pthread_attr_t * __restrict attr,
+size_t * __restrict guardsize)
{
int ret;
___
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: r338124 - in stable/11/lib/libc: gen inet
Author: pfg
Date: Tue Aug 21 01:17:28 2018
New Revision: 338124
URL: https://svnweb.freebsd.org/changeset/base/338124
Log:
MFC r337422:
libc: fix cases of undefined behavior.
These were found by the Undefined Behavior GsoC project at NetBSD:
Avoid undefined behavior in ftok(3)
Do not change the signedness bit with a left shift operation.
Cast to unsigned integer to prevent this.
ftok.c:56:10, left shift of 123456789 by 24 places cannot be represented
in type 'int'
ftok.c:56:10, left shift of 4160 by 24 places cannot be represented in
type 'int'
Avoid undefined behavior in an inet_addr.c
Do not change the signedness bit with a left shift operation.
Cast to unsigned integer to prevent this.
inet_addr.c:218:20, left shift of 131 by 24 places cannot be represented
in type 'int'
Detected with micro-UBSan in the user mode.
Obtained from:NetBSD
Modified:
stable/11/lib/libc/gen/ftok.c
stable/11/lib/libc/inet/inet_addr.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/gen/ftok.c
==
--- stable/11/lib/libc/gen/ftok.c Tue Aug 21 00:37:48 2018
(r338123)
+++ stable/11/lib/libc/gen/ftok.c Tue Aug 21 01:17:28 2018
(r338124)
@@ -40,5 +40,6 @@ ftok(const char *path, int id)
if (stat(path, ) < 0)
return (key_t)-1;
- return (key_t) (id << 24 | (st.st_dev & 0xff) << 16 | (st.st_ino &
0x));
+ return ((key_t)((unsigned int)id << 24 | (st.st_dev & 0xff) << 16 |
+ (st.st_ino & 0x)));
}
Modified: stable/11/lib/libc/inet/inet_addr.c
==
--- stable/11/lib/libc/inet/inet_addr.c Tue Aug 21 00:37:48 2018
(r338123)
+++ stable/11/lib/libc/inet/inet_addr.c Tue Aug 21 01:17:28 2018
(r338124)
@@ -182,19 +182,20 @@ inet_aton(const char *cp, struct in_addr *addr) {
case 2: /*%< a.b -- 8.24 bits */
if (val > 0xffU)
return (0);
- val |= parts[0] << 24;
+ val |= (uint32_t)parts[0] << 24;
break;
case 3: /*%< a.b.c -- 8.8.16 bits */
if (val > 0xU)
return (0);
- val |= (parts[0] << 24) | (parts[1] << 16);
+ val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16);
break;
case 4: /*%< a.b.c.d -- 8.8.8.8 bits */
if (val > 0xffU)
return (0);
- val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+ val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16) |
+ (parts[2] << 8);
break;
}
if (addr != 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: r338123 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet
Author: cy Date: Tue Aug 21 00:37:48 2018 New Revision: 338123 URL: https://svnweb.freebsd.org/changeset/base/338123 Log: MFC r337410: Remove redundant and incorrect default definition of AF_INET6. AF_INET6 is defined in sys/socket.h where it's defined as 28. A bit of trivia: On NetBSD AF_INET6 is defined as 24. On Solaris it is defined as 26. This is probably why Darren defaulted to 26, because ipfilter was originally written for SunOS 4 and Solaris many moons ago. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/10/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h == --- stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Mon Aug 20 22:23:59 2018(r338122) +++ stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Tue Aug 21 00:37:48 2018(r338123) @@ -1462,10 +1462,6 @@ typedef struct tcpiphdrtcpiphdr_t; # define DPRINT(x) #endif -#ifndefAF_INET6 -# define AF_INET626 -#endif - #ifdef DTRACE_PROBE # ifdef _KERNEL # define DT(_n) DTRACE_PROBE(_n) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338123 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet
Author: cy Date: Tue Aug 21 00:37:48 2018 New Revision: 338123 URL: https://svnweb.freebsd.org/changeset/base/338123 Log: MFC r337410: Remove redundant and incorrect default definition of AF_INET6. AF_INET6 is defined in sys/socket.h where it's defined as 28. A bit of trivia: On NetBSD AF_INET6 is defined as 24. On Solaris it is defined as 26. This is probably why Darren defaulted to 26, because ipfilter was originally written for SunOS 4 and Solaris many moons ago. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/11/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h == --- stable/10/sys/contrib/ipfilter/netinet/ip_compat.h Mon Aug 20 22:23:59 2018(r338122) +++ stable/10/sys/contrib/ipfilter/netinet/ip_compat.h Tue Aug 21 00:37:48 2018(r338123) @@ -1448,10 +1448,6 @@ typedef struct tcpiphdrtcpiphdr_t; # define DPRINT(x) #endif -#ifndefAF_INET6 -# define AF_INET626 -#endif - #ifdef DTRACE_PROBE # ifdef _KERNEL # define DT(_n) DTRACE_PROBE(_n) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338122 - head/usr.bin/grep
Author: 0mp (ports committer) Date: Mon Aug 20 22:23:59 2018 New Revision: 338122 URL: https://svnweb.freebsd.org/changeset/base/338122 Log: Adjust formatting of grep and zgrep manual pages. grep(1) changes: - Pet mandoc & igor. - Stylize the text more with macros when appropriate. - Stylize equal signs in long options (e.g., "--color=auto") with the "Cm" macro as suggested by mdoc(7). - Add missing arguments to --exlude, --exclude-dir, --include and --include-dir. - Remove a duplicate entry for the --context flag. - Use a list in the EXAMPLES sections to make it easier to tell which paragraphs belong to which example. - Cross reference zgrep(1). zgrep(1) changes: - Fix Nd. - Split synopsis into paragraphs for readability. - Cross reference bzip(1), grep(1) and xz(1). Reviewed by: bcr Approved by: mat (mentor) Differential Revision:https://reviews.freebsd.org/D16779 Modified: head/usr.bin/grep/grep.1 head/usr.bin/grep/zgrep.1 Modified: head/usr.bin/grep/grep.1 == --- head/usr.bin/grep/grep.1Mon Aug 20 22:16:15 2018(r338121) +++ head/usr.bin/grep/grep.1Mon Aug 20 22:23:59 2018(r338122) @@ -30,11 +30,14 @@ .\" .\"@(#)grep.1 8.3 (Berkeley) 4/18/94 .\" -.Dd May 7, 2018 +.Dd August 21, 2018 .Dt GREP 1 .Os .Sh NAME -.Nm grep , egrep , fgrep , rgrep , +.Nm grep , +.Nm egrep , +.Nm fgrep , +.Nm rgrep .Nd file pattern searcher .Sh SYNOPSIS .Nm grep @@ -45,10 +48,10 @@ .Op Fl C Ns Op Ar num .Op Fl e Ar pattern .Op Fl f Ar file -.Op Fl Fl binary-files Ns = Ns Ar value -.Op Fl Fl color Ns Op = Ns Ar when -.Op Fl Fl colour Ns Op = Ns Ar when -.Op Fl Fl context Ns Op = Ns Ar num +.Op Fl Fl binary-files= Ns Ar value +.Op Fl Fl color Ns Op Cm = Ns Ar when +.Op Fl Fl colour Ns Op Cm = Ns Ar when +.Op Fl Fl context Ns Op Cm = Ns Ar num .Op Fl Fl label .Op Fl Fl line-buffered .Op Fl Fl null @@ -83,13 +86,13 @@ is quicker than both and .Nm egrep , but can only handle fixed patterns -(i.e. it does not interpret regular expressions). +(i.e., it does not interpret regular expressions). Patterns may consist of one or more lines, allowing any of the pattern lines to match a portion of the input. .Pp The following options are available: .Bl -tag -width indent -.It Fl A Ar num , Fl Fl after-context Ns = Ns Ar num +.It Fl A Ar num , Fl Fl after-context= Ns Ar num Print .Ar num lines of trailing context after each match. @@ -108,7 +111,7 @@ if files contain binary characters. Use of this option forces .Nm to output lines matching the specified pattern. -.It Fl B Ar num , Fl Fl before-context Ns = Ns Ar num +.It Fl B Ar num , Fl Fl before-context= Ns Ar num Print .Ar num lines of leading context before each match. @@ -120,36 +123,58 @@ options. .It Fl b , Fl Fl byte-offset The offset in bytes of a matched pattern is displayed in front of the respective matched line. -.It Fl C Ns Op Ar num , Fl Fl context Ns = Ns Ar num +.It Fl C Ns Oo Ar num Oc , Fl Fl context Ns Oo = Ns Ar num Oc Print .Ar num lines of leading and trailing context surrounding each match. -The default is 2 and is equivalent to -.Fl A -.Ar 2 -.Fl B -.Ar 2 . +The default value of +.Ar num +is +.Dq 2 +and is equivalent to +.Dq Fl A Ar 2 Fl B Ar 2 . Note: no whitespace may be given between the option and its argument. .It Fl c , Fl Fl count Only a count of selected lines is written to standard output. -.It Fl Fl colour Ns = Ns Op Ar when , Fl Fl color Ns = Ns Op Ar when -Mark up the matching text with the expression stored in +.It Fl Fl colour= Ns Oo Ar when Oc , Fl Fl color= Ns Oo Ar when Oc +Mark up the matching text with the expression stored in the .Ev GREP_COLOR environment variable. -The possible values of when can be `never', `always' or `auto'. -.It Fl D Ar action , Fl Fl devices Ns = Ns Ar action -Specify the demanded action for devices, FIFOs and sockets. -The default action is `read', which means, that they are read -as if they were normal files. -If the action is set to `skip', devices will be silently skipped. -.It Fl d Ar action , Fl Fl directories Ns = Ns Ar action -Specify the demanded action for directories. -It is `read' by default, which means that the directories +The possible values of +.Ar when +are +.Dq Cm never , +.Dq Cm always +and +.Dq Cm auto . +.It Fl D Ar action , Fl Fl devices= Ns Ar action +Specify the demanded +.Ar action +for devices, FIFOs and sockets. +The default +.Ar action +is +.Dq Cm read , +which means, that they are read as if they were normal files. +If the +.Ar action +is set to +.Dq Cm skip , +devices are silently skipped. +.It Fl d Ar action , Fl Fl directories= Ns Ar action +Specify the demanded +.Ar action +for directories. +It is +.Dq Cm read +by default, which means that the directories are read in the same manner as normal files. -Other possible values are `skip' to silently ignore the
svn commit: r338121 - head/share/man/man4
Author: 0mp (ports committer)
Date: Mon Aug 20 22:16:15 2018
New Revision: 338121
URL: https://svnweb.freebsd.org/changeset/base/338121
Log:
efidev.4: Improve formatting.
- Move some information out of the SYNOPSIS section because it is formated
in a broken way by mandoc(1) otherwise.
- Improve the formatting of the list of provided ioctls.
- Use "Fa" for struct fields.
- Pet mandoc and igor.
- Fix typos.
Reviewed by: kevans
Approved by: mat (mentor)
Differential Revision:https://reviews.freebsd.org/D16765
Modified:
head/share/man/man4/efidev.4
Modified: head/share/man/man4/efidev.4
==
--- head/share/man/man4/efidev.4Mon Aug 20 22:08:03 2018
(r338120)
+++ head/share/man/man4/efidev.4Mon Aug 20 22:16:15 2018
(r338121)
@@ -47,15 +47,12 @@ line in
efirt_load="YES"
.Ed
.Pp
-.Nm
-may be disabled by setting the
+The driver may be disabled by setting the
.Xr loader 8
tunable
.Va efi.rt.disabled
-to 1.
-.Pp
-.Nm
-is currently only available on amd64 and arm64.
+to
+.Dq Li 1 .
.Sh DESCRIPTION
The
.Nm
@@ -72,10 +69,10 @@ provides the following ioctls defined in
.In sys/efiio.h
with supplemental structures and constants defined in
.In sys/efi.h :
-.Bl -tag -width ".Dv EFIIOC_GET_TABLE"
+.Bl -tag -width indent
.It Dv EFIIOC_GET_TABLE Pq Vt "struct efi_get_table_ioc"
Get a table by uuid from the UEFI system table.
-.Bd -literal
+.Bd -literal -offset indent
struct efi_get_table_ioc {
struct uuid uuid;
void *ptr;
@@ -86,7 +83,7 @@ Get the time from the RTC, if the RTC is available.
The
.Vt struct efi_tm
passed is populated with the current time, unless an error occurs.
-.Bd -literal
+.Bd -literal -offset indent
struct efi_tm {
uint16_ttm_year;
uint8_t tm_mon
@@ -106,9 +103,13 @@ Sets the time stored by the RTC, if the RTC is availab
.It Dv EFIIOC_VAR_GET Pq Vt "struct efi_var_ioc"
Gets data from the variable described by the vendor and name fields of the
.Vt struct efi_var_ioc
-into the aata field.
+into the
+.Fa data
+field.
.Dv EFIIOC_VAR_GET Pq Vt "struct efi_var_ioc"
-will also populate the attrib field.
+will also populate the
+.Fa attrib
+field.
.Bd -literal
struct efi_var_ioc {
efi_char*name;
@@ -134,10 +135,13 @@ the
.It Pa /dev/efi
.El
.Sh SEE ALSO
-.Xr efivar 3
+.Xr efivar 3 ,
.Xr efirt 9
.Sh HISTORY
A
.Nm
device first appeared in
.Fx 11.1 .
+.Sh BUGS
+.Nm
+is currently only available on amd64 and arm64.
___
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: r338120 - head/usr.sbin/config
Author: kevans
Date: Mon Aug 20 22:08:03 2018
New Revision: 338120
URL: https://svnweb.freebsd.org/changeset/base/338120
Log:
config(8): Allow escape-quoted empty strings
For use with things like BOOT_TAG=\"\" -- there are valid reasons to allow
empty strings, especially as these are usually being passed through as
options. The same argument could perhaps be made for the unquoted
variant in things like MODULES_OVERRIDE="", but it's not immediately clear
that this is an issue so I've left it untouched.
MFC after:3 days
Modified:
head/usr.sbin/config/lang.l
Modified: head/usr.sbin/config/lang.l
==
--- head/usr.sbin/config/lang.l Mon Aug 20 21:40:14 2018(r338119)
+++ head/usr.sbin/config/lang.l Mon Aug 20 22:08:03 2018(r338120)
@@ -127,7 +127,7 @@ PATH[./][-/.%^A-Za-z_0-9]+
BEGIN ENVC;
return i;
}
-\\\"[^"]+\\\" {
+\\\"[^"]*\\\" {
BEGIN 0;
yytext[yyleng-2] = '"';
yytext[yyleng-1] = '\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: r338119 - head/sys/dev/cxgbe/tom
Author: np Date: Mon Aug 20 21:40:14 2018 New Revision: 338119 URL: https://svnweb.freebsd.org/changeset/base/338119 Log: cxgbe/tom: Provide the hardware tid in tcp_info. Submitted by: marius@ Modified: head/sys/dev/cxgbe/tom/t4_tom.c Modified: head/sys/dev/cxgbe/tom/t4_tom.c == --- head/sys/dev/cxgbe/tom/t4_tom.c Mon Aug 20 21:19:21 2018 (r338118) +++ head/sys/dev/cxgbe/tom/t4_tom.c Mon Aug 20 21:40:14 2018 (r338119) @@ -438,6 +438,8 @@ t4_tcp_info(struct toedev *tod, struct tcpcb *tp, stru INP_WLOCK_ASSERT(tp->t_inpcb); MPASS(ti != NULL); + ti->tcpi_toe_tid = toep->tid; + addr = t4_read_reg(sc, A_TP_CMM_TCB_BASE) + toep->tid * TCB_SIZE; rc = read_via_memwin(sc, 2, addr, [0], TCB_SIZE); if (rc != 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: r338118 - head/sys/ufs/ffs
Author: mckusick Date: Mon Aug 20 21:19:21 2018 New Revision: 338118 URL: https://svnweb.freebsd.org/changeset/base/338118 Log: TRIM consolodation is supposed to be off by default Modified: head/sys/ufs/ffs/ffs_alloc.c Modified: head/sys/ufs/ffs/ffs_alloc.c == --- head/sys/ufs/ffs/ffs_alloc.cMon Aug 20 20:44:11 2018 (r338117) +++ head/sys/ufs/ffs/ffs_alloc.cMon Aug 20 21:19:21 2018 (r338118) @@ -484,7 +484,7 @@ static int doreallocblks = 1; SYSCTL_INT(_vfs_ffs, OID_AUTO, doreallocblks, CTLFLAG_RW, , 0, "enable block reallocation"); -static int dotrimcons = 1; +static int dotrimcons = 0; SYSCTL_INT(_vfs_ffs, OID_AUTO, dotrimcons, CTLFLAG_RW, , 0, "enable BIO_DELETE / TRIM consolodation"); ___ 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: r338117 - head/tools/diag/prtblknos
Author: mckusick Date: Mon Aug 20 20:44:11 2018 New Revision: 338117 URL: https://svnweb.freebsd.org/changeset/base/338117 Log: Fix incorrect output when printing block lists for files small enough to fit in only direct blocks whose size is exactly a multiple of the filesystem block size. Reported by: Peter Holm Tested by:Peter Holm Sponsored by: Netflix Modified: head/tools/diag/prtblknos/prtblknos.c Modified: head/tools/diag/prtblknos/prtblknos.c == --- head/tools/diag/prtblknos/prtblknos.c Mon Aug 20 20:31:53 2018 (r338116) +++ head/tools/diag/prtblknos/prtblknos.c Mon Aug 20 20:44:11 2018 (r338117) @@ -121,7 +121,7 @@ prtblknos(disk, dp) if (i < lastlbn - 1) frags = fs->fs_frag; else - frags = howmany(size % fs->fs_bsize, + frags = howmany(size - (lastlbn - 1) * fs->fs_bsize, fs->fs_fsize); if (fs->fs_magic == FS_UFS1_MAGIC) blkno = dp->dp1.di_db[i]; ___ 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: r338116 - in head/sys/arm: conf nvidia/tegra124
Author: imp Date: Mon Aug 20 20:31:53 2018 New Revision: 338116 URL: https://svnweb.freebsd.org/changeset/base/338116 Log: Move options INTRNG into std.armv6 and std.armv7 INTRNG is required on all armv6 and armv7 systems, so make it standard. Modified: head/sys/arm/conf/ALPINE head/sys/arm/conf/ARMADA38X head/sys/arm/conf/ARMADAXP head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/GENERIC head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI-B head/sys/arm/conf/RPI2 head/sys/arm/conf/SOCFPGA head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VSATV102 head/sys/arm/conf/VYBRID head/sys/arm/conf/ZEDBOARD head/sys/arm/conf/std.armv6 head/sys/arm/conf/std.armv7 head/sys/arm/nvidia/tegra124/std.tegra124 Modified: head/sys/arm/conf/ALPINE == --- head/sys/arm/conf/ALPINEMon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/ALPINEMon Aug 20 20:31:53 2018(r338116) @@ -31,7 +31,6 @@ options PLATFORM # Interrupt controller device gic -optionsINTRNG # Annapurna Alpine drivers device al_ccu # Alpine Cache Coherency Unit Modified: head/sys/arm/conf/ARMADA38X == --- head/sys/arm/conf/ARMADA38X Mon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/ARMADA38X Mon Aug 20 20:31:53 2018(r338116) @@ -50,7 +50,6 @@ devicepci # Interrupt controllers device gic -optionsINTRNG # Timers device mpcore_timer Modified: head/sys/arm/conf/ARMADAXP == --- head/sys/arm/conf/ARMADAXP Mon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/ARMADAXP Mon Aug 20 20:31:53 2018(r338116) @@ -18,7 +18,6 @@ # # $FreeBSD$ -# TODO: Port to INTRNG #NO_UNIVERSE ident MV-88F78XX0 @@ -88,7 +87,5 @@ devicepci optionsFDT # Configure using FDT/DTB data optionsFDT_DTB_STATIC makeoptionsFDT_DTS_FILE=db78460.dts - -options INTRNG optionsPLATFORM Modified: head/sys/arm/conf/BEAGLEBONE == --- head/sys/arm/conf/BEAGLEBONEMon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/BEAGLEBONEMon Aug 20 20:31:53 2018 (r338116) @@ -28,8 +28,6 @@ include "../ti/am335x/std.am335x" makeoptionsMODULES_EXTRA="dtb/am335x am335x_dmtpps" -optionsINTRNG - optionsSCHED_4BSD # 4BSD scheduler optionsPLATFORM Modified: head/sys/arm/conf/EFIKA_MX == --- head/sys/arm/conf/EFIKA_MX Mon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/EFIKA_MX Mon Aug 20 20:31:53 2018(r338116) @@ -131,5 +131,3 @@ options SC_DFLT_FONT# compile font in makeoptionsSC_DFLT_FONT=cp437 device ukbd# Allow keyboard like HIDs to control console device ums - -optionsINTRNG Modified: head/sys/arm/conf/EXYNOS5.common == --- head/sys/arm/conf/EXYNOS5.commonMon Aug 20 20:06:36 2018 (r338115) +++ head/sys/arm/conf/EXYNOS5.commonMon Aug 20 20:31:53 2018 (r338116) @@ -73,7 +73,6 @@ devicedwmmc # Interrupt controller device gic -optionsINTRNG # ARM Generic Timer device generic_timer Modified: head/sys/arm/conf/GENERIC == --- head/sys/arm/conf/GENERIC Mon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/GENERIC Mon Aug 20 20:31:53 2018(r338116) @@ -80,7 +80,6 @@ devicesyscon device cpufreq # Interrupt controller -optionsINTRNG device gic # PMU support (for CCNT). Modified: head/sys/arm/conf/IMX53 == --- head/sys/arm/conf/IMX53 Mon Aug 20 20:06:36 2018(r338115) +++ head/sys/arm/conf/IMX53 Mon Aug 20 20:31:53 2018(r338116) @@ -119,5 +119,3 @@ device wlan_amrr # AMRR transmit rate control algori optionsFDT # Configure using FDT/DTB data makeoptionsMODULES_EXTRA="dtb/imx5 imx" device fdt_pinctrl # FDT pinmux driver - -optionsINTRNG Modified: head/sys/arm/conf/IMX6
Re: svn commit: r338096 - head/tools/build/mk
On Mon, Aug 20, 2018 at 1:59 PM, O. Hartmann
wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
>
> Am Mon, 20 Aug 2018 13:48:45 -0600
> Warner Losh schrieb:
>
> > On Mon, Aug 20, 2018 at 1:45 PM, O. Hartmann
> wrote:
> >
> > > -BEGIN PGP SIGNED MESSAGE-
> > > Hash: SHA512
> > >
> > > Am Mon, 20 Aug 2018 10:39:43 + (UTC)
> > > Alex Richardson schrieb:
> > >
> > > > Author: arichardson
> > > > Date: Mon Aug 20 10:39:42 2018
> > > > New Revision: 338096
> > > > URL: https://svnweb.freebsd.org/changeset/base/338096
> > > >
> > > > Log:
> > > > Avoid depending on system headers from the source tree during
> bootstrap
> > > >
> > > > This can cause surprising errors if the build tools is built
> against
> > > > headers that don't match the host system. It is also required in
> order
> > > > to allow building on non-FreeBSD systems where the headers in
> > > > /usr/include/sys are usually completely incompatible with those in
> the
> > > > source tree.
> > > >
> > > > I added an error to Makefile.boot if this is done and found this
> was
> > > > only the case in libnv. With this error in the Makefile ABI
> breakages
> > > > such as r336019 should no longer be possible.
> > > >
> > > > Reviewed By:bdrewery, kevans
> > > > Approved By:jhb (mentor)
> > > > Differential Revision: https://reviews.freebsd.org/D16186
> > > >
> > > > Modified:
> > > > head/tools/build/mk/Makefile.boot
> > > >
> > > > Modified: head/tools/build/mk/Makefile.boot
> > > >
> > > ==
> > > > --- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018
> > > (r338095)
> > > > +++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018
> > > (r338096)
> > > > @@ -7,3 +7,20 @@ LDFLAGS+=-L${WORLDTMP}/legacy/usr/lib
> > > >
> > > > # we do not want to capture dependencies referring to the above
> > > > UPDATE_DEPENDFILE= no
> > > > +
> > > > +# When building host tools we should never pull in headers from
> the
> > > source sys
> > > > +# directory to avoid any ABI issues that might cause the built
> binary
> > > to crash.
> > > > +# The only exceptions to this are sys/cddl/compat for dtrace
> bootstrap
> > > tools and
> > > > +# sys/crypto for libmd bootstrap.
> > > > +.if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:
> > > N*${SRCTOP}/sys/crypto*)
> > > > +.error Do not include $${SRCTOP}/sys when building bootstrap tools.
> \
> > > > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> > > instead. \
> > > > +Error was caused by Makefile in ${.CURDIR}
> > > > +.endif
> > > > +
> > > > +# ${SRCTOP}/include should also never be used to avoid ABI issues
> > > > +.if !empty(CFLAGS:M*${SRCTOP}/include*)
> > > > +.error Do not include $${SRCTOP}/include when building bootstrap
> tools.
> > > \
> > > > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> > > instead. \
> > > > +Error was caused by Makefile in ${.CURDIR}
> > > > +.endif
> > > > ___
> > > > 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-unsubscribe@
> freebsd.org"
> > >
> > >
> > > This commit seems to break NanoBSD builds!
> > >
> > > While r338095 still build my NanoBSD obj tree, >= r338096 fails with:
> > >
> > > [...]
> > > - --- obj_crunchdir_gbde ---
> > > cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde &&
> MK_TESTS=no
> > > UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1
> > > MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/
> > > pool/sources/CURRENT/src/amd64.amd64/rescue/rescue
> > > make MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/gbde/ -DRESCUE
> > > CRUNCH_CFLAGS=-DRESCUE
> > > MK_AUTO_OBJ=no obj make[5]: "/pool/sources/CURRENT/src/
> > > tools/build/mk/Makefile.boot"
> > > line 18: Do not include ${SRCTOP}/sys when building bootstrap tools.
> Copy
> > > the header to
> > > ${WORLDTMP}/legacy in tools/build/Makefile instead. Error was caused
> by
> > > Makefile
> > > in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error
> > > code 1
> > >
> >
> >
> > NanoBSD just does a buildworld with a few env vars, but nothing
> exotic
> >
> > And in the case of 'obj' target, who cares about the includes...
> >
> > Warner
>
> So, how to explain r338095 works, r338096 doesn't?
>
I'm unsure. I've not had a chance to look closely...
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"
svn commit: r338115 - head/sys/netinet
Author: bz
Date: Mon Aug 20 20:06:36 2018
New Revision: 338115
URL: https://svnweb.freebsd.org/changeset/base/338115
Log:
GC inc_isipv6; it was added for "temp" compatibility in 2001, r86764
and does not seem to be used.
Modified:
head/sys/netinet/in_pcb.h
Modified: head/sys/netinet/in_pcb.h
==
--- head/sys/netinet/in_pcb.h Mon Aug 20 19:39:49 2018(r338114)
+++ head/sys/netinet/in_pcb.h Mon Aug 20 20:06:36 2018(r338115)
@@ -123,7 +123,6 @@ struct in_conninfo {
*/
#defineINC_ISIPV6 0x01
-#defineinc_isipv6 inc_flags /* temp compatibility */
#defineinc_fport inc_ie.ie_fport
#defineinc_lport inc_ie.ie_lport
#defineinc_faddr inc_ie.ie_faddr
___
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: r338096 - head/tools/build/mk
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Am Mon, 20 Aug 2018 13:48:45 -0600
Warner Losh schrieb:
> On Mon, Aug 20, 2018 at 1:45 PM, O. Hartmann wrote:
>
> > -BEGIN PGP SIGNED MESSAGE-
> > Hash: SHA512
> >
> > Am Mon, 20 Aug 2018 10:39:43 + (UTC)
> > Alex Richardson schrieb:
> >
> > > Author: arichardson
> > > Date: Mon Aug 20 10:39:42 2018
> > > New Revision: 338096
> > > URL: https://svnweb.freebsd.org/changeset/base/338096
> > >
> > > Log:
> > > Avoid depending on system headers from the source tree during bootstrap
> > >
> > > This can cause surprising errors if the build tools is built against
> > > headers that don't match the host system. It is also required in order
> > > to allow building on non-FreeBSD systems where the headers in
> > > /usr/include/sys are usually completely incompatible with those in the
> > > source tree.
> > >
> > > I added an error to Makefile.boot if this is done and found this was
> > > only the case in libnv. With this error in the Makefile ABI breakages
> > > such as r336019 should no longer be possible.
> > >
> > > Reviewed By:bdrewery, kevans
> > > Approved By:jhb (mentor)
> > > Differential Revision: https://reviews.freebsd.org/D16186
> > >
> > > Modified:
> > > head/tools/build/mk/Makefile.boot
> > >
> > > Modified: head/tools/build/mk/Makefile.boot
> > >
> > ==
> > > --- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018
> > (r338095)
> > > +++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018
> > (r338096)
> > > @@ -7,3 +7,20 @@ LDFLAGS+=-L${WORLDTMP}/legacy/usr/lib
> > >
> > > # we do not want to capture dependencies referring to the above
> > > UPDATE_DEPENDFILE= no
> > > +
> > > +# When building host tools we should never pull in headers from the
> > source sys
> > > +# directory to avoid any ABI issues that might cause the built binary
> > to crash.
> > > +# The only exceptions to this are sys/cddl/compat for dtrace bootstrap
> > tools and
> > > +# sys/crypto for libmd bootstrap.
> > > +.if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:
> > N*${SRCTOP}/sys/crypto*)
> > > +.error Do not include $${SRCTOP}/sys when building bootstrap tools. \
> > > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> > instead. \
> > > +Error was caused by Makefile in ${.CURDIR}
> > > +.endif
> > > +
> > > +# ${SRCTOP}/include should also never be used to avoid ABI issues
> > > +.if !empty(CFLAGS:M*${SRCTOP}/include*)
> > > +.error Do not include $${SRCTOP}/include when building bootstrap tools.
> > \
> > > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> > instead. \
> > > +Error was caused by Makefile in ${.CURDIR}
> > > +.endif
> > > ___
> > > 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"
> >
> >
> > This commit seems to break NanoBSD builds!
> >
> > While r338095 still build my NanoBSD obj tree, >= r338096 fails with:
> >
> > [...]
> > - --- obj_crunchdir_gbde ---
> > cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde && MK_TESTS=no
> > UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1
> > MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/
> > pool/sources/CURRENT/src/amd64.amd64/rescue/rescue
> > make MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/gbde/ -DRESCUE
> > CRUNCH_CFLAGS=-DRESCUE
> > MK_AUTO_OBJ=no obj make[5]: "/pool/sources/CURRENT/src/
> > tools/build/mk/Makefile.boot"
> > line 18: Do not include ${SRCTOP}/sys when building bootstrap tools. Copy
> > the header to
> > ${WORLDTMP}/legacy in tools/build/Makefile instead. Error was caused by
> > Makefile
> > in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error
> > code 1
> >
>
>
> NanoBSD just does a buildworld with a few env vars, but nothing exotic
>
> And in the case of 'obj' target, who cares about the includes...
>
> Warner
So, how to explain r338095 works, r338096 doesn't?
- --
O. Hartmann
Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
-BEGIN PGP SIGNATURE-
iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCW3sd2QAKCRDS528fyFhY
lFveAf9Swvp4duDd7nh9MWgX3nEds/hFCO6viAJLGLZqRzJCA8rIbZKIRAh+31OD
ZqJ/ZZk9vEPQu2+f0o1YdbWzSQYZAf9x9CbjibmH5ZQ+O+BX0F3mAPdEhCsZu/fa
mp4TWV/EqwJeFRrk1T1CqfwS8+vMPk+S9+crW6ODINl/2oA5DFoK
=yjaP
-END PGP SIGNATURE-
___
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: r338096 - head/tools/build/mk
On Mon, Aug 20, 2018 at 1:45 PM, O. Hartmann wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
>
> Am Mon, 20 Aug 2018 10:39:43 + (UTC)
> Alex Richardson schrieb:
>
> > Author: arichardson
> > Date: Mon Aug 20 10:39:42 2018
> > New Revision: 338096
> > URL: https://svnweb.freebsd.org/changeset/base/338096
> >
> > Log:
> > Avoid depending on system headers from the source tree during bootstrap
> >
> > This can cause surprising errors if the build tools is built against
> > headers that don't match the host system. It is also required in order
> > to allow building on non-FreeBSD systems where the headers in
> > /usr/include/sys are usually completely incompatible with those in the
> > source tree.
> >
> > I added an error to Makefile.boot if this is done and found this was
> > only the case in libnv. With this error in the Makefile ABI breakages
> > such as r336019 should no longer be possible.
> >
> > Reviewed By:bdrewery, kevans
> > Approved By:jhb (mentor)
> > Differential Revision: https://reviews.freebsd.org/D16186
> >
> > Modified:
> > head/tools/build/mk/Makefile.boot
> >
> > Modified: head/tools/build/mk/Makefile.boot
> >
> ==
> > --- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018
> (r338095)
> > +++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018
> (r338096)
> > @@ -7,3 +7,20 @@ LDFLAGS+=-L${WORLDTMP}/legacy/usr/lib
> >
> > # we do not want to capture dependencies referring to the above
> > UPDATE_DEPENDFILE= no
> > +
> > +# When building host tools we should never pull in headers from the
> source sys
> > +# directory to avoid any ABI issues that might cause the built binary
> to crash.
> > +# The only exceptions to this are sys/cddl/compat for dtrace bootstrap
> tools and
> > +# sys/crypto for libmd bootstrap.
> > +.if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:
> N*${SRCTOP}/sys/crypto*)
> > +.error Do not include $${SRCTOP}/sys when building bootstrap tools. \
> > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> instead. \
> > +Error was caused by Makefile in ${.CURDIR}
> > +.endif
> > +
> > +# ${SRCTOP}/include should also never be used to avoid ABI issues
> > +.if !empty(CFLAGS:M*${SRCTOP}/include*)
> > +.error Do not include $${SRCTOP}/include when building bootstrap tools.
> \
> > +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile
> instead. \
> > +Error was caused by Makefile in ${.CURDIR}
> > +.endif
> > ___
> > 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"
>
>
> This commit seems to break NanoBSD builds!
>
> While r338095 still build my NanoBSD obj tree, >= r338096 fails with:
>
> [...]
> - --- obj_crunchdir_gbde ---
> cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde && MK_TESTS=no
> UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1
> MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/
> pool/sources/CURRENT/src/amd64.amd64/rescue/rescue
> make MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/gbde/ -DRESCUE
> CRUNCH_CFLAGS=-DRESCUE
> MK_AUTO_OBJ=no obj make[5]: "/pool/sources/CURRENT/src/
> tools/build/mk/Makefile.boot"
> line 18: Do not include ${SRCTOP}/sys when building bootstrap tools. Copy
> the header to
> ${WORLDTMP}/legacy in tools/build/Makefile instead. Error was caused by
> Makefile
> in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error
> code 1
>
NanoBSD just does a buildworld with a few env vars, but nothing exotic
And in the case of 'obj' target, who cares about the includes...
Warner
> - --
> O. Hartmann
>
> Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
> Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
> -BEGIN PGP SIGNATURE-
>
> iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCW3sadQAKCRDS528fyFhY
> lPM7Af4iQXvPALoDxlQNnJXuWsqi+ntJ/8RoSHcz9rh7oVBOIqAm/O8IQ46GxKSP
> j1WhU/mQ26cNCLeE0QR7uueDhPVAAf42QU5z9iO9mZ/q1mgg0tDhDkkZkcPkrbFm
> mj/dWopPygFgptxOYiP78Jzp1IHf2QJjHCRmv13fbE8IrIO0BnbJ
> =FS8J
> -END PGP SIGNATURE-
>
___
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: r338096 - head/tools/build/mk
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Am Mon, 20 Aug 2018 10:39:43 + (UTC)
Alex Richardson schrieb:
> Author: arichardson
> Date: Mon Aug 20 10:39:42 2018
> New Revision: 338096
> URL: https://svnweb.freebsd.org/changeset/base/338096
>
> Log:
> Avoid depending on system headers from the source tree during bootstrap
>
> This can cause surprising errors if the build tools is built against
> headers that don't match the host system. It is also required in order
> to allow building on non-FreeBSD systems where the headers in
> /usr/include/sys are usually completely incompatible with those in the
> source tree.
>
> I added an error to Makefile.boot if this is done and found this was
> only the case in libnv. With this error in the Makefile ABI breakages
> such as r336019 should no longer be possible.
>
> Reviewed By:bdrewery, kevans
> Approved By:jhb (mentor)
> Differential Revision: https://reviews.freebsd.org/D16186
>
> Modified:
> head/tools/build/mk/Makefile.boot
>
> Modified: head/tools/build/mk/Makefile.boot
> ==
> --- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018
> (r338095)
> +++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018
> (r338096)
> @@ -7,3 +7,20 @@ LDFLAGS+=-L${WORLDTMP}/legacy/usr/lib
>
> # we do not want to capture dependencies referring to the above
> UPDATE_DEPENDFILE= no
> +
> +# When building host tools we should never pull in headers from the source
> sys
> +# directory to avoid any ABI issues that might cause the built binary to
> crash.
> +# The only exceptions to this are sys/cddl/compat for dtrace bootstrap tools
> and
> +# sys/crypto for libmd bootstrap.
> +.if
> !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:N*${SRCTOP}/sys/crypto*)
> +.error Do not include $${SRCTOP}/sys when building bootstrap tools. \
> +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile instead. \
> +Error was caused by Makefile in ${.CURDIR}
> +.endif
> +
> +# ${SRCTOP}/include should also never be used to avoid ABI issues
> +.if !empty(CFLAGS:M*${SRCTOP}/include*)
> +.error Do not include $${SRCTOP}/include when building bootstrap tools. \
> +Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile instead. \
> +Error was caused by Makefile in ${.CURDIR}
> +.endif
> ___
> 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"
This commit seems to break NanoBSD builds!
While r338095 still build my NanoBSD obj tree, >= r338096 fails with:
[...]
- --- obj_crunchdir_gbde ---
cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde && MK_TESTS=no
UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1
MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/pool/sources/CURRENT/src/amd64.amd64/rescue/rescue
make MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/gbde/ -DRESCUE
CRUNCH_CFLAGS=-DRESCUE
MK_AUTO_OBJ=no obj make[5]:
"/pool/sources/CURRENT/src/tools/build/mk/Makefile.boot"
line 18: Do not include ${SRCTOP}/sys when building bootstrap tools. Copy the
header to
${WORLDTMP}/legacy in tools/build/Makefile instead. Error was caused by
Makefile
in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error code 1
- --
O. Hartmann
Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
-BEGIN PGP SIGNATURE-
iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCW3sadQAKCRDS528fyFhY
lPM7Af4iQXvPALoDxlQNnJXuWsqi+ntJ/8RoSHcz9rh7oVBOIqAm/O8IQ46GxKSP
j1WhU/mQ26cNCLeE0QR7uueDhPVAAf42QU5z9iO9mZ/q1mgg0tDhDkkZkcPkrbFm
mj/dWopPygFgptxOYiP78Jzp1IHf2QJjHCRmv13fbE8IrIO0BnbJ
=FS8J
-END PGP SIGNATURE-
___
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: r338114 - head/usr.sbin/mergemaster
Author: imp
Date: Mon Aug 20 19:39:49 2018
New Revision: 338114
URL: https://svnweb.freebsd.org/changeset/base/338114
Log:
mergemaster: better defaults for SOURCEDIR
If we can't find a Makefile.inc1 in the specified / default SOURCEDIR, and
there's a Makefile.inc1 in the current directory, offer the user the choice
of using . for SOURCEDIR.
Differential Revsion: https://reviews.freebsd.org/D16709
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shMon Aug 20 19:09:39 2018
(r338113)
+++ head/usr.sbin/mergemaster/mergemaster.shMon Aug 20 19:39:49 2018
(r338114)
@@ -483,6 +483,27 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
sleep 3
SOURCEDIR=${SOURCEDIR}/..
fi
+if [ ! -f ${SOURCEDIR}/Makefile.inc1 ]; then
+echo "*** ${SOURCEDIR} was not found."
+if [ -f ./Makefile.inc1 ]; then
+ echo "Found Makefile.inc1 in the current directory."
+ echo -n "Would you like to set SOURCEDIR to $(pwd)? [no and exit] "
+ read SRCDOT
+ case "${SRCDOT}" in
+ [yY]*)
+ echo "*** Setting SOURCEDIR to $(pwd)"
+ SOURCEDIR=$(pwd)
+ ;;
+ *)
+ echo " No suitable ${SOURCEDIR} found, exiting"
+ exit 1
+ ;;
+ esac
+else
+ echo " No suitable ${SOURCEDIR} found, exiting"
+ exit 1
+fi
+fi
SOURCEDIR=$(realpath "$SOURCEDIR")
# Setup make to use system files from SOURCEDIR
___
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: r338113 - head/sys/amd64/amd64
Author: kib Date: Mon Aug 20 19:09:39 2018 New Revision: 338113 URL: https://svnweb.freebsd.org/changeset/base/338113 Log: Update comment about ABI of flush_l1s_sw to match the reality. CPUID instruction clobbers %rbx and %rdx. Sponsored by: The FreeBSD Foundation MFC after:13 days Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S == --- head/sys/amd64/amd64/support.S Mon Aug 20 19:07:57 2018 (r338112) +++ head/sys/amd64/amd64/support.S Mon Aug 20 19:09:39 2018 (r338113) @@ -1230,9 +1230,9 @@ END(handle_ibrs_exit_rs) * Flush L1D cache. Load enough of the data from the kernel text * to flush existing L1D content. * - * N.B. The function follows ABI calling conventions, but the vmm.ko - * caller expects that only %rax, %rcx, %r9, and %rflags registers - * are clobbered. + * N.B. The function does not follow ABI calling conventions, it corrupts %rbx. + * The vmm.ko caller expects that only %rax, %rdx, %rbx, %rcx, %r9, and %rflags + * registers are clobbered. The NMI handler caller only needs %r13 preserved. */ ENTRY(flush_l1d_sw) #defineL1D_FLUSH_SIZE (64 * 1024) ___ 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: r338112 - head/sys/amd64/amd64
Author: kib
Date: Mon Aug 20 19:07:57 2018
New Revision: 338112
URL: https://svnweb.freebsd.org/changeset/base/338112
Log:
Always initialize PCPU kcr3 for vmspace0 pmap.
If an exception or NMI occurs before CPU switched to a pmap different
from vmspace0, PCPU kcr3 is left zero for pti config, which causes
triple-fault in the handler.
Sponsored by: The FreeBSD Foundation
MFC after:3 days
Modified:
head/sys/amd64/amd64/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Mon Aug 20 18:50:56 2018(r338111)
+++ head/sys/amd64/amd64/pmap.c Mon Aug 20 19:07:57 2018(r338112)
@@ -2661,10 +2661,6 @@ pmap_pinit0(pmap_t pmap)
CPU_FOREACH(i) {
pmap->pm_pcids[i].pm_pcid = PMAP_PCID_KERN + 1;
pmap->pm_pcids[i].pm_gen = 1;
- if (!pti) {
- __pcpu[i].pc_kcr3 = PMAP_NO_CR3;
- __pcpu[i].pc_ucr3 = PMAP_NO_CR3;
- }
}
pmap_activate_boot(pmap);
}
@@ -7571,6 +7567,7 @@ pmap_activate(struct thread *td)
void
pmap_activate_boot(pmap_t pmap)
{
+ uint64_t kcr3;
u_int cpuid;
/*
@@ -7586,6 +7583,11 @@ pmap_activate_boot(pmap_t pmap)
CPU_SET(cpuid, >pm_active);
#endif
PCPU_SET(curpmap, pmap);
+ kcr3 = pmap->pm_cr3;
+ if (pmap_pcid_enabled)
+ kcr3 |= pmap->pm_pcids[cpuid].pm_pcid | CR3_PCID_SAVE;
+ PCPU_SET(kcr3, kcr3);
+ PCPU_SET(ucr3, PMAP_NO_CR3);
}
void
___
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: r338111 - head/sys/dev/ichiic
Author: gonzo
Date: Mon Aug 20 18:50:56 2018
New Revision: 338111
URL: https://svnweb.freebsd.org/changeset/base/338111
Log:
[ig4] add ACPI Device HID for AMD platforms
Added ACPI Device HID AMDI0010 for the designware I2C controllers in
future AMD platforms. Also, when verifying component version check for
minimal value instead of exact match.
PR: 230641
Submitted by: Rajesh
Reviewed by: cem, gonzo
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D16670
Modified:
head/sys/dev/ichiic/ig4_acpi.c
head/sys/dev/ichiic/ig4_iic.c
head/sys/dev/ichiic/ig4_reg.h
Modified: head/sys/dev/ichiic/ig4_acpi.c
==
--- head/sys/dev/ichiic/ig4_acpi.c Mon Aug 20 18:17:50 2018
(r338110)
+++ head/sys/dev/ichiic/ig4_acpi.c Mon Aug 20 18:50:56 2018
(r338111)
@@ -60,6 +60,7 @@ static char *ig4iic_ids[] = {
"80860F41",
"808622C1",
"AMDI0510",
+ "AMDI0010",
"APMC0D0F",
NULL
};
Modified: head/sys/dev/ichiic/ig4_iic.c
==
--- head/sys/dev/ichiic/ig4_iic.c Mon Aug 20 18:17:50 2018
(r338110)
+++ head/sys/dev/ichiic/ig4_iic.c Mon Aug 20 18:50:56 2018
(r338111)
@@ -563,7 +563,7 @@ ig4iic_attach(ig4iic_softc_t *sc)
if (sc->version == IG4_HASWELL || sc->version == IG4_ATOM) {
v = reg_read(sc, IG4_REG_COMP_VER);
- if (v != IG4_COMP_VER) {
+ if (v < IG4_COMP_MIN_VER) {
error = ENXIO;
goto done;
}
Modified: head/sys/dev/ichiic/ig4_reg.h
==
--- head/sys/dev/ichiic/ig4_reg.h Mon Aug 20 18:17:50 2018
(r338110)
+++ head/sys/dev/ichiic/ig4_reg.h Mon Aug 20 18:50:56 2018
(r338111)
@@ -73,7 +73,6 @@
* SDA_HOLD0x0001
* SDA_SETUP 0x0064
* COMP_PARAM1 0x006E
- * COMP_VER0x3131352A
*/
#define IG4_REG_CTL0x /* RW Control Register */
@@ -552,11 +551,10 @@
/*
* COMP_VER - (RO) Component Version Register 22.2.36
- *Default Value 0x3131352A
*
* Contains the chip version number. All 32 bits.
*/
-#define IG4_COMP_VER 0x3131352A
+#define IG4_COMP_MIN_VER 0x3131352A
/*
* COMP_TYPE - (RO) (linux) Endian and bus width probe
___
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: r338018 - head/sys/vm
On 08/20/2018 13:36, O. Hartmann wrote:
> Am Sat, 18 Aug 2018 18:33:50 + (UTC)
> Alan Cox schrieb:
>
> > Author: alc
> > Date: Sat Aug 18 18:33:50 2018
> > New Revision: 338018
> > URL: https://svnweb.freebsd.org/changeset/base/338018
>
> > Log:
> > Eliminate the arena parameter to kmem_malloc_domain(). It is
> redundant.
> > The domain and flags parameters suffice. In fact, the related
> functions
> > kmem_alloc_{attr,contig}_domain() don't have an arena parameter.
>
> > Reviewed by:kib, markj
> > Differential Revision:https://reviews.freebsd.org/D16713
>
> > Modified:
> > head/sys/vm/uma_core.c
> > head/sys/vm/vm_extern.h
> > head/sys/vm/vm_kern.c
>
> > Modified: head/sys/vm/uma_core.c
> >
> ==
> > --- head/sys/vm/uma_core.cSat Aug 18 16:03:15 2018(r338017)
> > +++ head/sys/vm/uma_core.cSat Aug 18 18:33:50 2018(r338018)
> > @@ -1169,7 +1169,7 @@ page_alloc(uma_zone_t zone, vm_size_t bytes,
> int domai
> > void *p;/* Returned page */
>
> > *pflag = UMA_SLAB_KERNEL;
> > -p = (void *) kmem_malloc_domain(kernel_arena, domain, bytes, wait);
> > +p = (void *) kmem_malloc_domain(domain, bytes, wait);
>
> > return (p);
> > }
> > @@ -3680,32 +3680,22 @@ uma_zone_exhausted_nolock(uma_zone_t zone)
> > void *
> > uma_large_malloc_domain(vm_size_t size, int domain, int wait)
> > {
> > -struct vmem *arena;
> > vm_offset_t addr;
> > uma_slab_t slab;
>
> > -#if VM_NRESERVLEVEL > 0
> > -if (__predict_true((wait & M_EXEC) == 0))
> > -arena = kernel_arena;
> > -else
> > -arena = kernel_rwx_arena;
> > -#else
> > -arena = kernel_arena;
> > -#endif
> > -
> > slab = zone_alloc_item(slabzone, NULL, domain, wait);
> > if (slab == NULL)
> > return (NULL);
> > if (domain == UMA_ANYDOMAIN)
> > -addr = kmem_malloc(arena, size, wait);
> > +addr = kmem_malloc(NULL, size, wait);
> > else
> > -addr = kmem_malloc_domain(arena, domain, size, wait);
> > +addr = kmem_malloc_domain(domain, size, wait);
> > if (addr != 0) {
> > vsetslab(addr, slab);
> > slab->us_data = (void *)addr;
> > slab->us_flags = UMA_SLAB_KERNEL | UMA_SLAB_MALLOC;
> > #if VM_NRESERVLEVEL > 0
> > -if (__predict_false(arena == kernel_rwx_arena))
> > +if (__predict_false((wait & M_EXEC) != 0))
> > slab->us_flags |= UMA_SLAB_KRWX;
> > #endif
> > slab->us_size = size;
>
> > Modified: head/sys/vm/vm_extern.h
> >
> ==
> > --- head/sys/vm/vm_extern.hSat Aug 18 16:03:15 2018(r338017)
> > +++ head/sys/vm/vm_extern.hSat Aug 18 18:33:50 2018(r338018)
> > @@ -65,8 +65,7 @@ vm_offset_t kmem_alloc_contig_domain(int domain, vm_si
> > vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t
> boundary,
> > vm_memattr_t memattr);
> > vm_offset_t kmem_malloc(struct vmem *, vm_size_t size, int flags);
> > -vm_offset_t kmem_malloc_domain(struct vmem *, int domain, vm_size_t
> size,
> > -int flags);
> > +vm_offset_t kmem_malloc_domain(int domain, vm_size_t size, int flags);
> > void kmem_free(struct vmem *, vm_offset_t, vm_size_t);
>
> > /* This provides memory for previously allocated address space. */
>
> > Modified: head/sys/vm/vm_kern.c
> >
> ==
> > --- head/sys/vm/vm_kern.cSat Aug 18 16:03:15 2018(r338017)
> > +++ head/sys/vm/vm_kern.cSat Aug 18 18:33:50 2018(r338018)
> > @@ -372,23 +372,18 @@ kmem_suballoc(vm_map_t parent, vm_offset_t
> *min, vm_of
> > *Allocate wired-down pages in the kernel's address space.
> > */
> > vm_offset_t
> > -kmem_malloc_domain(struct vmem *vmem, int domain, vm_size_t size,
> int flags)
> > +kmem_malloc_domain(int domain, vm_size_t size, int flags)
> > {
> > vmem_t *arena;
> > vm_offset_t addr;
> > int rv;
>
> > #if VM_NRESERVLEVEL > 0
> > -KASSERT(vmem == kernel_arena || vmem == kernel_rwx_arena,
> > -("kmem_malloc_domain: Only kernel_arena or kernel_rwx_arena "
> > -"are supported."));
> > -if (__predict_true(vmem == kernel_arena))
> > +if (__predict_true((flags & M_EXEC) == 0))
> > arena = vm_dom[domain].vmd_kernel_arena;
> > else
> > arena = vm_dom[domain].vmd_kernel_rwx_arena;
> > #else
> > -KASSERT(vmem == kernel_arena,
> > -("kmem_malloc_domain: Only kernel_arena is supported."));
> > arena = vm_dom[domain].vmd_kernel_arena;
> > #endif
> > size = round_page(size);
> > @@ -404,7 +399,7 @@ kmem_malloc_domain(struct vmem *vmem, int
> domain, vm_s
> > }
>
> > vm_offset_t
> > -kmem_malloc(struct vmem *vmem, vm_size_t size, int flags)
> > +kmem_malloc(struct vmem *vmem __unused, vm_size_t size, int flags)
> > {
> > struct
Re: svn commit: r338018 - head/sys/vm
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Am Sat, 18 Aug 2018 18:33:50 + (UTC)
Alan Cox schrieb:
> Author: alc
> Date: Sat Aug 18 18:33:50 2018
> New Revision: 338018
> URL: https://svnweb.freebsd.org/changeset/base/338018
>
> Log:
> Eliminate the arena parameter to kmem_malloc_domain(). It is redundant.
> The domain and flags parameters suffice. In fact, the related functions
> kmem_alloc_{attr,contig}_domain() don't have an arena parameter.
>
> Reviewed by:kib, markj
> Differential Revision: https://reviews.freebsd.org/D16713
>
> Modified:
> head/sys/vm/uma_core.c
> head/sys/vm/vm_extern.h
> head/sys/vm/vm_kern.c
>
> Modified: head/sys/vm/uma_core.c
> ==
> --- head/sys/vm/uma_core.cSat Aug 18 16:03:15 2018(r338017)
> +++ head/sys/vm/uma_core.cSat Aug 18 18:33:50 2018(r338018)
> @@ -1169,7 +1169,7 @@ page_alloc(uma_zone_t zone, vm_size_t bytes, int domai
> void *p;/* Returned page */
>
> *pflag = UMA_SLAB_KERNEL;
> - p = (void *) kmem_malloc_domain(kernel_arena, domain, bytes, wait);
> + p = (void *) kmem_malloc_domain(domain, bytes, wait);
>
> return (p);
> }
> @@ -3680,32 +3680,22 @@ uma_zone_exhausted_nolock(uma_zone_t zone)
> void *
> uma_large_malloc_domain(vm_size_t size, int domain, int wait)
> {
> - struct vmem *arena;
> vm_offset_t addr;
> uma_slab_t slab;
>
> -#if VM_NRESERVLEVEL > 0
> - if (__predict_true((wait & M_EXEC) == 0))
> - arena = kernel_arena;
> - else
> - arena = kernel_rwx_arena;
> -#else
> - arena = kernel_arena;
> -#endif
> -
> slab = zone_alloc_item(slabzone, NULL, domain, wait);
> if (slab == NULL)
> return (NULL);
> if (domain == UMA_ANYDOMAIN)
> - addr = kmem_malloc(arena, size, wait);
> + addr = kmem_malloc(NULL, size, wait);
> else
> - addr = kmem_malloc_domain(arena, domain, size, wait);
> + addr = kmem_malloc_domain(domain, size, wait);
> if (addr != 0) {
> vsetslab(addr, slab);
> slab->us_data = (void *)addr;
> slab->us_flags = UMA_SLAB_KERNEL | UMA_SLAB_MALLOC;
> #if VM_NRESERVLEVEL > 0
> - if (__predict_false(arena == kernel_rwx_arena))
> + if (__predict_false((wait & M_EXEC) != 0))
> slab->us_flags |= UMA_SLAB_KRWX;
> #endif
> slab->us_size = size;
>
> Modified: head/sys/vm/vm_extern.h
> ==
> --- head/sys/vm/vm_extern.h Sat Aug 18 16:03:15 2018(r338017)
> +++ head/sys/vm/vm_extern.h Sat Aug 18 18:33:50 2018(r338018)
> @@ -65,8 +65,7 @@ vm_offset_t kmem_alloc_contig_domain(int domain, vm_si
> vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary,
> vm_memattr_t memattr);
> vm_offset_t kmem_malloc(struct vmem *, vm_size_t size, int flags);
> -vm_offset_t kmem_malloc_domain(struct vmem *, int domain, vm_size_t size,
> -int flags);
> +vm_offset_t kmem_malloc_domain(int domain, vm_size_t size, int flags);
> void kmem_free(struct vmem *, vm_offset_t, vm_size_t);
>
> /* This provides memory for previously allocated address space. */
>
> Modified: head/sys/vm/vm_kern.c
> ==
> --- head/sys/vm/vm_kern.c Sat Aug 18 16:03:15 2018(r338017)
> +++ head/sys/vm/vm_kern.c Sat Aug 18 18:33:50 2018(r338018)
> @@ -372,23 +372,18 @@ kmem_suballoc(vm_map_t parent, vm_offset_t *min, vm_of
> * Allocate wired-down pages in the kernel's address space.
> */
> vm_offset_t
> -kmem_malloc_domain(struct vmem *vmem, int domain, vm_size_t size, int flags)
> +kmem_malloc_domain(int domain, vm_size_t size, int flags)
> {
> vmem_t *arena;
> vm_offset_t addr;
> int rv;
>
> #if VM_NRESERVLEVEL > 0
> - KASSERT(vmem == kernel_arena || vmem == kernel_rwx_arena,
> - ("kmem_malloc_domain: Only kernel_arena or kernel_rwx_arena "
> - "are supported."));
> - if (__predict_true(vmem == kernel_arena))
> + if (__predict_true((flags & M_EXEC) == 0))
> arena = vm_dom[domain].vmd_kernel_arena;
> else
> arena = vm_dom[domain].vmd_kernel_rwx_arena;
> #else
> - KASSERT(vmem == kernel_arena,
> - ("kmem_malloc_domain: Only kernel_arena is supported."));
> arena = vm_dom[domain].vmd_kernel_arena;
> #endif
> size = round_page(size);
> @@ -404,7 +399,7 @@ kmem_malloc_domain(struct vmem *vmem, int domain, vm_s
> }
>
> vm_offset_t
> -kmem_malloc(struct vmem *vmem, vm_size_t size, int flags)
> +kmem_malloc(struct vmem *vmem __unused, vm_size_t size, int flags)
> {
> struct vm_domainset_iter di;
> vm_offset_t addr;
> @@ -412,7 +407,7 @@
svn commit: r338110 - head/usr.sbin/jail
Author: bhd (doc committer) Date: Mon Aug 20 18:17:50 2018 New Revision: 338110 URL: https://svnweb.freebsd.org/changeset/base/338110 Log: In r324732 sysinstall was replaced by bsdinstall. However, for post-install configuration, bsdinstall is not of much use. Point the user to bsdconfig instead. Reviewed by: 0mp, bcr Approved by: 0mp, bcr Differential Revision:https://reviews.freebsd.org/D16751 Modified: head/usr.sbin/jail/jail.8 Modified: head/usr.sbin/jail/jail.8 == --- head/usr.sbin/jail/jail.8 Mon Aug 20 17:27:30 2018(r338109) +++ head/usr.sbin/jail/jail.8 Mon Aug 20 18:17:50 2018(r338110) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 30, 2018 +.Dd August 20, 2018 .Dt JAIL 8 .Os .Sh NAME @@ -1033,7 +1033,7 @@ jail -c path=/data/jail/testjail mount.devfs \\ .Pp Assuming no errors, you will end up with a shell prompt within the jail. You can now run -.Pa /usr/sbin/bsdinstall +.Xr bsdconfig 8 and do the post-install configuration to set various configuration options, or perform these actions manually by editing .Pa /etc/rc.conf , @@ -1312,6 +1312,7 @@ environment of the first jail. .Xr procfs 5 , .Xr rc.conf 5 , .Xr sysctl.conf 5 , +.Xr bsdconfig 8 , .Xr chroot 8 , .Xr devfs 8 , .Xr halt 8 , ___ 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: r337978 - in head/libexec/rtld-elf: . aarch64 arm mips powerpc powerpc64 riscv
On 20.08.2018 18:02, Kyle Evans wrote: > On Mon, Aug 20, 2018 at 11:00 AM, Michal Meloun > wrote: >> >> >> On 17.08.2018 18:19, Brooks Davis wrote: >>> Author: brooks >>> Date: Fri Aug 17 16:19:47 2018 >>> New Revision: 337978 >>> URL: https://svnweb.freebsd.org/changeset/base/337978 >>> >>> Log: >>> Rework rtld's TLS Variant I implementation to match r326794 >>> >>> The above commit fixed handling overaligned TLS segments in libc's >>> TLS Variant I implementation, but rtld provides its own implementation >>> for dynamically-linked executables which lacks these fixes. Thus, >>> port these changes to rtld. >>> >>> Submitted by: James Clarke >>> Reviewed by:kbowling >>> Testing byL kbowling (powerpc64), br (riscv), kevans (armv7) >>> Obtained from: CheriBSD >>> Sponsored by: DARPA, AFRL >>> Differential Revision: https://reviews.freebsd.org/D16510 >>> >>> Modified: >>> head/libexec/rtld-elf/aarch64/rtld_machdep.h >>> head/libexec/rtld-elf/arm/rtld_machdep.h >>> head/libexec/rtld-elf/mips/rtld_machdep.h >>> head/libexec/rtld-elf/powerpc/rtld_machdep.h >>> head/libexec/rtld-elf/powerpc64/rtld_machdep.h >>> head/libexec/rtld-elf/riscv/rtld_machdep.h >>> head/libexec/rtld-elf/rtld.c >>> >> This commit breaks TLS handling for (at least) armv7. Can you please >> revert it until I will be able to identify where is problem? >> In my case, the libc _ThreadRuneLocale symbol is not zero on program start. >> > > Interesting that I didn't hit this on my armv7 test > No idea yet. For me, it breaks all ctype (isspace()..) related function. Originally, I found that bash port gets broken. Its funny if shell takes 'a' as non-alphanumeric character, 'x' as whitespace, ... Anyway, give me a while - I need to write testcase because bas is too complex for effective debugging. This commit isn't fundamentally bad, it works for jemalloc thread local variables so I think that only some edge case (tbss handling is my candidate) is affected. Michal ___ 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: r338109 - in stable/11/sys: conf kern sys
Author: kevans Date: Mon Aug 20 17:27:30 2018 New Revision: 338109 URL: https://svnweb.freebsd.org/changeset/base/338109 Log: MFC boot tagging support: r337518, r337544-r337546, r337548, r337579-r337580, r337952 This is equivalent to what's in head, except the default is an empty boot tag string so that nothing gets output by default. r337518: kern: Add a BOOT_TAG marker at the beginning of boot dmesg From the "newly licensed to drive" PR department, add a BOOT_TAG marker (by default, --<>--, to the beginning of each boot's dmesg. This makes it easier to do textproc magic to locate the start of each boot and, of particular interest to some, the dmesg of the current boot. The PR has a dmesg(8) component as well that I've opted not to include for the moment- it was the more contentious part of this PR. bde@ also made the statement that this boot tag should be written with an ordinary printf, which I've- for the moment- declined to change about this patch to keep it more transparent to observer of the boot process. PR: 43434 Submitted by: dak (basically rewritten) r337544: msgbuf: Light detailing (const'ify and bool'itize) r337545: BOOT_TAG: Make a config(5) option, expose as sysctl and loader tunable BOOT_TAG lived shortly in sys/msgbuf.h, but this wasn't necessarily great for changing it or removing it. Move it into subr_prf.c and add options for it to opt_printf.h. One can specify both the BOOT_TAG and BOOT_TAG_SZ (really, size of the buffer that holds the BOOT_TAG). We expose it as kern.boot_tag and also add a loader tunable by the same name that we'll fetch upon initialization of the msgbuf. This allows for flexibility and also ensures that there's a consistent way to figure out the boot tag of the running kernel, rather than relying on headers to be in-sync. Prodded super-super-lightly by: imp r337546: subr_prf: Use "sizeof current_boot_tag" instead r337548: subr_prf: style(9) the sizeof Reported by: jkim, ian r337579: boot tagging: minor fixes msgbufinit may be called multiple times as we initialize the msgbuf into a progressively larger buffer. This doesn't happen as of now on head, but it may happen in the future and we generally support this. As such, only print the boot tag if we've just initialized the buffer for the first time. The boot tag also now has a newline appended to it for better visibility, and has been switched to a normal printf, by requesto f bde, after we've denoted that the msgbuf is mapped. r337580: subr_prf: remove think-o that had returned to local patch Reported by: cognet r337952: subr_prf: Don't write kern.boot_tag if it's empty This change allows one to set kern.boot_tag="" and not get a blank line preceding other boot messages. While this isn't super critical- blank lines are easy to filter out both mentally and in processing dmesg later- it allows for a mode of operation that matches previous behavior. I intend to MFC this whole series to stable/11 by the end of the month with boot_tag empty by default to make this effectively a nop in the stable branch. Modified: stable/11/sys/conf/NOTES stable/11/sys/conf/options stable/11/sys/kern/subr_msgbuf.c stable/11/sys/kern/subr_prf.c stable/11/sys/sys/msgbuf.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/NOTES == --- stable/11/sys/conf/NOTESMon Aug 20 16:44:09 2018(r338108) +++ stable/11/sys/conf/NOTESMon Aug 20 17:27:30 2018(r338109) @@ -145,6 +145,16 @@ optionsINCLUDE_CONFIG_FILE # Include this file i optionsBOOTVERBOSE=1 optionsBOOTHOWTO=RB_MULTIPLE +# +# Compile-time defaults for dmesg boot tagging +# +# Default boot tag; may use 'kern.boot_tag' loader tunable to override. The +# current boot's tag is also exposed via the 'kern.boot_tag' sysctl. +optionsBOOT_TAG=\"\" +# Maximum boot tag size the kernel's static buffer should accomodate. Maximum +# size for both BOOT_TAG and the assocated tunable. +optionsBOOT_TAG_SZ=32 + optionsGEOM_AES# Don't use, use GEOM_BDE (obsolete, gone in 12) optionsGEOM_BDE# Disk encryption. optionsGEOM_BSD# BSD disklabels (obsolete, gone in 12) Modified: stable/11/sys/conf/options == --- stable/11/sys/conf/options Mon Aug 20 16:44:09 2018(r338108) +++ stable/11/sys/conf/options Mon Aug 20 17:27:30 2018(r338109) @@ -801,6 +801,8 @@ TERMINAL_NORM_ATTR opt_teken.h # options for printf PRINTF_BUFR_SIZE opt_printf.h +BOOT_TAG opt_printf.h +BOOT_TAG_SZopt_printf.h # kbd options KBD_DISABLE_KEYMAP_LOAD
svn commit: r338108 - head/stand/lua
Author: imp
Date: Mon Aug 20 16:44:09 2018
New Revision: 338108
URL: https://svnweb.freebsd.org/changeset/base/338108
Log:
Serial console menus for lua.
Remove a bunch of special cases for UEFI and serial consoles. We do
want to do curses and menu things here. This makes us match what we do
in FORTH, with the possible exception of boxes around menus.
Differential Revision: https://reviews.freebsd.org/D16816
Modified:
head/stand/lua/core.lua
head/stand/lua/screen.lua
Modified: head/stand/lua/core.lua
==
--- head/stand/lua/core.lua Mon Aug 20 15:57:27 2018(r338107)
+++ head/stand/lua/core.lua Mon Aug 20 16:44:09 2018(r338108)
@@ -310,14 +310,6 @@ function core.isZFSBoot()
end
function core.isSerialBoot()
- local c = loader.getenv("console")
-
- if c ~= nil then
- if c:find("comconsole") ~= nil then
- return true
- end
- end
-
local s = loader.getenv("boot_serial")
if s ~= nil then
return true
@@ -336,14 +328,6 @@ end
-- Is the menu skipped in the environment in which we've booted?
function core.isMenuSkipped()
- if core.isSerialBoot() then
- return true
- end
- local c = string.lower(loader.getenv("console") or "")
- if c:match("^efi[ ;]") ~= nil or c:match("[ ;]efi[ ;]") ~= nil then
- return true
- end
-
c = string.lower(loader.getenv("beastie_disable") or "")
return c == "yes"
end
Modified: head/stand/lua/screen.lua
==
--- head/stand/lua/screen.lua Mon Aug 20 15:57:27 2018(r338107)
+++ head/stand/lua/screen.lua Mon Aug 20 16:44:09 2018(r338108)
@@ -38,17 +38,10 @@ screen.default_x = 0
screen.default_y = 25
function screen.clear()
- if core.isSerialBoot() then
- return
- end
printc(core.KEYSTR_CSI .. "H" .. core.KEYSTR_CSI .. "J")
end
function screen.setcursor(x, y)
- if core.isSerialBoot() then
- return
- end
-
printc(core.KEYSTR_CSI .. y .. ";" .. x .. "H")
end
@@ -71,9 +64,6 @@ function screen.defcolor()
end
function screen.defcursor()
- if core.isSerialBoot() then
- return
- end
screen.setcursor(screen.default_x, screen.default_y)
end
___
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: r337978 - in head/libexec/rtld-elf: . aarch64 arm mips powerpc powerpc64 riscv
On Mon, Aug 20, 2018 at 11:00 AM, Michal Meloun wrote: > > > On 17.08.2018 18:19, Brooks Davis wrote: >> Author: brooks >> Date: Fri Aug 17 16:19:47 2018 >> New Revision: 337978 >> URL: https://svnweb.freebsd.org/changeset/base/337978 >> >> Log: >> Rework rtld's TLS Variant I implementation to match r326794 >> >> The above commit fixed handling overaligned TLS segments in libc's >> TLS Variant I implementation, but rtld provides its own implementation >> for dynamically-linked executables which lacks these fixes. Thus, >> port these changes to rtld. >> >> Submitted by: James Clarke >> Reviewed by:kbowling >> Testing byL kbowling (powerpc64), br (riscv), kevans (armv7) >> Obtained from: CheriBSD >> Sponsored by: DARPA, AFRL >> Differential Revision: https://reviews.freebsd.org/D16510 >> >> Modified: >> head/libexec/rtld-elf/aarch64/rtld_machdep.h >> head/libexec/rtld-elf/arm/rtld_machdep.h >> head/libexec/rtld-elf/mips/rtld_machdep.h >> head/libexec/rtld-elf/powerpc/rtld_machdep.h >> head/libexec/rtld-elf/powerpc64/rtld_machdep.h >> head/libexec/rtld-elf/riscv/rtld_machdep.h >> head/libexec/rtld-elf/rtld.c >> > This commit breaks TLS handling for (at least) armv7. Can you please > revert it until I will be able to identify where is problem? > In my case, the libc _ThreadRuneLocale symbol is not zero on program start. > Interesting that I didn't hit this on my armv7 test Thanks, Kyle Evans ___ 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: r338107 - in head/sys: arm/allwinner arm/arm arm/freescale/imx arm/nvidia arm/nvidia/drm2 arm/samsung/exynos arm64/arm64 compat/linuxkpi/common/include/linux compat/linuxkpi/common/src ...
Author: alc
Date: Mon Aug 20 15:57:27 2018
New Revision: 338107
URL: https://svnweb.freebsd.org/changeset/base/338107
Log:
Eliminate kmem_alloc_contig()'s unused arena parameter.
Reviewed by: hselasky, kib, markj
Discussed with: jeff
Differential Revision:https://reviews.freebsd.org/D16799
Modified:
head/sys/arm/allwinner/a10_fb.c
head/sys/arm/arm/busdma_machdep-v4.c
head/sys/arm/arm/busdma_machdep-v6.c
head/sys/arm/arm/pmap-v6.c
head/sys/arm/freescale/imx/imx6_sdma.c
head/sys/arm/nvidia/drm2/tegra_dc.c
head/sys/arm/nvidia/tegra_pcie.c
head/sys/arm/nvidia/tegra_xhci.c
head/sys/arm/samsung/exynos/exynos5_fimd.c
head/sys/arm64/arm64/busdma_bounce.c
head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
head/sys/compat/linuxkpi/common/src/linux_page.c
head/sys/compat/ndis/subr_ntoskrnl.c
head/sys/dev/agp/agp.c
head/sys/dev/agp/agp_i810.c
head/sys/dev/liquidio/lio_network.h
head/sys/dev/xdma/controller/pl330.c
head/sys/kern/kern_malloc.c
head/sys/mips/ingenic/jz4780_lcd.c
head/sys/mips/mips/busdma_machdep.c
head/sys/powerpc/powerpc/busdma_machdep.c
head/sys/vm/vm_extern.h
head/sys/vm/vm_kern.c
head/sys/x86/iommu/intel_intrmap.c
head/sys/x86/iommu/intel_qi.c
Modified: head/sys/arm/allwinner/a10_fb.c
==
--- head/sys/arm/allwinner/a10_fb.c Mon Aug 20 15:43:08 2018
(r338106)
+++ head/sys/arm/allwinner/a10_fb.c Mon Aug 20 15:57:27 2018
(r338107)
@@ -178,8 +178,8 @@ static struct resource_spec a10fb_spec[] = {
static int
a10fb_allocfb(struct a10fb_softc *sc)
{
- sc->vaddr = kmem_alloc_contig(kernel_arena, sc->fbsize,
- M_NOWAIT | M_ZERO, 0, ~0, FB_ALIGN, 0, VM_MEMATTR_WRITE_COMBINING);
+ sc->vaddr = kmem_alloc_contig(sc->fbsize, M_NOWAIT | M_ZERO, 0, ~0,
+ FB_ALIGN, 0, VM_MEMATTR_WRITE_COMBINING);
if (sc->vaddr == 0) {
device_printf(sc->dev, "failed to allocate FB memory\n");
return (ENOMEM);
Modified: head/sys/arm/arm/busdma_machdep-v4.c
==
--- head/sys/arm/arm/busdma_machdep-v4.cMon Aug 20 15:43:08 2018
(r338106)
+++ head/sys/arm/arm/busdma_machdep-v4.cMon Aug 20 15:57:27 2018
(r338107)
@@ -750,9 +750,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
*vaddr = (void *)kmem_alloc_attr(dmat->maxsize, mflags, 0,
dmat->lowaddr, memattr);
} else {
- *vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
- mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
- memattr);
+ *vaddr = (void *)kmem_alloc_contig(dmat->maxsize, mflags, 0,
+ dmat->lowaddr, dmat->alignment, dmat->boundary, memattr);
}
if (*vaddr == NULL) {
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
Modified: head/sys/arm/arm/busdma_machdep-v6.c
==
--- head/sys/arm/arm/busdma_machdep-v6.cMon Aug 20 15:43:08 2018
(r338106)
+++ head/sys/arm/arm/busdma_machdep-v6.cMon Aug 20 15:57:27 2018
(r338107)
@@ -815,9 +815,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
*vaddr = (void *)kmem_alloc_attr(dmat->maxsize, mflags, 0,
dmat->lowaddr, memattr);
} else {
- *vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
- mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
- memattr);
+ *vaddr = (void *)kmem_alloc_contig(dmat->maxsize, mflags, 0,
+ dmat->lowaddr, dmat->alignment, dmat->boundary, memattr);
}
if (*vaddr == NULL) {
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
Modified: head/sys/arm/arm/pmap-v6.c
==
--- head/sys/arm/arm/pmap-v6.c Mon Aug 20 15:43:08 2018(r338106)
+++ head/sys/arm/arm/pmap-v6.c Mon Aug 20 15:57:27 2018(r338107)
@@ -2219,9 +2219,8 @@ pmap_pinit(pmap_t pmap)
*/
if (pmap->pm_pt1 == NULL) {
- pmap->pm_pt1 = (pt1_entry_t *)kmem_alloc_contig(kernel_arena,
- NB_IN_PT1, M_NOWAIT | M_ZERO, 0, -1UL, NB_IN_PT1, 0,
- pt_memattr);
+ pmap->pm_pt1 = (pt1_entry_t *)kmem_alloc_contig(NB_IN_PT1,
+ M_NOWAIT | M_ZERO, 0, -1UL, NB_IN_PT1, 0, pt_memattr);
if (pmap->pm_pt1 == NULL)
return (0);
}
Modified: head/sys/arm/freescale/imx/imx6_sdma.c
==
--- head/sys/arm/freescale/imx/imx6_sdma.c Mon Aug 20
Re: svn commit: r337978 - in head/libexec/rtld-elf: . aarch64 arm mips powerpc powerpc64 riscv
On 17.08.2018 18:19, Brooks Davis wrote:
> Author: brooks
> Date: Fri Aug 17 16:19:47 2018
> New Revision: 337978
> URL: https://svnweb.freebsd.org/changeset/base/337978
>
> Log:
> Rework rtld's TLS Variant I implementation to match r326794
>
> The above commit fixed handling overaligned TLS segments in libc's
> TLS Variant I implementation, but rtld provides its own implementation
> for dynamically-linked executables which lacks these fixes. Thus,
> port these changes to rtld.
>
> Submitted by: James Clarke
> Reviewed by:kbowling
> Testing byL kbowling (powerpc64), br (riscv), kevans (armv7)
> Obtained from: CheriBSD
> Sponsored by: DARPA, AFRL
> Differential Revision: https://reviews.freebsd.org/D16510
>
> Modified:
> head/libexec/rtld-elf/aarch64/rtld_machdep.h
> head/libexec/rtld-elf/arm/rtld_machdep.h
> head/libexec/rtld-elf/mips/rtld_machdep.h
> head/libexec/rtld-elf/powerpc/rtld_machdep.h
> head/libexec/rtld-elf/powerpc64/rtld_machdep.h
> head/libexec/rtld-elf/riscv/rtld_machdep.h
> head/libexec/rtld-elf/rtld.c
>
This commit breaks TLS handling for (at least) armv7. Can you please
revert it until I will be able to identify where is problem?
In my case, the libc _ThreadRuneLocale symbol is not zero on program start.
Thanks,
Michal
> Modified: head/libexec/rtld-elf/aarch64/rtld_machdep.h
> ==
> --- head/libexec/rtld-elf/aarch64/rtld_machdep.h Fri Aug 17 16:07:06
> 2018(r337977)
> +++ head/libexec/rtld-elf/aarch64/rtld_machdep.h Fri Aug 17 16:19:47
> 2018(r337978)
> @@ -69,6 +69,8 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr targe
> #define calculate_tls_offset(prev_offset, prev_size, size, align) \
> round(prev_offset + prev_size, align)
> #define calculate_tls_end(off, size)((off) + (size))
> +#define calculate_tls_post_size(align) \
> + round(TLS_TCB_SIZE, align) - TLS_TCB_SIZE
>
> #define TLS_TCB_SIZE16
> typedef struct {
>
> Modified: head/libexec/rtld-elf/arm/rtld_machdep.h
> ==
> --- head/libexec/rtld-elf/arm/rtld_machdep.h Fri Aug 17 16:07:06 2018
> (r337977)
> +++ head/libexec/rtld-elf/arm/rtld_machdep.h Fri Aug 17 16:19:47 2018
> (r337978)
> @@ -69,6 +69,8 @@ typedef struct {
> #define calculate_tls_offset(prev_offset, prev_size, size, align) \
> round(prev_offset + prev_size, align)
> #define calculate_tls_end(off, size)((off) + (size))
> +#define calculate_tls_post_size(align) \
> +round(TLS_TCB_SIZE, align) - TLS_TCB_SIZE
>
> extern void *__tls_get_addr(tls_index *ti);
>
>
> Modified: head/libexec/rtld-elf/mips/rtld_machdep.h
> ==
> --- head/libexec/rtld-elf/mips/rtld_machdep.h Fri Aug 17 16:07:06 2018
> (r337977)
> +++ head/libexec/rtld-elf/mips/rtld_machdep.h Fri Aug 17 16:19:47 2018
> (r337978)
> @@ -64,10 +64,11 @@ typedef struct {
> #define round(size, align) \
> (((size) + (align) - 1) & ~((align) - 1))
> #define calculate_first_tls_offset(size, align) \
> -round(TLS_TCB_SIZE, align)
> +TLS_TCB_SIZE
> #define calculate_tls_offset(prev_offset, prev_size, size, align) \
> round(prev_offset + prev_size, align)
> #define calculate_tls_end(off, size)((off) + (size))
> +#define calculate_tls_post_size(align) 0
>
> extern void *__tls_get_addr(tls_index *ti);
>
>
> Modified: head/libexec/rtld-elf/powerpc/rtld_machdep.h
> ==
> --- head/libexec/rtld-elf/powerpc/rtld_machdep.h Fri Aug 17 16:07:06
> 2018(r337977)
> +++ head/libexec/rtld-elf/powerpc/rtld_machdep.h Fri Aug 17 16:19:47
> 2018(r337978)
> @@ -74,10 +74,11 @@ void _rtld_powerpc_pltcall(void);
> #define round(size, align) \
> (((size) + (align) - 1) & ~((align) - 1))
> #define calculate_first_tls_offset(size, align) \
> -round(8, align)
> +TLS_TCB_SIZE
> #define calculate_tls_offset(prev_offset, prev_size, size, align) \
> round(prev_offset + prev_size, align)
> #define calculate_tls_end(off, size)((off) + (size))
> +#define calculate_tls_post_size(align) 0
>
> typedef struct {
> unsigned long ti_module;
>
> Modified: head/libexec/rtld-elf/powerpc64/rtld_machdep.h
> ==
> --- head/libexec/rtld-elf/powerpc64/rtld_machdep.hFri Aug 17 16:07:06
> 2018(r337977)
> +++ head/libexec/rtld-elf/powerpc64/rtld_machdep.hFri Aug 17 16:19:47
> 2018(r337978)
> @@ -66,10 +66,11 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr targe
> #define round(size, align) \
> (((size) + (align) - 1) & ~((align) - 1))
> #define
svn commit: r338106 - stable/10/sys/netpfil/pf
Author: kp
Date: Mon Aug 20 15:43:08 2018
New Revision: 338106
URL: https://svnweb.freebsd.org/changeset/base/338106
Log:
MFC r337969:
pf: Limit the maximum number of fragments per packet
Similar to the network stack issue fixed in r337782 pf did not limit the
number
of fragments per packet, which could be exploited to generate high CPU loads
with a crafted series of packets.
Limit each packet to no more than 64 fragments. This should be sufficient on
typical networks to allow maximum-sized IP frames.
This addresses the issue for both IPv4 and IPv6.
Security: CVE-2018-5391
Sponsored by: Klara Systems
Modified:
stable/10/sys/netpfil/pf/pf_norm.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netpfil/pf/pf_norm.c
==
--- stable/10/sys/netpfil/pf/pf_norm.c Mon Aug 20 14:35:54 2018
(r338105)
+++ stable/10/sys/netpfil/pf/pf_norm.c Mon Aug 20 15:43:08 2018
(r338106)
@@ -95,8 +95,10 @@ struct pf_fragment {
uint16_tfr_max; /* fragment data max */
uint32_tfr_timeout;
uint16_tfr_maxlen; /* maximum length of single fragment */
+ uint16_tfr_entries; /* Total number of pf_fragment entries
*/
TAILQ_HEAD(pf_fragq, pf_frent) fr_queue;
};
+#define PF_MAX_FRENT_PER_FRAGMENT 64
struct pf_fragment_tag {
uint16_tft_hdrlen; /* header length of reassembled pkt */
@@ -436,6 +438,7 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
frag->fr_flags = 0;
frag->fr_timeout = time_uptime;
frag->fr_maxlen = frent->fe_len;
+ frag->fr_entries = 0;
TAILQ_INIT(>fr_queue);
RB_INSERT(pf_frag_tree, _pf_frag_tree, frag);
@@ -447,6 +450,9 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
return (frag);
}
+ if (frag->fr_entries >= PF_MAX_FRENT_PER_FRAGMENT)
+ goto bad_fragment;
+
KASSERT(!TAILQ_EMPTY(>fr_queue), ("!TAILQ_EMPTY()->fr_queue"));
/* Remember maximum fragment len for refragmentation. */
@@ -518,6 +524,8 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
TAILQ_INSERT_HEAD(>fr_queue, frent, fr_next);
else
TAILQ_INSERT_AFTER(>fr_queue, prev, frent, fr_next);
+
+ frag->fr_entries++;
return (frag);
___
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: r338105 - head/sys/netgraph
Author: mav
Date: Mon Aug 20 14:35:54 2018
New Revision: 338105
URL: https://svnweb.freebsd.org/changeset/base/338105
Log:
Remove extra M_ZERO from NG_MKRESPONSE() argument.
NG_MKRESPONSE() sets M_ZERO by itself.
Submitted by: Dmitry Luhtionov
MFC after:1 week
Modified:
head/sys/netgraph/ng_base.c
Modified: head/sys/netgraph/ng_base.c
==
--- head/sys/netgraph/ng_base.c Mon Aug 20 14:27:37 2018(r338104)
+++ head/sys/netgraph/ng_base.c Mon Aug 20 14:35:54 2018(r338105)
@@ -2665,7 +2665,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lastho
IDHASH_RLOCK();
/* Get response struct. */
NG_MKRESPONSE(resp, msg, sizeof(*nl) +
- (V_ng_nodes * sizeof(struct nodeinfo)), M_NOWAIT | M_ZERO);
+ (V_ng_nodes * sizeof(struct nodeinfo)), M_NOWAIT);
if (resp == NULL) {
IDHASH_RUNLOCK();
error = ENOMEM;
___
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: r338104 - stable/11/sys/netpfil/pf
Author: kp
Date: Mon Aug 20 14:27:37 2018
New Revision: 338104
URL: https://svnweb.freebsd.org/changeset/base/338104
Log:
MFC r337969:
pf: Limit the maximum number of fragments per packet
Similar to the network stack issue fixed in r337782 pf did not limit the
number
of fragments per packet, which could be exploited to generate high CPU loads
with a crafted series of packets.
Limit each packet to no more than 64 fragments. This should be sufficient on
typical networks to allow maximum-sized IP frames.
This addresses the issue for both IPv4 and IPv6.
Security: CVE-2018-5391
Sponsored by: Klara Systems
Modified:
stable/11/sys/netpfil/pf/pf_norm.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/netpfil/pf/pf_norm.c
==
--- stable/11/sys/netpfil/pf/pf_norm.c Mon Aug 20 13:42:22 2018
(r338103)
+++ stable/11/sys/netpfil/pf/pf_norm.c Mon Aug 20 14:27:37 2018
(r338104)
@@ -90,8 +90,10 @@ struct pf_fragment {
TAILQ_ENTRY(pf_fragment) frag_next;
uint32_tfr_timeout;
uint16_tfr_maxlen; /* maximum length of single fragment */
+ uint16_tfr_entries; /* Total number of pf_fragment entries
*/
TAILQ_HEAD(pf_fragq, pf_frent) fr_queue;
};
+#define PF_MAX_FRENT_PER_FRAGMENT 64
struct pf_fragment_tag {
uint16_tft_hdrlen; /* header length of reassembled pkt */
@@ -376,6 +378,7 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
*(struct pf_fragment_cmp *)frag = *key;
frag->fr_timeout = time_uptime;
frag->fr_maxlen = frent->fe_len;
+ frag->fr_entries = 0;
TAILQ_INIT(>fr_queue);
RB_INSERT(pf_frag_tree, _pf_frag_tree, frag);
@@ -387,6 +390,9 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
return (frag);
}
+ if (frag->fr_entries >= PF_MAX_FRENT_PER_FRAGMENT)
+ goto bad_fragment;
+
KASSERT(!TAILQ_EMPTY(>fr_queue), ("!TAILQ_EMPTY()->fr_queue"));
/* Remember maximum fragment len for refragmentation. */
@@ -458,6 +464,8 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct
TAILQ_INSERT_HEAD(>fr_queue, frent, fr_next);
else
TAILQ_INSERT_AFTER(>fr_queue, prev, frent, fr_next);
+
+ frag->fr_entries++;
return (frag);
___
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: r338103 - head/usr.sbin/iostat
Author: will Date: Mon Aug 20 13:42:22 2018 New Revision: 338103 URL: https://svnweb.freebsd.org/changeset/base/338103 Log: iostat: update man page for r277566 The original commit added granularity to the transaction latency display in the extended device stats mode, but didn't update the man page. Reported by: Miroslav Lachman <000.f...@quip.cz> via jmg MFC after:1 day Modified: head/usr.sbin/iostat/iostat.8 Modified: head/usr.sbin/iostat/iostat.8 == --- head/usr.sbin/iostat/iostat.8 Mon Aug 20 12:43:18 2018 (r338102) +++ head/usr.sbin/iostat/iostat.8 Mon Aug 20 13:42:22 2018 (r338103) @@ -360,8 +360,14 @@ kilobytes read per second kilobytes write per second .It qlen transactions queue length -.It svc_t -average duration of transactions, in milliseconds +.It ms/r +average duration of read transactions, in milliseconds +.It ms/w +average duration of write transactions, in milliseconds +.It ms/o +average duration of all other transactions, in milliseconds +.It ms/t +average duration of all transactions, in milliseconds .It %b % of time the device had one or more outstanding transactions .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: r338102 - in head/sys/netinet: . tcp_stacks
Author: rrs
Date: Mon Aug 20 12:43:18 2018
New Revision: 338102
URL: https://svnweb.freebsd.org/changeset/base/338102
Log:
This change represents a substantial restructure of the way we
reassembly inbound tcp segments. The old algorithm just blindly
dropped in segments without coalescing. This meant that every
segment could take up greater and greater room on the linked list
of segments. This of course is now subject to a tighter limit (100)
of segments which in a high BDP situation will cause us to be a
lot more in-efficent as we drop segments beyond 100 entries that
we receive. What this restructure does is cause the reassembly
buffer to coalesce segments putting an emphasis on the two
common cases (which avoid walking the list of segments) i.e.
where we add to the back of the queue of segments and where we
add to the front. We also have the reassembly buffer supporting
a couple of debug options (black box logging as well as counters
for code coverage). These are compiled out by default but can
be added by uncommenting the defines.
Sponsored by: Netflix Inc.
Differential Revision:https://reviews.freebsd.org/D16626
Modified:
head/sys/netinet/tcp_input.c
head/sys/netinet/tcp_log_buf.h
head/sys/netinet/tcp_reass.c
head/sys/netinet/tcp_stacks/rack.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_usrreq.c
head/sys/netinet/tcp_var.h
Modified: head/sys/netinet/tcp_input.c
==
--- head/sys/netinet/tcp_input.cMon Aug 20 12:31:39 2018
(r338101)
+++ head/sys/netinet/tcp_input.cMon Aug 20 12:43:18 2018
(r338102)
@@ -1734,7 +1734,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
tp->snd_nxt == tp->snd_max &&
tiwin && tiwin == tp->snd_wnd &&
((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&
- LIST_EMPTY(>t_segq) &&
+ SEGQ_EMPTY(tp) &&
((to.to_flags & TOF_TS) == 0 ||
TSTMP_GEQ(to.to_tsval, tp->ts_recent)) ) {
@@ -2440,7 +2440,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
* later; if not, do so now to pass queued data to user.
*/
if (tlen == 0 && (thflags & TH_FIN) == 0)
- (void) tcp_reass(tp, (struct tcphdr *)0, 0,
+ (void) tcp_reass(tp, (struct tcphdr *)0, NULL, 0,
(struct mbuf *)0);
tp->snd_wl1 = th->th_seq - 1;
/* FALLTHROUGH */
@@ -3017,7 +3017,7 @@ dodata:
/* XXX */
* fast retransmit can work).
*/
if (th->th_seq == tp->rcv_nxt &&
- LIST_EMPTY(>t_segq) &&
+ SEGQ_EMPTY(tp) &&
(TCPS_HAVEESTABLISHED(tp->t_state) ||
tfo_syn)) {
if (DELAY_ACK(tp, tlen) || tfo_syn)
@@ -3042,7 +3042,7 @@ dodata:
/* XXX */
* m_adj() doesn't actually frees any mbufs
* when trimming from the head.
*/
- thflags = tcp_reass(tp, th, , m);
+ thflags = tcp_reass(tp, th, _start, , m);
tp->t_flags |= TF_ACKNOW;
}
if (tlen > 0 && (tp->t_flags & TF_SACK_PERMIT))
Modified: head/sys/netinet/tcp_log_buf.h
==
--- head/sys/netinet/tcp_log_buf.h Mon Aug 20 12:31:39 2018
(r338101)
+++ head/sys/netinet/tcp_log_buf.h Mon Aug 20 12:43:18 2018
(r338102)
@@ -217,7 +217,9 @@ enum tcp_log_events {
BBR_LOG_REDUCE, /* old bbr log reduce for 4.1 and earlier 46*/
TCP_LOG_RTT,/* A rtt (in useconds) is being sampled and
applied to the srtt algo 47 */
BBR_LOG_SETTINGS_CHG, /* Settings changed for loss response 48 */
- TCP_LOG_END /* End (keep at end)49 */
+ BBR_LOG_SRTT_GAIN_EVENT, /* SRTT gaining 49 */
+ TCP_LOG_REASS, /* Reassembly buffer logging 50 */
+ TCP_LOG_END /* End (keep at end)51 */
};
enum tcp_log_states {
Modified: head/sys/netinet/tcp_reass.c
==
--- head/sys/netinet/tcp_reass.cMon Aug 20 12:31:39 2018
(r338101)
+++ head/sys/netinet/tcp_reass.cMon Aug 20 12:43:18 2018
(r338102)
@@ -72,15 +72,37 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include
#include
#ifdef TCPDEBUG
#include
#endif /* TCPDEBUG */
+#define TCP_R_LOG_ADD 1
+#define TCP_R_LOG_LIMIT_REACHED 2
+#define TCP_R_LOG_APPEND 3
+#define
svn commit: r338101 - in head/sys: amd64/include i386/include x86/include
Author: jhb
Date: Mon Aug 20 12:31:39 2018
New Revision: 338101
URL: https://svnweb.freebsd.org/changeset/base/338101
Log:
Merge amd64 and i386 headers.
Reviewed by: kib
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D16803
Added:
head/sys/x86/include/intr_machdep.h (contents, props changed)
- copied, changed from r338055, head/sys/amd64/include/intr_machdep.h
Modified:
head/sys/amd64/include/intr_machdep.h
head/sys/i386/include/intr_machdep.h
Modified: head/sys/amd64/include/intr_machdep.h
==
--- head/sys/amd64/include/intr_machdep.h Mon Aug 20 11:05:36 2018
(r338100)
+++ head/sys/amd64/include/intr_machdep.h Mon Aug 20 12:31:39 2018
(r338101)
@@ -31,114 +31,9 @@
#ifndef __MACHINE_INTR_MACHDEP_H__
#define__MACHINE_INTR_MACHDEP_H__
-#ifdef _KERNEL
+#include
/*
- * The maximum number of I/O interrupts we allow. This number is rather
- * arbitrary as it is just the maximum IRQ resource value. The interrupt
- * source for a given IRQ maps that I/O interrupt to device interrupt
- * source whether it be a pin on an interrupt controller or an MSI interrupt.
- * The 16 ISA IRQs are assigned fixed IDT vectors, but all other device
- * interrupts allocate IDT vectors on demand. Currently we have 191 IDT
- * vectors available for device interrupts. On many systems with I/O APICs,
- * a lot of the IRQs are not used, so this number can be much larger than
- * 191 and still be safe since only interrupt sources in actual use will
- * allocate IDT vectors.
- *
- * The first 255 IRQs (0 - 254) are reserved for ISA IRQs and PCI intline IRQs.
- * IRQ values from 256 to 767 are used by MSI. When running under the Xen
- * Hypervisor, IRQ values from 768 to 4863 are available for binding to
- * event channel events. We leave 255 unused to avoid confusion since 255 is
- * used in PCI to indicate an invalid IRQ.
- */
-#defineNUM_MSI_INTS512
-#defineFIRST_MSI_INT 256
-#ifdef XENHVM
-#include
-#include
-#defineNUM_EVTCHN_INTS NR_EVENT_CHANNELS
-#defineFIRST_EVTCHN_INT \
-(FIRST_MSI_INT + NUM_MSI_INTS)
-#defineLAST_EVTCHN_INT \
-(FIRST_EVTCHN_INT + NUM_EVTCHN_INTS - 1)
-#else
-#defineNUM_EVTCHN_INTS 0
-#endif
-#defineNUM_IO_INTS (FIRST_MSI_INT + NUM_MSI_INTS + NUM_EVTCHN_INTS)
-
-/*
- * Default base address for MSI messages on x86 platforms.
- */
-#defineMSI_INTEL_ADDR_BASE 0xfee0
-
-/*
- * - 1 ??? dummy counter.
- * - 2 counters for each I/O interrupt.
- * - 1 counter for each CPU for lapic timer.
- * - 8 counters for each CPU for IPI counters for SMP.
- */
-#ifdef SMP
-#defineINTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 8) * MAXCPU)
-#else
-#defineINTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1)
-#endif
-
-#ifndef LOCORE
-
-typedef void inthand_t(void);
-
-#defineIDTVEC(name)__CONCAT(X,name)
-
-struct intsrc;
-
-/*
- * Methods that a PIC provides to mask/unmask a given interrupt source,
- * "turn on" the interrupt on the CPU side by setting up an IDT entry, and
- * return the vector associated with this source.
- */
-struct pic {
- void (*pic_enable_source)(struct intsrc *);
- void (*pic_disable_source)(struct intsrc *, int);
- void (*pic_eoi_source)(struct intsrc *);
- void (*pic_enable_intr)(struct intsrc *);
- void (*pic_disable_intr)(struct intsrc *);
- int (*pic_vector)(struct intsrc *);
- int (*pic_source_pending)(struct intsrc *);
- void (*pic_suspend)(struct pic *);
- void (*pic_resume)(struct pic *, bool suspend_cancelled);
- int (*pic_config_intr)(struct intsrc *, enum intr_trigger,
- enum intr_polarity);
- int (*pic_assign_cpu)(struct intsrc *, u_int apic_id);
- void (*pic_reprogram_pin)(struct intsrc *);
- TAILQ_ENTRY(pic) pics;
-};
-
-/* Flags for pic_disable_source() */
-enum {
- PIC_EOI,
- PIC_NO_EOI,
-};
-
-/*
- * An interrupt source. The upper-layer code uses the PIC methods to
- * control a given source. The lower-layer PIC drivers can store additional
- * private data in a given interrupt source such as an interrupt pin number
- * or an I/O APIC pointer.
- */
-struct intsrc {
- struct pic *is_pic;
- struct intr_event *is_event;
- u_long *is_count;
- u_long *is_straycount;
- u_int is_index;
- u_int is_handlers;
- u_int is_domain;
- u_int is_cpu;
-};
-
-struct trapframe;
-
-/*
* The following data structure holds per-cpu data, and is placed just
* above the top of the space used for the NMI and MC# stacks.
*/
@@ -147,53 +42,4 @@ struct nmi_pcpu {
register_t __padding; /* pad to 16 bytes */
};
-#ifdef SMP
-extern cpuset_t intr_cpus;
-#endif
-extern struct mtx icu_lock;
-extern int elcr_found;
-#ifdef SMP
-extern int
Re: svn commit: r338053 - head/sys/netinet
> On 20. Aug 2018, at 09:33, Bjoern A. Zeeb > wrote: > > On 20 Aug 2018, at 1:13, Conrad Meyer wrote: > >> On Sun, Aug 19, 2018 at 11:40 AM, Bjoern A. Zeeb >> wrote: >>> I am so happy we have a version control system where you could hopefully >>> find out if the original committer left a decent commit message.. takes less >>> than 60 seconds .. >>> https://svnweb.freebsd.org/base?view=revision=82122 >> >> It is great we have such a system, but unfortunately the message >> doesn't really answer my question(s). I don't know that that means it >> isn't "decent," but it isn't really helpful. :-) > > Well it tells you all you need to know. > If you open the RFC cited it’ll tell you why the 4-tuple is used and why MD5, > which seemed to be the questions you two were guessing about. At the time the RFC was written, the choice was good. The question I have is if we should change the function to SIP-HASH... Best regards Michael > > /bz > smime.p7s Description: S/MIME cryptographic signature
svn commit: r338100 - head/share/man/man8
Author: 0mp (ports committer)
Date: Mon Aug 20 11:05:36 2018
New Revision: 338100
URL: https://svnweb.freebsd.org/changeset/base/338100
Log:
Create a manual page for beinstall.sh.
Reviewed by: bcr, brd, will
Approved by: krion (mentor)
Differential Revision:https://reviews.freebsd.org/D16742
Added:
head/share/man/man8/beinstall.8 (contents, props changed)
Modified:
head/share/man/man8/Makefile
Modified: head/share/man/man8/Makefile
==
--- head/share/man/man8/MakefileMon Aug 20 10:59:49 2018
(r338099)
+++ head/share/man/man8/MakefileMon Aug 20 11:05:36 2018
(r338100)
@@ -5,7 +5,9 @@
PACKAGE=runtime-manuals
-MAN= crash.8 \
+MAN= \
+ beinstall.8 \
+ crash.8 \
diskless.8 \
intro.8 \
nanobsd.8 \
@@ -17,6 +19,7 @@ MAN= crash.8 \
${_uefi.8} \
MLINKS= \
+ beinstall.8 beinstall.sh.8 \
nanobsd.8 nanobsd.sh.8 \
rc.8 rc.d.8 \
rc.8 rc.firewall.8 \
Added: head/share/man/man8/beinstall.8
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man8/beinstall.8 Mon Aug 20 11:05:36 2018
(r338100)
@@ -0,0 +1,134 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\"
+.\" Copyright (c) 2018 Mateusz Piotrowski <0...@freebsd.org>
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.Dd August 20, 2018
+.Dt BEINSTALL.SH 1
+.Os
+.Sh NAME
+.Nm beinstall.sh
+.Nd "install a boot environment using the current FreeBSD source tree"
+.Sh SYNOPSIS
+.Nm
+.Op Ar options Ar ...
+.Sh DESCRIPTION
+.Nm
+installs a boot environment using the current
+.Fx
+source tree.
+.Nm
+also automatically performs
+.Pa /etc
+updates
+(using either
+.Xr etcupdate 8
+or
+.Xr mergemaster 8 )
+and
+package updates using
+.Xr pkg-upgrade 8
+automatically in the new boot environment sandbox.
+.Pp
+Upon successful completion, the system will be ready to boot into the new boot
+environment.
+Upon failure, the target boot environment will be destroyed.
+In all cases, the running system is left untouched
+and a reboot into a partially updated system
+(due to install or hardware failure) cannot happen.
+Additionally, the full installation process requires
+only one reboot as it is performed
+in a new boot environment.
+.Pp
+.Nm
+requires a fully built world and kernel.
+It also requires
+.Xr beadm 1
+and
+.Xr pkg 8 ,
+which are not present in the base system and have to be installed manually.
+.Pp
+The
+.Ar options
+provided to
+.Nm
+are world and kernel flags like
+.Ev KERNCONF
+as described in
+.Xr build 7 .
+.Sh ENVIRONMENT
+User modifiable variables.
+Set these in the environment if desired:
+.Bl -tag -width indent
+.It Ev CONFIG_UPDATER Pq default: Dq Li "etcupdate"
+Config updater:
+.Xr etcupdate 8
+and
+.Xr mergemaster 8
+are supported.
+Set to an empty string to skip.
+.It Ev ETCUPDATE_FLAGS Pq default: Dq Li "-F"
+Flags for
+.Xr etcupdate 8
+if used.
+.It Ev MERGEMASTER_FLAGS Pq default: Dq Li "-iFU"
+Flags for
+.Xr mergemaster 8
+if used.
+.It Ev NO_PKG_UPGRADE Pq default: Dq Li ""
+If not empty,
+.Dq Li pkg upgrade
+will be skipped.
+.El
+.Sh FILES
+.Bl -tag -width indent
+.It Sy src/ Ns Pa tools/build/beinstall.sh
+Place where
+.Nm
+lives in the src tree.
+.El
+.Sh SEE ALSO
+.Xr beadm 1 ,
+.Xr build 7 ,
+.Xr development 7 ,
+.Xr etcupdate 8 ,
+.Xr mergemaster 8 ,
+.Xr pkg 8
+.Sh HISTORY
+.Nm
+is inspired by and similar in function to
+Solaris/illumos-style upgrades.
+.Pp
+The
+.Nm
+manual page first appeared in
+.Fx 12.0 .
+.Sh
svn commit: r338099 - head/lib/libsysdecode
Author: arichardson
Date: Mon Aug 20 10:59:49 2018
New Revision: 338099
URL: https://svnweb.freebsd.org/changeset/base/338099
Log:
Don't rebuild ioctl.c and relink libsysdecode if there are no changes
Instead generate a temporary file and only overwrite ioctl.c if the
files are actually different.
Approved By: jhb (mentor)
Modified:
head/lib/libsysdecode/Makefile
Modified: head/lib/libsysdecode/Makefile
==
--- head/lib/libsysdecode/Makefile Mon Aug 20 10:39:53 2018
(r338098)
+++ head/lib/libsysdecode/Makefile Mon Aug 20 10:59:49 2018
(r338099)
@@ -129,11 +129,16 @@ tables.h: mktables
# mkioctls runs find(1) for headers so needs to rebuild every time. This used
# to be a hack only done in buildworld.
.if !defined(_SKIP_BUILD)
-ioctl.c: .PHONY
+ioctl.c.tmp: .PHONY
.endif
-ioctl.c: mkioctls .META
+ioctl.c.tmp: mkioctls .META
env CPP="${CPP}" MK_PF="${MK_PF}" \
/bin/sh ${.CURDIR}/mkioctls ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} >
${.TARGET}
+
+ioctl.c: ioctl.c.tmp
+ if [ ! -e ${.TARGET} ] || ! cmp -s ${.TARGET} ${.TARGET}.tmp; then \
+ mv -f ${.TARGET}.tmp ${.TARGET}; \
+ fi
beforedepend: ioctl.c tables.h
___
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: r338098 - in head: . tools/build
Author: arichardson
Date: Mon Aug 20 10:39:53 2018
New Revision: 338098
URL: https://svnweb.freebsd.org/changeset/base/338098
Log:
Don't create directories in ${WORLDTMP}/legacy with mtree
This has two advantages:
1) We no longer create lots of empty directories that are not needed
2) This is a requirement for building on non-FreeBSD hosts since mtree will
only exist after the bootstrap-tools phase there.
Aproved By: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D16773
Modified:
head/Makefile.inc1
head/tools/build/Makefile
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon Aug 20 10:39:48 2018(r338097)
+++ head/Makefile.inc1 Mon Aug 20 10:39:53 2018(r338098)
@@ -968,29 +968,10 @@ _worldtmp: .PHONY
.endif # !defined(NO_CLEAN)
@mkdir -p ${WORLDTMP}
@touch ${WORLDTMP}/${.TARGET}
-
-.for _dir in \
-lib lib/casper lib/geom usr legacy/bin legacy/usr
- mkdir -p ${WORLDTMP}/${_dir}
-.endfor
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
- -p ${WORLDTMP}/legacy/usr >/dev/null
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
- -p ${WORLDTMP}/legacy/usr/include >/dev/null
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
- -p ${WORLDTMP}/usr >/dev/null
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
- -p ${WORLDTMP}/usr/include >/dev/null
- ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if ${MK_DEBUG_FILES} != "no"
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
- -p ${WORLDTMP}/legacy/usr/lib >/dev/null
- ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
- -p ${WORLDTMP}/usr/lib >/dev/null
-.endif
-.for _mtree in ${LOCAL_MTREE}
- ${WORLDTMP_MTREE} -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
-.endfor
+# We can't use mtree to create the worldtmp directories since it may not be
+# available on the target system (this happens e.g. when building on
non-FreeBSD)
+ cd ${.CURDIR}/tools/build; \
+ ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy installdirs
_legacy:
@echo
@echo "--"
@@ -1003,6 +984,19 @@ _bootstrap-tools:
@echo ">>> stage 1.2: bootstrap tools"
@echo "--"
${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
+ mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${WORLDTMP}/usr >/dev/null
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+ -p ${WORLDTMP}/usr/include >/dev/null
+ ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if ${MK_DEBUG_FILES} != "no"
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+ -p ${WORLDTMP}/usr/lib >/dev/null
+.endif
+.for _mtree in ${LOCAL_MTREE}
+ ${WORLDTMP_MTREE} -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
+.endfor
_cleanobj:
.if !defined(NO_CLEAN)
@echo
Modified: head/tools/build/Makefile
==
--- head/tools/build/Makefile Mon Aug 20 10:39:48 2018(r338097)
+++ head/tools/build/Makefile Mon Aug 20 10:39:53 2018(r338098)
@@ -59,4 +59,17 @@ SUBDIR= cross-build
# Needed to build config (since it uses libnv)
SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h
+
+# Create all the directories that are needed during the legacy, bootstrap-tools
+# and cross-tools stages. We do this here using mkdir since mtree may not exist
+# yet (this happens if we are crossbuilding from Linux/Mac).
+installdirs:
+.for _dir in bin sbin usr/bin usr/sbin usr/lib usr/include lib/geom lib/casper
+ mkdir -p "${DESTDIR}/${_dir}"
+.endfor
+
+.for _group in ${INCSGROUPS:NINCS}
+ mkdir -p "${DESTDIR}/${${_group}DIR}"
+.endfor
+
.include
___
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: r338096 - head/tools/build/mk
Author: arichardson
Date: Mon Aug 20 10:39:42 2018
New Revision: 338096
URL: https://svnweb.freebsd.org/changeset/base/338096
Log:
Avoid depending on system headers from the source tree during bootstrap
This can cause surprising errors if the build tools is built against
headers that don't match the host system. It is also required in order
to allow building on non-FreeBSD systems where the headers in
/usr/include/sys are usually completely incompatible with those in the
source tree.
I added an error to Makefile.boot if this is done and found this was
only the case in libnv. With this error in the Makefile ABI breakages
such as r336019 should no longer be possible.
Reviewed By: bdrewery, kevans
Approved By: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D16186
Modified:
head/tools/build/mk/Makefile.boot
Modified: head/tools/build/mk/Makefile.boot
==
--- head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:37 2018
(r338095)
+++ head/tools/build/mk/Makefile.boot Mon Aug 20 10:39:42 2018
(r338096)
@@ -7,3 +7,20 @@ LDFLAGS+= -L${WORLDTMP}/legacy/usr/lib
# we do not want to capture dependencies referring to the above
UPDATE_DEPENDFILE= no
+
+# When building host tools we should never pull in headers from the source sys
+# directory to avoid any ABI issues that might cause the built binary to crash.
+# The only exceptions to this are sys/cddl/compat for dtrace bootstrap tools
and
+# sys/crypto for libmd bootstrap.
+.if
!empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:N*${SRCTOP}/sys/crypto*)
+.error Do not include $${SRCTOP}/sys when building bootstrap tools. \
+Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile instead. \
+Error was caused by Makefile in ${.CURDIR}
+.endif
+
+# ${SRCTOP}/include should also never be used to avoid ABI issues
+.if !empty(CFLAGS:M*${SRCTOP}/include*)
+.error Do not include $${SRCTOP}/include when building bootstrap tools. \
+Copy the header to $${WORLDTMP}/legacy in tools/build/Makefile instead. \
+Error was caused by Makefile in ${.CURDIR}
+.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: r338097 - head/lib/libmd
Author: arichardson
Date: Mon Aug 20 10:39:48 2018
New Revision: 338097
URL: https://svnweb.freebsd.org/changeset/base/338097
Log:
Allow bootstrapping libmd on MacOS
The assembly files use directives that only work for ELF targets so skip
them when bootstrapping on MacOS.
Reviewed By: imp
Approved By: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D14247
Modified:
head/lib/libmd/Makefile
Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Mon Aug 20 10:39:42 2018(r338096)
+++ head/lib/libmd/Makefile Mon Aug 20 10:39:48 2018(r338097)
@@ -98,6 +98,13 @@ CFLAGS+= -DSKEIN_LOOP=995
.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
+USE_ASM_SOURCES?=1
+.if defined(BOOTSTRAPPING)
+# Don't build ASM sources when bootstrapping to avoid toolchain dependencies
+USE_ASM_SOURCES:=0
+.endif
+
+.if ${USE_ASM_SOURCES} != 0
.if exists(${MACHINE_ARCH}/sha.S)
SRCS+= sha.S
CFLAGS+= -DSHA1_ASM
@@ -116,6 +123,7 @@ CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of bl
.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) ||
exists(${MACHINE_ARCH}/skein_block_asm.s)
ACFLAGS+= -DELF -Wa,--noexecstack
.endif
+.endif # ${USE_ASM_SOURCES} != 0
md4hl.c: mdXhl.c
(echo '#define LENGTH 16'; \
___
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: r338095 - head/lib/libsysdecode
Author: arichardson
Date: Mon Aug 20 10:39:37 2018
New Revision: 338095
URL: https://svnweb.freebsd.org/changeset/base/338095
Log:
Make mkioctls script work on Linux and MacOS
Using find -s will not work with the Linux or MacOS find command. We pipe
to sort instead since the only real requirement here is that the order
stays the same. While I am touching this file I also fixed a `==` construct
which is not supported by POSIX sh but appears to work on FreeBSD.
Reviewed By: imp
Approved By: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D14246
Modified:
head/lib/libsysdecode/mkioctls
Modified: head/lib/libsysdecode/mkioctls
==
--- head/lib/libsysdecode/mkioctls Mon Aug 20 09:29:21 2018
(r338094)
+++ head/lib/libsysdecode/mkioctls Mon Aug 20 10:39:37 2018
(r338095)
@@ -17,18 +17,29 @@ LC_ALL=C; export LC_ALL
# XXX should we use an ANSI cpp?
ioctl_includes=$(
cd $includedir
+ set -e
+ # if /bin/sh is bash this will avoid further errors due to missing
commands
+ if set -o | grep -q pipefail; then
+ set -o pipefail
+ fi
filter='tee'
- if [ "${MK_PF}" == "no" ]; then
+ if [ "${MK_PF}" = "no" ]; then
filter='egrep -v (net/pfvar|net/if_pfsync)\.h'
fi
-
- find -H -s * -name '*.h' | \
+ # find -s would avoid the need to invoke sort but it is non-portable
+ find -L ./* -type f -name '*.h' | \
+ LC_ALL=C sort | \
$filter | \
xargs egrep -l \
'^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' |
awk '{printf("#include <%s>\\n", $1)}'
)
+
+if [ -z "$ioctl_includes" ]; then
+ echo "Failed to build list of ioctl headers"
+ exit 1
+fi
awk -v x="$ioctl_includes" 'BEGIN {print x}' |
$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |
___
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: r338094 - head/usr.bin/vmstat
Author: jhb
Date: Mon Aug 20 09:29:21 2018
New Revision: 338094
URL: https://svnweb.freebsd.org/changeset/base/338094
Log:
Fully retire the unimplemented -t option from vmstat(8).
It was #ifdef'd out in the 4.4BSD import and hasn't been re-enabled
since then.
Reviewed by: kib
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D16804
Modified:
head/usr.bin/vmstat/vmstat.c
Modified: head/usr.bin/vmstat/vmstat.c
==
--- head/usr.bin/vmstat/vmstat.cMon Aug 20 06:09:09 2018
(r338093)
+++ head/usr.bin/vmstat/vmstat.cMon Aug 20 09:29:21 2018
(r338094)
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
static char da[] = "da";
enum x_stats { X_SUM, X_HZ, X_STATHZ, X_NCHSTATS, X_INTRNAMES, X_SINTRNAMES,
-X_INTRCNT, X_SINTRCNT, X_DEFICIT, X_REC, X_PGIN, X_XSTATS };
+X_INTRCNT, X_SINTRCNT };
static struct nlist namelist[] = {
[X_SUM] = { .n_name = "_vm_cnt", },
@@ -97,12 +97,6 @@ static struct nlist namelist[] = {
[X_SINTRNAMES] = { .n_name = "_sintrnames", },
[X_INTRCNT] = { .n_name = "_intrcnt", },
[X_SINTRCNT] = { .n_name = "_sintrcnt", },
-#ifdef notyet
- [X_DEFICIT] = { .n_name = "_deficit", },
- [X_REC] = { .n_name = "_rectime", },
- [X_PGIN] = { .n_name = "_pgintime", },
- [X_XSTATS] = { .n_name = "_xstats", },
-#endif
{ .n_name = NULL, },
};
@@ -232,7 +226,7 @@ main(int argc, char *argv[])
if (argc < 0)
return (argc);
- while ((c = getopt(argc, argv, "ac:fhHiM:mN:n:oPp:stw:z")) != -1) {
+ while ((c = getopt(argc, argv, "ac:fhHiM:mN:n:oPp:sw:z")) != -1) {
switch (c) {
case 'a':
aflag++;
@@ -282,14 +276,6 @@ main(int argc, char *argv[])
case 's':
todo |= SUMSTAT;
break;
- case 't':
-#ifdef notyet
- todo |= TIMESTAT;
-#else
- xo_errx(EX_USAGE,
- "sorry, -t is not (re)implemented yet");
-#endif
- break;
case 'w':
/* Convert to milliseconds. */
f = atof(optarg);
@@ -394,10 +380,6 @@ retry_nlist:
dosum();
if (todo & OBJSTAT)
doobjstat();
-#ifdef notyet
- if (todo & TIMESTAT)
- dotimes();
-#endif
if (todo & INTRSTAT)
dointr(interval, reps);
if (todo & VMSTAT)
@@ -966,29 +948,6 @@ doresize(void)
*/
wresized = 0;
}
-
-#ifdef notyet
-static void
-dotimes(void)
-{
- unsigned int pgintime, rectime;
-
- kread(X_REC, , sizeof(rectime));
- kread(X_PGIN, , sizeof(pgintime));
- kread(X_SUM, , sizeof(sum));
- xo_emit("{:page-reclaims/%u} {N:reclaims}, "
- "{:reclaim-time/%u} {N:total time (usec)}\n",
- sum.v_pgrec, rectime);
- xo_emit("{L:average}: {:reclaim-average/%u} {N:usec \\/ reclaim}\n",
- rectime / sum.v_pgrec);
- xo_emit("\n");
- xo_emit("{:page-ins/%u} {N:page ins}, "
- "{:page-in-time/%u} {N:total time (msec)}\n",
- sum.v_pgin, pgintime / 10);
- xo_emit("{L:average}: {:average/%8.1f} {N:msec \\/ page in}\n",
- pgintime / (sum.v_pgin * 10.0));
-}
-#endif
static long
pct(long top, long bot)
___
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: r338053 - head/sys/netinet
On 20 Aug 2018, at 1:13, Conrad Meyer wrote: On Sun, Aug 19, 2018 at 11:40 AM, Bjoern A. Zeeb wrote: I am so happy we have a version control system where you could hopefully find out if the original committer left a decent commit message.. takes less than 60 seconds .. https://svnweb.freebsd.org/base?view=revision=82122 It is great we have such a system, but unfortunately the message doesn't really answer my question(s). I don't know that that means it isn't "decent," but it isn't really helpful. :-) Well it tells you all you need to know. If you open the RFC cited it’ll tell you why the 4-tuple is used and why MD5, which seemed to be the questions you two were guessing about. /bz ___ 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: r338093 - vendor/ntp/4.2.8p12
Author: delphij Date: Mon Aug 20 06:09:09 2018 New Revision: 338093 URL: https://svnweb.freebsd.org/changeset/base/338093 Log: Tag ntp 4.2.8p12. Added: vendor/ntp/4.2.8p12/ - copied from r338092, vendor/ntp/dist/ ___ 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: r338092 - in vendor/ntp/dist: . html include libntp ntpd ntpdate ntpdc ntpq ntpsnmpd ports/winnt/include ports/winnt/ntpd scripts scripts/calc_tickadj scripts/ntp-wait scripts/ntpsweep ...
Author: delphij Date: Mon Aug 20 06:07:33 2018 New Revision: 338092 URL: https://svnweb.freebsd.org/changeset/base/338092 Log: Vendor import of ntp-4.2.8p12. Modified: vendor/ntp/dist/ChangeLog vendor/ntp/dist/NEWS vendor/ntp/dist/config.h.in vendor/ntp/dist/configure vendor/ntp/dist/configure.ac vendor/ntp/dist/html/authentic.html vendor/ntp/dist/html/authopt.html vendor/ntp/dist/html/confopt.html vendor/ntp/dist/html/keygen.html vendor/ntp/dist/html/ntpdate.html vendor/ntp/dist/include/ntp.h vendor/ntp/dist/include/ntp_md5.h vendor/ntp/dist/libntp/a_md5encrypt.c vendor/ntp/dist/libntp/ntp_calendar.c vendor/ntp/dist/libntp/prettydate.c vendor/ntp/dist/libntp/ssl_init.c vendor/ntp/dist/libntp/syssignal.c vendor/ntp/dist/libntp/work_fork.c vendor/ntp/dist/libntp/work_thread.c vendor/ntp/dist/ntpd/complete.conf.in vendor/ntp/dist/ntpd/invoke-ntp.conf.texi vendor/ntp/dist/ntpd/invoke-ntp.keys.texi vendor/ntp/dist/ntpd/invoke-ntpd.texi vendor/ntp/dist/ntpd/ntp.conf.5man vendor/ntp/dist/ntpd/ntp.conf.5mdoc vendor/ntp/dist/ntpd/ntp.conf.def vendor/ntp/dist/ntpd/ntp.conf.html vendor/ntp/dist/ntpd/ntp.conf.man.in vendor/ntp/dist/ntpd/ntp.conf.mdoc.in vendor/ntp/dist/ntpd/ntp.keys.5man vendor/ntp/dist/ntpd/ntp.keys.5mdoc vendor/ntp/dist/ntpd/ntp.keys.def vendor/ntp/dist/ntpd/ntp.keys.html vendor/ntp/dist/ntpd/ntp.keys.man.in vendor/ntp/dist/ntpd/ntp.keys.mdoc.in vendor/ntp/dist/ntpd/ntp_config.c vendor/ntp/dist/ntpd/ntp_control.c vendor/ntp/dist/ntpd/ntp_io.c vendor/ntp/dist/ntpd/ntp_loopfilter.c vendor/ntp/dist/ntpd/ntp_parser.c vendor/ntp/dist/ntpd/ntp_parser.h vendor/ntp/dist/ntpd/ntp_parser.y vendor/ntp/dist/ntpd/ntp_proto.c vendor/ntp/dist/ntpd/ntp_refclock.c vendor/ntp/dist/ntpd/ntp_request.c vendor/ntp/dist/ntpd/ntpd-opts.c vendor/ntp/dist/ntpd/ntpd-opts.h vendor/ntp/dist/ntpd/ntpd.1ntpdman vendor/ntp/dist/ntpd/ntpd.1ntpdmdoc vendor/ntp/dist/ntpd/ntpd.c vendor/ntp/dist/ntpd/ntpd.html vendor/ntp/dist/ntpd/ntpd.man.in vendor/ntp/dist/ntpd/ntpd.mdoc.in vendor/ntp/dist/ntpd/rc_cmdlength.c vendor/ntp/dist/ntpd/refclock_datum.c vendor/ntp/dist/ntpd/refclock_gpsdjson.c vendor/ntp/dist/ntpd/refclock_jupiter.c vendor/ntp/dist/ntpd/refclock_shm.c vendor/ntp/dist/ntpd/refclock_true.c vendor/ntp/dist/ntpdate/ntpdate.c vendor/ntp/dist/ntpdc/invoke-ntpdc.texi vendor/ntp/dist/ntpdc/ntpdc-opts.c vendor/ntp/dist/ntpdc/ntpdc-opts.h vendor/ntp/dist/ntpdc/ntpdc.1ntpdcman vendor/ntp/dist/ntpdc/ntpdc.1ntpdcmdoc vendor/ntp/dist/ntpdc/ntpdc.c vendor/ntp/dist/ntpdc/ntpdc.html vendor/ntp/dist/ntpdc/ntpdc.man.in vendor/ntp/dist/ntpdc/ntpdc.mdoc.in vendor/ntp/dist/ntpq/invoke-ntpq.texi vendor/ntp/dist/ntpq/ntpq-opts.c vendor/ntp/dist/ntpq/ntpq-opts.h vendor/ntp/dist/ntpq/ntpq-subs.c vendor/ntp/dist/ntpq/ntpq.1ntpqman vendor/ntp/dist/ntpq/ntpq.1ntpqmdoc vendor/ntp/dist/ntpq/ntpq.c vendor/ntp/dist/ntpq/ntpq.html vendor/ntp/dist/ntpq/ntpq.man.in vendor/ntp/dist/ntpq/ntpq.mdoc.in vendor/ntp/dist/ntpq/ntpq.texi vendor/ntp/dist/ntpsnmpd/invoke-ntpsnmpd.texi vendor/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c vendor/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h vendor/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdman vendor/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc vendor/ntp/dist/ntpsnmpd/ntpsnmpd.html vendor/ntp/dist/ntpsnmpd/ntpsnmpd.man.in vendor/ntp/dist/ntpsnmpd/ntpsnmpd.mdoc.in vendor/ntp/dist/packageinfo.sh vendor/ntp/dist/ports/winnt/include/ntservice.h vendor/ntp/dist/ports/winnt/ntpd/nt_clockstuff.c vendor/ntp/dist/ports/winnt/ntpd/ntservice.c vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.html vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.man.in vendor/ntp/dist/scripts/calc_tickadj/calc_tickadj.mdoc.in vendor/ntp/dist/scripts/calc_tickadj/invoke-calc_tickadj.texi vendor/ntp/dist/scripts/invoke-plot_summary.texi vendor/ntp/dist/scripts/invoke-summary.texi vendor/ntp/dist/scripts/ntp-wait/invoke-ntp-wait.texi vendor/ntp/dist/scripts/ntp-wait/ntp-wait-opts vendor/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitman vendor/ntp/dist/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc vendor/ntp/dist/scripts/ntp-wait/ntp-wait.html vendor/ntp/dist/scripts/ntp-wait/ntp-wait.man.in vendor/ntp/dist/scripts/ntp-wait/ntp-wait.mdoc.in vendor/ntp/dist/scripts/ntpsweep/invoke-ntpsweep.texi vendor/ntp/dist/scripts/ntpsweep/ntpsweep-opts vendor/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepman vendor/ntp/dist/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc vendor/ntp/dist/scripts/ntpsweep/ntpsweep.html vendor/ntp/dist/scripts/ntpsweep/ntpsweep.man.in vendor/ntp/dist/scripts/ntpsweep/ntpsweep.mdoc.in vendor/ntp/dist/scripts/ntptrace/invoke-ntptrace.texi vendor/ntp/dist/scripts/ntptrace/ntptrace-opts
