Re: svn commit: r368736 - head/tools/tools/git/hooks
On Mon, 28 Dec 2020 at 14:34, Alan Somers wrote: > > On Thu, Dec 17, 2020 at 12:58 PM Ed Maste wrote: >> >> Author: emaste >> Date: Thu Dec 17 19:58:29 2020 >> New Revision: 368736 >> URL: https://svnweb.freebsd.org/changeset/base/368736 >> >> Log: >> Add initial version of git commit message preparation hook >> > Thanks! But how can we use it? Is there a "git config" incantation that > will use this file? Just copy it into .git/hooks/. Can also fetch the latest version directly from cgit; lwhsu added this to https://github.com/bsdimp/freebsd-git-docs/blob/main/URLs.md: fetch https://cgit.freebsd.org/src/plain/tools/tools/git/hooks/prepare-commit-msg -o .git/hooks chmod 755 .git/hooks/prepare-commit-msg I'd like us to end up with a setup-repo.sh or such that will offer to take care of all of these things. >Also, this seems too complicated. Git already has a "config.template" >configuration variable. Could we just use that instead, or does it not work >for some reason? It does work, although it's a bit awkward. For one thing, the provided template is placed at the top of the message, followed by the default message, but our addition is really commented-out information and fits best in the middle of the existing text - after the "Please enter the..." and before the list of changes and such. With config.template we'd end up with something like: # PR: # ... # Differential Revision:<https://reviews.freebsd.org/D###> # # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # ... Additionally we might want to make some more programmatic changes in the default message (depending on the resolution of some open questions). For example we could strip the "MFC after" line that's copied from the original commit, when preparing the commit message for a MFC/cherry-pick. ___ 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: r368740 - head/tools/tools/git/hooks
Author: emaste Date: Thu Dec 17 20:31:45 2020 New Revision: 368740 URL: https://svnweb.freebsd.org/changeset/base/368740 Log: Describe the commit message template our git hook script produces Reported by: rpokala Modified: head/tools/tools/git/hooks/prepare-commit-msg Modified: head/tools/tools/git/hooks/prepare-commit-msg == --- head/tools/tools/git/hooks/prepare-commit-msg Thu Dec 17 20:31:17 2020(r368739) +++ head/tools/tools/git/hooks/prepare-commit-msg Thu Dec 17 20:31:45 2020(r368740) @@ -16,8 +16,17 @@ merge) esac outfile=$(mktemp /tmp/freebsd-git-commit.) -cat >$outfile <$outfile
svn commit: r368737 - head/tools/tools/git/hooks
Author: emaste Date: Thu Dec 17 20:11:31 2020 New Revision: 368737 URL: https://svnweb.freebsd.org/changeset/base/368737 Log: chmod +x the git commit message prep hook Modified: Directory Properties: head/tools/tools/git/hooks/prepare-commit-msg (props changed) ___ 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: r368736 - head/tools/tools/git/hooks
Author: emaste Date: Thu Dec 17 19:58:29 2020 New Revision: 368736 URL: https://svnweb.freebsd.org/changeset/base/368736 Log: Add initial version of git commit message preparation hook Start with a slightly modified version of the SVN commit template, to allow developers to experiment. This will be updated in the future as our process and techniques evolve. This can be installed by copying or symlinking into the .git/hooks/ directory. Feedback from:cem, jhb Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D27633 Added: head/tools/tools/git/hooks/ head/tools/tools/git/hooks/prepare-commit-msg (contents, props changed) Added: head/tools/tools/git/hooks/prepare-commit-msg == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/git/hooks/prepare-commit-msg Thu Dec 17 19:58:29 2020(r368736) @@ -0,0 +1,55 @@ +#!/bin/sh + +case "$2" in +commit|message) + # It appears git invokes this script for interactive rebase but does + # not remove commented lines, so just exit if we're not called with the + # default (comment-containing) template. + egrep -q '^#' "$1" || return 0 + ;; +template) + return 0 + ;; +merge) + return 0 + ;; +esac + +outfile=$(mktemp /tmp/freebsd-git-commit.) +cat >$outfile
Re: svn commit: r368667 - in head: . gnu/usr.bin gnu/usr.bin/binutils gnu/usr.bin/gdb tools/build/mk
On Tue, 15 Dec 2020 at 18:25, John Baldwin wrote: > > On 12/15/20 9:44 AM, Ed Maste wrote: > > Author: emaste > > Date: Tue Dec 15 17:44:19 2020 > > New Revision: 368667 > > URL: https://svnweb.freebsd.org/changeset/base/368667 > > > > Log: > > Retire obsolete GDB 6.1.1 > > Are you going to remove the -gdwarf-2 bits from kern.mk now? Yes, soon. We probably need to change it to explicit -gdwarf-4 (not just remove it and rely on the compiler's default) as we'll see DWARF5 by default before long and will need to update ctfconvert again. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368696 - head/contrib/binutils
Author: emaste Date: Wed Dec 16 14:01:04 2020 New Revision: 368696 URL: https://svnweb.freebsd.org/changeset/base/368696 Log: Remove contrib/binutils, unused after r368667 Deleted: head/contrib/binutils/ ___ 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: r368695 - head/share/man/man5
Author: emaste Date: Wed Dec 16 14:00:42 2020 New Revision: 368695 URL: https://svnweb.freebsd.org/changeset/base/368695 Log: src.conf.5: regen after r368667, GDB retirement Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Wed Dec 16 11:02:25 2020 (r368694) +++ head/share/man/man5/src.conf.5 Wed Dec 16 14:00:42 2020 (r368695) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd December 10, 2020 +.Dd December 15, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -656,9 +656,6 @@ and .Xr ftpd 8 . .It Va WITHOUT_GAMES Set to not build games. -.It Va WITH_GDB -Set to build -.Xr gdb 1 . .It Va WITHOUT_GH_BC Set to not build and install the enhanced .Xr bc 1 @@ -1633,8 +1630,6 @@ When set, it enforces these options: .Va WITHOUT_CLANG_FORMAT .It .Va WITHOUT_CLANG_FULL -.It -.Va WITHOUT_GDB .It .Va WITHOUT_INCLUDES .It ___ 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: r368669 - in head: . gnu/lib share/mk
Author: emaste
Date: Tue Dec 15 18:12:03 2020
New Revision: 368669
URL: https://svnweb.freebsd.org/changeset/base/368669
Log:
Remove additional GDB leftovers missed in r368667
Modified:
head/Makefile.inc1
head/gnu/lib/Makefile
head/share/mk/src.opts.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Dec 15 17:52:04 2020(r368668)
+++ head/Makefile.inc1 Tue Dec 15 18:12:03 2020(r368669)
@@ -761,7 +761,7 @@ TMAKE= \
XMAKE= ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \
- MK_GDB=no MK_TESTS=no
+ MK_TESTS=no
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -2729,7 +2729,6 @@ NXBMAKEARGS+= \
MK_CLANG_FULL=no \
MK_CTF=no \
MK_DEBUG_FILES=no \
- MK_GDB=no \
MK_HTML=no \
MK_LLDB=no \
MK_MAN=no \
Modified: head/gnu/lib/Makefile
==
--- head/gnu/lib/Makefile Tue Dec 15 17:52:04 2020(r368668)
+++ head/gnu/lib/Makefile Tue Dec 15 18:12:03 2020(r368669)
@@ -6,7 +6,7 @@ SUBDIR=
SUBDIR.${MK_DIALOG}+= libdialog
SUBDIR.${MK_TESTS}+= tests
-.if ${MK_GNU_GREP} != "no" || ${MK_GDB} != "no"
+.if ${MK_GNU_GREP} != "no"
SUBDIR+= libregex
.endif
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Tue Dec 15 17:52:04 2020(r368668)
+++ head/share/mk/src.opts.mk Tue Dec 15 18:12:03 2020(r368669)
@@ -206,7 +206,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_FORMAT \
DTRACE_TESTS \
EXPERIMENTAL \
-GDB \
GNU_GREP \
HESIOD \
LIBSOFT \
@@ -289,10 +288,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
.include
-# In-tree gdb is an older versions without modern architecture support.
-.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
-BROKEN_OPTIONS+=GDB
-.endif
.if ${__T:Mriscv*} != ""
BROKEN_OPTIONS+=OFED
.endif
@@ -481,7 +476,6 @@ MK_LLD_BOOTSTRAP:= no
.if ${MK_TOOLCHAIN} == "no"
MK_CLANG:= no
-MK_GDB:= no
MK_INCLUDES:= no
MK_LLD:= no
MK_LLDB:= no
___
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: r368668 - head
Author: emaste Date: Tue Dec 15 17:52:04 2020 New Revision: 368668 URL: https://svnweb.freebsd.org/changeset/base/368668 Log: Add relnote for r368667, GDB 6.1.1 removal Modified: head/RELNOTES Modified: head/RELNOTES == --- head/RELNOTES Tue Dec 15 17:44:19 2020(r368667) +++ head/RELNOTES Tue Dec 15 17:52:04 2020(r368668) @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +r368667: + GDB 6.1.1 was removed. Users of crashinfo(8) should install the + gdb package or devel/gdb port. + r368559: The hme(4) driver was removed. ___ 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: r368667 - in head: . gnu/usr.bin gnu/usr.bin/binutils gnu/usr.bin/gdb tools/build/mk
Author: emaste
Date: Tue Dec 15 17:44:19 2020
New Revision: 368667
URL: https://svnweb.freebsd.org/changeset/base/368667
Log:
Retire obsolete GDB 6.1.1
GDB 6.1.1 was released in June 2004 and is long obsolete. It does not
support all of the architectures that FreeBSD does, and imposes
limitations on the FreeBSD kernel build, such as the continued use of
DWARF2 debugging information.
It was kept (in /usr/libexec/) only for use by crashinfo(8), which
extracts some basic information from a kernel core dump after a crash.
Crashinfo already prefers gdb from port/package if installed.
Future work may add kernel debug support to LLDB or find another path
for crashinfo's needs, but in any case we do not want to ship the
excessively outdated GDB in FreeBSD 13.
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D27610
Deleted:
head/gnu/usr.bin/binutils/
head/gnu/usr.bin/gdb/
Modified:
head/ObsoleteFiles.inc
head/UPDATING
head/gnu/usr.bin/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Tue Dec 15 16:15:25 2020(r368666)
+++ head/ObsoleteFiles.inc Tue Dec 15 17:44:19 2020(r368667)
@@ -36,6 +36,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20201215: in-tree gdb removed
+OLD_FILES+=usr/libexec/gdb
+OLD_FILES+=usr/libexec/kgdb
+
# 20201211: hme(4) removed
OLD_FILES+=usr/share/man/man4/hme.4.gz
OLD_FILES+=usr/share/man/man4/if_hme.4.gz
Modified: head/UPDATING
==
--- head/UPDATING Tue Dec 15 16:15:25 2020(r368666)
+++ head/UPDATING Tue Dec 15 17:44:19 2020(r368667)
@@ -26,6 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20201215:
+ Obsolete in-tree GDB 6.1.1 has been removed. GDB (including kgdb)
+ may be installed from ports or packages.
+
20201124:
ping6 has been merged into ping. It can now be called as "ping -6".
See ping(8) for details.
Modified: head/gnu/usr.bin/Makefile
==
--- head/gnu/usr.bin/Makefile Tue Dec 15 16:15:25 2020(r368666)
+++ head/gnu/usr.bin/Makefile Tue Dec 15 17:44:19 2020(r368667)
@@ -5,8 +5,6 @@
SUBDIR.${MK_DIALOG}+= dialog
SUBDIR.${MK_GNU_DIFF}+=diff3
SUBDIR.${MK_GNU_GREP}+=grep
-SUBDIR.${MK_GDB}+= binutils gdb
-SUBDIR_DEPEND_gdb= binutils
SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 15 16:15:25
2020(r368666)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 15 17:44:19
2020(r368667)
@@ -2143,11 +2143,6 @@ OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
.endif
-.if ${MK_GDB} == no
-OLD_FILES+=usr/libexec/gdb
-OLD_FILES+=usr/libexec/kgdb
-.endif
-
.if ${MK_GOOGLETEST} == no
OLD_FILES+=usr/include/gmock/gmock-actions.h
OLD_FILES+=usr/include/gmock/gmock-cardinalities.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: r368652 - head/tools/kerneldoc/subsys
Author: emaste Date: Tue Dec 15 01:45:19 2020 New Revision: 368652 URL: https://svnweb.freebsd.org/changeset/base/368652 Log: Remove more cx,ctau leftovers Missed in r359178 Deleted: head/tools/kerneldoc/subsys/Doxyfile-dev_ctau head/tools/kerneldoc/subsys/Doxyfile-dev_cx ___ 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: r368469 - in stable/12: share/man/man4 sys/dev/mn
Author: emaste
Date: Wed Dec 9 00:28:27 2020
New Revision: 368469
URL: https://svnweb.freebsd.org/changeset/base/368469
Log:
MFC r368397: Add deprecation notice to mn(4)
Sync serial (T1/E1) interfaces are largely irrelevant today and phk
confirms this driver is unnecessary in review D23928.
This leaves ce(4) and cp(4) in the tree. They're likely not relevant
either, but glebius contacted the manufacturer and those devices are
still available for purchase. At glebius' suggestion leave them in
the tree as long as they do not impose a maintenace burden.
[Build fix from hps included in MFC]
Sponsored by: The FreeBSD Foundation
Modified:
stable/12/share/man/man4/mn.4
stable/12/sys/dev/mn/if_mn.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man4/mn.4
==
--- stable/12/share/man/man4/mn.4 Tue Dec 8 23:54:09 2020
(r368468)
+++ stable/12/share/man/man4/mn.4 Wed Dec 9 00:28:27 2020
(r368469)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 10, 2005
+.Dd December 6, 2020
.Dt MN 4
.Os
.Sh NAME
@@ -33,6 +33,12 @@
.Sh SYNOPSIS
.Cd "device mn"
.Cd "options NETGRAPH"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
.Sh HARDWARE
The
.Nm
Modified: stable/12/sys/dev/mn/if_mn.c
==
--- stable/12/sys/dev/mn/if_mn.cTue Dec 8 23:54:09 2020
(r368468)
+++ stable/12/sys/dev/mn/if_mn.cWed Dec 9 00:28:27 2020
(r368469)
@@ -1395,6 +1395,7 @@ mn_attach (device_t self)
default:
printf(" Rev 0x%x\n", sc->f54r->vstr);
}
+ gone_in_dev(self, 13, "sync serial (T1/E1) driver");
if (ng_make_node_common(, >node) != 0) {
printf("ng_make_node_common failed\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: r368459 - in stable/12/crypto/openssl: crypto/asn1 crypto/err crypto/x509v3 include/openssl
Author: emaste
Date: Tue Dec 8 18:28:49 2020
New Revision: 368459
URL: https://svnweb.freebsd.org/changeset/base/368459
Log:
MFC r368447: OpenSSL: address CVE-2020-1971
OpenSSL commit 3db2c9f3:
Complain if we are attempting to encode with an invalid ASN.1 template
OpenSSL commit 43a7033:
Check that multi-strings/CHOICE types don't use implicit tagging
OpenSSL commit f960d812:
Correctly compare EdiPartyName in GENERAL_NAME_cmp()
Obtained from:OpenSSL 3db2c9f3, 43a7033, f960d812
Security: CVE-2020-1971
Modified:
stable/12/crypto/openssl/crypto/asn1/asn1_err.c
stable/12/crypto/openssl/crypto/asn1/tasn_dec.c
stable/12/crypto/openssl/crypto/asn1/tasn_enc.c
stable/12/crypto/openssl/crypto/err/openssl.txt
stable/12/crypto/openssl/crypto/x509v3/v3_genn.c
stable/12/crypto/openssl/include/openssl/asn1err.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/crypto/openssl/crypto/asn1/asn1_err.c
==
--- stable/12/crypto/openssl/crypto/asn1/asn1_err.c Tue Dec 8 18:24:33
2020(r368458)
+++ stable/12/crypto/openssl/crypto/asn1/asn1_err.c Tue Dec 8 18:28:49
2020(r368459)
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -49,6 +49,7 @@ static const ERR_STRING_DATA ASN1_str_functs[] = {
"asn1_item_embed_d2i"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_EMBED_NEW, 0),
"asn1_item_embed_new"},
+{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_EX_I2D, 0), "ASN1_item_ex_i2d"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_FLAGS_I2D, 0),
"asn1_item_flags_i2d"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_I2D_BIO, 0), "ASN1_item_i2d_bio"},
@@ -160,6 +161,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
"asn1 sig parse error"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header"},
+{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
"bmpstring is wrong length"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib"},
Modified: stable/12/crypto/openssl/crypto/asn1/tasn_dec.c
==
--- stable/12/crypto/openssl/crypto/asn1/tasn_dec.c Tue Dec 8 18:24:33
2020(r368458)
+++ stable/12/crypto/openssl/crypto/asn1/tasn_dec.c Tue Dec 8 18:28:49
2020(r368459)
@@ -182,6 +182,15 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
tag, aclass, opt, ctx);
case ASN1_ITYPE_MSTRING:
+/*
+ * It never makes sense for multi-strings to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+if (tag != -1) {
+ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_BAD_TEMPLATE);
+goto err;
+}
+
p = *in;
/* Just read in tag and class */
ret = asn1_check_tlen(NULL, , , NULL, NULL,
@@ -199,6 +208,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_MSTRING_NOT_UNIVERSAL);
goto err;
}
+
/* Check tag matches bit map */
if (!(ASN1_tag2bit(otag) & it->utype)) {
/* If OPTIONAL, assume this is OK */
@@ -215,6 +225,15 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
case ASN1_ITYPE_CHOICE:
+/*
+ * It never makes sense for CHOICE types to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+if (tag != -1) {
+ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_BAD_TEMPLATE);
+goto err;
+}
+
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
goto auxerr;
if (*pval) {
Modified: stable/12/crypto/openssl/crypto/asn1/tasn_enc.c
==
--- stable/12/crypto/openssl/crypto/asn1/tasn_enc.c Tue Dec 8 18:24:33
2020(r368458)
+++ stable/12/crypto/openssl/crypto/asn1/tasn_enc.c Tue Dec 8 18:28:49
2020(r368459)
@@ -103,9 +103,25 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char
return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
case ASN1_ITYPE_MSTRING:
+/*
+ * It never makes sense for multi-strings to have implicit
svn commit: r368447 - in head/crypto/openssl: crypto/asn1 crypto/err crypto/x509v3 include/openssl
Author: emaste
Date: Tue Dec 8 16:43:35 2020
New Revision: 368447
URL: https://svnweb.freebsd.org/changeset/base/368447
Log:
OpenSSL: address CVE-2020-1971
OpenSSL commit 3db2c9f3:
Complain if we are attempting to encode with an invalid ASN.1 template
OpenSSL commit 43a7033:
Check that multi-strings/CHOICE types don't use implicit tagging
OpenSSL commit f960d812:
Correctly compare EdiPartyName in GENERAL_NAME_cmp()
Obtained from:OpenSSL 3db2c9f3, 43a7033, f960d812
Security: CVE-2020-1971
Modified:
head/crypto/openssl/crypto/asn1/asn1_err.c
head/crypto/openssl/crypto/asn1/tasn_dec.c
head/crypto/openssl/crypto/asn1/tasn_enc.c
head/crypto/openssl/crypto/err/openssl.txt
head/crypto/openssl/crypto/x509v3/v3_genn.c
head/crypto/openssl/include/openssl/asn1err.h
Modified: head/crypto/openssl/crypto/asn1/asn1_err.c
==
--- head/crypto/openssl/crypto/asn1/asn1_err.c Tue Dec 8 16:36:46 2020
(r368446)
+++ head/crypto/openssl/crypto/asn1/asn1_err.c Tue Dec 8 16:43:35 2020
(r368447)
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -49,6 +49,7 @@ static const ERR_STRING_DATA ASN1_str_functs[] = {
"asn1_item_embed_d2i"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_EMBED_NEW, 0),
"asn1_item_embed_new"},
+{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_EX_I2D, 0), "ASN1_item_ex_i2d"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_FLAGS_I2D, 0),
"asn1_item_flags_i2d"},
{ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_ITEM_I2D_BIO, 0), "ASN1_item_i2d_bio"},
@@ -160,6 +161,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
"asn1 sig parse error"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header"},
+{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
"bmpstring is wrong length"},
{ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib"},
Modified: head/crypto/openssl/crypto/asn1/tasn_dec.c
==
--- head/crypto/openssl/crypto/asn1/tasn_dec.c Tue Dec 8 16:36:46 2020
(r368446)
+++ head/crypto/openssl/crypto/asn1/tasn_dec.c Tue Dec 8 16:43:35 2020
(r368447)
@@ -182,6 +182,15 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
tag, aclass, opt, ctx);
case ASN1_ITYPE_MSTRING:
+/*
+ * It never makes sense for multi-strings to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+if (tag != -1) {
+ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_BAD_TEMPLATE);
+goto err;
+}
+
p = *in;
/* Just read in tag and class */
ret = asn1_check_tlen(NULL, , , NULL, NULL,
@@ -199,6 +208,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_MSTRING_NOT_UNIVERSAL);
goto err;
}
+
/* Check tag matches bit map */
if (!(ASN1_tag2bit(otag) & it->utype)) {
/* If OPTIONAL, assume this is OK */
@@ -215,6 +225,15 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, cons
return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
case ASN1_ITYPE_CHOICE:
+/*
+ * It never makes sense for CHOICE types to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+if (tag != -1) {
+ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_BAD_TEMPLATE);
+goto err;
+}
+
if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
goto auxerr;
if (*pval) {
Modified: head/crypto/openssl/crypto/asn1/tasn_enc.c
==
--- head/crypto/openssl/crypto/asn1/tasn_enc.c Tue Dec 8 16:36:46 2020
(r368446)
+++ head/crypto/openssl/crypto/asn1/tasn_enc.c Tue Dec 8 16:43:35 2020
(r368447)
@@ -103,9 +103,25 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char
return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
case ASN1_ITYPE_MSTRING:
+/*
+ * It never makes sense for multi-strings to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+if (tag != -1) {
+
svn commit: r368442 - head/share/man/man5
Author: emaste Date: Tue Dec 8 15:00:07 2020 New Revision: 368442 URL: https://svnweb.freebsd.org/changeset/base/368442 Log: regen src.conf.5 after r368441, WITHOUT_GDB default Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Dec 8 14:56:15 2020 (r368441) +++ head/share/man/man5/src.conf.5 Tue Dec 8 15:00:07 2020 (r368442) @@ -656,18 +656,9 @@ and .Xr ftpd 8 . .It Va WITHOUT_GAMES Set to not build games. -.It Va WITHOUT_GDB -Set to not build -.Xr gdb 1 . -.Pp -This is a default setting on -arm64/aarch64, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_GDB Set to build .Xr gdb 1 . -.Pp -This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, i386/i386, mips/mips, mips/mips64, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_GH_BC Set to not build and install the enhanced .Xr bc 1 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368441 - head/share/mk
Author: emaste Date: Tue Dec 8 14:56:15 2020 New Revision: 368441 URL: https://svnweb.freebsd.org/changeset/base/368441 Log: Default to WITHOUT_GDB (GDB 6.1.1) for FreeBSD 13 As discussed on -current, -stable, -toolchain, and with jhb@ and imp@, disable the obsolete in-tree GDB 6.1.1 by default. This was kept only to provide kgdb for the crashinfo tool, but is long-obsolete, does not support all architectures that FreeBSD does, and held back other work (such as forcing the use of DWARF2 for kernel debug). Crashinfo will use kgdb from the gdb package or devel/gdb port, and will privde a message referencing those if no kgdb is found. Relnotes: Yes Sponsored by: The FreeBSD Foundation Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Tue Dec 8 14:05:54 2020(r368440) +++ head/share/mk/src.opts.mk Tue Dec 8 14:56:15 2020(r368441) @@ -106,7 +106,6 @@ __DEFAULT_YES_OPTIONS = \ FREEBSD_UPDATE \ FTP \ GAMES \ -GDB \ GH_BC \ GNU_DIFF \ GNU_GREP \ @@ -208,6 +207,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_FORMAT \ DTRACE_TESTS \ EXPERIMENTAL \ +GDB \ HESIOD \ LIBSOFT \ LOADER_FIREWIRE \ ___ 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: r368409 - head/sys/dev/mn
On Mon, 7 Dec 2020 at 06:19, Hans Petter Selasky wrote: > > Author: hselasky > Date: Mon Dec 7 11:18:51 2020 > New Revision: 368409 > URL: https://svnweb.freebsd.org/changeset/base/368409 > > Log: > Fix compilation after r368397. > > MFC after:3 days > Sponsored by: Mellanox Technologies // NVIDIA Networking Thanks. I will be sure to pick this up with the MFC. ___ 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: r368397 - in head: share/man/man4 sys/dev/mn
Author: emaste
Date: Sun Dec 6 21:34:04 2020
New Revision: 368397
URL: https://svnweb.freebsd.org/changeset/base/368397
Log:
Add deprecation notice to mn(4)
Sync serial (T1/E1) interfaces are largely irrelevant today and phk
confirms this driver is unnecessary in review D23928.
This leaves ce(4) and cp(4) in the tree. They're likely not relevant
either, but glebius contacted the manufacturer and those devices are
still available for purchase. At glebius' suggestion leave them in
the tree as long as they do not impose a maintenace burden.
Approved by: phk
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/share/man/man4/mn.4
head/sys/dev/mn/if_mn.c
Modified: head/share/man/man4/mn.4
==
--- head/share/man/man4/mn.4Sun Dec 6 20:50:21 2020(r368396)
+++ head/share/man/man4/mn.4Sun Dec 6 21:34:04 2020(r368397)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 10, 2005
+.Dd December 6, 2020
.Dt MN 4
.Os
.Sh NAME
@@ -33,6 +33,12 @@
.Sh SYNOPSIS
.Cd "device mn"
.Cd "options NETGRAPH"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
.Sh HARDWARE
The
.Nm
Modified: head/sys/dev/mn/if_mn.c
==
--- head/sys/dev/mn/if_mn.c Sun Dec 6 20:50:21 2020(r368396)
+++ head/sys/dev/mn/if_mn.c Sun Dec 6 21:34:04 2020(r368397)
@@ -1392,6 +1392,7 @@ mn_attach (device_t self)
default:
printf(" Rev 0x%x\n", sc->f54r->vstr);
}
+ gone_in_dev(dev, 13, "sync serial (T1/E1) driver");
if (ng_make_node_common(, >node) != 0) {
printf("ng_make_node_common failed\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"
Re: svn commit: r368345 - head/libexec/rc/rc.d
On Fri, 4 Dec 2020 at 14:31, Cy Schubert wrote: > > Author: cy > Date: Fri Dec 4 19:31:16 2020 > New Revision: 368345 > URL: https://svnweb.freebsd.org/changeset/base/368345 > > Log: > Revert r366857. HW lab CI is green again with this change: https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/8044/ (2 of 18 tests after r368345 failed; they timed out waiting for the login prompt. Perhaps the timeout is just not long enough.) ___ 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: r366857 - head/libexec/rc/rc.d
On Wed, 2 Dec 2020 at 23:19, Cy Schubert wrote: > > I've been looking at this earlier today, a different issue. > > This reverts r366857 and adds netifdown to run almost prior to shutdown. The netbooted pine64 hwlab CI job has been mostly failing since the original change as well as it appears the root filesystem disappears before shutdown is complete: ``` root@pinea64-cidev:~ # poweroff poweroff Shutdown NOW! poweroff: [pid 796] root@pinea64-cidev:~ # System shutdown Stopping devd. Waiting for PIDS: 492. nfs server 10.0.0.1:/b/tftpboot/pinea64/install/: not responding ``` https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/ Once the potential fix makes it into the tree I'll check on this again. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368302 - head/contrib/elftoolchain/addr2line
Author: emaste
Date: Thu Dec 3 14:41:11 2020
New Revision: 368302
URL: https://svnweb.freebsd.org/changeset/base/368302
Log:
addr2line: fix allocation leak in error path
CID: 1437677
Reported by: Coverity Scan
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/addr2line/addr2line.c
Modified: head/contrib/elftoolchain/addr2line/addr2line.c
==
--- head/contrib/elftoolchain/addr2line/addr2line.c Thu Dec 3 14:04:42
2020(r368301)
+++ head/contrib/elftoolchain/addr2line/addr2line.c Thu Dec 3 14:41:11
2020(r368302)
@@ -491,6 +491,7 @@ check_labels(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Uns
if (dwarf_tag(prev_die, , ) != DW_DLV_OK) {
warnx("dwarf_tag failed: %s",
dwarf_errmsg(de));
+ free(labels);
return DW_DLV_ERROR;
}
if (tag == DW_TAG_label) {
___
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: r368282 - head/usr.sbin/crashinfo
Author: emaste Date: Wed Dec 2 19:58:50 2020 New Revision: 368282 URL: https://svnweb.freebsd.org/changeset/base/368282 Log: crashinfo: Add references to the gdb port/package We intend to remove the obsolete GDB 6.1.1 from FreeBSD before FreeBSD 13. Reviewed by jhb Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D27447 Modified: head/usr.sbin/crashinfo/crashinfo.8 head/usr.sbin/crashinfo/crashinfo.sh Modified: head/usr.sbin/crashinfo/crashinfo.8 == --- head/usr.sbin/crashinfo/crashinfo.8 Wed Dec 2 17:37:32 2020 (r368281) +++ head/usr.sbin/crashinfo/crashinfo.8 Wed Dec 2 19:58:50 2020 (r368282) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 19, 2017 +.Dd December 2, 2020 .Dt CRASHINFO 8 .Os .Sh NAME @@ -85,6 +85,7 @@ it uses several utilities to analyze the core includin .Xr pstat 8 , and .Xr vmstat 8 . +Note that kgdb must be installed from the devel/gdb port or gdb package. .Pp The options are as follows: .Bl -tag -width indent Modified: head/usr.sbin/crashinfo/crashinfo.sh == --- head/usr.sbin/crashinfo/crashinfo.shWed Dec 2 17:37:32 2020 (r368281) +++ head/usr.sbin/crashinfo/crashinfo.shWed Dec 2 19:58:50 2020 (r368282) @@ -177,6 +177,7 @@ fi find_gdb if [ -z "$GDB" ]; then echo "Unable to find a kernel debugger." + echo "Please install the devel/gdb port or gdb package." exit 1 fi ___ 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: r368280 - head/contrib/elftoolchain/addr2line
Author: emaste
Date: Wed Dec 2 17:22:29 2020
New Revision: 368280
URL: https://svnweb.freebsd.org/changeset/base/368280
Log:
addr2line: rework check_range conditions
Simplify logic and reduce indentation for DW_AT_low_pc case.
Reviewed by: Tiger Gao, markj
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D27426
Modified:
head/contrib/elftoolchain/addr2line/addr2line.c
Modified: head/contrib/elftoolchain/addr2line/addr2line.c
==
--- head/contrib/elftoolchain/addr2line/addr2line.c Wed Dec 2 16:54:24
2020(r368279)
+++ head/contrib/elftoolchain/addr2line/addr2line.c Wed Dec 2 17:22:29
2020(r368280)
@@ -580,8 +580,8 @@ check_range(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Unsi
ranges_cnt = 0;
in_cu = false;
- ret = dwarf_attrval_unsigned(die, DW_AT_ranges, _off, );
- if (ret == DW_DLV_OK) {
+ if (dwarf_attrval_unsigned(die, DW_AT_ranges, _off, ) ==
+ DW_DLV_OK) {
ret = dwarf_get_ranges(dbg, ranges_off, ,
_cnt, NULL, );
if (ret != DW_DLV_OK)
@@ -612,33 +612,30 @@ check_range(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Unsi
break;
}
}
- } else {
- if (dwarf_attrval_unsigned(die, DW_AT_low_pc, , ) ==
+ } else if (dwarf_attrval_unsigned(die, DW_AT_low_pc, , ) ==
+ DW_DLV_OK) {
+ if (lopc == curlopc)
+ return (DW_DLV_ERROR);
+ if (dwarf_attrval_unsigned(die, DW_AT_high_pc, , ) ==
DW_DLV_OK) {
- if (lopc == curlopc)
+ /*
+* Check if the address falls into the PC
+* range of this CU.
+*/
+ if (handle_high_pc(die, lopc, ) != DW_DLV_OK)
return (DW_DLV_ERROR);
- if (dwarf_attrval_unsigned(die, DW_AT_high_pc, ,
- ) == DW_DLV_OK) {
- /*
-* Check if the address falls into the PC
-* range of this CU.
-*/
- if (handle_high_pc(die, lopc, ) !=
- DW_DLV_OK)
- return (DW_DLV_ERROR);
- } else {
- /* Assume ~0ULL if DW_AT_high_pc not present. */
- hipc = ~0ULL;
- }
-
- if (addr >= lopc && addr < hipc) {
- in_cu = true;
- }
} else {
- /* Addr not in range die, try labels. */
- ret = check_labels(dbg, die, addr, range);
- return ret;
+ /* Assume ~0ULL if DW_AT_high_pc not present. */
+ hipc = ~0ULL;
}
+
+ if (addr >= lopc && addr < hipc) {
+ in_cu = true;
+ }
+ } else {
+ /* Addr not found above, try labels. */
+ ret = check_labels(dbg, die, addr, range);
+ return ret;
}
if (in_cu) {
___
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: r368124 - in head/sys: cam cam/ata cam/ctl cam/mmc cam/nvme cam/scsi compat/linprocfs compat/linux conf contrib/openzfs/module/os/freebsd/zfs dev/ahci dev/ata dev/firewire dev/flash de
On Sun, 29 Nov 2020 at 12:36, Konstantin Belousov wrote: > > I think it is reasonable to return to 128KB for 32bit systems. ... > +#ifndef MAXPHYS/* max raw I/O transfer size > */ > +#ifdef __ILP32__ > +#define MAXPHYS(128 * 1024) > +#else > +#define MAXPHYS(1024 * 1024) > +#endif This seems reasonable to me. ___ 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: r368114 - head/contrib/elftoolchain/addr2line
Author: emaste
Date: Fri Nov 27 21:38:03 2020
New Revision: 368114
URL: https://svnweb.freebsd.org/changeset/base/368114
Log:
addr2line: add label checks when DW_AT_range and DW_AT_low_pc cannot be used
Check label's ranges for address we want to translate if a CU doesn't
have usable DW_AT_range or DW_AT_low_pc.
Use more appropriate names: "struct CU" -> "struct range"
Developed as part of upstream ELF Tool Chain bug report
https://sourceforge.net/p/elftoolchain/tickets/552/ although this does
not address the specific case reported there.
Submitted by: Tiger Gao
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D23782
Modified:
head/contrib/elftoolchain/addr2line/addr2line.c
Modified: head/contrib/elftoolchain/addr2line/addr2line.c
==
--- head/contrib/elftoolchain/addr2line/addr2line.c Fri Nov 27 21:37:48
2020(r368113)
+++ head/contrib/elftoolchain/addr2line/addr2line.c Fri Nov 27 21:38:03
2020(r368114)
@@ -57,8 +57,8 @@ struct Func {
STAILQ_ENTRY(Func) next;
};
-struct CU {
- RB_ENTRY(CU) entry;
+struct range {
+ RB_ENTRY(range) entry;
Dwarf_Off off;
Dwarf_Unsigned lopc;
Dwarf_Unsigned hipc;
@@ -89,16 +89,16 @@ static char unknown[] = { '?', '?', '\0' };
static Dwarf_Addr section_base;
/* Need a new curlopc that stores last lopc value. */
static Dwarf_Unsigned curlopc = ~0ULL;
-static RB_HEAD(cutree, CU) cuhead = RB_INITIALIZER();
+static RB_HEAD(cutree, range) cuhead = RB_INITIALIZER();
static int
-lopccmp(struct CU *e1, struct CU *e2)
+lopccmp(struct range *e1, struct range *e2)
{
return (e1->lopc < e2->lopc ? -1 : e1->lopc > e2->lopc);
}
-RB_PROTOTYPE(cutree, CU, entry, lopccmp);
-RB_GENERATE(cutree, CU, entry, lopccmp)
+RB_PROTOTYPE(cutree, range, entry, lopccmp);
+RB_GENERATE(cutree, range, entry, lopccmp)
#defineUSAGE_MESSAGE "\
Usage: %s [options] hexaddress...\n\
@@ -171,7 +171,7 @@ handle_high_pc(Dwarf_Die die, Dwarf_Unsigned lopc, Dwa
}
static struct Func *
-search_func(struct CU *cu, Dwarf_Unsigned addr)
+search_func(struct range *range, Dwarf_Unsigned addr)
{
struct Func *f, *f0;
Dwarf_Unsigned lopc, hipc, addr_base;
@@ -179,7 +179,7 @@ search_func(struct CU *cu, Dwarf_Unsigned addr)
f0 = NULL;
- STAILQ_FOREACH(f, >funclist, next) {
+ STAILQ_FOREACH(f, >funclist, next) {
if (f->ranges != NULL) {
addr_base = 0;
for (i = 0; i < f->ranges_cnt; i++) {
@@ -216,7 +216,8 @@ search_func(struct CU *cu, Dwarf_Unsigned addr)
}
static void
-collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Func *parent, struct CU
*cu)
+collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Func *parent,
+struct range *range)
{
Dwarf_Die ret_die, abst_die, spec_die;
Dwarf_Error de;
@@ -238,7 +239,7 @@ collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Fu
goto cont_search;
}
if (tag == DW_TAG_subprogram || tag == DW_TAG_entry_point ||
- tag == DW_TAG_inlined_subroutine) {
+ tag == DW_TAG_inlined_subroutine || tag == DW_TAG_label) {
/*
* Function address range can be specified by either
* a DW_AT_ranges attribute which points to a range list or
@@ -258,14 +259,21 @@ collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Fu
}
/*
-* Search for DW_AT_low_pc/DW_AT_high_pc if ranges pointer
-* not found.
-*/
- if (dwarf_attrval_unsigned(die, DW_AT_low_pc, , ) ||
- dwarf_attrval_unsigned(die, DW_AT_high_pc, , ))
- goto cont_search;
- if (handle_high_pc(die, lopc, ) != DW_DLV_OK)
- goto cont_search;
+* Ranges pointer not found. Search for DW_AT_low_pc, and
+* DW_AT_high_pc iff die is not a label. Labels doesn't have
+* hipc attr. */
+ if (tag == DW_TAG_label) {
+ if (dwarf_attrval_unsigned(die, DW_AT_low_pc, ,
+ ) != DW_DLV_OK)
+ goto cont_search;
+ } else {
+ if (dwarf_attrval_unsigned(die, DW_AT_low_pc, ,
+ ) || dwarf_attrval_unsigned(die, DW_AT_high_pc,
+ , ))
+ goto cont_search;
+ if (handle_high_pc(die, lopc, ) != DW_DLV_OK)
+ goto cont_search;
+ }
get_func_name:
/*
@@ -323,7 +331,7 @@ collect_func(Dwarf_Debug dbg, Dwarf_Die die, struct Fu
dwarf_attrval_unsigned(die,
svn commit: r368027 - stable/12/lib/libc/string
Author: emaste
Date: Wed Nov 25 18:36:38 2020
New Revision: 368027
URL: https://svnweb.freebsd.org/changeset/base/368027
Log:
MFC r351700: libc: Use musl's optimized memchr
Parentheses added to HASZERO macro to avoid a GCC warning.
Sponsored by: The FreeBSD Foundation
Modified:
stable/12/lib/libc/string/memchr.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/string/memchr.c
==
--- stable/12/lib/libc/string/memchr.c Wed Nov 25 18:09:01 2020
(r368026)
+++ stable/12/lib/libc/string/memchr.c Wed Nov 25 18:36:38 2020
(r368027)
@@ -1,55 +1,54 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: MIT
*
- * Copyright (c) 1990, 1993
- * The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2005-2014 Rich Felker, et al.
*
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
*
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memchr.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
#include
__FBSDID("$FreeBSD$");
#include
+#include
+#include
-void *
-memchr(const void *s, int c, size_t n)
-{
- if (n != 0) {
- const unsigned char *p = s;
+#define SS (sizeof(size_t))
+#define ALIGN (sizeof(size_t)-1)
+#define ONES ((size_t)-1/UCHAR_MAX)
+#define HIGHS (ONES * (UCHAR_MAX/2+1))
+#define HASZERO(x) (((x)-ONES) & ~(x) & HIGHS)
- do {
- if (*p++ == (unsigned char)c)
- return ((void *)(p - 1));
- } while (--n != 0);
+void *memchr(const void *src, int c, size_t n)
+{
+ const unsigned char *s = src;
+ c = (unsigned char)c;
+#ifdef __GNUC__
+ for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--);
+ if (n && *s != c) {
+ typedef size_t __attribute__((__may_alias__)) word;
+ const word *w;
+ size_t k = ONES * c;
+ for (w = (const void *)s; n>=SS && !HASZERO(*w^k); w++, n-=SS);
+ s = (const void *)w;
}
- return (NULL);
+#endif
+ for (; n && *s != c; s++, n--);
+ return n ? (void *)s : 0;
}
___
svn-src-all@freebsd.org mailing list
svn commit: r368019 - head/contrib/llvm-project/clang/lib/Driver/ToolChains
Author: emaste
Date: Wed Nov 25 14:26:13 2020
New Revision: 368019
URL: https://svnweb.freebsd.org/changeset/base/368019
Log:
clang: allow -fstack-clash-protection on FreeBSD
-fstack-clash-protection was added in Clang commit e67cbac81211 but was
enabled only on Linux. It should work fine on FreeBSD as well, so
enable it.
To be discussed and upstreamed with a test. The OS test should probably
just be removed.
Reviewed by: dim
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D27366
Modified:
head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
Modified: head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
==
--- head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp Wed Nov
25 11:21:03 2020(r368018)
+++ head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp Wed Nov
25 14:26:13 2020(r368019)
@@ -2967,7 +2967,7 @@ static void RenderSCPOptions(const ToolChain , cons
ArgStringList ) {
const llvm::Triple = TC.getEffectiveTriple();
- if (!EffectiveTriple.isOSLinux())
+ if (!EffectiveTriple.isOSFreeBSD() && !EffectiveTriple.isOSLinux())
return;
if (!EffectiveTriple.isX86() && !EffectiveTriple.isSystemZ() &&
___
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: r367853 - head/contrib/elftoolchain/addr2line
Author: emaste
Date: Thu Nov 19 21:10:36 2020
New Revision: 367853
URL: https://svnweb.freebsd.org/changeset/base/367853
Log:
addr2line: swap if conditions for diff reduction in upcoming change
No functional change intended.
Modified:
head/contrib/elftoolchain/addr2line/addr2line.c
Modified: head/contrib/elftoolchain/addr2line/addr2line.c
==
--- head/contrib/elftoolchain/addr2line/addr2line.c Thu Nov 19 19:25:47
2020(r367852)
+++ head/contrib/elftoolchain/addr2line/addr2line.c Thu Nov 19 21:10:36
2020(r367853)
@@ -436,30 +436,7 @@ check_range(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Unsi
in_range = false;
ret = dwarf_attrval_unsigned(die, DW_AT_ranges, _off, );
- if (ret == DW_DLV_NO_ENTRY) {
- if (dwarf_attrval_unsigned(die, DW_AT_low_pc, , ) ==
- DW_DLV_OK) {
- if (lopc == curlopc)
- return (DW_DLV_ERROR);
- if (dwarf_attrval_unsigned(die, DW_AT_high_pc, ,
- ) == DW_DLV_OK) {
- /*
-* Check if the address falls into the PC
-* range of this CU.
-*/
- if (handle_high_pc(die, lopc, ) !=
- DW_DLV_OK)
- return (DW_DLV_ERROR);
- } else {
- /* Assume ~0ULL if DW_AT_high_pc not present */
- hipc = ~0ULL;
- }
-
- if (addr >= lopc && addr < hipc) {
- in_range = true;
- }
- }
- } else if (ret == DW_DLV_OK) {
+ if (ret == DW_DLV_OK) {
ret = dwarf_get_ranges(dbg, ranges_off, ,
_cnt, NULL, );
if (ret != DW_DLV_OK)
@@ -488,6 +465,29 @@ check_range(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Unsi
if (addr >= lopc && addr < hipc){
in_range = true;
break;
+ }
+ }
+ } else if (ret == DW_DLV_NO_ENTRY) {
+ if (dwarf_attrval_unsigned(die, DW_AT_low_pc, , ) ==
+ DW_DLV_OK) {
+ if (lopc == curlopc)
+ return (DW_DLV_ERROR);
+ if (dwarf_attrval_unsigned(die, DW_AT_high_pc, ,
+ ) == DW_DLV_OK) {
+ /*
+* Check if the address falls into the PC
+* range of this CU.
+*/
+ if (handle_high_pc(die, lopc, ) !=
+ DW_DLV_OK)
+ return (DW_DLV_ERROR);
+ } else {
+ /* Assume ~0ULL if DW_AT_high_pc not present */
+ hipc = ~0ULL;
+ }
+
+ if (addr >= lopc && addr < hipc) {
+ in_range = true;
}
}
} else {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367823 - head/lib/libc/string
Author: emaste
Date: Thu Nov 19 00:03:15 2020
New Revision: 367823
URL: https://svnweb.freebsd.org/changeset/base/367823
Log:
libc: fix undefined behavior from signed overflow in strstr and memmem
unsigned char promotes to int, which can overflow when shifted left by
24 bits or more. this has been reported multiple times but then
forgotten. it's expected to be benign UB, but can trap when built with
explicit overflow catching (ubsan or similar). fix it now.
note that promotion to uint32_t is safe and portable even outside of
the assumptions usually made in musl, since either uint32_t has rank
at least unsigned int, so that no further default promotions happen,
or int is wide enough that the shift can't overflow. this is a
desirable property to have in case someone wants to reuse the code
elsewhere.
musl commit: 593caa456309714402ca4cb77c3770f4c24da9da
Obtained from:musl
Modified:
head/lib/libc/string/memmem.c
head/lib/libc/string/strstr.c
Modified: head/lib/libc/string/memmem.c
==
--- head/lib/libc/string/memmem.c Thu Nov 19 00:02:12 2020
(r367822)
+++ head/lib/libc/string/memmem.c Thu Nov 19 00:03:15 2020
(r367823)
@@ -41,8 +41,8 @@ twobyte_memmem(const unsigned char *h, size_t k, const
static char *
threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
{
- uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8;
- uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8;
+ uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8;
+ uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8;
for (h += 3, k -= 3; k; k--, hw = (hw | *h++) << 8)
if (hw == nw)
return (char *)h - 3;
@@ -52,8 +52,8 @@ threebyte_memmem(const unsigned char *h, size_t k, con
static char *
fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
{
- uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
- uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
+ uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
+ uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
for (h += 4, k -= 4; k; k--, hw = hw << 8 | *h++)
if (hw == nw)
return (char *)h - 4;
Modified: head/lib/libc/string/strstr.c
==
--- head/lib/libc/string/strstr.c Thu Nov 19 00:02:12 2020
(r367822)
+++ head/lib/libc/string/strstr.c Thu Nov 19 00:03:15 2020
(r367823)
@@ -40,8 +40,8 @@ twobyte_strstr(const unsigned char *h, const unsigned
static char *
threebyte_strstr(const unsigned char *h, const unsigned char *n)
{
- uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8;
- uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8;
+ uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8;
+ uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8;
for (h += 2; *h && hw != nw; hw = (hw | *++h) << 8)
;
return *h ? (char *)h - 2 : 0;
@@ -50,8 +50,8 @@ threebyte_strstr(const unsigned char *h, const unsigne
static char *
fourbyte_strstr(const unsigned char *h, const unsigned char *n)
{
- uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
- uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
+ uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
+ uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
for (h += 3; *h && hw != nw; hw = hw << 8 | *++h)
;
return *h ? (char *)h - 3 : 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: r367822 - head/lib/libc/string
Author: emaste
Date: Thu Nov 19 00:02:12 2020
New Revision: 367822
URL: https://svnweb.freebsd.org/changeset/base/367822
Log:
libc: optimize memmem two-way bad character shift
first, the condition (mem && k < p) is redundant, because mem being
nonzero implies the needle is periodic with period exactly p, in which
case any byte that appears in the needle must appear in the last p
bytes of the needle, bounding the shift (k) by p.
second, the whole point of replacing the shift k by mem (=l-p) is to
prevent shifting by less than mem when discarding the memory on shift,
in which case linear time could not be guaranteed. but as written, the
check also replaced shifts greater than mem by mem, reducing the
benefit of the shift. there is no possible benefit to this reduction of
the shift; since mem is being cleared, the full shift is valid and
more optimal. so only replace the shift by mem when it would be less
than mem.
musl commits:
8f5a820d147da36bcdbddd201b35d293699dacd8
122d67f846cb0be2c9e1c3880db9eb9545bbe38c
Obtained from:musl
MFC after:2 weeks
Modified:
head/lib/libc/string/memmem.c
Modified: head/lib/libc/string/memmem.c
==
--- head/lib/libc/string/memmem.c Wed Nov 18 22:01:34 2020
(r367821)
+++ head/lib/libc/string/memmem.c Thu Nov 19 00:02:12 2020
(r367822)
@@ -153,8 +153,8 @@ twoway_memmem(const unsigned char *h, const unsigned c
if (BITOP(byteset, h[l - 1], &)) {
k = l - shift[h[l - 1]];
if (k) {
- if (mem0 && mem && k < p)
- k = l - p;
+ if (k < mem)
+ k = mem;
h += k;
mem = 0;
continue;
___
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: r367821 - head/lib/libc/string
Author: emaste
Date: Wed Nov 18 22:01:34 2020
New Revision: 367821
URL: https://svnweb.freebsd.org/changeset/base/367821
Log:
clang-format libc string functions imported from musl
We have adopted these and don't consider them 'contrib' code, so bring
them closer to style(9). This is a followon to r315467 and r351700.
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/libc/string/memchr.c
head/lib/libc/string/memmem.c
head/lib/libc/string/strstr.c
Modified: head/lib/libc/string/memchr.c
==
--- head/lib/libc/string/memchr.c Wed Nov 18 21:26:14 2020
(r367820)
+++ head/lib/libc/string/memchr.c Wed Nov 18 22:01:34 2020
(r367821)
@@ -25,30 +25,35 @@
#include
__FBSDID("$FreeBSD$");
-#include
-#include
#include
+#include
+#include
#define SS (sizeof(size_t))
-#define ALIGN (sizeof(size_t)-1)
-#define ONES ((size_t)-1/UCHAR_MAX)
-#define HIGHS (ONES * (UCHAR_MAX/2+1))
-#define HASZERO(x) (((x)-ONES) & ~(x) & HIGHS)
+#define ALIGN (sizeof(size_t) - 1)
+#define ONES ((size_t)-1 / UCHAR_MAX)
+#define HIGHS (ONES * (UCHAR_MAX / 2 + 1))
+#define HASZERO(x) (((x)-ONES) & ~(x))
-void *memchr(const void *src, int c, size_t n)
+void *
+memchr(const void *src, int c, size_t n)
{
const unsigned char *s = src;
c = (unsigned char)c;
#ifdef __GNUC__
- for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--);
+ for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--)
+ ;
if (n && *s != c) {
typedef size_t __attribute__((__may_alias__)) word;
const word *w;
size_t k = ONES * c;
- for (w = (const void *)s; n>=SS && !HASZERO(*w^k); w++, n-=SS);
+ for (w = (const void *)s; n >= SS && !HASZERO(*w ^ k);
+w++, n -= SS)
+ ;
s = (const void *)w;
}
#endif
- for (; n && *s != c; s++, n--);
+ for (; n && *s != c; s++, n--)
+ ;
return n ? (void *)s : 0;
}
Modified: head/lib/libc/string/memmem.c
==
--- head/lib/libc/string/memmem.c Wed Nov 18 21:26:14 2020
(r367820)
+++ head/lib/libc/string/memmem.c Wed Nov 18 22:01:34 2020
(r367821)
@@ -25,40 +25,47 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
+#include
-static char *twobyte_memmem(const unsigned char *h, size_t k, const unsigned
char *n)
+static char *
+twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
{
- uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
- for (h+=2, k-=2; k; k--, hw = hw<<8 | *h++)
- if (hw == nw) return (char *)h-2;
- return hw == nw ? (char *)h-2 : 0;
+ uint16_t nw = n[0] << 8 | n[1], hw = h[0] << 8 | h[1];
+ for (h += 2, k -= 2; k; k--, hw = hw << 8 | *h++)
+ if (hw == nw)
+ return (char *)h - 2;
+ return hw == nw ? (char *)h - 2 : 0;
}
-static char *threebyte_memmem(const unsigned char *h, size_t k, const unsigned
char *n)
+static char *
+threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
{
- uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
- uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
- for (h+=3, k-=3; k; k--, hw = (hw|*h++)<<8)
- if (hw == nw) return (char *)h-3;
- return hw == nw ? (char *)h-3 : 0;
+ uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8;
+ uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8;
+ for (h += 3, k -= 3; k; k--, hw = (hw | *h++) << 8)
+ if (hw == nw)
+ return (char *)h - 3;
+ return hw == nw ? (char *)h - 3 : 0;
}
-static char *fourbyte_memmem(const unsigned char *h, size_t k, const unsigned
char *n)
+static char *
+fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
{
- uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
- uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
- for (h+=4, k-=4; k; k--, hw = hw<<8 | *h++)
- if (hw == nw) return (char *)h-4;
- return hw == nw ? (char *)h-4 : 0;
+ uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
+ uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
+ for (h += 4, k -= 4; k; k--, hw = hw << 8 | *h++)
+ if (hw == nw)
+ return (char *)h - 4;
+ return hw == nw ? (char *)h - 4 : 0;
}
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#define MIN(a,b) ((a)<(b)?(a):(b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define BITOP(a,b,op) \
- ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a
+#define BITOP(a, b, op) \
+ ((a)[(size_t)(b) / (8 * sizeof
svn commit: r367772 - in head: share/man/man4 sys/dev/usb sys/dev/usb/serial
Author: emaste
Date: Tue Nov 17 18:28:20 2020
New Revision: 367772
URL: https://svnweb.freebsd.org/changeset/base/367772
Log:
uplcom: add ATen/Prolific USB-232 Controller D USB ID
PR: 251166
Submitted by: marcus
MFC after:2 weeks
Modified:
head/share/man/man4/uplcom.4
head/sys/dev/usb/serial/uplcom.c
head/sys/dev/usb/usbdevs
Modified: head/share/man/man4/uplcom.4
==
--- head/share/man/man4/uplcom.4Tue Nov 17 17:12:28 2020
(r367771)
+++ head/share/man/man4/uplcom.4Tue Nov 17 18:28:20 2020
(r367772)
@@ -82,6 +82,8 @@ Anchor Serial adapter
.It
ATEN UC-232A
.It
+ATEN UC-232B
+.It
BAFO BF-800 and BF-810
.It
Belkin F5U257
@@ -133,6 +135,8 @@ PLANEX USB-RS232 URS-03
Prolific Generic USB-Serial Adapters
.It
Prolific Pharos USB-Serial Adapter
+.It
+Prolific USB-Serial Controller D
.It
RATOC REX-USB60
.It
Modified: head/sys/dev/usb/serial/uplcom.c
==
--- head/sys/dev/usb/serial/uplcom.cTue Nov 17 17:12:28 2020
(r367771)
+++ head/sys/dev/usb/serial/uplcom.cTue Nov 17 18:28:20 2020
(r367772)
@@ -260,6 +260,7 @@ static const STRUCT_USB_HOST_ID uplcom_devs[] = {
UPLCOM_DEV(ALCOR, AU9720), /* Alcor AU9720 USB 2.0-RS232 */
UPLCOM_DEV(ANCHOR, SERIAL), /* Anchor Serial adapter */
UPLCOM_DEV(ATEN, UC232A), /* PLANEX USB-RS232 URS-03 */
+ UPLCOM_DEV(ATEN, UC232B), /* Prolific USB-RS232
Controller D */
UPLCOM_DEV(BELKIN, F5U257), /* Belkin F5U257 USB to Serial
*/
UPLCOM_DEV(COREGA, CGUSBRS232R),/* Corega CG-USBRS232R */
UPLCOM_DEV(EPSON, CRESSI_EDY), /* Cressi Edy diving computer */
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsTue Nov 17 17:12:28 2020(r367771)
+++ head/sys/dev/usb/usbdevsTue Nov 17 18:28:20 2020(r367772)
@@ -1275,6 +1275,7 @@ product ATEN UC1284 0x2001 Parallel printer
product ATEN UC10T 0x2002 10Mbps Ethernet
product ATEN UC110T0x2007 UC-110T Ethernet
product ATEN UC232A0x2008 Serial
+product ATEN UC232B0x2022 Serial
product ATEN UC210T0x2009 UC-210T Ethernet
product ATEN DSB650C 0x4000 DSB-650C
___
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: r367649 - head/share/man/man5
Author: emaste Date: Fri Nov 13 19:09:21 2020 New Revision: 367649 URL: https://svnweb.freebsd.org/changeset/base/367649 Log: src.conf.5: regenerate after r367577 INIT_ALL_ZERO / INIT_ALL_PATTERN Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Fri Nov 13 19:08:42 2020 (r367648) +++ head/share/man/man5/src.conf.5 Fri Nov 13 19:09:21 2020 (r367649) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 4, 2020 +.Dd November 13, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -757,6 +757,15 @@ Set to not build .Xr inetd 8 . .It Va WITHOUT_INET_SUPPORT Set to build libraries, programs, and kernel modules without IPv4 support. +.It Va WITH_INIT_ALL_PATTERN +Set to build the base system or kernel with stack variables initialized to +.Pq compiler defined +debugging patterns on function entry. +This option requires the clang compiler. +.It Va WITH_INIT_ALL_ZERO +Set to build the base system or kernel with stack variables initialized +to zero on function entry. +This option requires that the clang compiler be used. .It Va WITHOUT_INSTALLLIB Set this to not install optional libraries. For example, when creating a ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367648 - head/share/mk
Author: emaste
Date: Fri Nov 13 19:08:42 2020
New Revision: 367648
URL: https://svnweb.freebsd.org/changeset/base/367648
Log:
Fix `make makeman` after r367577
WITH_INIT_ALL_ZERO and WITH_INIT_ALL_PATTERN are mutually exclusive.
The .error when they were both set broke makeman so demote it to a
warning (and presumably the compiler will fail on an error later on).
We could improve this to make one take precedence but this is sufficient
for now.
MFC with: r367577
Sponsored by: The FreeBSD Foundation
Modified:
head/share/mk/bsd.opts.mk
Modified: head/share/mk/bsd.opts.mk
==
--- head/share/mk/bsd.opts.mk Fri Nov 13 18:50:24 2020(r367647)
+++ head/share/mk/bsd.opts.mk Fri Nov 13 19:08:42 2020(r367648)
@@ -88,7 +88,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
.include
.if ${MK_INIT_ALL_PATTERN} == "yes" && ${MK_INIT_ALL_ZERO} == "yes"
-.error WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO are mutually exclusive.
+.warning WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO are mutually exclusive.
.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: r367646 - head/sys/conf
Author: emaste
Date: Fri Nov 13 18:34:13 2020
New Revision: 367646
URL: https://svnweb.freebsd.org/changeset/base/367646
Log:
Disable kernel INIT_ALL_ZERO on amd64
It is currently incompatible with kernel ifunc memset.
PR: 251083
MFC with: r367577
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/kern.opts.mk
Modified: head/sys/conf/kern.opts.mk
==
--- head/sys/conf/kern.opts.mk Fri Nov 13 18:25:07 2020(r367645)
+++ head/sys/conf/kern.opts.mk Fri Nov 13 18:34:13 2020(r367646)
@@ -68,6 +68,11 @@ __DEFAULT_NO_OPTIONS = \
# affected by KERNEL_SYMBOLS, FORMAT_EXTENSIONS, CTF and SSP.
# Things that don't work based on the CPU
+.if ${MACHINE} == "amd64"
+# PR251083 conflict between INIT_ALL_ZERO and ifunc memset
+BROKEN_OPTIONS+= INIT_ALL_ZERO
+.endif
+
.if ${MACHINE_CPUARCH} == "arm"
. if ${MACHINE_ARCH:Marmv[67]*} == ""
BROKEN_OPTIONS+= CDDL ZFS
___
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: r367645 - head/sys/netinet
Author: emaste
Date: Fri Nov 13 18:25:07 2020
New Revision: 367645
URL: https://svnweb.freebsd.org/changeset/base/367645
Log:
ip_fastfwd: style(9) tidy for r367628
Discussed with: gnn
MFC with: r367628
Modified:
head/sys/netinet/ip_fastfwd.c
head/sys/netinet/ip_input.c
Modified: head/sys/netinet/ip_fastfwd.c
==
--- head/sys/netinet/ip_fastfwd.c Fri Nov 13 16:56:03 2020
(r367644)
+++ head/sys/netinet/ip_fastfwd.c Fri Nov 13 18:25:07 2020
(r367645)
@@ -131,17 +131,18 @@ ip_redir_alloc(struct mbuf *m, struct nhop_object *nh,
*/
m_free(mcopy);
return (NULL);
- }
+ }
mcopy->m_len = min(ntohs(ip->ip_len), M_TRAILINGSPACE(mcopy));
mcopy->m_pkthdr.len = mcopy->m_len;
m_copydata(m, 0, mcopy->m_len, mtod(mcopy, caddr_t));
-
+
if (nh != NULL &&
((nh->nh_flags & (NHF_REDIRECT|NHF_DEFAULT)) == 0)) {
struct in_ifaddr *nh_ia = (struct in_ifaddr *)(nh->nh_ifa);
u_long src = ntohl(ip->ip_src.s_addr);
-
- if (nh_ia != NULL && (src & nh_ia->ia_subnetmask) ==
nh_ia->ia_subnet) {
+
+ if (nh_ia != NULL &&
+ (src & nh_ia->ia_subnetmask) == nh_ia->ia_subnet) {
if (nh->nh_flags & NHF_GATEWAY)
*addr = nh->gw4_sa.sin_addr.s_addr;
else
Modified: head/sys/netinet/ip_input.c
==
--- head/sys/netinet/ip_input.c Fri Nov 13 16:56:03 2020(r367644)
+++ head/sys/netinet/ip_input.c Fri Nov 13 18:25:07 2020(r367645)
@@ -111,7 +111,7 @@ SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding,
_NAME(ipforwarding), 0,
"Enable IP forwarding between interfaces");
-/*
+/*
* Respond with an ICMP host redirect when we forward a packet out of
* the same interface on which it was received. See RFC 792.
*/
___
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: r367489 - stable/12/usr.sbin/mergemaster
Author: emaste
Date: Sun Nov 8 17:10:12 2020
New Revision: 367489
URL: https://svnweb.freebsd.org/changeset/base/367489
Log:
MFC r367042: mergemaster: Clarify installed and updated versions
Describe "diff installed new" as "Displaying differences between
installed and new." Previously mergemaster described them in the
opposite order.
PR: 249214
Reported by: Yuri Victorovich
Modified:
stable/12/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/mergemaster/mergemaster.sh
==
--- stable/12/usr.sbin/mergemaster/mergemaster.sh Sun Nov 8 15:54:59
2020(r367488)
+++ stable/12/usr.sbin/mergemaster/mergemaster.sh Sun Nov 8 17:10:12
2020(r367489)
@@ -143,7 +143,7 @@ diff_loop () {
echo '
== '
echo ''
(
- echo " *** Displaying differences between ${COMPFILE} and installed
version:"
+ echo " *** Displaying differences between installed version and
${COMPFILE}:"
echo ''
diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}"
"${COMPFILE}"
) | ${PAGER}
___
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: r367304 - in head: share/man/man5 share/mk tools/build/options usr.bin usr.bin/clang usr.bin/clang/llvm-cxxfilt
On Wed, 4 Nov 2020 at 12:40, Dimitry Andric wrote: > > I think this guidance originates from the world of embedded systems, > where storage size is a more limiting factor than on recent desktop or > server class machines. On my desktops I won't care too much whether an > executable is 1M or 100MB, but on a small SD card things add up very > quickly! Indeed, although even there the lowest-capacity SD card available in the market keeps growing. Most of the tool chain is irrelevant for embedded systems and the size makes little difference, but there are some tool chain components that may be of interest. We don't expect Clang on a constrained target, but might want find size, or strings. ___ 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: r367304 - in head: share/man/man5 share/mk tools/build/options usr.bin usr.bin/clang usr.bin/clang/llvm-cxxfilt
On Tue, 3 Nov 2020 at 14:57, Dimitry Andric wrote: > > Author: dim > Date: Tue Nov 3 19:57:28 2020 > New Revision: 367304 > URL: https://svnweb.freebsd.org/changeset/base/367304 > > Log: > Add WITH_LLVM_CXXFILT option to install llvm-cxxfilt as c++filt A previous argument against the LLVM versions of binutils replacements is that they were excessively large, but this does not look like a substantial problem here. LLVM's cxxfilt is indeed many times the size of ELF Tool Chain's, but still small enough that for a tool chain component it's not a concern, in my opinion. ELF Tool Chain: $ size obj/c++filt text databss dec hex filename 66966 1008 8400 76374 0x12a56 obj/c++filt LLVM: $ size obj/llvm-cxxfilt text databss dec hex filename 378138 1756 9165 389059 0x5efc3 obj/llvm-cxxfilt A remaining issue is that both nm and addr2line can also demangle C++ symbols. ___ 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: r367321 - head/sys/amd64/linux
On Wed, 4 Nov 2020 at 07:10, Kristof Provost wrote: > > > And why you just abandoned the differential [1]? > > > Probably because it timed out. The review had been pending since August. > Arguably the differential link should have been included as well, but > it’s hardly important in this case. I don’t think we have explicit > policies about this. We probably should. Yes, it's still worth including the phab URL so that it closes automatically and so that others can see how long it was open for. I take no issue with the change itself. ___ 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: r367289 - stable/12/sys/arm64/conf
Author: emaste Date: Tue Nov 3 01:38:16 2020 New Revision: 367289 URL: https://svnweb.freebsd.org/changeset/base/367289 Log: MFC r366902: arm64: add uhci to GENERIC uhci is (or, can be) used by VMware ESXi-Arm. PR: 250308 Reported by: Vincent Milum Jr Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/arm64/conf/GENERIC Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/arm64/conf/GENERIC == --- stable/12/sys/arm64/conf/GENERICTue Nov 3 01:19:13 2020 (r367288) +++ stable/12/sys/arm64/conf/GENERICTue Nov 3 01:38:16 2020 (r367289) @@ -189,6 +189,7 @@ device rk_typec_phy# Rockchip TypeC PHY device dwcotg # DWC OTG controller device musb# Mentor Graphics USB OTG controller device ohci# OHCI USB interface +device uhci# UHCI USB interface device ehci# EHCI USB interface (USB 2.0) device ehci_mv # Marvell EHCI USB interface device xhci# XHCI PCI->USB interface (USB 3.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: r367260 - in stable/12/sys/modules: . vmware
Author: emaste
Date: Mon Nov 2 00:45:40 2020
New Revision: 367260
URL: https://svnweb.freebsd.org/changeset/base/367260
Log:
MFC r366861: build vmware modules on arm64
Modified:
stable/12/sys/modules/Makefile
stable/12/sys/modules/vmware/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/modules/Makefile
==
--- stable/12/sys/modules/Makefile Sun Nov 1 22:50:21 2020
(r367259)
+++ stable/12/sys/modules/Makefile Mon Nov 2 00:45:40 2020
(r367260)
@@ -527,6 +527,7 @@ _mthca= mthca
_mlx4ib= mlx4ib
_mlx5ib= mlx5ib
.endif
+_vmware= vmware
.endif
.if ${MK_NAND} != "no" || defined(ALL_MODULES)
@@ -668,7 +669,6 @@ _scsi_low= scsi_low
_speaker= speaker
_splash= splash
_sppp= sppp
-_vmware= vmware
_wbwd= wbwd
_wi= wi
_xe= xe
Modified: stable/12/sys/modules/vmware/Makefile
==
--- stable/12/sys/modules/vmware/Makefile Sun Nov 1 22:50:21 2020
(r367259)
+++ stable/12/sys/modules/vmware/Makefile Mon Nov 2 00:45:40 2020
(r367260)
@@ -23,6 +23,9 @@
# SUCH DAMAGE.
#
-SUBDIR= vmci vmxnet3
+SUBDIR= vmxnet3
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+SUBDIR+= vmci
+.endif
.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: r367209 - in head: contrib/elftoolchain/readelf usr.bin/readelf
Author: emaste
Date: Sat Oct 31 15:27:45 2020
New Revision: 367209
URL: https://svnweb.freebsd.org/changeset/base/367209
Log:
readelf: Add -z decompression support
Compatible with GNU readelf, -z decompresses sections displayed by
-x or -p.
ELF Tool Chain ticket #555
https://sourceforge.net/p/elftoolchain/tickets/555/
Submitted by: Tiger Gao
Reviewed by: markj
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D26909
Modified:
head/contrib/elftoolchain/readelf/readelf.1
head/contrib/elftoolchain/readelf/readelf.c
head/usr.bin/readelf/Makefile
Modified: head/contrib/elftoolchain/readelf/readelf.1
==
--- head/contrib/elftoolchain/readelf/readelf.1 Sat Oct 31 15:25:41 2020
(r367208)
+++ head/contrib/elftoolchain/readelf/readelf.1 Sat Oct 31 15:27:45 2020
(r367209)
@@ -24,7 +24,7 @@
.\"
.\" $Id: readelf.1 3753 2019-06-28 01:13:13Z emaste $
.\"
-.Dd June 27, 2019
+.Dd October 31, 2020
.Dt READELF 1
.Os
.Sh NAME
@@ -49,6 +49,7 @@
.Fl -debug-dump Ns Op Ns = Ns Ar long-option-name , Ns ...
.Oc
.Op Fl x Ar section | Fl -hex-dump Ns = Ns Ar section
+.Op Fl z | Fl -decompress
.Op Fl A | Fl -arch-specific
.Op Fl D | Fl -use-dynamic
.Op Fl H | Fl -help
@@ -157,6 +158,13 @@ Display the contents of the specified section in hexad
The argument
.Ar section
should be the name of a section or a numeric section index.
+.It Fl z | Fl -decompress
+Decompress contents of sections specified by
+.Fl x
+or
+.Fl p
+before displaying.
+If the specified section is not compressed, it is displayed as is.
.It Fl A | Fl -arch-specific
This option is accepted but is currently unimplemented.
.It Fl D | Fl -use-dynamic
Modified: head/contrib/elftoolchain/readelf/readelf.c
==
--- head/contrib/elftoolchain/readelf/readelf.c Sat Oct 31 15:25:41 2020
(r367208)
+++ head/contrib/elftoolchain/readelf/readelf.c Sat Oct 31 15:27:45 2020
(r367209)
@@ -40,12 +40,14 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
@@ -87,6 +89,7 @@ ELFTC_VCSID("$Id: readelf.c 3769 2019-06-29 15:15:02Z
#defineRE_WW 0x0004
#defineRE_W0x0008
#defineRE_X0x0010
+#defineRE_Z0x0020
/*
* dwarf dump options.
@@ -189,6 +192,7 @@ static struct option longopts[] = {
{"arch-specific", no_argument, NULL, 'A'},
{"archive-index", no_argument, NULL, 'c'},
{"debug-dump", optional_argument, NULL, OPTION_DEBUG_DUMP},
+ {"decompress", no_argument, 0, 'z'},
{"dynamic", no_argument, NULL, 'd'},
{"file-header", no_argument, NULL, 'h'},
{"full-section-name", no_argument, NULL, 'N'},
@@ -6900,17 +6904,96 @@ get_symbol_value(struct readelf *re, int symtab, int i
return (sym.st_value);
}
+/*
+ * Decompress a data section if needed (using ZLIB).
+ * Returns true if sucessful, false otherwise.
+ */
+static bool decompress_section(struct section *s,
+unsigned char *compressed_data_buffer, uint64_t compressed_size,
+unsigned char **ret_buf, uint64_t *ret_sz)
+{
+ GElf_Shdr sh;
+
+ if (gelf_getshdr(s->scn, ) == NULL)
+ errx(EXIT_FAILURE, "gelf_getshdr() failed: %s", elf_errmsg(-1));
+
+ if (sh.sh_flags & SHF_COMPRESSED) {
+ int ret;
+ GElf_Chdr chdr;
+ Elf64_Xword inflated_size;
+ unsigned char *uncompressed_data_buffer = NULL;
+ Elf64_Xword uncompressed_size;
+ z_stream strm;
+
+ if (gelf_getchdr(s->scn, ) == NULL)
+ errx(EXIT_FAILURE, "gelf_getchdr() failed: %s",
elf_errmsg(-1));
+ if (chdr.ch_type != ELFCOMPRESS_ZLIB) {
+ warnx("unknown compression type: %d", chdr.ch_type);
+ return (false);
+ }
+
+ inflated_size = 0;
+ uncompressed_size = chdr.ch_size;
+ uncompressed_data_buffer = malloc(uncompressed_size);
+ compressed_data_buffer += sizeof(chdr);
+ compressed_size -= sizeof(chdr);
+
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ strm.avail_in = compressed_size;
+ strm.avail_out = uncompressed_size;
+ ret = inflateInit();
+
+ if (ret != Z_OK)
+ goto fail;
+ /*
+* The section can contain several compressed buffers,
+* so decompress in a loop until all data is inflated.
+*/
+ while (inflated_size < compressed_size) {
+ strm.next_in =
svn commit: r367125 - head
Author: emaste Date: Thu Oct 29 02:02:30 2020 New Revision: 367125 URL: https://svnweb.freebsd.org/changeset/base/367125 Log: CI: switch to qemu42 package It appears that booting FreeBSD from qemu's synthesized FAT filesystem broke somehow in a recent qemu-devel update. qemu42 works so switch to it for now. Modified: head/.cirrus.yml Modified: head/.cirrus.yml == --- head/.cirrus.ymlThu Oct 29 00:30:38 2020(r367124) +++ head/.cirrus.ymlThu Oct 29 02:02:30 2020(r367125) @@ -14,7 +14,7 @@ task: only_if: $CIRRUS_BRANCH != 'svn_head' timeout_in: 120m install_script: - - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 llvm11 + - pkg install -y qemu42 uefi-edk2-qemu-x86_64 llvm11 setup_user_script: - pw useradd user - mkdir -p /usr/obj/$(pwd -P) ___ 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: r367066 - head/sys/compat/linux
On Mon, 26 Oct 2020 at 14:03, Mateusz Guzik wrote: > > Author: mjg > Date: Mon Oct 26 18:03:50 2020 > New Revision: 367066 > URL: https://svnweb.freebsd.org/changeset/base/367066 > > Log: > linux: silence renameat2 flags warning What flag(s) are missing? ___ 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: r366993 - head/sys/net
On Sat, 24 Oct 2020 at 06:46, Konstantin Belousov wrote: > > > -#include > sys/systm.h should come right after sys/param.h. These two headers are > exceptions to the normal alphabetical rule. style(9) claims that sys/types.h and sys/param.h are the special headers: Kernel include files (sys/*.h) come first. If is needed for __FBSDID(), include it first. If either or is needed, include it before other include files. ( includes ; do not include both.) The remaining kernel headers should be sorted alphabetically. We should add sys/systm.h to style(9) as another special case if necessary. > > -infiniband_ipv4_multicast_map(uint32_t addr, > > -const uint8_t *broadcast, uint8_t *buf) > > +infiniband_ipv4_multicast_map( > > +uint32_t addr, const uint8_t *broadcast, uint8_t *buf) > And this is arguably regression, we fill line up to columns 72-80 before > splitting to the continuation line. I agree with kib and arichardson has a clang-format fix for this in D26978. That said I can see an argument for it being easier to read with all function args on the same line. > > - m = NULL; /* mbuf is consumed by > > resolver */ > > + m = NULL; /* mbuf is consumed by resolver */ > This is a regression as well, in-line comment is typically preceeded by tab. I suspect this is hard to do in an automated fashion in a way that's sensible overall (i.e., lining up inline comments on different lines). This could be a case where we decide to just accept it when someone uses clang-format on new code, and just discourage sweeping clang-format changes on existing code. ___ 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: r367043 - head/libexec/rc/rc.d
Author: emaste
Date: Sun Oct 25 18:27:21 2020
New Revision: 367043
URL: https://svnweb.freebsd.org/changeset/base/367043
Log:
rc.d/syscons: remove spaces before tab
Modified:
head/libexec/rc/rc.d/syscons
Modified: head/libexec/rc/rc.d/syscons
==
--- head/libexec/rc/rc.d/sysconsSun Oct 25 18:06:45 2020
(r367042)
+++ head/libexec/rc/rc.d/sysconsSun Oct 25 18:27:21 2020
(r367043)
@@ -151,7 +151,7 @@ kbdcontrol_load_keymap()
if [ -n "${keymap_vt}" ]; then
errmsg=`kbdcontrol < ${kbddev} -l ${keymap_vt} 2>&1`
if [ -z "${errmsg}" ]; then
- _sc_keymap_msg="New keymap: In /etc/rc.conf
replace 'keymap=${keymap}' by 'keymap=${keymap_vt}'"
+ _sc_keymap_msg="New keymap: In /etc/rc.conf
replace 'keymap=${keymap}' by 'keymap=${keymap_vt}'"
fi
else
_sc_keymap_msg="No replacement found for keymap
'${keymap}'.
___
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: r367042 - head/usr.sbin/mergemaster
Author: emaste
Date: Sun Oct 25 18:06:45 2020
New Revision: 367042
URL: https://svnweb.freebsd.org/changeset/base/367042
Log:
mergemaster: Clarify installed and updated versions
Describe "diff installed new" as "Displaying differences between
installed and new." Previously mergemaster described them in the
opposite order.
PR: 249214
Reported by: Yuri Victorovich
MFC after:2 weeks
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shSun Oct 25 16:58:48 2020
(r367041)
+++ head/usr.sbin/mergemaster/mergemaster.shSun Oct 25 18:06:45 2020
(r367042)
@@ -143,7 +143,7 @@ diff_loop () {
echo '
== '
echo ''
(
- echo " *** Displaying differences between ${COMPFILE} and installed
version:"
+ echo " *** Displaying differences between installed version and
${COMPFILE}:"
echo ''
diff ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}"
"${COMPFILE}"
) | ${PAGER}
___
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: r366993 - head/sys/net
On Sat, 24 Oct 2020 at 11:27, Warner Losh wrote: > >> Given we already have nice .clang-format, that does most of the job, maybe >> it's worth considering looking into tweaking it further to fix this part? >> It would be nice if we could finally offload all formatting issues to the >> tool and focus on the actual code :-) > > It would be nice if it produced one of the style(9) acceptable formats > without disrupting things already acceptable. That's been the big problem > with the tweaks to date... some things are fixed, others break. It's getting > a lot closer, though Upstream clang-format comes with a script that can integrate with git, adding a `git clang-format` command. It will apply formatting to modified lines, leaving unchanged ones alone. ___ 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: r366977 - in head: contrib/elftoolchain/libelf lib/libelf
Author: emaste
Date: Fri Oct 23 16:35:23 2020
New Revision: 366977
URL: https://svnweb.freebsd.org/changeset/base/366977
Log:
libelf: add compression header support
GNU and Oracle libelf implementations added support for section
compression, intended to reduce the size of DWARF debug info (which
might be an order of magnitude larger than the code).
There are two compressed ELF section formats:
1. Old GNU - sections are renmaed to start with 'z'. Section contains
a magic number, uncompressed size, and compressed data.
2. Oracle and New GNU - compressed sections use the SHF_COMPRESSED flag.
The compression header contains the compression type, uncompressed
size, and uncompressed alignment.
The second style is preferred and this change implements only that one.
Submitted by: Tiger Gao
Reviewed by: markj
MFC after:2 weeks
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D24566
Added:
head/contrib/elftoolchain/libelf/gelf_chdr.c (contents, props changed)
head/contrib/elftoolchain/libelf/gelf_getchdr.3 (contents, props changed)
head/contrib/elftoolchain/libelf/libelf_chdr.c (contents, props changed)
Modified:
head/contrib/elftoolchain/libelf/Version.map
head/contrib/elftoolchain/libelf/_libelf.h
head/contrib/elftoolchain/libelf/gelf.3
head/contrib/elftoolchain/libelf/gelf.h
head/contrib/elftoolchain/libelf/libelf.h
head/lib/libelf/Makefile
Modified: head/contrib/elftoolchain/libelf/Version.map
==
--- head/contrib/elftoolchain/libelf/Version.mapFri Oct 23 15:56:22
2020(r366976)
+++ head/contrib/elftoolchain/libelf/Version.mapFri Oct 23 16:35:23
2020(r366977)
@@ -91,6 +91,13 @@ global:
gelf_update_symshndx;
gelf_xlatetof;
gelf_xlatetom;
+};
+
+R1.1 {
+global:
+ elf32_getchdr;
+ elf64_getchdr;
+ gelf_getchdr;
local:
*;
-};
+} R1.0;
Modified: head/contrib/elftoolchain/libelf/_libelf.h
==
--- head/contrib/elftoolchain/libelf/_libelf.h Fri Oct 23 15:56:22 2020
(r366976)
+++ head/contrib/elftoolchain/libelf/_libelf.h Fri Oct 23 16:35:23 2020
(r366977)
@@ -220,6 +220,7 @@ size_t _libelf_fsize(Elf_Type _t, int _elfclass, unsig
size_t count);
_libelf_translator_function *_libelf_get_translator(Elf_Type _t,
int _direction, int _elfclass, int _elfmachine);
+void *_libelf_getchdr(Elf_Scn *_e, int _elfclass);
void *_libelf_getphdr(Elf *_e, int _elfclass);
void *_libelf_getshdr(Elf_Scn *_scn, int _elfclass);
void _libelf_init_elf(Elf *_e, Elf_Kind _kind);
Modified: head/contrib/elftoolchain/libelf/gelf.3
==
--- head/contrib/elftoolchain/libelf/gelf.3 Fri Oct 23 15:56:22 2020
(r366976)
+++ head/contrib/elftoolchain/libelf/gelf.3 Fri Oct 23 16:35:23 2020
(r366977)
@@ -23,7 +23,7 @@
.\"
.\" $Id: gelf.3 3743 2019-06-12 19:36:30Z jkoshy $
.\"
-.Dd June 12, 2019
+.Dd October 23, 2020
.Dt GELF 3
.Os
.Sh NAME
@@ -45,6 +45,8 @@ The GElf API defines the following class-independent d
.Bl -tag -width GElf_Sxword
.It Vt GElf_Addr
A representation of ELF addresses.
+.It Vt GElf_Chdr
+A class-independent representation of an ELF Compression Header.
.It Vt GElf_Dyn
A class-independent representation of ELF
.Sy .dynamic
@@ -144,6 +146,8 @@ native representation.
.El
.It "Retrieving ELF Data"
.Bl -tag -compact -width indent
+.It Fn gelf_getchdr
+Retrieve an ELF Compression Header from the underlying ELF descriptor.
.It Fn gelf_getdyn
Retrieve an ELF
.Sy .dynamic
Modified: head/contrib/elftoolchain/libelf/gelf.h
==
--- head/contrib/elftoolchain/libelf/gelf.h Fri Oct 23 15:56:22 2020
(r366976)
+++ head/contrib/elftoolchain/libelf/gelf.h Fri Oct 23 16:35:23 2020
(r366977)
@@ -39,6 +39,7 @@ typedef Elf64_Sxword GElf_Sxword;/* Signed long words
typedef Elf64_Word GElf_Word; /* Unsigned words (32 bit) */
typedef Elf64_XwordGElf_Xword; /* Unsigned long words (64 bit) */
+typedef Elf64_Chdr GElf_Chdr; /* Compressed section header */
typedef Elf64_Dyn GElf_Dyn; /* ".dynamic" section entries */
typedef Elf64_Ehdr GElf_Ehdr; /* ELF header */
typedef Elf64_Phdr GElf_Phdr; /* Program header */
@@ -73,6 +74,7 @@ extern "C" {
long gelf_checksum(Elf *_elf);
size_t gelf_fsize(Elf *_elf, Elf_Type _type, size_t _count,
unsigned int _version);
+GElf_Chdr *gelf_getchdr(Elf_Scn *_scn, GElf_Chdr *_dst);
intgelf_getclass(Elf *_elf);
GElf_Dyn *gelf_getdyn(Elf_Data *_data, int _index,
Re: svn commit: r366936 - head/sys/net
On Fri, 23 Oct 2020 at 07:27, Hans Petter Selasky wrote: > > Do we have a script or tool, which can do this? Clang-format can do it; have a look at the IncludeCategories in .clang-format at the top of the tree to see the current rule set for includes. ___ 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: r366902 - head/sys/arm64/conf
Author: emaste Date: Tue Oct 20 20:11:29 2020 New Revision: 366902 URL: https://svnweb.freebsd.org/changeset/base/366902 Log: arm64: add uhci to GENERIC uhci is (or, can be) used by VMware ESXi-Arm. PR: 250308 Reported by: Vincent Milum Jr MFC after:2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/arm64/conf/GENERIC Modified: head/sys/arm64/conf/GENERIC == --- head/sys/arm64/conf/GENERIC Tue Oct 20 17:50:18 2020(r366901) +++ head/sys/arm64/conf/GENERIC Tue Oct 20 20:11:29 2020(r366902) @@ -227,6 +227,7 @@ device rk_typec_phy# Rockchip TypeC PHY device dwcotg # DWC OTG controller device musb# Mentor Graphics USB OTG controller device ohci# OHCI USB interface +device uhci# UHCI USB interface device ehci# EHCI USB interface (USB 2.0) device ehci_mv # Marvell EHCI USB interface device xhci# XHCI USB interface (USB 3.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: r366861 - in head/sys/modules: . vmware
Author: emaste
Date: Mon Oct 19 20:43:29 2020
New Revision: 366861
URL: https://svnweb.freebsd.org/changeset/base/366861
Log:
build vmware modules on arm64
pvscsi and vmxnet3 build and work. Exclude vmci for now as it contains
x86-specific assembly.
Reported by: Vincent Milum Jr
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/modules/Makefile
head/sys/modules/vmware/Makefile
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Mon Oct 19 20:42:01 2020(r366860)
+++ head/sys/modules/Makefile Mon Oct 19 20:43:29 2020(r366861)
@@ -511,6 +511,7 @@ _mthca= mthca
_mlx4ib= mlx4ib
_mlx5ib= mlx5ib
.endif
+_vmware= vmware
.endif
.if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
@@ -633,7 +634,6 @@ _safe= safe
_speaker= speaker
_splash= splash
_sppp= sppp
-_vmware= vmware
_wbwd= wbwd
_wi= wi
Modified: head/sys/modules/vmware/Makefile
==
--- head/sys/modules/vmware/MakefileMon Oct 19 20:42:01 2020
(r366860)
+++ head/sys/modules/vmware/MakefileMon Oct 19 20:43:29 2020
(r366861)
@@ -23,6 +23,8 @@
# SUCH DAMAGE.
#
-SUBDIR= pvscsi vmci vmxnet3
-
+SUBDIR= pvscsi vmxnet3
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+SUBDIR+= vmci
+.endif
.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: r366847 - head/sys/vm
Author: emaste Date: Mon Oct 19 18:54:44 2020 New Revision: 366847 URL: https://svnweb.freebsd.org/changeset/base/366847 Log: uma: fix KTR message after r366840 Reported by: bz Sponsored by: The FreeBSD Foundation Modified: head/sys/vm/uma_core.c Modified: head/sys/vm/uma_core.c == --- head/sys/vm/uma_core.c Mon Oct 19 18:51:51 2020(r366846) +++ head/sys/vm/uma_core.c Mon Oct 19 18:54:44 2020(r366847) @@ -1427,7 +1427,7 @@ keg_drain_domain(uma_keg_t keg, int domain) LIST_INIT(); CTR4(KTR_UMA, "keg_drain %s(%p) domain %d free items: %u", - keg->uk_name, keg, i, dom->ud_free_items); + keg->uk_name, keg, domain, dom->ud_free_items); KEG_LOCK(keg, domain); ___ 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: r366726 - head/sys/conf
Author: emaste Date: Thu Oct 15 14:37:51 2020 New Revision: 366726 URL: https://svnweb.freebsd.org/changeset/base/366726 Log: move vmware pv drivers to sys/conf/files VMware now has arm64 support; move these to MI files in advance of building them on arm64. PR: 250308 Reported by: Vincent Milum Jr MFC after:1 week Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/files head/sys/conf/files.amd64 head/sys/conf/files.i386 Modified: head/sys/conf/files == --- head/sys/conf/files Thu Oct 15 14:17:45 2020(r366725) +++ head/sys/conf/files Thu Oct 15 14:37:51 2020(r366726) @@ -3455,6 +3455,18 @@ dev/virtio/random/virtio_random.coptional virtio_rand dev/virtio/console/virtio_console.coptionalvirtio_console dev/vkbd/vkbd.coptional vkbd dev/vmgenc/vmgenc_acpi.c optional acpi +dev/vmware/vmxnet3/if_vmx.coptional vmx +dev/vmware/vmci/vmci.c optional vmci +dev/vmware/vmci/vmci_datagram.coptional vmci +dev/vmware/vmci/vmci_doorbell.coptional vmci +dev/vmware/vmci/vmci_driver.c optional vmci +dev/vmware/vmci/vmci_event.c optional vmci +dev/vmware/vmci/vmci_hashtable.c optional vmci +dev/vmware/vmci/vmci_kernel_if.c optional vmci +dev/vmware/vmci/vmci_qpair.c optional vmci +dev/vmware/vmci/vmci_queue_pair.c optional vmci +dev/vmware/vmci/vmci_resource.coptional vmci +dev/vmware/pvscsi/pvscsi.c optional pvscsi dev/vr/if_vr.c optional vr pci dev/vt/colors/vt_termcolors.c optional vt dev/vt/font/vt_font_default.c optional vt Modified: head/sys/conf/files.amd64 == --- head/sys/conf/files.amd64 Thu Oct 15 14:17:45 2020(r366725) +++ head/sys/conf/files.amd64 Thu Oct 15 14:37:51 2020(r366726) @@ -378,18 +378,6 @@ dev/tpm/tpm_acpi.c optionaltpm acpi dev/tpm/tpm_isa.c optionaltpm isa dev/uart/uart_cpu_x86.coptionaluart dev/viawd/viawd.c optionalviawd -dev/vmware/vmxnet3/if_vmx.coptionalvmx -dev/vmware/vmci/vmci.c optionalvmci -dev/vmware/vmci/vmci_datagram.coptionalvmci -dev/vmware/vmci/vmci_doorbell.coptionalvmci -dev/vmware/vmci/vmci_driver.c optionalvmci -dev/vmware/vmci/vmci_event.c optionalvmci -dev/vmware/vmci/vmci_hashtable.c optionalvmci -dev/vmware/vmci/vmci_kernel_if.c optionalvmci -dev/vmware/vmci/vmci_qpair.c optionalvmci -dev/vmware/vmci/vmci_queue_pair.c optionalvmci -dev/vmware/vmci/vmci_resource.coptionalvmci -dev/vmware/pvscsi/pvscsi.c optionalpvscsi dev/vmd/vmd.c optionalvmd dev/vmd/vmd_bus.c optionalvmd_bus dev/wbwd/wbwd.coptionalwbwd Modified: head/sys/conf/files.i386 == --- head/sys/conf/files.i386Thu Oct 15 14:17:45 2020(r366725) +++ head/sys/conf/files.i386Thu Oct 15 14:37:51 2020(r366726) @@ -126,18 +126,6 @@ dev/tpm/tpm_acpi.c optional tpm acpi dev/tpm/tpm_isa.c optional tpm isa dev/uart/uart_cpu_x86.coptional uart dev/viawd/viawd.c optional viawd -dev/vmware/vmxnet3/if_vmx.coptional vmx -dev/vmware/vmci/vmci.c optionalvmci -dev/vmware/vmci/vmci_datagram.coptionalvmci -dev/vmware/vmci/vmci_doorbell.coptionalvmci -dev/vmware/vmci/vmci_driver.c optionalvmci -dev/vmware/vmci/vmci_event.c optionalvmci -dev/vmware/vmci/vmci_hashtable.c optionalvmci -dev/vmware/vmci/vmci_kernel_if.c optionalvmci -dev/vmware/vmci/vmci_qpair.c optionalvmci -dev/vmware/vmci/vmci_queue_pair.c optionalvmci -dev/vmware/vmci/vmci_resource.coptionalvmci -dev/vmware/pvscsi/pvscsi.c optionalpvscsi dev/acpi_support/acpi_wmi_if.m standard dev/wbwd/wbwd.coptional wbwd i386/acpica/acpi_machdep.c optional acpi ___ 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: r366705 - stable/12/sys/arm64/conf
Author: emaste Date: Wed Oct 14 15:26:19 2020 New Revision: 366705 URL: https://svnweb.freebsd.org/changeset/base/366705 Log: MFC r366313: Add cd device to arm64 GENERIC Big-iron arm64 machines might have a CD, possibly provided by some IPMI emulation. Modified: stable/12/sys/arm64/conf/GENERIC Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/arm64/conf/GENERIC == --- stable/12/sys/arm64/conf/GENERICWed Oct 14 14:51:11 2020 (r366704) +++ stable/12/sys/arm64/conf/GENERICWed Oct 14 15:26:19 2020 (r366705) @@ -154,6 +154,7 @@ device scbus device da # ATA/SCSI peripherals +device cd # CD device pass# Passthrough device (direct ATA/SCSI access) # NVM Express (NVMe) support ___ 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: r366596 - head/sys/modules/crypto
Author: emaste
Date: Sat Oct 10 01:13:14 2020
New Revision: 366596
URL: https://svnweb.freebsd.org/changeset/base/366596
Log:
modules/crypto: reenable assembly optimized skein implementation
r366344 corrected the optimized amd64 skein assembly implementation, so
we can now enable it again.
Also add a dependency on this Makefile for the skein_block object, so
that it will be rebuit (similar to r366362).
PR: 248221
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/modules/crypto/Makefile
Modified: head/sys/modules/crypto/Makefile
==
--- head/sys/modules/crypto/MakefileSat Oct 10 00:01:40 2020
(r366595)
+++ head/sys/modules/crypto/MakefileSat Oct 10 01:13:14 2020
(r366596)
@@ -28,14 +28,18 @@ SRCS+= sha1.c sha256c.c sha512c.c
SRCS += skein.c skein_block.c
# unroll the 256 and 512 loops, half unroll the 1024
CFLAGS.skein_block.c += -DSKEIN_LOOP=995
-#.if exists(${MACHINE_ARCH}/skein_block_asm.S)
-#.PATH:${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
-#SRCS += skein_block_asm.S
-#CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions
to replace with assembly: 256+512+1024 = 1792
-#ACFLAGS += -DELF -Wa,--noexecstack
-## Fully unroll all loops in the assembly optimized version
-#ACFLAGS += -DSKEIN_LOOP=0
-#.endif
+.if exists(${MACHINE_ARCH}/skein_block_asm.S)
+.PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
+SRCS += skein_block_asm.S
+CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to
replace with assembly: 256+512+1024 = 1792
+ACFLAGS+= -DELF -Wa,--noexecstack
+# Fully unroll all loops in the assembly optimized version
+ACFLAGS+= -DSKEIN_LOOP=0
+# 20201002 Add explict Makefile dependency for reenabled assembly optimized
+# version. SKEIN_USE_ASM determines which routines should come from the
assembly
+# vs C versions, and skein_block needs to be rebuilt if it changes.
+skein_block.o: Makefile
+.endif
SRCS += siphash.c
SRCS += gmac.c gfmult.c
SRCS += blake2b-ref.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366581 - in stable/12/usr.sbin/makefs: . cd9660
Author: emaste
Date: Fri Oct 9 18:30:49 2020
New Revision: 366581
URL: https://svnweb.freebsd.org/changeset/base/366581
Log:
MFC r365847: makefs: connect cd9660 El Torito EFI boot image system type
Sponsored by: The FreeBSD Foundation
Modified:
stable/12/usr.sbin/makefs/cd9660/cd9660_eltorito.c
stable/12/usr.sbin/makefs/makefs.8
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==
--- stable/12/usr.sbin/makefs/cd9660/cd9660_eltorito.c Fri Oct 9 15:50:50
2020(r366580)
+++ stable/12/usr.sbin/makefs/cd9660/cd9660_eltorito.c Fri Oct 9 18:30:49
2020(r366581)
@@ -107,9 +107,11 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, cons
else if (strcmp(sysname, "macppc") == 0 ||
strcmp(sysname, "mac68k") == 0)
new_image->system = ET_SYS_MAC;
+ else if (strcmp(sysname, "efi") == 0)
+ new_image->system = ET_SYS_EFI;
else {
warnx("boot disk system must be "
- "i386, powerpc, macppc, or mac68k");
+ "i386, powerpc, macppc, mac68k, or efi");
free(temp);
free(new_image);
return 0;
Modified: stable/12/usr.sbin/makefs/makefs.8
==
--- stable/12/usr.sbin/makefs/makefs.8 Fri Oct 9 15:50:50 2020
(r366580)
+++ stable/12/usr.sbin/makefs/makefs.8 Fri Oct 9 18:30:49 2020
(r366581)
@@ -35,7 +35,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 20, 2019
+.Dd September 17, 2020
.Dt MAKEFS 8
.Os
.Sh NAME
@@ -385,8 +385,9 @@ is one of
.Ql i386 ,
.Ql mac68k ,
.Ql macppc ,
+.Ql powerpc ,
or
-.Ql powerpc .
+.Ql efi .
.It Sy generic-bootimage
Load a generic boot image into the first 32K of the cd9660 image.
.It Sy hard-disk-boot
___
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: r366431 - head/sys/dev/usb/serial
On Mon, 5 Oct 2020 at 07:46, Ronald Klop wrote: > > Hi, > > I was interested by this commit. But the commit and commit message don't have > much information. I was surprised that the "Differential Revision" link > contains a lot of info about this. How permanent is this review.freebsd.org > server? Wil it stay after the git migration? It will remain, but commit messages ought to contain all of the information necessary to make sense of the commit even in the absence of reviews.freebsd.org. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366344 - in head: lib/libmd sys/crypto/skein/amd64
On Thu, 1 Oct 2020 at 21:18, Kyle Evans wrote: > > We need some kind of magic to walk across this for -DNO_CLEAN builds > -- skein_block.c has no reason to get rebuilt, but we need it to > because we're now defining SKEIN_USE_ASM=1792, which will strip out > some symbols. kevans and I discussed on IRC yesterday; a workaround is now committed in r366362 ___ 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: r366362 - head/lib/libmd
Author: emaste
Date: Fri Oct 2 14:00:52 2020
New Revision: 366362
URL: https://svnweb.freebsd.org/changeset/base/366362
Log:
libmd: add dependency workaround for r366344
r366344 fixed and reenabled the assembly optimized skein implementation,
but skein_block objects were not being rebuilt in no-clean builds. This
resulted in failing no-clean builds. SKEIN_USE_ASM controls which
routines come from C vs assembly, and with no explicit dependency
r366344's change to SKEIN_USE_ASM did not cause skein_block.{o,pico}
to be rebuilt.
Add a dependency on this Makefile for the skein_block objects. This
dependency is broader in scope than absolutely required (that is, the
skein_block objects will now be rebuilt on any change to this Makefile).
There are ways this could be addressed, but it is probably not worth the
additional effort or testing time to pursue them.
PR: 248221
Reported by: kevans, Jeremy Faulkner
Discussed with: kevans
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/libmd/Makefile
Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Fri Oct 2 13:36:29 2020(r366361)
+++ head/lib/libmd/Makefile Fri Oct 2 14:00:52 2020(r366362)
@@ -121,6 +121,10 @@ CFLAGS+= -DRMD160_ASM
ACFLAGS+= -DSKEIN_LOOP=0
SRCS+= skein_block_asm.S
CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace
with assembly: 256+512+1024 = 1792
+# 20201002 Add explict Makefile dependency for r366344 (reenabled assembly
+# optimized version). SKEIN_USE_ASM determines which routines should come from
+# the assembly vs C versions, and skein_block needs to be rebuilt if it
changes.
+skein_block.o skein_block.pico: Makefile
.endif
.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) ||
exists(${MACHINE_ARCH}/skein_block_asm.S)
ACFLAGS+= -DELF -Wa,--noexecstack
___
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: r366344 - in head: lib/libmd sys/crypto/skein/amd64
Author: emaste
Date: Thu Oct 1 21:05:50 2020
New Revision: 366344
URL: https://svnweb.freebsd.org/changeset/base/366344
Log:
libmd: fix assembly optimized skein implementation
The assembly implementation incorrectly used logical AND instead of
bitwise AND. Fix, and re-enable in libmd.
Submitted by: Yang Zhong
Reviewed by: cem (earlier)
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D26614
Modified:
head/lib/libmd/Makefile
head/sys/crypto/skein/amd64/skein_block_asm.S
Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Thu Oct 1 20:08:27 2020(r366343)
+++ head/lib/libmd/Makefile Thu Oct 1 21:05:50 2020(r366344)
@@ -116,12 +116,12 @@ CFLAGS+= -DSHA1_ASM
SRCS+= rmd160.S
CFLAGS+= -DRMD160_ASM
.endif
-#.if exists(${MACHINE_ARCH}/skein_block_asm.S)
-## Fully unroll all loops in the assembly optimized version
-#ACFLAGS+= -DSKEIN_LOOP=0
-#SRCS+= skein_block_asm.S
-#CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to
replace with assembly: 256+512+1024 = 1792
-#.endif
+.if exists(${MACHINE_ARCH}/skein_block_asm.S)
+# Fully unroll all loops in the assembly optimized version
+ACFLAGS+= -DSKEIN_LOOP=0
+SRCS+= skein_block_asm.S
+CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace
with assembly: 256+512+1024 = 1792
+.endif
.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) ||
exists(${MACHINE_ARCH}/skein_block_asm.S)
ACFLAGS+= -DELF -Wa,--noexecstack
.endif
Modified: head/sys/crypto/skein/amd64/skein_block_asm.S
==
--- head/sys/crypto/skein/amd64/skein_block_asm.S Thu Oct 1 20:08:27
2020(r366343)
+++ head/sys/crypto/skein/amd64/skein_block_asm.S Thu Oct 1 21:05:50
2020(r366344)
@@ -56,7 +56,7 @@ ROUNDS_512 = 8*SKEIN_ROUNDS / 10) + 5) % 10) + 5
ROUNDS_1024 = 8*SKEIN_ROUNDS ) + 5) % 10) + 5)
# only display rounds if default size is changed on command line
.irp _NN_,256,512,1024
- .if _USE_ASM_ && \_NN_
+ .if _USE_ASM_ & \_NN_
.irp _RR_,%(ROUNDS_\_NN_)
.if _NN_ < 1024
.print "+++ SKEIN_ROUNDS_\_NN_ = \_RR_"
@@ -277,7 +277,7 @@ _STK_OFFS_ = 0 #starting offset f
StackVarX_stk ,8*(WCNT)#local context vars
StackVarksTwk ,8*3 #key schedule: tweak words
StackVarksKey ,8*(WCNT)+8 #key schedule: key words
- .if (SKEIN_ASM_UNROLL && (\BLK_BITS)) == 0
+ .if (SKEIN_ASM_UNROLL & (\BLK_BITS)) == 0
StackVarksRot ,16*(\KS_CNT) #leave space for "rotation" to happen
.endif
StackVarWcopy ,8*(WCNT)#copy of input block
@@ -397,15 +397,15 @@ _NN_ = _NN_ - 1
.macro Skein_Debug_Round BLK_BITS,R,RDI_OFFS,afterOp
# call the appropriate (local) debug "function"
pushq %rdx#save rdx, so we can use it for round
"number"
- .if (SKEIN_ASM_UNROLL && \BLK_BITS) || (\R >= SKEIN_RND_SPECIAL)
+ .if (SKEIN_ASM_UNROLL & \BLK_BITS) || (\R >= SKEIN_RND_SPECIAL)
movq$\R,%rdx
.else #compute round number using edi
_rOffs_ = \RDI_OFFS + 0
.if \BLK_BITS == 1024
movqrIdx_offs+8(%rsp),%rdx #get rIdx off the stack (adjust for pushq
rdx above)
-leaq1+(((\R)-1) && 3)+_rOffs_(,%rdx,4),%rdx
+leaq1+(((\R)-1) & 3)+_rOffs_(,%rdx,4),%rdx
.else
-leaq1+(((\R)-1) && 3)+_rOffs_(,%rdi,4),%rdx
+leaq1+(((\R)-1) & 3)+_rOffs_(,%rdi,4),%rdx
.endif
.endif
callSkein_Debug_Round_\BLK_BITS
@@ -749,7 +749,7 @@ C_label Skein_256_Unroll_Cnt
# MACRO: eight rounds for 512-bit blocks
#
.macro R_512_FourRounds _RR_#RR = base round number (0 % 8)
- .if (SKEIN_ASM_UNROLL && 512)
+ .if (SKEIN_ASM_UNROLL & 512)
# here for fully unrolled case.
_II_ = ((\_RR_)/4) + 1 #key injection counter
R_512_OneRound 8, 9,10,11,12,13,14,15,%((\_RR_)+0),,,
@@ -972,13 +972,13 @@ rIdx_offs = tmpStk_1024
addReg \reg0 , \reg1 #perform the MIX
RotL64 \reg1 , 1024,%((\_RN0_) % 8),\_Rn1_
xorReg \reg1 , \reg0
-.if ((\_RN0_) && 3) == 3#time to do key injection?
+.if ((\_RN0_) & 3) == 3#time to do key injection?
.if _SKEIN_DEBUG
movq %\reg0 , xDebug_1024+8*\w0(%rsp)#save intermediate values
for Debug_Round
movq %\reg1 , xDebug_1024+8*\w1(%rsp)# (before inline key
injection)
.endif
_II_ = ((\_RN0_)/4)+1 #injection count
- .if SKEIN_ASM_UNROLL && 1024 #here to do fully unrolled key injection
+ .if SKEIN_ASM_UNROLL & 1024 #here to do fully unrolled key injection
addqksKey+ 8*((_II_+\w0) % 17)(%rsp),%\reg0
addqksKey+ 8*((_II_+\w1) % 17)(%rsp),%\reg1
.if \w1 == 13#tweak injection
Re: svn commit: r366312 - head/sys/dev/extres/syscon
On Thu, 1 Oct 2020 at 05:50, Michal Meloun wrote: > > Author: mmel > Date: Thu Oct 1 09:50:08 2020 > New Revision: 366312 > URL: https://svnweb.freebsd.org/changeset/base/366312 > > Log: > Fix the inverted condition in mtx_asserts. > Mutex should be owned in affected functions. Thanks! The board now boots to the login prompt in the CI hwlab. CI is still reporting failure but I believe it is a hardware issue. The smoke test tries to log in on the console then run a few commands and shutdown, and it looks like the USB-serial dongle has working rx but not tx. ___ 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: r366313 - head/sys/arm64/conf
Author: emaste Date: Thu Oct 1 13:29:29 2020 New Revision: 366313 URL: https://svnweb.freebsd.org/changeset/base/366313 Log: Add cd device to arm64 GENERIC Big-iron arm64 machines might have a CD, possibly provided by some IPMI emulation. Reported by: scottph Modified: head/sys/arm64/conf/GENERIC Modified: head/sys/arm64/conf/GENERIC == --- head/sys/arm64/conf/GENERIC Thu Oct 1 09:50:08 2020(r366312) +++ head/sys/arm64/conf/GENERIC Thu Oct 1 13:29:29 2020(r366313) @@ -189,6 +189,7 @@ device scbus device da # ATA/SCSI peripherals +device cd # CD device pass# Passthrough device (direct ATA/SCSI access) # NVM Express (NVMe) support ___ 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: r366299 - stable/12/share/examples/ipfw
Author: emaste Date: Wed Sep 30 20:57:01 2020 New Revision: 366299 URL: https://svnweb.freebsd.org/changeset/base/366299 Log: MFC r359067: -F is GNU diff specific, not implemented in BSD diff. PR: 239519 Reported by: ko...@ryuhoku.jp [in -CURRENT] MFC after:3 days Modified: stable/12/share/examples/ipfw/change_rules.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/share/examples/ipfw/change_rules.sh == --- stable/12/share/examples/ipfw/change_rules.sh Wed Sep 30 19:23:25 2020(r366298) +++ stable/12/share/examples/ipfw/change_rules.sh Wed Sep 30 20:57:01 2020(r366299) @@ -149,7 +149,7 @@ cat
svn commit: r366298 - stable/12/bin/chio
Author: emaste
Date: Wed Sep 30 19:23:25 2020
New Revision: 366298
URL: https://svnweb.freebsd.org/changeset/base/366298
Log:
MFC r363563: chio: avoid out of bounds read
ch_ces is alloacated with space for total_elem entries.
CID: 1418536
Reported by: Coverity Scan
Sponsored by: The FreeBSD Foundation
Modified:
stable/12/bin/chio/chio.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/bin/chio/chio.c
==
--- stable/12/bin/chio/chio.c Wed Sep 30 18:09:50 2020(r366297)
+++ stable/12/bin/chio/chio.c Wed Sep 30 19:23:25 2020(r366298)
@@ -1144,7 +1144,7 @@ find_element(char *voltag, uint16_t *et, uint16_t *eu)
/*
* Now search the list the specified
*/
- for (elem = 0; elem <= total_elem; ++elem) {
+ for (elem = 0; elem < total_elem; ++elem) {
ces = _ces[elem];
___
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: r366161 - head/sys/dev/extres/syscon
On Fri, 25 Sep 2020 at 12:44, Michal Meloun wrote: > > Author: mmel > Date: Fri Sep 25 16:44:01 2020 > New Revision: 366161 > URL: https://svnweb.freebsd.org/changeset/base/366161 The pine64 in CI is currently broken, panicking at boot with: panic: mutex aw_syscon0 owned at /usr/src/sys/dev/extres/syscon/syscon_generic.c:98 Log: https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/6480/artifact/device_tests/pinea64.boot.log It's possible there's an outdated dtb involved here, as there was with the BBB. Hopefully manu's change to report/check the dtb version makes it in and can be used to help track these issues down. Unfortunately the USB-serial interface connected to the pine64 was broken until yesterday so I'm not sure for how long this has been broken in this way. The last successful run was at r364130 almost 2 months ago; the first failure after that was because of an apparent hang at shutdown. ___ 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: r366230 - in head: share/man/man9 sys/net sys/sys
Author: emaste
Date: Mon Sep 28 16:54:39 2020
New Revision: 366230
URL: https://svnweb.freebsd.org/changeset/base/366230
Log:
add SIOCGIFDATA ioctl
For interfaces that do not support SIOCGIFMEDIA (for which there are
quite a few) the only fallback is to query the interface for
if_data->ifi_link_state. While it's possible to get at if_data for an
interface via getifaddrs(3) or sysctl, both are heavy weight mechanisms.
SIOCGIFDATA is a simple ioctl to retrieve this fast with very little
resource use in comparison. This implementation mirrors that of other
similar ioctls in FreeBSD.
Submitted by: Roy Marples
Reviewed by: markj
MFC after:1 month
Differential Revision:https://reviews.freebsd.org/D26538
Modified:
head/share/man/man9/ifnet.9
head/sys/net/if.c
head/sys/sys/sockio.h
Modified: head/share/man/man9/ifnet.9
==
--- head/share/man/man9/ifnet.9 Mon Sep 28 16:19:29 2020(r366229)
+++ head/share/man/man9/ifnet.9 Mon Sep 28 16:54:39 2020(r366230)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 14, 2018
+.Dd September 28, 2020
.Dt IFNET 9
.Os
.Sh NAME
@@ -1310,12 +1310,13 @@ list.
Caller must have appropriate privilege.
(No call-down to driver.)
.It Dv SIOCGIFCAP
+.It Dv SIOCGIFDATA
.It Dv SIOCGIFFIB
.It Dv SIOCGIFFLAGS
.It Dv SIOCGIFMETRIC
.It Dv SIOCGIFMTU
.It Dv SIOCGIFPHYS
-Get interface capabilities, FIB, flags, metric, MTU, medium selection.
+Get interface capabilities, data, FIB, flags, metric, MTU, medium selection.
(No call-down to driver.)
.Pp
.It Dv SIOCSIFCAP
Modified: head/sys/net/if.c
==
--- head/sys/net/if.c Mon Sep 28 16:19:29 2020(r366229)
+++ head/sys/net/if.c Mon Sep 28 16:54:39 2020(r366230)
@@ -2518,6 +2518,18 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data,
ifr->ifr_curcap = ifp->if_capenable;
break;
+ case SIOCGIFDATA:
+ {
+ struct if_data ifd;
+
+ /* Ensure uninitialised padding is not leaked. */
+ memset(, 0, sizeof(ifd));
+
+ if_data_copy(ifp, );
+ error = copyout(, ifr_data_get_ptr(ifr), sizeof(ifd));
+ break;
+ }
+
#ifdef MAC
case SIOCGIFMAC:
error = mac_ifnet_ioctl_get(td->td_ucred, ifr, ifp);
Modified: head/sys/sys/sockio.h
==
--- head/sys/sys/sockio.h Mon Sep 28 16:19:29 2020(r366229)
+++ head/sys/sys/sockio.h Mon Sep 28 16:54:39 2020(r366230)
@@ -83,6 +83,7 @@
#defineSIOCSIFDESCR _IOW('i', 41, struct ifreq)/* set ifnet
descr */
#defineSIOCGIFDESCR_IOWR('i', 42, struct ifreq)/* get ifnet
descr */
#defineSIOCAIFADDR _IOW('i', 43, struct ifaliasreq)/* add/chg IF
alias */
+#defineSIOCGIFDATA _IOW('i', 44, struct ifreq)/* get if_data
*/
#defineSIOCADDMULTI _IOW('i', 49, struct ifreq)/* add m'cast
addr */
#defineSIOCDELMULTI _IOW('i', 50, struct ifreq)/* del m'cast
addr */
___
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: r366209 - stable/12/share/mk
Author: emaste
Date: Sun Sep 27 22:50:01 2020
New Revision: 366209
URL: https://svnweb.freebsd.org/changeset/base/366209
Log:
MFC r356323: src.opts.mk: SVNLITE requires FILE
Modified:
stable/12/share/mk/src.opts.mk
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/mk/src.opts.mk
==
--- stable/12/share/mk/src.opts.mk Sun Sep 27 22:48:43 2020
(r366208)
+++ stable/12/share/mk/src.opts.mk Sun Sep 27 22:50:01 2020
(r366209)
@@ -490,6 +490,10 @@ MK_TESTS:= no
MK_BSDINSTALL:=no
.endif
+.if ${MK_FILE} == "no"
+MK_SVNLITE:= no
+.endif
+
.if ${MK_MAIL} == "no"
MK_MAILWRAPPER:= no
MK_SENDMAIL:= no
___
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: r366208 - stable/12/share/mk
Author: emaste
Date: Sun Sep 27 22:48:43 2020
New Revision: 366208
URL: https://svnweb.freebsd.org/changeset/base/366208
Log:
MFC r356615: src.opts.mk: force KERBEROS_SUPPORT off where KERBEROS forced off
Explicitly setting WITHOUT_KERBEROS implies WITHOUT_KERBEROS_SUPPORT,
but previously other cases that forced KERBEROS off (such as
WITHOUT_CRYPT) did not also set KERBEROS_SUPPORT off. Because the
_SUPPORT dependent options (KERBEROS/KERBEROS_SUPPORT) are processed
before other dependencies (CRYPT/KERBEROS) it's not easy to make this
happen automatically. Instead just explicitly set KERBEROS_SUPPORT
off where we set KERBEROS off.
Modified:
stable/12/share/mk/src.opts.mk
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/mk/src.opts.mk
==
--- stable/12/share/mk/src.opts.mk Sun Sep 27 22:26:41 2020
(r366207)
+++ stable/12/share/mk/src.opts.mk Sun Sep 27 22:48:43 2020
(r366208)
@@ -477,6 +477,7 @@ MK_CTF:=no
MK_OPENSSL:= no
MK_OPENSSH:= no
MK_KERBEROS:= no
+MK_KERBEROS_SUPPORT:= no
.endif
.if ${MK_CXX} == "no"
@@ -508,6 +509,7 @@ MK_NLS_CATALOGS:= no
MK_DMAGENT:= no
MK_OPENSSH:= no
MK_KERBEROS:= no
+MK_KERBEROS_SUPPORT:= no
MK_LDNS:= no
MK_PKGBOOTSTRAP:= no
MK_SVN:= no
___
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: r363700 - in head/sys: arm/ti arm/ti/am335x arm/ti/clk arm/ti/cpsw arm/ti/omap4 arm/ti/usb dev/uart modules
On Tue, 22 Sep 2020 at 12:50, Ed Maste wrote: > > On Thu, 30 Jul 2020 at 10:45, Michal Meloun wrote: > > > > Author: mmel > > Date: Thu Jul 30 14:45:05 2020 > > New Revision: 363700 > > URL: https://svnweb.freebsd.org/changeset/base/363700 > > > > Log: > > Move Ti AM335x to dev/extres/clk framework. > > It looks like BeagleBone Black is indeed broken after this commit > https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-beaglebone-test/6131/ > https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-beaglebone-test/6131/artifact/device_tests/beaglebone.boot.log It seems this was because we weren't using an up-to-date dtb - at various times during my investigation of the CI setup we were using either uboot's built-in dtb or were tftp fetching an old copy of am335x-boneblack.dtb. With bootcmd including "run findfdt" and making sure there are no old copies in the tftproot directory the CI environment is booting again. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366115 - head/share/man/man4
Author: emaste Date: Thu Sep 24 14:42:22 2020 New Revision: 366115 URL: https://svnweb.freebsd.org/changeset/base/366115 Log: mgb.4: add note about experimental status Also remove HISTORY section until it is connected to the build. Modified: head/share/man/man4/mgb.4 Modified: head/share/man/man4/mgb.4 == --- head/share/man/man4/mgb.4 Thu Sep 24 12:26:06 2020(r366114) +++ head/share/man/man4/mgb.4 Thu Sep 24 14:42:22 2020(r366115) @@ -38,6 +38,10 @@ if_mgb_load="YES" .Sh DESCRIPTION The .Nm +driver is experimental, and is not yet connected to the build. +.Pp +The +.Nm device driver provides support for PCIe Gigabit Ethernet adapters based on Microchip's LAN7430 and LAN7431. .Pp @@ -79,8 +83,3 @@ RSS .El .Pp LAN7431 support is completely untested. -.Sh HISTORY -The -.Nm -device driver first appeared in -.Fx 13.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: r366077 - head/sys/conf
Author: emaste
Date: Wed Sep 23 14:52:43 2020
New Revision: 366077
URL: https://svnweb.freebsd.org/changeset/base/366077
Log:
remove reference to obsolete arm NOTES files
We left these in the clean rule to avoid having stale files remain in
working trees, but enough time has now passed that it's no longer
relevant.
Discussed with: imp
Modified:
head/sys/conf/makeLINT.mk
Modified: head/sys/conf/makeLINT.mk
==
--- head/sys/conf/makeLINT.mk Wed Sep 23 14:36:38 2020(r366076)
+++ head/sys/conf/makeLINT.mk Wed Sep 23 14:52:43 2020(r366077)
@@ -11,12 +11,6 @@ clean:
.if ${TARGET} == "amd64" || ${TARGET} == "i386"
rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
.endif
-.if ${TARGET} == "arm"
- # LINT-V5 removed 2019-11-26. The clean rule is left here temporarily
- # to avoid having stale copies left behind. LINT-V7 left the tree on
- # 2020-02-02.
- rm -f LINT-V5 LINT-V7
-.endif
.if ${TARGET} == "powerpc"
rm -f LINT64
.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"
Re: svn commit: r363700 - in head/sys: arm/ti arm/ti/am335x arm/ti/clk arm/ti/cpsw arm/ti/omap4 arm/ti/usb dev/uart modules
On Thu, 30 Jul 2020 at 10:45, Michal Meloun wrote: > > Author: mmel > Date: Thu Jul 30 14:45:05 2020 > New Revision: 363700 > URL: https://svnweb.freebsd.org/changeset/base/363700 > > Log: > Move Ti AM335x to dev/extres/clk framework. It looks like BeagleBone Black is indeed broken after this commit https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-beaglebone-test/6131/ https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-beaglebone-test/6131/artifact/device_tests/beaglebone.boot.log ... ti_clkctrl0: mem 0x14-0x14f on ti_omap4_cm0 ti_clkctrl1: mem 0x4-0xd7 on ti_omap4_cm1 ti_clkctrl2: mem 0x4-0x7 on ti_omap4_cm2 panic: Duplicated clock registration: clk@4_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: r365902 - head
Author: emaste Date: Sat Sep 19 13:55:26 2020 New Revision: 365902 URL: https://svnweb.freebsd.org/changeset/base/365902 Log: Cirrus-CI: skip svn_head branch svn_head has the same content as the master or main branch (it's just the result of a `git svn` conversion instead of svn2git). Sponsored by: The FreeBSD Foundation Modified: head/.cirrus.yml Modified: head/.cirrus.yml == --- head/.cirrus.ymlSat Sep 19 12:08:16 2020(r365901) +++ head/.cirrus.ymlSat Sep 19 13:55:26 2020(r365902) @@ -9,6 +9,7 @@ env: CIRRUS_CLONE_DEPTH: 1 task: + only_if: $CIRRUS_BRANCH != 'svn_head' timeout_in: 120m install_script: - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 ___ 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: r365888 - head/sys/contrib/dev/ath/ath_hal/ar9300
Author: emaste
Date: Fri Sep 18 18:35:18 2020
New Revision: 365888
URL: https://svnweb.freebsd.org/changeset/base/365888
Log:
ys/contrib/dev/ath: remove unintentional double semicolon
Approved by: adrian
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Sep 18
17:17:46 2020(r365887)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Sep 18
18:35:18 2020(r365888)
@@ -3879,7 +3879,7 @@ ar9300_init_cal_internal(struct ath_hal *ah, struct ie
cl_tab_reg = BB_cl_tab_b[ch_idx];
for (j = 0; j < BB_cl_tab_entry; j++) {
OS_REG_WRITE(ah, cl_tab_reg, ichan->tx_clcal[ch_idx][j]);
-cl_tab_reg += 4;;
+cl_tab_reg += 4;
}
}
HALDEBUG(ah, HAL_DEBUG_FCS_RTT,
___
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: r365846 - head
On Thu, 17 Sep 2020 at 18:35, Ed Maste wrote: > > On Thu, 17 Sep 2020 at 15:07, Kyle Evans wrote: > > > > Is there any way we can sneak a r/o src tree build in here? I've had a > > PR open to do this in our Jenkins builds for a couple years, but > > without any ability to test it myself I suspect it'll continue > > unmerged. > > Cirrus-CI does the git clone for us and it is done as root, so we > should in effect have a RO src tree here. I'll confirm sometime later > on. Indeed, Cirrus checks out the tree under /tmp/cirrus-ci-build as root, and there are no files/directories writable by the unprivileged user added by this change. ___ 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: r365846 - head
On Thu, 17 Sep 2020 at 15:07, Kyle Evans wrote: > > Is there any way we can sneak a r/o src tree build in here? I've had a > PR open to do this in our Jenkins builds for a couple years, but > without any ability to test it myself I suspect it'll continue > unmerged. Cirrus-CI does the git clone for us and it is done as root, so we should in effect have a RO src tree here. I'll confirm sometime later on. ___ 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: r365847 - in head/usr.sbin/makefs: . cd9660
Author: emaste
Date: Thu Sep 17 19:41:10 2020
New Revision: 365847
URL: https://svnweb.freebsd.org/changeset/base/365847
Log:
makefs: connect cd9660 El Torito EFI boot image system type
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
head/usr.sbin/makefs/makefs.8
Modified: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Thu Sep 17 18:47:23
2020(r365846)
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Thu Sep 17 19:41:10
2020(r365847)
@@ -107,9 +107,11 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, cons
else if (strcmp(sysname, "macppc") == 0 ||
strcmp(sysname, "mac68k") == 0)
new_image->system = ET_SYS_MAC;
+ else if (strcmp(sysname, "efi") == 0)
+ new_image->system = ET_SYS_EFI;
else {
warnx("boot disk system must be "
- "i386, powerpc, macppc, or mac68k");
+ "i386, powerpc, macppc, mac68k, or efi");
free(temp);
free(new_image);
return 0;
Modified: head/usr.sbin/makefs/makefs.8
==
--- head/usr.sbin/makefs/makefs.8 Thu Sep 17 18:47:23 2020
(r365846)
+++ head/usr.sbin/makefs/makefs.8 Thu Sep 17 19:41:10 2020
(r365847)
@@ -35,7 +35,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 20, 2019
+.Dd September 17, 2020
.Dt MAKEFS 8
.Os
.Sh NAME
@@ -385,8 +385,9 @@ is one of
.Ql i386 ,
.Ql mac68k ,
.Ql macppc ,
+.Ql powerpc ,
or
-.Ql powerpc .
+.Ql efi .
.It Sy generic-bootimage
Load a generic boot image into the first 32K of the cd9660 image.
.It Sy hard-disk-boot
___
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: r365846 - head
Author: emaste Date: Thu Sep 17 18:47:23 2020 New Revision: 365846 URL: https://svnweb.freebsd.org/changeset/base/365846 Log: Cirrus-CI: build as an unprivileged user The Cirrus-CI-provided working tree is owned by root. Leave that as is for simplicity but build as an unprivileged user; this tests building with an unmodifiable source tree as a side effect. Continue running the smoke test as root for now, as it failed when run as an unprivileged user - pkg reported "Fail to chmod /usr/bin/.pkgtemp.lpq.dUHpEqPGJ9pq:Operation not permitted" Sponsored by: The FreeBSD Foundation Modified: head/.cirrus.yml Modified: head/.cirrus.yml == --- head/.cirrus.ymlThu Sep 17 18:24:51 2020(r365845) +++ head/.cirrus.ymlThu Sep 17 18:47:23 2020(r365846) @@ -12,9 +12,13 @@ task: timeout_in: 120m install_script: - pkg install -y qemu-devel uefi-edk2-qemu-x86_64 + setup_user_script: + - pw useradd user + - mkdir -p /usr/obj/$(pwd -P) + - chown user:user /usr/obj/$(pwd -P) script: - - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel + - su user -c "make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel" package_script: - - make WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages + - su user -c "make WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages" test_script: - sh tools/boot/ci-qemu-test.sh ___ 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: r365777 - in stable: 11/sys/amd64/vmm/amd 11/sys/amd64/vmm/intel 12/sys/amd64/vmm/amd 12/sys/amd64/vmm/intel
Author: emaste
Date: Tue Sep 15 21:28:47 2020
New Revision: 365777
URL: https://svnweb.freebsd.org/changeset/base/365777
Log:
MFC r365775: bhyve: do not permit write access to VMCB / VMCS
Reported by: Patrick Mooney
Submitted by: jhb
Security: CVE-2020-24718
Modified:
stable/11/sys/amd64/vmm/amd/svm.c
stable/11/sys/amd64/vmm/intel/vmx.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/amd64/vmm/amd/svm.c
stable/12/sys/amd64/vmm/intel/vmx.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/amd64/vmm/amd/svm.c
==
--- stable/11/sys/amd64/vmm/amd/svm.c Tue Sep 15 21:07:30 2020
(r365776)
+++ stable/11/sys/amd64/vmm/amd/svm.c Tue Sep 15 21:28:47 2020
(r365777)
@@ -2202,8 +2202,11 @@ svm_setreg(void *arg, int vcpu, int ident, uint64_t va
return (svm_modify_intr_shadow(svm_sc, vcpu, val));
}
- if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
- return (0);
+ /* Do not permit user write access to VMCB fields by offset. */
+ if (!VMCB_ACCESS_OK(ident)) {
+ if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
+ return (0);
+ }
}
reg = swctx_regptr(svm_get_guest_regctx(svm_sc, vcpu), ident);
Modified: stable/11/sys/amd64/vmm/intel/vmx.c
==
--- stable/11/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:07:30 2020
(r365776)
+++ stable/11/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:28:47 2020
(r365777)
@@ -3215,6 +3215,10 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
if (vmxctx_setreg(>ctx[vcpu], reg, val) == 0)
return (0);
+ /* Do not permit user write access to VMCS fields by offset. */
+ if (reg < 0)
+ return (EINVAL);
+
error = vmcs_setreg(>vmcs[vcpu], running, reg, val);
if (error == 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: r365777 - in stable: 11/sys/amd64/vmm/amd 11/sys/amd64/vmm/intel 12/sys/amd64/vmm/amd 12/sys/amd64/vmm/intel
Author: emaste
Date: Tue Sep 15 21:28:47 2020
New Revision: 365777
URL: https://svnweb.freebsd.org/changeset/base/365777
Log:
MFC r365775: bhyve: do not permit write access to VMCB / VMCS
Reported by: Patrick Mooney
Submitted by: jhb
Security: CVE-2020-24718
Modified:
stable/12/sys/amd64/vmm/amd/svm.c
stable/12/sys/amd64/vmm/intel/vmx.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/amd64/vmm/amd/svm.c
stable/11/sys/amd64/vmm/intel/vmx.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/amd64/vmm/amd/svm.c
==
--- stable/12/sys/amd64/vmm/amd/svm.c Tue Sep 15 21:07:30 2020
(r365776)
+++ stable/12/sys/amd64/vmm/amd/svm.c Tue Sep 15 21:28:47 2020
(r365777)
@@ -2205,8 +2205,11 @@ svm_setreg(void *arg, int vcpu, int ident, uint64_t va
return (svm_modify_intr_shadow(svm_sc, vcpu, val));
}
- if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
- return (0);
+ /* Do not permit user write access to VMCB fields by offset. */
+ if (!VMCB_ACCESS_OK(ident)) {
+ if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
+ return (0);
+ }
}
reg = swctx_regptr(svm_get_guest_regctx(svm_sc, vcpu), ident);
Modified: stable/12/sys/amd64/vmm/intel/vmx.c
==
--- stable/12/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:07:30 2020
(r365776)
+++ stable/12/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:28:47 2020
(r365777)
@@ -3324,6 +3324,10 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
if (vmxctx_setreg(>ctx[vcpu], reg, val) == 0)
return (0);
+ /* Do not permit user write access to VMCS fields by offset. */
+ if (reg < 0)
+ return (EINVAL);
+
error = vmcs_setreg(>vmcs[vcpu], running, reg, val);
if (error == 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: r365775 - in head/sys/amd64/vmm: amd intel
Author: emaste
Date: Tue Sep 15 21:04:27 2020
New Revision: 365775
URL: https://svnweb.freebsd.org/changeset/base/365775
Log:
bhyve: do not permit write access to VMCB / VMCS
Reported by: Patrick Mooney
Submitted by: jhb
Security: CVE-2020-24718
Modified:
head/sys/amd64/vmm/amd/svm.c
head/sys/amd64/vmm/intel/vmx.c
Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cTue Sep 15 21:00:25 2020
(r365774)
+++ head/sys/amd64/vmm/amd/svm.cTue Sep 15 21:04:27 2020
(r365775)
@@ -2227,8 +2227,11 @@ svm_setreg(void *arg, int vcpu, int ident, uint64_t va
return (svm_modify_intr_shadow(svm_sc, vcpu, val));
}
- if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
- return (0);
+ /* Do not permit user write access to VMCB fields by offset. */
+ if (!VMCB_ACCESS_OK(ident)) {
+ if (vmcb_write(svm_sc, vcpu, ident, val) == 0) {
+ return (0);
+ }
}
reg = swctx_regptr(svm_get_guest_regctx(svm_sc, vcpu), ident);
Modified: head/sys/amd64/vmm/intel/vmx.c
==
--- head/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:00:25 2020
(r365774)
+++ head/sys/amd64/vmm/intel/vmx.c Tue Sep 15 21:04:27 2020
(r365775)
@@ -3341,6 +3341,10 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
if (vmxctx_setreg(>ctx[vcpu], reg, val) == 0)
return (0);
+ /* Do not permit user write access to VMCS fields by offset. */
+ if (reg < 0)
+ return (EINVAL);
+
error = vmcs_setreg(>vmcs[vcpu], running, reg, val);
if (error == 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: r365704 - stable/12/usr.sbin/ntp/ntpd
Author: emaste Date: Mon Sep 14 01:20:57 2020 New Revision: 365704 URL: https://svnweb.freebsd.org/changeset/base/365704 Log: MFC r365422: ntp: whitespace and typo fix in conf file PR: 248942 Submitted by: Jose Luis Duran (whitespace), igor (typo) Modified: stable/12/usr.sbin/ntp/ntpd/ntp.conf Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/ntp/ntpd/ntp.conf == --- stable/12/usr.sbin/ntp/ntpd/ntp.confMon Sep 14 00:44:50 2020 (r365703) +++ stable/12/usr.sbin/ntp/ntpd/ntp.confMon Sep 14 01:20:57 2020 (r365704) @@ -14,8 +14,8 @@ # Set the target and limit for adding servers configured via pool statements # or discovered dynamically via mechanisms such as broadcast and manycast. # Ntpd automatically adds maxclock-1 servers from configured pools, and may -# add as many as maxclock*2 if necessary to ensure that at least minclock -# servers are providing good consistant time. +# add as many as maxclock*2 if necessary to ensure that at least minclock +# servers are providing good consistent time. # tos minclock 3 maxclock 6 ___ 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: r365701 - head
Author: emaste
Date: Sun Sep 13 23:05:19 2020
New Revision: 365701
URL: https://svnweb.freebsd.org/changeset/base/365701
Log:
Makefile.inc1: remove more old stale depend hacks
Current stale dependency hacks are in tools/build/depend-cleanup.sh.
These ones were almost a year old; remove them from Makefile.inc1.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Sep 13 22:57:50 2020(r365700)
+++ head/Makefile.inc1 Sun Sep 13 23:05:19 2020(r365701)
@@ -983,34 +983,6 @@ _sanity_check: .PHONY .MAKE
_cleanobj_fast_depend_hack: .PHONY
@echo ">>> Deleting stale dependencies...";
sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP}
-# Date SVN Rev Syscalls/Changes
-# Syscall stubs rewritten in C and obsolete MD assembly implementations
-# 20191009 r353340 removal of opensolaris_atomic.S (also r353381)
-.if ${MACHINE} != i386
-.for f in opensolaris_atomic
- @if [ -e "${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o" ] && \
- egrep -qw 'opensolaris_atomic\.S'
${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o; then \
- echo "Removing stale dependencies for opensolaris_atomic"; \
- rm -f ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.* \
-
${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/cddl/lib/libzpool/.depend.${f}.*}; \
- fi
-.endfor
-.endif
-# 20190925 r352689 removal of obsolete i386 memchr.S
-.for f in memchr
- @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
- egrep -qw 'i386/string/memchr\.S'
${OBJTOP}/lib/libc/.depend.${f}.o; then \
- echo "Removing stale dependencies for memchr"; \
- rm -f ${OBJTOP}/lib/libc/.depend.${f}.*; \
- fi
-.if defined(_LIBCOMPAT)
- @if [ -e "${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.o" ] && \
- egrep -qw 'i386/string/memchr\.S'
${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.o; then \
- echo "Removing stale dependencies for memchr"; \
- rm -f ${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*; \
- fi
-.endif
-.endfor
_worldtmp: .PHONY
@echo
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r365692 - head/tools/build/options
Author: emaste Date: Sun Sep 13 17:13:32 2020 New Revision: 365692 URL: https://svnweb.freebsd.org/changeset/base/365692 Log: Remove WITHOUT_BMAKE description The option was retired in r265423 and bmake is the only make in tree. Deleted: head/tools/build/options/WITHOUT_BMAKE ___ 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: r365440 - head/share/man/man5
Author: emaste Date: Tue Sep 8 00:48:18 2020 New Revision: 365440 URL: https://svnweb.freebsd.org/changeset/base/365440 Log: src.conf.5: regen after r365439, WITH_/WITHOUT_CLEAN option Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Sep 8 00:44:35 2020 (r365439) +++ head/share/man/man5/src.conf.5 Tue Sep 8 00:48:18 2020 (r365440) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd September 5, 2020 +.Dd September 7, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -346,6 +346,8 @@ Do not install links to the Clang C/C++ compiler as .Pa /usr/bin/c++ and .Pa /usr/bin/cpp . +.It Va WITHOUT_CLEAN +Do not clean before building world and/or kernel. .It Va WITHOUT_CPP Set to not build .Xr cpp 1 . @@ -1108,7 +1110,6 @@ for more details. Set to disable assertions and statistics gathering in .Xr malloc 3 . It also defaults the A and J runtime options to off. -Disabled by default on -CURRENT. .It Va WITHOUT_MAN Set to not build manual pages. When set, these options are also in effect: ___ 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: r365439 - in head: . share/mk tools/build/options
Author: emaste
Date: Tue Sep 8 00:44:35 2020
New Revision: 365439
URL: https://svnweb.freebsd.org/changeset/base/365439
Log:
Add WITH_/WITHOUT_CLEAN option to replace NO_CLEAN
This allows use of the standard src.conf configuration for controlling
whether the tree is cleaned before build or not. The default is still
to clean.
Setting either NOCLEAN or NO_CLEAN will mention the new src.conf option.
NOCLEAN remains a .warning, while for now NO_CLEAN is .info.
Reviewed by: bdrewery (earlier version)
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D22762
Added:
head/tools/build/options/WITHOUT_CLEAN (contents, props changed)
Modified:
head/Makefile.inc1
head/Makefile.libcompat
head/share/mk/src.opts.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Sep 8 00:15:18 2020(r365438)
+++ head/Makefile.inc1 Tue Sep 8 00:44:35 2020(r365439)
@@ -441,9 +441,13 @@ SUBDIR+=etc
.endif # !empty(SUBDIR_OVERRIDE)
.if defined(NOCLEAN)
-.warning NOCLEAN option is deprecated. Use NO_CLEAN instead.
-NO_CLEAN= ${NOCLEAN}
+.warning The src.conf WITHOUT_CLEAN option can now be used instead of NOCLEAN.
+MK_CLEAN:= no
.endif
+.if defined(NO_CLEAN)
+.info The src.conf WITHOUT_CLEAN option can now be used instead of NO_CLEAN.
+MK_CLEAN:= no
+.endif
.if defined(NO_CLEANDIR)
CLEANDIR= clean cleandepend
.else
@@ -451,7 +455,7 @@ CLEANDIR= cleandir
.endif
.if defined(WORLDFAST)
-NO_CLEAN= t
+MK_CLEAN:= no
NO_OBJWALK=t
.endif
@@ -460,7 +464,7 @@ NO_OBJWALK= t
# The .meta files will also track the build command and rebuild should
# it change.
.if empty(.MAKE.MODE:Mnofilemon)
-NO_CLEAN= t
+MK_CLEAN:= no
.endif
.endif
.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes"
@@ -837,7 +841,7 @@ _LIBCOMPAT= SOFT
# timestamps (see NO_META_IGNORE_HOST in sys.mk). There are known times
# when the ABI breaks though that we want to force rebuilding WORLDTMP
# to get updated host tools.
-.if ${MK_META_MODE} == "yes" && defined(NO_CLEAN) && \
+.if ${MK_META_MODE} == "yes" && ${MK_CLEAN} == "no" && \
!defined(NO_META_IGNORE_HOST) && !defined(NO_META_IGNORE_HOST_HEADERS) && \
!defined(_MKSHOWCONFIG)
# r318736 - ino64 major ABI breakage
@@ -869,7 +873,7 @@ NO_META_IGNORE_HOST_HEADERS=1
.export NO_META_IGNORE_HOST_HEADERS
.endif # defined(_meta_mode_need_rebuild)
.endif # defined(OBJDIR_HOST_OSRELDATE)
-.endif # ${MK_META_MODE} == "yes" && defined(NO_CLEAN) ...
+.endif # ${MK_META_MODE} == "yes" && ${MK_CLEAN} == "no" ...
# This is only used for META_MODE+filemon to track what the oldest
# __FreeBSD_version is in WORLDTMP. This purposely does NOT have
# a make dependency on /usr/include/osreldate.h as the file should
@@ -1013,7 +1017,7 @@ _worldtmp: .PHONY
@echo "--"
@echo ">>> Rebuilding the temporary build tree"
@echo "--"
-.if !defined(NO_CLEAN)
+.if ${MK_CLEAN} == "yes"
rm -rf ${WORLDTMP}
.else
# Note: for delete-old we need to set $PATH to also include the host $PATH
@@ -1038,7 +1042,7 @@ _worldtmp: .PHONY
.if ${USING_SYSTEM_LINKER} == "yes"
@rm -f ${WORLDTMP}/usr/bin/ld ${WORLDTMP}/usr/bin/ld.lld
.endif # ${USING_SYSTEM_LINKER} == "yes"
-.endif # !defined(NO_CLEAN)
+.endif # ${MK_CLEAN} == "yes"
@mkdir -p ${WORLDTMP}
@touch ${WORLDTMP}/${.TARGET}
# We can't use mtree to create the worldtmp directories since it may not be
@@ -1077,7 +1081,7 @@ _bootstrap-tools:
${WORLDTMP_MTREE} -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
.endfor
_cleanobj:
-.if !defined(NO_CLEAN)
+.if ${MK_CLEAN} == "yes"
@echo
@echo "--"
@echo ">>> stage 2.1: cleaning up the object tree"
@@ -1090,7 +1094,7 @@ _cleanobj:
.endif
.else
${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t
_cleanobj_fast_depend_hack
-.endif # !defined(NO_CLEAN)
+.endif # ${MK_CLEAN} == "yes"
_obj:
@echo
@echo "--"
@@ -1672,7 +1676,7 @@ buildkernel: .MAKE .PHONY
-I '${KERNCONFDIR}' -I '${KRNLCONFDIR}' \
'${KERNCONFDIR}/${_kernel}'
.endif
-.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
+.if ${MK_CLEAN} == "yes" && !defined(NO_KERNELCLEAN)
@echo
@echo "--"
@echo ">>> stage 2.1: cleaning up the object tree"
@@ -2478,7 +2482,7 @@ _jevents=lib/libpmc/pmu-events
# kernel-toolchain skips _cleanobj, so handle cleaning up previous
# build-tools directories if needed.
-.if !defined(NO_CLEAN) &&
svn commit: r365438 - head/tools/build
Author: emaste Date: Tue Sep 8 00:15:18 2020 New Revision: 365438 URL: https://svnweb.freebsd.org/changeset/base/365438 Log: retire an old NO_CLEAN dependency cleanup hack We have some hacks to remove stale dependency files for NO_CLEAN builds that are missed by make's dependency handling. These are intended to upport ongoing NO_CLEAN builds, and are no longer needed after a sufficient amount of time elapses. Modified: head/tools/build/depend-cleanup.sh Modified: head/tools/build/depend-cleanup.sh == --- head/tools/build/depend-cleanup.sh Mon Sep 7 23:28:33 2020 (r365437) +++ head/tools/build/depend-cleanup.sh Tue Sep 8 00:15:18 2020 (r365438) @@ -37,8 +37,6 @@ clean_dep() } # Date Rev Description -# 20190916 r352703 shm_open syscall reimplemented in C -clean_dep lib/libc shm_open S # 20200310 r358851 rename of openmp's ittnotify_static.c to .cpp clean_dep lib/libomp ittnotify_static c # 20200414 r359930 closefrom ___ 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: r365423 - stable/12/sys/netinet/tcp_stacks
Author: emaste Date: Mon Sep 7 17:31:58 2020 New Revision: 365423 URL: https://svnweb.freebsd.org/changeset/base/365423 Log: TPC rack: use #error rather than syntax error Until the changes to make this a proper dependency are merged, avoid using a syntax error for a user-facing error report. PR: 249037 Suggested by: avg Modified: stable/12/sys/netinet/tcp_stacks/rack.c Modified: stable/12/sys/netinet/tcp_stacks/rack.c == --- stable/12/sys/netinet/tcp_stacks/rack.c Mon Sep 7 17:19:31 2020 (r365422) +++ stable/12/sys/netinet/tcp_stacks/rack.c Mon Sep 7 17:31:58 2020 (r365423) @@ -128,7 +128,7 @@ struct sysctl_ctx_list rack_sysctl_ctx; struct sysctl_oid *rack_sysctl_root; #ifndef TCPHPTS -fatal error missing option TCPHSTS in the build; +#error Kernel option TCPHPTS is required #endif #define CUM_ACKED 1 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r365422 - head/usr.sbin/ntp/ntpd
Author: emaste Date: Mon Sep 7 17:19:31 2020 New Revision: 365422 URL: https://svnweb.freebsd.org/changeset/base/365422 Log: ntp: whitespace and typo fix in conf file PR: 248942 Submitted by: Jose Luis Duran (whitespace), igor (typo) MFC after:1 week Modified: head/usr.sbin/ntp/ntpd/ntp.conf Modified: head/usr.sbin/ntp/ntpd/ntp.conf == --- head/usr.sbin/ntp/ntpd/ntp.conf Mon Sep 7 16:11:49 2020 (r365421) +++ head/usr.sbin/ntp/ntpd/ntp.conf Mon Sep 7 17:19:31 2020 (r365422) @@ -14,8 +14,8 @@ # Set the target and limit for adding servers configured via pool statements # or discovered dynamically via mechanisms such as broadcast and manycast. # Ntpd automatically adds maxclock-1 servers from configured pools, and may -# add as many as maxclock*2 if necessary to ensure that at least minclock -# servers are providing good consistant time. +# add as many as maxclock*2 if necessary to ensure that at least minclock +# servers are providing good consistent time. # tos minclock 3 maxclock 6 ___ 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: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgrap
On Fri, 4 Sep 2020 at 23:11, Kevin Bowling wrote: > > An arbitrary formater may leave a > little bit of annoyance to each person's taste, but that is a tiny > drop in the bucket compared to never having to discuss and especially > correct (which may /seem/ helpful but is pretty offputting to > newcomers). As an experiment I ran clang-format over an arbitrary file (vtfontcvt.c) and put the results in https://reviews.freebsd.org/D26340 Relative to the original file there are a few style(9) items that have been fixed, a few that have been broken, and some that are arguably worse but really indifferent. Fixed: - *_FOREACH now has a space before (, equivalent to for (;;) - header sorting - space between sizeof and ( removed - indentation of an if body - unwrapped function call that fits on one line Broken: - indentation of if / for conditions that span 2 or more lines Indifferent: - lose lined-up struct members or comments - space vs tab after #define - newlines before quoted function arguments - function argument wrapping (see write_glyph_buf) - leading indentation and args-per-line (print_font_info) ___ 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: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgrap
On Sat, 5 Sep 2020 at 16:41, Warner Losh wrote: > >> Fixed: >> - *_FOREACH now has a space before (, equivalent to for (;;) > > Except pretty much everywhere we don't have a space there... Why not? Why should TAILQ_FOREACH have a different style from a for loop? > broke all alignment of variables and comments that were done. > broke purposely outdented code in statistics function > broke all err() calls to wrap too much I had all of these under "indifferent" already, or are more examples of already covered cases (e.g. what seems to be string argument wrapping). > extra headers still included. This is probably not the job of a formatter though. >> - function argument wrapping (see write_glyph_buf) >> - leading indentation and args-per-line (print_font_info) > > An interesting experiment, but there's far more worse after than before. The > rearranging of carefully aligned elements is an especially galling change for > some people (myself included). I disagree this is far worse. If we fixed the wrapping on the second line of if/for conditions I'd say the benefit of letting tooling take care of the formatting outweighs the perhaps slightly less appealing formatting. ___ 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: r365365 - head/tools/boot
Author: emaste
Date: Sat Sep 5 19:03:34 2020
New Revision: 365365
URL: https://svnweb.freebsd.org/changeset/base/365365
Log:
ci-qemu-test.sh: use pkgbase
Reviewed by: bcran (earlier), manu (earlier), imp
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D24276
Modified:
head/tools/boot/ci-qemu-test.sh
Modified: head/tools/boot/ci-qemu-test.sh
==
--- head/tools/boot/ci-qemu-test.sh Sat Sep 5 17:02:48 2020
(r365364)
+++ head/tools/boot/ci-qemu-test.sh Sat Sep 5 19:03:34 2020
(r365365)
@@ -1,11 +1,12 @@
#!/bin/sh
-# Install loader, kernel, and enough of userland to boot in QEMU and echo
-# "Hello world." from init, as a very quick smoke test for CI. Uses QEMU's
-# virtual FAT filesystem to avoid the need to create a disk image. While
-# designed for CI automated testing, this script can also be run by hand as
-# a quick smoke-test. The rootgen.sh and related scripts generate much more
-# extensive tests for many combinations of boot env (ufs, zfs, geli, etc).
+# Install pkgbase packages for loader, kernel, and enough of userland to boot
+# in QEMU and echo "Hello world." from init, as a very quick smoke test for CI.
+# Uses QEMU's virtual FAT filesystem to avoid the need to create a disk image.
+# While designed for CI automated testing, this script can also be run by hand
+# as a quick smoke-test as long as pkgbase packages have been built. The
+# rootgen.sh and related scripts generate much more extensive tests for many
+# combinations of boot env (ufs, zfs, geli, etc).
#
# $FreeBSD$
@@ -26,32 +27,22 @@ tempdir_cleanup()
tempdir_setup()
{
# Create minimal directory structure and populate it.
- # Caller must cd ${SRCTOP} before calling this function.
for dir in dev bin efi/boot etc lib libexec sbin usr/lib usr/libexec; do
mkdir -p ${ROOTDIR}/${dir}
done
# Install kernel, loader and minimal userland.
+ cat<${ROOTDIR}/pkg.conf
+REPOS_DIR=[]
+repositories={local {url = file://$(dirname $OBJTOP)/repo/\${ABI}/latest}}
+EOF
+ ASSUME_ALWAYS_YES=true INSTALL_AS_USER=true pkg \
+ -o ABI_FILE=$OBJTOP/bin/sh/sh \
+ -C ${ROOTDIR}/pkg.conf -r ${ROOTDIR} install \
+ FreeBSD-kernel-generic FreeBSD-bootloader \
+ FreeBSD-clibs FreeBSD-runtime
- make -DNO_ROOT DESTDIR=${ROOTDIR} \
- MODULES_OVERRIDE= \
- WITHOUT_DEBUG_FILES=yes \
- WITHOUT_KERNEL_SYMBOLS=yes \
- installkernel
- for dir in stand \
- lib/libc lib/libedit lib/ncurses \
- libexec/rtld-elf \
- bin/sh sbin/init sbin/shutdown sbin/sysctl; do
- make -DNO_ROOT DESTDIR=${ROOTDIR} INSTALL="install -U" \
- WITHOUT_DEBUG_FILES= \
- WITHOUT_MAN= \
- WITHOUT_PROFILE= \
- WITHOUT_TESTS= \
- WITHOUT_TOOLCHAIN= \
- -C ${dir} install
- done
-
# Put loader in standard EFI location.
mv ${ROOTDIR}/boot/loader.efi ${ROOTDIR}/efi/boot/BOOTx64.EFI
@@ -80,6 +71,10 @@ EOF
: ${SRCTOP:=$(make -V SRCTOP)}
if [ -z "${SRCTOP}" ]; then
die "Cannot locate top of source tree"
+fi
+: ${OBJTOP:=$(make -V OBJTOP)}
+if [ -z "${OBJTOP}" ]; then
+ die "Cannot locate top of object tree"
fi
# Locate the uefi firmware file used by qemu.
___
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: r365362 - head/sys/net
Author: emaste
Date: Sat Sep 5 16:13:36 2020
New Revision: 365362
URL: https://svnweb.freebsd.org/changeset/base/365362
Log:
rtsock.c: remove extraneous space
Submitted by: Neel Chauhan
Differential Revision:https://reviews.freebsd.org/D26249
Modified:
head/sys/net/rtsock.c
Modified: head/sys/net/rtsock.c
==
--- head/sys/net/rtsock.c Sat Sep 5 16:11:04 2020(r365361)
+++ head/sys/net/rtsock.c Sat Sep 5 16:13:36 2020(r365362)
@@ -2137,7 +2137,7 @@ static struct protosw routesw[] = {
static struct domain routedomain = {
.dom_family = PF_ROUTE,
- .dom_name = "route",
+ .dom_name = "route",
.dom_protosw = routesw,
.dom_protoswNPROTOSW = [nitems(routesw)]
};
___
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: r365305 - in head: . tools/build/mk
On Thu, 3 Sep 2020 at 14:22, Dimitry Andric wrote: > > Author: dim > Date: Thu Sep 3 18:21:58 2020 > New Revision: 365305 > URL: https://svnweb.freebsd.org/changeset/base/365305 > > Log: > Ensure zpool-features(5) doesn't get removed by make delete-old. > > Apparently, somewhere in 2012 ZFS-on-FreeBSD moved it from section 5 to > 7, but ZFS-on-Linux never did. Certainly it's silly for us to install zpool-features.5 and then remove it again and this change is sensible in the immediate term, although it looks like this should actually be in section 7. ___ 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: r365285 - head/sys/dev/mgb
Author: emaste Date: Thu Sep 3 02:17:55 2020 New Revision: 365285 URL: https://svnweb.freebsd.org/changeset/base/365285 Log: mgb: correct macro argument name mgb had a longstanding typo in function-like macro MGB_NEXT_RING_IDX's argument, but the macro had no consumers. r365061 introduced a use of the macro, after which mgb failed to build. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/mgb/if_mgb.h Modified: head/sys/dev/mgb/if_mgb.h == --- head/sys/dev/mgb/if_mgb.h Wed Sep 2 23:17:33 2020(r365284) +++ head/sys/dev/mgb/if_mgb.h Thu Sep 3 02:17:55 2020(r365285) @@ -178,8 +178,8 @@ #define MGB_DESC_GET_FRAME_LEN(_desc) \ (((_desc)->ctl & MGB_DESC_FRAME_LEN_MASK) >> 16) -#define MGB_NEXT_RING_IDX(_idx)(((_idx) == MGB_DMA_RING_SIZE - 1) ? 0 : ((_idx_) + 1)) -#define MGB_PREV_RING_IDX(_idx)(((_idx) == 0) ? (MGB_DMA_RING_SIZE - 1) : ((_idx_) - 1)) +#define MGB_NEXT_RING_IDX(_idx)(((_idx) == MGB_DMA_RING_SIZE - 1) ? 0 : ((_idx) + 1)) +#define MGB_PREV_RING_IDX(_idx)(((_idx) == 0) ? (MGB_DMA_RING_SIZE - 1) : ((_idx) - 1)) #define MGB_RING_SPACE(_sc)\ _sc)->tx_ring_data.last_head - (_sc)->tx_ring_data.last_tail - 1) \ + MGB_DMA_RING_SIZE ) % MGB_DMA_RING_SIZE ) ___ 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: r365263 - stable/12/bin/date
Author: emaste Date: Wed Sep 2 17:46:56 2020 New Revision: 365263 URL: https://svnweb.freebsd.org/changeset/base/365263 Log: MFC r364790: date.1: note possibly surprising behaviour of -j -f PR: 248918 Modified: stable/12/bin/date/date.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/date/date.1 == --- stable/12/bin/date/date.1 Wed Sep 2 17:36:30 2020(r365262) +++ stable/12/bin/date/date.1 Wed Sep 2 17:46:56 2020(r365263) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd August 4, 2018 +.Dd August 25, 2020 .Dt DATE 1 .Os .Sh NAME @@ -154,6 +154,9 @@ This allows you to use the flag in addition to the .Cm + option to convert one date format to another. +Note that any date or time components unspecified by the +.Fl f +format string take their values from the current time. .It Fl n By default, if the .Xr timed 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"
svn commit: r365049 - head/share/man/man7
Author: emaste Date: Tue Sep 1 15:30:40 2020 New Revision: 365049 URL: https://svnweb.freebsd.org/changeset/base/365049 Log: release.7: update for current context It's no longer unusual to be able to build a release with a single command, so drop "actually" that hints at a surprise. Also just use "network install directory" instead of referencing FTP; it's more likely to be HTTP now. Reviewed by: gjb Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D26260 Modified: head/share/man/man7/release.7 Modified: head/share/man/man7/release.7 == --- head/share/man/man7/release.7 Tue Sep 1 15:15:44 2020 (r365048) +++ head/share/man/man7/release.7 Tue Sep 1 15:30:40 2020 (r365049) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 16, 2020 +.Dd September 1, 2020 .Dt RELEASE 7 .Os .Sh NAME @@ -40,9 +40,9 @@ All of the tools necessary to build a release are avai .Fx source code repository in .Pa src/release . -A complete release can actually be built with only a single command, +A complete release can be built with only a single command, including the creation of ISO images suitable for burning to CD-ROM, -memory stick images, and an FTP install directory. +memory stick images, and a network install directory. This command is aptly named .Dq Li "make release" . .Pp @@ -96,7 +96,7 @@ assurance, or other aspects of the release engineering .Sh CLEAN RELEASE GENERATION Official releases of .Fx -are produced in a totally clean environment to +are produced in a clean environment to ensure consistency between the versions of the src, ports, and doc trees and to avoid contamination from the host system .Po such as local patches, changes ___ 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: r365018 - head
Author: emaste
Date: Tue Sep 1 00:14:40 2020
New Revision: 365018
URL: https://svnweb.freebsd.org/changeset/base/365018
Log:
Makefile.inc1: comment .endif to ease finding matching .if
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon Aug 31 23:48:27 2020(r365017)
+++ head/Makefile.inc1 Tue Sep 1 00:14:40 2020(r365018)
@@ -1436,7 +1436,7 @@ distributeworld installworld stageworld: _installcheck
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys
-.endif
+.endif # make(distributeworld)
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
.if make(distributeworld)
@@ -1465,7 +1465,7 @@ distributeworld installworld stageworld: _installcheck
${DESTDIR}/${DISTDIR}/${dist}.debug.meta
.endfor
.endif
-.endif
+.endif # make(distributeworld)
packageworld: .PHONY
.for dist in base ${EXTRA_DISTRIBUTIONS}
___
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"
