svn commit: r368092 - head/usr.sbin/bhyve
Author: bcran
Date: Fri Nov 27 07:53:15 2020
New Revision: 368092
URL: https://svnweb.freebsd.org/changeset/base/368092
Log:
bhyve: fix smbiostbl.c style issues and add comment about date format
Fix a couple of style issues introduced in my previous commit.
Add a comment explaining that the SMBIOS specification defines the date
format to be mm/dd/, which is why we don't use ISO 8601.
Modified:
head/usr.sbin/bhyve/smbiostbl.c
Modified: head/usr.sbin/bhyve/smbiostbl.c
==
--- head/usr.sbin/bhyve/smbiostbl.c Fri Nov 27 05:13:52 2020
(r368091)
+++ head/usr.sbin/bhyve/smbiostbl.c Fri Nov 27 07:53:15 2020
(r368092)
@@ -51,8 +51,9 @@ __FBSDID("$FreeBSD$");
#define SMBIOS_BASE0xF1000
-#define FIRMWARE_VERSION "13.0"
-#define FIRMWARE_RELEASE_DATE "11/10/2020"
+#defineFIRMWARE_VERSION"13.0"
+/* The SMBIOS specification defines the date format to be mm/dd/ */
+#defineFIRMWARE_RELEASE_DATE "11/10/2020"
/* BHYVE_ACPI_BASE - SMBIOS_BASE) */
#defineSMBIOS_MAX_LENGTH (0xF2400 - 0xF1000)
___
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: r368091 - head/sys/dev/isp
Author: mav Date: Fri Nov 27 05:13:52 2020 New Revision: 368091 URL: https://svnweb.freebsd.org/changeset/base/368091 Log: Restore break statement lost in r367857. Modified: head/sys/dev/isp/isp_target.c Modified: head/sys/dev/isp/isp_target.c == --- head/sys/dev/isp/isp_target.c Fri Nov 27 04:45:10 2020 (r368090) +++ head/sys/dev/isp/isp_target.c Fri Nov 27 05:13:52 2020 (r368091) @@ -174,6 +174,7 @@ isp_target_notify(ispsoftc_t *isp, void *vptr, uint32_ case RQSTYPE_NOTIFY: isp_get_notify_24xx(isp, inot_24xx, (in_fcentry_24xx_t *)local); isp_handle_notify_24xx(isp, (in_fcentry_24xx_t *)local); + break; case RQSTYPE_NOTIFY_ACK: /* ___ 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: r368090 - stable/12/lib/libc/tests/iconv
Author: asomers
Date: Fri Nov 27 04:45:10 2020
New Revision: 368090
URL: https://svnweb.freebsd.org/changeset/base/368090
Log:
MFC r366132:
lib/libc/tests/iconv: raise WARNS to 6
Modified:
stable/12/lib/libc/tests/iconv/Makefile
stable/12/lib/libc/tests/iconv/iconvctl_test.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/tests/iconv/Makefile
==
--- stable/12/lib/libc/tests/iconv/Makefile Fri Nov 27 03:17:21 2020
(r368089)
+++ stable/12/lib/libc/tests/iconv/Makefile Fri Nov 27 04:45:10 2020
(r368090)
@@ -3,6 +3,5 @@
TESTSDIR= ${TESTSBASE}/lib/libc/iconv
ATF_TESTS_C+= iconvctl_test
-WARNS?=2
.include
Modified: stable/12/lib/libc/tests/iconv/iconvctl_test.c
==
--- stable/12/lib/libc/tests/iconv/iconvctl_test.c Fri Nov 27 03:17:21
2020(r368089)
+++ stable/12/lib/libc/tests/iconv/iconvctl_test.c Fri Nov 27 04:45:10
2020(r368090)
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
#include
-void
+static void
test_trivialp(const char *src, const char *dst, int expected)
{
iconv_t ic;
___
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: r368089 - in stable: 11/sys/kern 12/sys/kern
Author: cy
Date: Fri Nov 27 03:17:21 2020
New Revision: 368089
URL: https://svnweb.freebsd.org/changeset/base/368089
Log:
MFC r367980:
Fix a typo in a comment.
Modified:
stable/12/sys/kern/kern_ntptime.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/kern/kern_ntptime.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/kern/kern_ntptime.c
==
--- stable/12/sys/kern/kern_ntptime.c Thu Nov 26 23:54:13 2020
(r368088)
+++ stable/12/sys/kern/kern_ntptime.c Fri Nov 27 03:17:21 2020
(r368089)
@@ -590,7 +590,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
/*
* Apply any correction from adjtime(2). If more than one second
-* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
+* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500 PPM)
* until the last second is slewed the final < 500 usecs.
*/
if (time_adjtime != 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: r368089 - in stable: 11/sys/kern 12/sys/kern
Author: cy
Date: Fri Nov 27 03:17:21 2020
New Revision: 368089
URL: https://svnweb.freebsd.org/changeset/base/368089
Log:
MFC r367980:
Fix a typo in a comment.
Modified:
stable/11/sys/kern/kern_ntptime.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/kern/kern_ntptime.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/kern/kern_ntptime.c
==
--- stable/11/sys/kern/kern_ntptime.c Thu Nov 26 23:54:13 2020
(r368088)
+++ stable/11/sys/kern/kern_ntptime.c Fri Nov 27 03:17:21 2020
(r368089)
@@ -590,7 +590,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
/*
* Apply any correction from adjtime(2). If more than one second
-* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
+* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500 PPM)
* until the last second is slewed the final < 500 usecs.
*/
if (time_adjtime != 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: r368088 - stable/12/lib/libc/tests/sys
Author: asomers
Date: Thu Nov 26 23:54:13 2020
New Revision: 368088
URL: https://svnweb.freebsd.org/changeset/base/368088
Log:
MFC r366131:
lib/libc/tests/sys: raise WARNS to 6
Modified:
stable/12/lib/libc/tests/sys/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/tests/sys/Makefile
==
--- stable/12/lib/libc/tests/sys/Makefile Thu Nov 26 23:44:57 2020
(r368087)
+++ stable/12/lib/libc/tests/sys/Makefile Thu Nov 26 23:54:13 2020
(r368088)
@@ -80,12 +80,6 @@ LIBADD.timer_create_test+= rt
SRCS.mlock_test+= mlock_helper.c
SRCS.setrlimit_test+= mlock_helper.c
-.if ${COMPILER_TYPE} == "gcc"
-WARNS?=3
-.else
-WARNS?=4
-.endif
-
FILESGROUPS+= truncate_test_FILES
truncate_test_FILES= truncate_test.root_owned
___
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: r368087 - stable/12/sys/kern
Author: asomers
Date: Thu Nov 26 23:44:57 2020
New Revision: 368087
URL: https://svnweb.freebsd.org/changeset/base/368087
Log:
MFC r366118:
Fix some signed/unsigned comparison warnings in NFS
Reviewed by: rmacklem
Differential Revision:https://reviews.freebsd.org/D26533
Modified:
stable/12/sys/kern/subr_acl_nfs4.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/subr_acl_nfs4.c
==
--- stable/12/sys/kern/subr_acl_nfs4.c Thu Nov 26 23:35:13 2020
(r368086)
+++ stable/12/sys/kern/subr_acl_nfs4.c Thu Nov 26 23:44:57 2020
(r368087)
@@ -349,9 +349,9 @@ _acl_append(struct acl *aclp, acl_tag_t tag, acl_perm_
}
static struct acl_entry *
-_acl_duplicate_entry(struct acl *aclp, int entry_index)
+_acl_duplicate_entry(struct acl *aclp, unsigned entry_index)
{
- int i;
+ unsigned i;
KASSERT(aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES,
("aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES"));
@@ -368,7 +368,8 @@ static void
acl_nfs4_sync_acl_from_mode_draft(struct acl *aclp, mode_t mode,
int file_owner_id)
{
- int i, meets, must_append;
+ int meets, must_append;
+ unsigned i;
struct acl_entry *entry, *copy, *previous,
*a1, *a2, *a3, *a4, *a5, *a6;
mode_t amode;
___
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: r368086 - stable/12/tools/regression/fsx
Author: asomers
Date: Thu Nov 26 23:35:13 2020
New Revision: 368086
URL: https://svnweb.freebsd.org/changeset/base/368086
Log:
MFC r365956:
fsx: fix build with WARNS=6
* signed/unsigned comparisons
* use standard warn(3)
* Suppress warnings about local vars and funcs not declared static
* const-correctness
* declaration shadows a variable in the global scope
Reviewed by: kevans
Differential Revision:https://reviews.freebsd.org/D26516
Modified:
stable/12/tools/regression/fsx/Makefile
stable/12/tools/regression/fsx/fsx.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/tools/regression/fsx/Makefile
==
--- stable/12/tools/regression/fsx/Makefile Thu Nov 26 23:34:02 2020
(r368085)
+++ stable/12/tools/regression/fsx/Makefile Thu Nov 26 23:35:13 2020
(r368086)
@@ -4,4 +4,9 @@ PROG= fsx
MAN=
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
.include
+
+# Don't require static declarations. It's line noise in a single-file program.
+CWARNFLAGS+= -Wno-strict-prototypes -Wno-missing-prototypes
Modified: stable/12/tools/regression/fsx/fsx.c
==
--- stable/12/tools/regression/fsx/fsx.cThu Nov 26 23:34:02 2020
(r368085)
+++ stable/12/tools/regression/fsx/fsx.cThu Nov 26 23:35:13 2020
(r368086)
@@ -112,7 +112,7 @@ int closeprob = 0; /* -c flag */
intinvlprob = 0; /* -i flag */
intdebug = 0; /* -d flag */
unsigned long debugstart = 0; /* -D flag */
-unsigned long maxfilelen = 256 * 1024;/* -l flag */
+off_t maxfilelen = 256 * 1024;/* -l flag */
intsizechecks = 1; /* -n flag disables them */
intmaxoplen = 64 * 1024; /* -o flag */
intquiet = 0; /* -q flag */
@@ -138,33 +138,8 @@ int invl = 0;
void
-vwarnc(code, fmt, ap)
- int code;
- const char *fmt;
- va_list ap;
+prt(const char *fmt, ...)
{
- fprintf(stderr, "fsx: ");
- if (fmt != NULL) {
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ": ");
- }
- fprintf(stderr, "%s\n", strerror(code));
-}
-
-
-void
-warn(const char * fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- vwarnc(errno, fmt, ap);
- va_end(ap);
-}
-
-
-void
-prt(char *fmt, ...)
-{
va_list args;
va_start(args, fmt);
@@ -179,7 +154,7 @@ prt(char *fmt, ...)
}
void
-prterr(char *prefix)
+prterr(const char *prefix)
{
prt("%s%s%s\n", prefix, prefix ? ": " : "", strerror(errno));
}
@@ -317,12 +292,12 @@ logdump(void)
void
-save_buffer(char *buffer, off_t bufferlength, int fd)
+save_buffer(char *buffer, off_t bufferlength, int savefd)
{
off_t ret;
ssize_t byteswritten;
- if (fd <= 0 || bufferlength == 0)
+ if (savefd <= 0 || bufferlength == 0)
return;
if (bufferlength > SSIZE_MAX) {
@@ -330,7 +305,7 @@ save_buffer(char *buffer, off_t bufferlength, int fd)
exit(67);
}
if (lite) {
- off_t size_by_seek = lseek(fd, (off_t)0, SEEK_END);
+ off_t size_by_seek = lseek(savefd, (off_t)0, SEEK_END);
if (size_by_seek == (off_t)-1)
prterr("save_buffer: lseek eof");
else if (bufferlength > size_by_seek) {
@@ -340,11 +315,11 @@ save_buffer(char *buffer, off_t bufferlength, int fd)
}
}
- ret = lseek(fd, (off_t)0, SEEK_SET);
+ ret = lseek(savefd, (off_t)0, SEEK_SET);
if (ret == (off_t)-1)
prterr("save_buffer: lseek 0");
- byteswritten = write(fd, buffer, (size_t)bufferlength);
+ byteswritten = write(savefd, buffer, (size_t)bufferlength);
if (byteswritten != bufferlength) {
if (byteswritten == -1)
prterr("save_buffer write");
@@ -458,10 +433,10 @@ check_trunc_hack(void)
void
-doread(unsigned offset, unsigned size)
+doread(off_t offset, off_t size)
{
off_t ret;
- unsigned iret;
+ ssize_t iret;
offset -= offset % readbdy;
if (size == 0) {
@@ -509,7 +484,7 @@ doread(unsigned offset, unsigned size)
void
-check_eofpage(char *s, unsigned offset, char *p, int size)
+check_eofpage(const char *s, unsigned offset, char *p, int size)
{
uintptr_t last_page, should_be_zero;
@@ -592,7 +567,7 @@ domapread(unsigned offset, unsigned size)
void
-gendata(char *original_buf, char *good_buf, unsigned offset, unsigned size)
+gendata(unsigned offset, unsigned size)
{
while (size--) {
good_buf[offset] = testcalls % 256;
@@ -607,7 +582,7 @@ void
dowrite(unsigned offset, unsigned size)
{
off_t ret;
-
svn commit: r368085 - stable/12/lib/libc/gen
Author: asomers
Date: Thu Nov 26 23:34:02 2020
New Revision: 368085
URL: https://svnweb.freebsd.org/changeset/base/368085
Log:
MFC r365910:
fix integer underflow in getgrnam_r and getpwnam_r
Sometimes nscd(8) will return a 1-byte buffer for a nonexistent entry. This
triggered an integer underflow in grp_unmarshal_func, causing getgrnam_r to
return ERANGE instead of 0.
Fix the user's buffer size check, and add a correct check for a too-small
nscd buffer.
PR: 248932
Event:September 2020 Bugathon
Reviewed by: markj
Sponsored by: Axcient
Differential Revision: https://reviews.freebsd.org/D26204
Modified:
stable/12/lib/libc/gen/getgrent.c
stable/12/lib/libc/gen/getpwent.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/gen/getgrent.c
==
--- stable/12/lib/libc/gen/getgrent.c Thu Nov 26 22:49:05 2020
(r368084)
+++ stable/12/lib/libc/gen/getgrent.c Thu Nov 26 23:34:02 2020
(r368085)
@@ -334,14 +334,27 @@ grp_unmarshal_func(char *buffer, size_t buffer_size, v
orig_buf_size = va_arg(ap, size_t);
ret_errno = va_arg(ap, int *);
- if (orig_buf_size <
- buffer_size - sizeof(struct group) - sizeof(char *)) {
+ if (orig_buf_size + sizeof(struct group) + sizeof(char *) < buffer_size)
+ {
*ret_errno = ERANGE;
return (NS_RETURN);
+ } else if (buffer_size < sizeof(struct group) + sizeof(char *)) {
+ /*
+* nscd(8) sometimes returns buffer_size=1 for nonexistent
+* entries.
+*/
+ *ret_errno = 0;
+ return (NS_NOTFOUND);
}
memcpy(grp, buffer, sizeof(struct group));
memcpy(, buffer + sizeof(struct group), sizeof(char *));
+
+ if (orig_buf_size + sizeof(struct group) + sizeof(char *) +
+ _ALIGN(p) - (size_t)p < buffer_size) {
+ *ret_errno = ERANGE;
+ return (NS_RETURN);
+ }
orig_buf = (char *)_ALIGN(orig_buf);
memcpy(orig_buf, buffer + sizeof(struct group) + sizeof(char *) +
Modified: stable/12/lib/libc/gen/getpwent.c
==
--- stable/12/lib/libc/gen/getpwent.c Thu Nov 26 22:49:05 2020
(r368084)
+++ stable/12/lib/libc/gen/getpwent.c Thu Nov 26 23:34:02 2020
(r368085)
@@ -389,10 +389,17 @@ pwd_unmarshal_func(char *buffer, size_t buffer_size, v
orig_buf_size = va_arg(ap, size_t);
ret_errno = va_arg(ap, int *);
- if (orig_buf_size <
- buffer_size - sizeof(struct passwd) - sizeof(char *)) {
+ if (orig_buf_size + sizeof(struct passwd) + sizeof(char *) <
+ buffer_size) {
*ret_errno = ERANGE;
return (NS_RETURN);
+ } else if (buffer_size < sizeof(struct passwd) + sizeof(char *)) {
+ /*
+* nscd(8) sometimes returns buffer_size=1 for nonexistent
+* entries.
+*/
+ *ret_errno = 0;
+ return (NS_NOTFOUND);
}
memcpy(pwd, buffer, sizeof(struct passwd));
___
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: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Just came in from outside to check my buildworld. Removing the gh-bc subdir
in obj fixed it.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
In message <94afc036-0c96-589b-47a4-7d9972b64...@freebsd.org>, Stefan Esser
wri
tes:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --LNh7JZBKUks6iTmPthYYHSJRZLxtgUw39
> Content-Type: multipart/mixed; boundary="UukPFASfKyppXv6KjFIjzyho2LVowmUF8";
> protected-headers="v1"
> From: Stefan Esser
> To: Cy Schubert
> Cc: "O. Hartmann" , src-committ...@freebsd.org,
> svn-src-all@freebsd.org, svn-src-h...@freebsd.org
> Message-ID: <94afc036-0c96-589b-47a4-7d9972b64...@freebsd.org>
> Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals
> manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
> References: <202011261739.0aqhdpe5012...@repo.freebsd.org>
> <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de>
> <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>
> <202011262003.0aqk3bte076...@slippy.cwsent.com>
>
> In-Reply-To:
>
> --UukPFASfKyppXv6KjFIjzyho2LVowmUF8
> Content-Type: text/plain; charset=windows-1252; format=flowed
> Content-Language: de-DE
> Content-Transfer-Encoding: quoted-printable
>
> FYI: Another "make buildworld" has succeeded on my system.
>
> I cannot reproduce the issue your report and need more
> information from your system, e.g. a TAR file with the
> contents of usr.bin/gh-bc, contrib/bc and your object
> directory ${.OBJDIR}.
>
> Regards, STefan
>
> Am 26.11.20 um 22:23 schrieb Stefan Esser:
> > Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:=
>
> >>
> >> ld: error: undefined symbol: bc_lib_name
> > referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:75=
> 2)
> > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> >>
> >> ld: error: undefined symbol: bc_lib
> > referenced by lex.c:225=20
> > (/opt/src/svn-current/contrib/bc/src/lex.c:225)
> > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> > referenced by lex.c:227=20
> > (/opt/src/svn-current/contrib/bc/src/lex.c:227)
> > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> >> cc: error: linker command failed with exit code 1 (use -v to see=20
> >> invocation)
> >> *** [gh-bc.full] Error code 1
> >=20
> > I cannot reproduce this issue on my system.
> >=20
> > The symbols are defined in files generated by gen/strgen.sh and
> > there was a change in the parameters passed to this script, but
> > I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
> > and then in base).
> >=20
> > The generated file lib.c should start like this:
> > -
> > // Copyright (c) 2018-2020 Gavin D. Howard and contributors.
> > // Licensed under the 2-clause BSD license.
> > // *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
> >=20
> > #if 1
> > extern const char *bc_lib_name;
> >=20
> > extern const char bc_lib[];
> >=20
> > const char *bc_lib_name =3D "gen/lib.bc";
> >=20
> > const char bc_lib[] =3D
> > "scale=3D20\n"
> > -
> >=20
> > This file is generated by this rule in usr.bin/gh-bc/Makefile:
> >=20
> > lib.c:=A0=A0=A0=A0=A0=A0=A0=A0=A0 lib.bc
> > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 cd ${BCDIR} && sh gen/st=
> rgen.sh gen/lib.bc=20
> > ${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
> >=20
> > By a script that assigns parameters to variables:
> >=20
> > input=3D"$1"
> > output=3D"$2"
> > name=3D"$3"
> > label=3D"$4"
> > define=3D"$5"
> > remove_tabs=3D"$6"
> >=20
> > And label=3D"bc_lib_name" is used to generate lib.c as included
> > above (passed as 4th parameter).
> >=20
> > I'm rebuilding a clean world, now, but I'd be surprised if it failed
> > after succeeding before readying the commit ...
> >=20
> > Regards, STefan
> >=20
>
>
> --UukPFASfKyppXv6KjFIjzyho2LVowmUF8--
>
> --LNh7JZBKUks6iTmPthYYHSJRZLxtgUw39
> Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
> Content-Description: OpenPGP digital signature
> Content-Disposition: attachment; filename="OpenPGP_signature"
>
> -BEGIN PGP SIGNATURE-
>
> wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl/AKs8FAwAACgkQR+u171r99UTb
> PQgAyB516biVoiagMuoLx2hEWmFtSVi81YJp89y0LMutWOiQNEqo7vSjDSp8lQFIxzLvuJs3ycyb
> tv3LdoHVZHAJHUc/Tyxzs2DAbiUnyF5p6zhYRkUIZjnW7NVF0PF5MiWZzhMjnNOczsFPdrBvY6Ey
> q1UoxrPLBFXavi53Q36q9ZuJFI7cv1l5Vsll+G0tAZzu4PXJQ6EDRhkQGpGWbvDb3gqIjnc2peEE
> tT0JfT6jo6/hNPTTvFo8McYeiwYqAXooa+mH/xjbq3WjGZ9s+vknr+pleH5YGYEP8NaNc+bzxZLk
> pehxZTxhS71hnvwtgf6ZWiH1QNzRNuWacHkPJy9gQg==
> =Vfzz
> -END PGP SIGNATURE-
>
> --LNh7JZBKUks6iTmPthYYHSJRZLxtgUw39--
___
svn-src-all@freebsd.org mailing list
svn commit: r368084 - head/lib/libprocstat
Author: 0mp (doc,ports committer) Date: Thu Nov 26 22:49:05 2020 New Revision: 368084 URL: https://svnweb.freebsd.org/changeset/base/368084 Log: libprocstat.3: Correct two occurrences of kvm_getprocs to procstat_getprocs Submitted by: otis_sk.freebsd.org Reviewed by: markj MFC after:3 days Differential Revision:https://reviews.freebsd.org/D26151 Modified: head/lib/libprocstat/libprocstat.3 Modified: head/lib/libprocstat/libprocstat.3 == --- head/lib/libprocstat/libprocstat.3 Thu Nov 26 20:27:23 2020 (r368083) +++ head/lib/libprocstat/libprocstat.3 Thu Nov 26 22:49:05 2020 (r368084) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 29, 2017 +.Dd November 26, 2020 .Dt LIBPROCSTAT 3 .Os .Sh NAME @@ -345,7 +345,7 @@ structure from one of the functions, a pointer to .Vt kinfo_proc structure from the array obtained from the -.Fn kvm_getprocs +.Fn procstat_getprocs function, and returns a null-terminated argument vector that corresponds to the command line arguments passed to the process. The @@ -402,7 +402,7 @@ structure initialized with one of the functions, a pointer to .Vt kinfo_proc structure from the array obtained from the -.Fn kvm_getprocs +.Fn procstat_getprocs function, and returns a dynamically allocated linked list of filled in .Vt filestat_list structures using the STAILQ macros defined in ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
In message , Stefan Esser
wri
tes:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --maOtBJEdTLpVHYJ8ME4Ow5t7gyU1h0CIy
> Content-Type: multipart/mixed; boundary="m8M7hYutSXzrBuT8orVd2JNQQPKxzBZwZ";
> protected-headers="v1"
> From: Stefan Esser
> To: Cy Schubert
> Cc: "O. Hartmann" , src-committ...@freebsd.org,
> svn-src-all@freebsd.org, svn-src-h...@freebsd.org
> Message-ID:
> Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals
> manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
> References: <202011261739.0aqhdpe5012...@repo.freebsd.org>
> <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de>
> <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>
> <202011262003.0aqk3bte076...@slippy.cwsent.com>
> In-Reply-To: <202011262003.0aqk3bte076...@slippy.cwsent.com>
>
> --m8M7hYutSXzrBuT8orVd2JNQQPKxzBZwZ
> Content-Type: text/plain; charset=windows-1252; format=flowed
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:
> >=20
> > ld: error: undefined symbol: bc_lib_name
> referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752=
> )
> lto.tmp:(bc_vm_boot)
> >=20
> > ld: error: undefined symbol: bc_lib
> referenced by lex.c:225 (/opt/src/svn-current/contrib/bc/src/lex.c:2=
> 25)
> lto.tmp:(bc_vm_boot)
> referenced by lex.c:227 (/opt/src/svn-current/contrib/bc/src/lex.c:2=
> 27)
> lto.tmp:(bc_vm_boot)
> > cc: error: linker command failed with exit code 1 (use -v to see invoca=
> tion)
> > *** [gh-bc.full] Error code 1
>
> I cannot reproduce this issue on my system.
>
> The symbols are defined in files generated by gen/strgen.sh and
> there was a change in the parameters passed to this script, but
> I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
> and then in base).
>
> The generated file lib.c should start like this:
> -
> // Copyright (c) 2018-2020 Gavin D. Howard and contributors.
> // Licensed under the 2-clause BSD license.
> // *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
>
> #if 1
> extern const char *bc_lib_name;
>
> extern const char bc_lib[];
>
> const char *bc_lib_name =3D "gen/lib.bc";
>
> const char bc_lib[] =3D
> "scale=3D20\n"
> -
>
> This file is generated by this rule in usr.bin/gh-bc/Makefile:
>
> lib.c: lib.bc
> cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc=20
> ${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
>
> By a script that assigns parameters to variables:
>
> input=3D"$1"
> output=3D"$2"
> name=3D"$3"
> label=3D"$4"
> define=3D"$5"
> remove_tabs=3D"$6"
>
> And label=3D"bc_lib_name" is used to generate lib.c as included
> above (passed as 4th parameter).
>
> I'm rebuilding a clean world, now, but I'd be surprised if it failed
> after succeeding before readying the commit ...
A clean build (sort of) did fix it: rm the appropriate subdir actually.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
FYI: Another "make buildworld" has succeeded on my system.
I cannot reproduce the issue your report and need more
information from your system, e.g. a TAR file with the
contents of usr.bin/gh-bc, contrib/bc and your object
directory ${.OBJDIR}.
Regards, STefan
Am 26.11.20 um 22:23 schrieb Stefan Esser:
Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:
ld: error: undefined symbol: bc_lib_name
referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752)
lto.tmp:(bc_vm_boot)
ld: error: undefined symbol: bc_lib
referenced by lex.c:225
(/opt/src/svn-current/contrib/bc/src/lex.c:225)
lto.tmp:(bc_vm_boot)
referenced by lex.c:227
(/opt/src/svn-current/contrib/bc/src/lex.c:227)
lto.tmp:(bc_vm_boot)
cc: error: linker command failed with exit code 1 (use -v to see
invocation)
*** [gh-bc.full] Error code 1
I cannot reproduce this issue on my system.
The symbols are defined in files generated by gen/strgen.sh and
there was a change in the parameters passed to this script, but
I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
and then in base).
The generated file lib.c should start like this:
-
// Copyright (c) 2018-2020 Gavin D. Howard and contributors.
// Licensed under the 2-clause BSD license.
// *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
#if 1
extern const char *bc_lib_name;
extern const char bc_lib[];
const char *bc_lib_name = "gen/lib.bc";
const char bc_lib[] =
"scale=20\n"
-
This file is generated by this rule in usr.bin/gh-bc/Makefile:
lib.c: lib.bc
cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc
${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
By a script that assigns parameters to variables:
input="$1"
output="$2"
name="$3"
label="$4"
define="$5"
remove_tabs="$6"
And label="bc_lib_name" is used to generate lib.c as included
above (passed as 4th parameter).
I'm rebuilding a clean world, now, but I'd be surprised if it failed
after succeeding before readying the commit ...
Regards, STefan
OpenPGP_signature
Description: OpenPGP digital signature
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:
ld: error: undefined symbol: bc_lib_name
referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752)
lto.tmp:(bc_vm_boot)
ld: error: undefined symbol: bc_lib
referenced by lex.c:225 (/opt/src/svn-current/contrib/bc/src/lex.c:225)
lto.tmp:(bc_vm_boot)
referenced by lex.c:227 (/opt/src/svn-current/contrib/bc/src/lex.c:227)
lto.tmp:(bc_vm_boot)
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** [gh-bc.full] Error code 1
I cannot reproduce this issue on my system.
The symbols are defined in files generated by gen/strgen.sh and
there was a change in the parameters passed to this script, but
I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
and then in base).
The generated file lib.c should start like this:
-
// Copyright (c) 2018-2020 Gavin D. Howard and contributors.
// Licensed under the 2-clause BSD license.
// *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
#if 1
extern const char *bc_lib_name;
extern const char bc_lib[];
const char *bc_lib_name = "gen/lib.bc";
const char bc_lib[] =
"scale=20\n"
-
This file is generated by this rule in usr.bin/gh-bc/Makefile:
lib.c: lib.bc
cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc
${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
By a script that assigns parameters to variables:
input="$1"
output="$2"
name="$3"
label="$4"
define="$5"
remove_tabs="$6"
And label="bc_lib_name" is used to generate lib.c as included
above (passed as 4th parameter).
I'm rebuilding a clean world, now, but I'd be surprised if it failed
after succeeding before readying the commit ...
Regards, STefan
OpenPGP_signature
Description: OpenPGP digital signature
svn commit: r368083 - head/lib/libc/gen
Author: kib Date: Thu Nov 26 20:27:23 2020 New Revision: 368083 URL: https://svnweb.freebsd.org/changeset/base/368083 Log: Remove stray column. Sponsored by: The FreeBSD Foundation MFC after: 3 days Modified: head/lib/libc/gen/_pthread_stubs.c Modified: head/lib/libc/gen/_pthread_stubs.c == --- head/lib/libc/gen/_pthread_stubs.c Thu Nov 26 20:23:17 2020 (r368082) +++ head/lib/libc/gen/_pthread_stubs.c Thu Nov 26 20:27:23 2020 (r368083) @@ -285,7 +285,7 @@ STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, i STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void) STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, void, int) STUB_FUNC3(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void *, -void *, void *); +void *, void *) STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, void, int) STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, void, int) ___ 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: r368082 - head/lib/libthr/thread
Author: kib Date: Thu Nov 26 20:23:17 2020 New Revision: 368082 URL: https://svnweb.freebsd.org/changeset/base/368082 Log: Style. Sponsored by: The FreeBSD Foundation MFC after: 3 days Modified: head/lib/libthr/thread/thr_attr.c Modified: head/lib/libthr/thread/thr_attr.c == --- head/lib/libthr/thread/thr_attr.c Thu Nov 26 20:22:34 2020 (r368081) +++ head/lib/libthr/thread/thr_attr.c Thu Nov 26 20:23:17 2020 (r368082) @@ -134,7 +134,7 @@ _thr_attr_destroy(pthread_attr_t *attr) *attr = NULL; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_get_np, pthread_attr_get_np); @@ -196,7 +196,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, i *detachstate = PTHREAD_CREATE_JOINABLE; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_getguardsize, pthread_attr_getguardsize); @@ -216,7 +216,7 @@ _thr_attr_getguardsize(const pthread_attr_t * __restri *guardsize = (*attr)->guardsize_attr; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_getinheritsched, pthread_attr_getinheritsched); @@ -233,7 +233,7 @@ _thr_attr_getinheritsched(const pthread_attr_t * __res else *sched_inherit = (*attr)->sched_inherit; - return(ret); + return (ret); } __weak_reference(_thr_attr_getschedparam, pthread_attr_getschedparam); @@ -250,7 +250,7 @@ _thr_attr_getschedparam(const pthread_attr_t * __restr else param->sched_priority = (*attr)->prio; - return(ret); + return (ret); } __weak_reference(_thr_attr_getschedpolicy, pthread_attr_getschedpolicy); @@ -267,7 +267,7 @@ _thr_attr_getschedpolicy(const pthread_attr_t * __rest else *policy = (*attr)->sched_policy; - return(ret); + return (ret); } __weak_reference(_thr_attr_getscope, pthread_attr_getscope); @@ -287,7 +287,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict a *contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ? PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS; - return(ret); + return (ret); } __weak_reference(_pthread_attr_getstack, pthread_attr_getstack); @@ -308,7 +308,7 @@ _pthread_attr_getstack(const pthread_attr_t * __restri *stacksize = (*attr)->stacksize_attr; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_getstackaddr, pthread_attr_getstackaddr); @@ -327,7 +327,7 @@ _thr_attr_getstackaddr(const pthread_attr_t *attr, voi *stackaddr = (*attr)->stackaddr_attr; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_getstacksize, pthread_attr_getstacksize); @@ -347,7 +347,7 @@ _thr_attr_getstacksize(const pthread_attr_t * __restri *stacksize = (*attr)->stacksize_attr; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_init, pthread_attr_init); @@ -373,7 +373,7 @@ _thr_attr_init(pthread_attr_t *attr) *attr = pattr; ret = 0; } - return(ret); + return (ret); } __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); @@ -389,7 +389,7 @@ _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr (*attr)->suspend = THR_CREATE_SUSPENDED; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_setdetachstate, pthread_attr_setdetachstate); @@ -415,7 +415,7 @@ _thr_attr_setdetachstate(pthread_attr_t *attr, int det (*attr)->flags &= ~PTHREAD_DETACHED; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_setguardsize, pthread_attr_setguardsize); @@ -434,7 +434,7 @@ _thr_attr_setguardsize(pthread_attr_t *attr, size_t gu (*attr)->guardsize_attr = guardsize; ret = 0; } - return(ret); + return (ret); } __weak_reference(_thr_attr_setinheritsched, pthread_attr_setinheritsched); @@ -453,7 +453,7 @@ _thr_attr_setinheritsched(pthread_attr_t *attr, int sc else (*attr)->sched_inherit = sched_inherit; - return(ret); + return (ret); } __weak_reference(_thr_attr_setschedparam, pthread_attr_setschedparam); @@ -506,7 +506,7 @@ _thr_attr_setschedpolicy(pthread_attr_t *attr, int pol (*attr)->sched_policy = policy; (*attr)->prio = _thr_priorities[policy-1].pri_default; } - return(ret); + return (ret); } __weak_reference(_thr_attr_setscope, pthread_attr_setscope); @@
svn commit: r368081 - head/sys/arm64/arm64
Author: manu
Date: Thu Nov 26 20:22:34 2020
New Revision: 368081
URL: https://svnweb.freebsd.org/changeset/base/368081
Log:
arm64: Do not rely on SPCR table to detect acpi
Since EDK2 commit d8e36289cef7bde628b023219cd65fa8e8d4562a, the Graphical
console may
completely hide SPCR, causing panics later when locating timers.
As such simply rely on the ACPI Root pointer presence.
Submitted by: dan.kotow...@a9development.com
Reviewed by: andrew, mw
Differential Revision:https://reviews.freebsd.org/D27306
Modified:
head/sys/arm64/arm64/machdep.c
Modified: head/sys/arm64/arm64/machdep.c
==
--- head/sys/arm64/arm64/machdep.c Thu Nov 26 19:38:02 2020
(r368080)
+++ head/sys/arm64/arm64/machdep.c Thu Nov 26 20:22:34 2020
(r368081)
@@ -1036,7 +1036,7 @@ bus_probe(void)
has_fdt = (OF_peer(0) != 0);
#endif
#ifdef DEV_ACPI
- has_acpi = (acpi_find_table(ACPI_SIG_SPCR) != 0);
+ has_acpi = (AcpiOsGetRootPointer() != 0);
#endif
env = kern_getenv("kern.cfg.order");
___
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: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
In message <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>, Stefan Esser wri tes: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --2G5HCRtxQxuyxUK7KLlZTL2fMyBuBvAg7 > Content-Type: multipart/mixed; boundary="FsAoxbmUuUe0Y5w6qCnYUtYCPXSqZLgCr"; > protected-headers="v1" > From: Stefan Esser > To: "O. Hartmann" > Cc: src-committ...@freebsd.org, svn-src-all@freebsd.org, > svn-src-h...@freebsd.org > Message-ID: <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org> > Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals > manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests > References: <202011261739.0aqhdpe5012...@repo.freebsd.org> > <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de> > In-Reply-To: <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de> > > --FsAoxbmUuUe0Y5w6qCnYUtYCPXSqZLgCr > Content-Type: text/plain; charset=utf-8; format=flowed > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > Am 26.11.20 um 19:19 schrieb O. Hartmann: > >> svn-src-h...@freebsd.org mailing list > >> https://lists.freebsd.org/mailman/listinfo/svn-src-head > >> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org= > " > > Buildworld fails with "don't know how to make bc/bc.c": > >=20 > > =3D=3D=3D> usr.sbin/ndp (all) > > - --- all_subdir_usr.bin --- > > make[4]: make[4]: don't know how to make bc/bc.c. Stop > > Hi Oliver, > > thanks - I had already noticed that for some reason the Makefile > in usr.bin/gh-bc had not been included in the commit. > > I just checked the command in the shell history and found that > I have used a wrong path in the commit: > > $ cd /usr/svn/base/head > $ svn ci contrib/bc usr.bin/bc > > And that should have been usr.bin/gh-bc ... > > Sorry for the breakage! I have committed the fix before seeing > your mail ... > > Regards, STefan But this is still a problem: ld: error: undefined symbol: bc_lib_name >>> referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752) >>> lto.tmp:(bc_vm_boot) ld: error: undefined symbol: bc_lib >>> referenced by lex.c:225 (/opt/src/svn-current/contrib/bc/src/lex.c:225) >>> lto.tmp:(bc_vm_boot) >>> referenced by lex.c:227 (/opt/src/svn-current/contrib/bc/src/lex.c:227) >>> lto.tmp:(bc_vm_boot) cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [gh-bc.full] Error code 1 make[4]: stopped in /opt/src/svn-current/usr.bin/gh-bc -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Am 26.11.20 um 19:19 schrieb O. Hartmann: svn-src-h...@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" Buildworld fails with "don't know how to make bc/bc.c": ===> usr.sbin/ndp (all) - --- all_subdir_usr.bin --- make[4]: make[4]: don't know how to make bc/bc.c. Stop Hi Oliver, thanks - I had already noticed that for some reason the Makefile in usr.bin/gh-bc had not been included in the commit. I just checked the command in the shell history and found that I have used a wrong path in the commit: $ cd /usr/svn/base/head $ svn ci contrib/bc usr.bin/bc And that should have been usr.bin/gh-bc ... Sorry for the breakage! I have committed the fix before seeing your mail ... Regards, STefan OpenPGP_signature Description: OpenPGP digital signature
svn commit: r368080 - head/usr.bin/gh-bc
Author: se
Date: Thu Nov 26 19:38:02 2020
New Revision: 368080
URL: https://svnweb.freebsd.org/changeset/base/368080
Log:
Update Makefile for new version 3.2.0
Modified:
head/usr.bin/gh-bc/Makefile
Modified: head/usr.bin/gh-bc/Makefile
==
--- head/usr.bin/gh-bc/Makefile Thu Nov 26 18:47:23 2020(r368079)
+++ head/usr.bin/gh-bc/Makefile Thu Nov 26 19:38:02 2020(r368080)
@@ -9,8 +9,8 @@ BCDIR= ${SRCTOP}/contrib/${PROGNAME}
BCVERSION!=sed -n -e '/.*VERSION *= *[0-9]/s/.*VERSION *= *//p'
${BCDIR}/Makefile.in
SRCS= args.c data.c file.c lang.c lex.c main.c num.c parse.c
program.c read.c vector.c vm.c
-SRCS+= bc/bc.c bc/lex.c bc/parse.c dc/dc.c dc/lex.c dc/parse.c
history/history.c
-SRCS+= bc_help.c dc_help.c lib.c lib2.c opt.c rand/rand.c
+SRCS+= bc.c bc_lex.c bc_parse.c dc.c dc_lex.c dc_parse.c history.c
library.c
+SRCS+= bc_help.c dc_help.c lib.c lib2.c opt.c rand.c
MAN= bc.1 dc.1
LINKS= ${BINDIR}/bc ${BINDIR}/dc
@@ -96,16 +96,16 @@ NLSLINKS_pt_PT.ISO8859-1+= pt_PT.ISO8859-15
.endif
lib.c: lib.bc
- cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc ${.OBJDIR}/lib.c
bc_lib bc.h bc_lib_name 1 1
+ cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc ${.OBJDIR}/lib.c
bc_lib bc_lib_name 1 1
lib2.c:lib2.bc
- cd ${BCDIR} && sh gen/strgen.sh gen/lib2.bc ${.OBJDIR}/lib2.c
bc_lib2 bc.h bc_lib2_name 1 1
+ cd ${BCDIR} && sh gen/strgen.sh gen/lib2.bc ${.OBJDIR}/lib2.c
bc_lib2 bc_lib2_name 1 1
bc_help.c: bc_help.txt
- cd ${BCDIR} && sh gen/strgen.sh gen/bc_help.txt
${.OBJDIR}/bc_help.c bc_help bc.h
+ cd ${BCDIR} && sh gen/strgen.sh gen/bc_help.txt
${.OBJDIR}/bc_help.c bc_help
dc_help.c: dc_help.txt
- cd ${BCDIR} && sh gen/strgen.sh gen/dc_help.txt
${.OBJDIR}/dc_help.c dc_help dc.h
+ cd ${BCDIR} && sh gen/strgen.sh gen/dc_help.txt
${.OBJDIR}/dc_help.c dc_help
bc.1:
${CP} ${BCDIR}/manuals/${MAN_SRC_BC} ${.OBJDIR}/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"
Re: svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On Thu, Nov 26, 2020 at 2:16 AM Bjoern A. Zeeb < bzeeb-li...@lists.zabbadoz.net> wrote: > On 26 Nov 2020, at 4:29, Alan Somers wrote: > > > Author: asomers > > Date: Thu Nov 26 04:29:30 2020 > > New Revision: 368045 > > URL: https://svnweb.freebsd.org/changeset/base/368045 > > > > Log: > > Merge ping6 to ping > > > > There is now a single ping binary, which chooses to use ICMP or > > ICMPv4 > > based on the -4 and -6 options, and the format of the address. > > > > Submitted by: Ján Sučan > > Sponsored by: Google LLC (Google Summer of Code 2019) > > MFC after: Never > > Differential Revision: https://reviews.freebsd.org/D21377 > > I don’t have IPv4 anymore. > I don’t see any WITHOUT_INET or -DINET checks. > How can I compile INET out now? > I don't see any such checks before, either. Was it ever possible to exclude ping by building WITHOUT_INET? > > > Also can we please have a ping6 [binary, compat shell script, or > hardlink] back which defaults to -6 with appropriate option parsing by > default? > People used that in scripts and whatnot for about 20 years (and > there’s even still stuff in tools in our own tree referencing it). > Done. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368079 - head/sys/dev/isp
Author: mav
Date: Thu Nov 26 18:47:23 2020
New Revision: 368079
URL: https://svnweb.freebsd.org/changeset/base/368079
Log:
More cleanup in response queue and reset code.
Modified:
head/sys/dev/isp/isp.c
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/isp_freebsd.h
head/sys/dev/isp/ispmbox.h
head/sys/dev/isp/ispvar.h
Modified: head/sys/dev/isp/isp.c
==
--- head/sys/dev/isp/isp.c Thu Nov 26 18:33:04 2020(r368078)
+++ head/sys/dev/isp/isp.c Thu Nov 26 18:47:23 2020(r368079)
@@ -64,11 +64,6 @@ __FBSDID("$FreeBSD$");
#endif
/*
- * General defines
- */
-#defineMBOX_DELAY_COUNT100 / 100
-
-/*
* Local static data
*/
static const char notresp[] = "Unknown IOCB in RESPONSE Queue (type 0x%x) @
idx %d (next %d)";
@@ -99,7 +94,7 @@ static const uint8_t alpa_map[] = {
* Local function prototypes.
*/
static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, uint32_t
*, uint16_t);
-static void isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *,
uint32_t *);
+static void isp_parse_status_24xx(ispsoftc_t *, isp24xx_statusreq_t *, XS_T *);
static void isp_clear_portdb(ispsoftc_t *, int);
static void isp_mark_portdb(ispsoftc_t *, int);
static int isp_plogx(ispsoftc_t *, int, uint16_t, uint32_t, int);
@@ -155,7 +150,7 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults)
char *buf;
uint64_t fwt;
uint32_t code_org, val;
- int loops, i, dodnld = 1;
+ int loaded_fw, loops, i, dodnld = 1;
const char *btype = "";
static const char dcrc[] = "Downloaded RISC Code Checksum Failure";
@@ -188,25 +183,19 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults)
}
/*
-* Hit the chip over the head with hammer,
-* and give it a chance to recover.
-*/
-
- /*
* Stop DMA and wait for it to stop.
*/
ISP_WRITE(isp, BIU2400_CSR, BIU2400_DMA_STOP|(3 << 4));
- for (val = loops = 0; loops < 3; loops++) {
+ for (loops = 0; loops < 10; loops++) {
ISP_DELAY(10);
val = ISP_READ(isp, BIU2400_CSR);
if ((val & BIU2400_DMA_ACTIVE) == 0) {
break;
}
}
- if (val & BIU2400_DMA_ACTIVE) {
+ if (val & BIU2400_DMA_ACTIVE)
isp_prt(isp, ISP_LOGERR, "DMA Failed to Stop on Reset");
- return;
- }
+
/*
* Hold it in SOFT_RESET and STOP state for 100us.
*/
@@ -215,33 +204,24 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults)
for (loops = 0; loops < 1; loops++) {
ISP_DELAY(5);
val = ISP_READ(isp, OUTMAILBOX0);
- }
- for (val = loops = 0; loops < 50; loops ++) {
- val = ISP_READ(isp, BIU2400_CSR);
- if ((val & BIU2400_SOFT_RESET) == 0) {
+ if (val != 0x4)
break;
- }
}
- if (val & BIU2400_SOFT_RESET) {
- isp_prt(isp, ISP_LOGERR, "Failed to come out of reset");
+ switch (val) {
+ case 0x0:
+ break;
+ case 0x4:
+ isp_prt(isp, ISP_LOGERR, "The ROM code is busy after 50ms.");
return;
+ case 0xf:
+ isp_prt(isp, ISP_LOGERR, "Board configuration error.");
+ return;
+ default:
+ isp_prt(isp, ISP_LOGERR, "Unknown RISC Status Code 0x%x.", val);
+ return;
}
/*
-* Wait for ISP to be ready to go...
-*/
- loops = MBOX_DELAY_COUNT;
- for (;;) {
- if (ISP_READ(isp, OUTMAILBOX0) == 0)
- break;
- ISP_DELAY(100);
- if (--loops < 0) {
- ISP_DUMPREGS(isp, "chip reset timed out");
- return;
- }
- }
-
- /*
* Reset RISC Processor
*/
ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_RESET);
@@ -251,16 +231,24 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults)
/*
* Post-RISC Reset stuff.
*/
- for (val = loops = 0; loops < 500; loops++) {
+ for (loops = 0; loops < 1; loops++) {
ISP_DELAY(5);
val = ISP_READ(isp, OUTMAILBOX0);
- if (val == 0) {
+ if (val != 0x4)
break;
- }
}
- if (val != 0) {
- isp_prt(isp, ISP_LOGERR, "reset didn't clear");
+ switch (val) {
+ case 0x0:
+ break;
+ case 0x4:
+ isp_prt(isp, ISP_LOGERR, "The ROM code is busy after 50ms.");
return;
+ case 0xf:
+ isp_prt(isp, ISP_LOGERR, "Board configuration error.");
+ return;
+ default:
+
svn commit: r368075 - head/sys/kern
Author: kib
Date: Thu Nov 26 18:08:42 2020
New Revision: 368075
URL: https://svnweb.freebsd.org/changeset/base/368075
Log:
More careful handling of the mount failure.
- VFS_UNMOUNT() requires vn_start_write() around it [*].
- call VFS_PURGE() before unmount.
- do not destroy mp if cleanup unmount did not succeed.
- set MNTK_UNMOUNT, and indicate forced unmount with MNTK_UNMOUNTF
for VFS_UNMOUNT() in cleanup.
PR: 251320 [*]
Reported by: Tong Zhang
Reviewed by: markj, mjg
Discussed with: rmacklem
Sponsored by: The FreeBSD Foundation
Differential revision:https://reviews.freebsd.org/D27327
Modified:
head/sys/kern/vfs_mount.c
Modified: head/sys/kern/vfs_mount.c
==
--- head/sys/kern/vfs_mount.c Thu Nov 26 18:03:24 2020(r368074)
+++ head/sys/kern/vfs_mount.c Thu Nov 26 18:08:42 2020(r368075)
@@ -903,6 +903,7 @@ vfs_domount_first(
struct mount *mp;
struct vnode *newdp, *rootvp;
int error, error1;
+ bool unmounted;
ASSERT_VOP_ELOCKED(vp, __func__);
KASSERT((fsflags & MNT_UPDATE) == 0, ("MNT_UPDATE shouldn't be here"));
@@ -964,23 +965,39 @@ vfs_domount_first(
* get. No freeing of cn_pnbuf.
*/
error1 = 0;
+ unmounted = true;
if ((error = VFS_MOUNT(mp)) != 0 ||
(error1 = VFS_STATFS(mp, >mnt_stat)) != 0 ||
(error1 = VFS_ROOT(mp, LK_EXCLUSIVE, )) != 0) {
rootvp = NULL;
if (error1 != 0) {
- error = error1;
+ MPASS(error == 0);
rootvp = vfs_cache_root_clear(mp);
if (rootvp != NULL) {
vhold(rootvp);
vrele(rootvp);
}
- if ((error1 = VFS_UNMOUNT(mp, 0)) != 0)
- printf("VFS_UNMOUNT returned %d\n", error1);
+ (void)vn_start_write(NULL, , V_WAIT);
+ MNT_ILOCK(mp);
+ mp->mnt_kern_flag |= MNTK_UNMOUNT | MNTK_UNMOUNTF;
+ MNT_IUNLOCK(mp);
+ VFS_PURGE(mp);
+ error = VFS_UNMOUNT(mp, 0);
+ vn_finished_write(mp);
+ if (error != 0) {
+ printf(
+ "failed post-mount (%d): rollback unmount returned %d\n",
+ error1, error);
+ unmounted = false;
+ }
+ error = error1;
}
vfs_unbusy(mp);
mp->mnt_vnodecovered = NULL;
- vfs_mount_destroy(mp);
+ if (unmounted) {
+ /* XXXKIB wait for mnt_lockref drain? */
+ vfs_mount_destroy(mp);
+ }
VI_LOCK(vp);
vp->v_iflag &= ~VI_MOUNT;
VI_UNLOCK(vp);
___
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: r368078 - in head: . rescue/rescue sbin/ping sbin/ping/tests tools/build/mk
Author: asomers
Date: Thu Nov 26 18:33:04 2020
New Revision: 368078
URL: https://svnweb.freebsd.org/changeset/base/368078
Log:
ping: add a ping6 hard link for backwards compatibility
When invoked as "ping6", ping will now attempt to use ICMPv6 for hostnames
that resolve both IPv4 and IPv6 addresses.
Reviewed by: bz, manu
MFC-With: r368045
Differential Revision:https://reviews.freebsd.org/D27384
Modified:
head/ObsoleteFiles.inc
head/rescue/rescue/Makefile
head/sbin/ping/Makefile
head/sbin/ping/main.c
head/sbin/ping/ping.8
head/sbin/ping/tests/ping_test.sh
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Thu Nov 26 18:16:32 2020(r368077)
+++ head/ObsoleteFiles.inc Thu Nov 26 18:33:04 2020(r368078)
@@ -37,8 +37,6 @@
# done
# 20201124: ping6(8) was merged into ping(8)
-OLD_FILES+=sbin/ping6
-OLD_FILES+=rescue/ping6
OLD_FILES+=usr/lib/debug/sbin/ping6.debug
OLD_FILES+=usr/share/man/man8/ping6.8.gz
OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Thu Nov 26 18:16:32 2020(r368077)
+++ head/rescue/rescue/Makefile Thu Nov 26 18:33:04 2020(r368078)
@@ -103,6 +103,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
.endif
.if ${MK_INET6_SUPPORT} != "no"
+CRUNCH_ALIAS_ping= ping6
CRUNCH_PROGS_sbin+= rtsol
.endif
Modified: head/sbin/ping/Makefile
==
--- head/sbin/ping/Makefile Thu Nov 26 18:16:32 2020(r368077)
+++ head/sbin/ping/Makefile Thu Nov 26 18:33:04 2020(r368078)
@@ -15,6 +15,7 @@ LIBADD= m
CFLAGS+= -DINET6 -DKAME_SCOPEID
SRCS+= ping6.c
LIBADD+= md
+LINKS= ${BINDIR}/ping ${BINDIR}/ping6
.endif
.if ${MK_DYNAMICROOT} == "no"
Modified: head/sbin/ping/main.c
==
--- head/sbin/ping/main.c Thu Nov 26 18:16:32 2020(r368077)
+++ head/sbin/ping/main.c Thu Nov 26 18:33:04 2020(r368078)
@@ -66,7 +66,10 @@ main(int argc, char *argv[])
struct in6_addr a6;
bool ipv6;
- ipv6 = false;
+ if (strcmp(getprogname(), "ping6") == 0)
+ ipv6 = true;
+ else
+ ipv6 = false;
#endif
ipv4 = false;
Modified: head/sbin/ping/ping.8
==
--- head/sbin/ping/ping.8 Thu Nov 26 18:16:32 2020(r368077)
+++ head/sbin/ping/ping.8 Thu Nov 26 18:33:04 2020(r368078)
@@ -28,7 +28,7 @@
.\" @(#)ping.8 8.2 (Berkeley) 12/11/93
.\" $FreeBSD$
.\"
-.Dd November 24, 2020
+.Dd November 26, 2020
.Dt PING 8
.Os
.Sh NAME
@@ -141,6 +141,9 @@ the specific IP version can be requested by
or
.Fl 6
options, respectively.
+For backwards-compatibility, ICMPv6 can also be selected by invoking the binary
+as
+.Nm ping6 .
.Ss Options common to both IPv4 and IPv6 targets
.Bl -tag -width indent
.It Fl A
Modified: head/sbin/ping/tests/ping_test.sh
==
--- head/sbin/ping/tests/ping_test.sh Thu Nov 26 18:16:32 2020
(r368077)
+++ head/sbin/ping/tests/ping_test.sh Thu Nov 26 18:33:04 2020
(r368078)
@@ -53,9 +53,23 @@ ping_6_c1_s8_t1_body() {
check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
}
+atf_test_case ping6_c1_s8_t1
+ping6_c1_s8_t1_head() {
+atf_set "descr" "Use IPv6 when invoked as ping6"
+}
+ping6_c1_s8_t1_body() {
+if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
+ atf_skip "IPv6 is not configured"
+fi
+atf_check -s exit:0 -o save:std.out -e empty \
+ ping6 -c 1 -s 8 -t 1 localhost
+check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
+}
+
atf_init_test_cases() {
atf_add_test_case ping_c1_s56_t1
atf_add_test_case ping_6_c1_s8_t1
+atf_add_test_case ping6_c1_s8_t1
}
check_ping_statistics() {
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 26 18:16:32
2020(r368077)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Nov 26 18:33:04
2020(r368078)
@@ -2583,6 +2583,7 @@ OLD_DIRS+=usr/share/i18n/csmapper/GB
.endif
.if ${MK_INET6} == no
+OLD_FILES+=sbin/ping6
OLD_FILES+=sbin/rtsol
OLD_FILES+=usr/sbin/ip6addrctl
OLD_FILES+=usr/sbin/mld6query
@@ -2611,6 +2612,7 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
.endif
.if ${MK_INET6_SUPPORT} == no
+OLD_FILES+=rescue/ping6
OLD_FILES+=rescue/rtsol
.endif
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Am Thu, 26 Nov 2020 17:39:51 + (UTC) Stefan Eßer schrieb: > Author: se > Date: Thu Nov 26 17:39:51 2020 > New Revision: 368072 > URL: https://svnweb.freebsd.org/changeset/base/368072 > > Log: > Update to version 3.2.0 > > Added: > head/contrib/bc/exec-install.sh > - copied unchanged from r368069, vendor/bc/dist/exec-install.sh > head/contrib/bc/include/bcl.h > - copied unchanged from r368069, vendor/bc/dist/include/bcl.h > head/contrib/bc/include/library.h > - copied unchanged from r368069, vendor/bc/dist/include/library.h > head/contrib/bc/manuals/bcl.3 > - copied unchanged from r368069, vendor/bc/dist/manuals/bcl.3 > head/contrib/bc/manuals/bcl.3.md > - copied unchanged from r368069, vendor/bc/dist/manuals/bcl.3.md > head/contrib/bc/manuals/header.txt > - copied unchanged from r368069, vendor/bc/dist/manuals/header.txt > head/contrib/bc/manuals/header_bc.txt > - copied unchanged from r368069, vendor/bc/dist/manuals/header_bc.txt > head/contrib/bc/manuals/header_bcl.txt > - copied unchanged from r368069, vendor/bc/dist/manuals/header_bcl.txt > head/contrib/bc/manuals/header_dc.txt > - copied unchanged from r368069, vendor/bc/dist/manuals/header_dc.txt > head/contrib/bc/src/bc.c > - copied unchanged from r368069, vendor/bc/dist/src/bc.c > head/contrib/bc/src/bc_lex.c > - copied unchanged from r368069, vendor/bc/dist/src/bc_lex.c > head/contrib/bc/src/bc_parse.c > - copied unchanged from r368069, vendor/bc/dist/src/bc_parse.c > head/contrib/bc/src/dc.c > - copied unchanged from r368069, vendor/bc/dist/src/dc.c > head/contrib/bc/src/dc_lex.c > - copied unchanged from r368069, vendor/bc/dist/src/dc_lex.c > head/contrib/bc/src/dc_parse.c > - copied unchanged from r368069, vendor/bc/dist/src/dc_parse.c > head/contrib/bc/src/history.c > - copied unchanged from r368069, vendor/bc/dist/src/history.c > head/contrib/bc/src/library.c > - copied unchanged from r368069, vendor/bc/dist/src/library.c > head/contrib/bc/src/rand.c > - copied unchanged from r368069, vendor/bc/dist/src/rand.c > head/contrib/bc/tests/bcl.c > - copied unchanged from r368069, vendor/bc/dist/tests/bcl.c > Deleted: > head/contrib/bc/install.sh > head/contrib/bc/src/bc/ > head/contrib/bc/src/dc/ > head/contrib/bc/src/history/ > head/contrib/bc/src/rand/ > Modified: > head/contrib/bc/.gitignore > head/contrib/bc/Makefile.in > head/contrib/bc/NEWS.md > head/contrib/bc/README.md > head/contrib/bc/configure.sh > head/contrib/bc/gen/lib.bc > head/contrib/bc/gen/strgen.c > head/contrib/bc/gen/strgen.sh > head/contrib/bc/include/file.h > head/contrib/bc/include/lex.h > head/contrib/bc/include/num.h > head/contrib/bc/include/parse.h > head/contrib/bc/include/rand.h > head/contrib/bc/include/status.h > head/contrib/bc/include/vector.h > head/contrib/bc/include/vm.h > head/contrib/bc/manpage.sh > head/contrib/bc/manuals/bc.1.md.in > head/contrib/bc/manuals/bc/A.1 > head/contrib/bc/manuals/bc/A.1.md > head/contrib/bc/manuals/bc/E.1 > head/contrib/bc/manuals/bc/E.1.md > head/contrib/bc/manuals/bc/EH.1 > head/contrib/bc/manuals/bc/EH.1.md > head/contrib/bc/manuals/bc/EHN.1 > head/contrib/bc/manuals/bc/EHN.1.md > head/contrib/bc/manuals/bc/EHNP.1 > head/contrib/bc/manuals/bc/EHNP.1.md > head/contrib/bc/manuals/bc/EHP.1 > head/contrib/bc/manuals/bc/EHP.1.md > head/contrib/bc/manuals/bc/EN.1 > head/contrib/bc/manuals/bc/EN.1.md > head/contrib/bc/manuals/bc/ENP.1 > head/contrib/bc/manuals/bc/ENP.1.md > head/contrib/bc/manuals/bc/EP.1 > head/contrib/bc/manuals/bc/EP.1.md > head/contrib/bc/manuals/bc/H.1 > head/contrib/bc/manuals/bc/H.1.md > head/contrib/bc/manuals/bc/HN.1 > head/contrib/bc/manuals/bc/HN.1.md > head/contrib/bc/manuals/bc/HNP.1 > head/contrib/bc/manuals/bc/HNP.1.md > head/contrib/bc/manuals/bc/HP.1 > head/contrib/bc/manuals/bc/HP.1.md > head/contrib/bc/manuals/bc/N.1 > head/contrib/bc/manuals/bc/N.1.md > head/contrib/bc/manuals/bc/NP.1 > head/contrib/bc/manuals/bc/NP.1.md > head/contrib/bc/manuals/bc/P.1 > head/contrib/bc/manuals/bc/P.1.md > head/contrib/bc/manuals/build.md > head/contrib/bc/manuals/dc.1.md.in > head/contrib/bc/manuals/dc/A.1 > head/contrib/bc/manuals/dc/A.1.md > head/contrib/bc/manuals/dc/E.1 > head/contrib/bc/manuals/dc/E.1.md > head/contrib/bc/manuals/dc/EH.1 > head/contrib/bc/manuals/dc/EH.1.md > head/contrib/bc/manuals/dc/EHN.1 > head/contrib/bc/manuals/dc/EHN.1.md > head/contrib/bc/manuals/dc/EHNP.1 > head/contrib/bc/manuals/dc/EHNP.1.md > head/contrib/bc/manuals/dc/EHP.1 > head/contrib/bc/manuals/dc/EHP.1.md > head/contrib/bc/manuals/dc/EN.1 > head/contrib/bc/manuals/dc/EN.1.md > head/contrib/bc/manuals/dc/ENP.1 > head/contrib/bc/manuals/dc/ENP.1.md > head/contrib/bc/manuals/dc/EP.1 >
svn commit: r368077 - head/sys/fs/nullfs
Author: kib
Date: Thu Nov 26 18:16:32 2020
New Revision: 368077
URL: https://svnweb.freebsd.org/changeset/base/368077
Log:
nullfs: provide custom bypass for VOP_READ_PGCACHE().
Normal bypass expects locked vnode, which is not true for
VOP_READ_PGCACHE(). Ensure liveness of the lower vnode by taking the
upper vnode interlock, which is also taked by null_reclaim() when
setting v_data to NULL.
Reported and tested by: pho
Reviewed by: markj, mjg
Sponsored by: The FreeBSD Foundation
Differential revision:https://reviews.freebsd.org/D27327
Modified:
head/sys/fs/nullfs/null_vnops.c
Modified: head/sys/fs/nullfs/null_vnops.c
==
--- head/sys/fs/nullfs/null_vnops.c Thu Nov 26 18:13:33 2020
(r368076)
+++ head/sys/fs/nullfs/null_vnops.c Thu Nov 26 18:16:32 2020
(r368077)
@@ -947,6 +947,28 @@ null_vptocnp(struct vop_vptocnp_args *ap)
return (error);
}
+static int
+null_read_pgcache(struct vop_read_pgcache_args *ap)
+{
+ struct vnode *lvp, *vp;
+ struct null_node *xp;
+ int error;
+
+ vp = ap->a_vp;
+ VI_LOCK(vp);
+ xp = VTONULL(vp);
+ if (xp == NULL) {
+ VI_UNLOCK(vp);
+ return (EJUSTRETURN);
+ }
+ lvp = xp->null_lowervp;
+ vref(lvp);
+ VI_UNLOCK(vp);
+ error = VOP_READ_PGCACHE(lvp, ap->a_uio, ap->a_ioflag, ap->a_cred);
+ vrele(lvp);
+ return (error);
+}
+
/*
* Global vfs data structures
*/
@@ -966,6 +988,7 @@ struct vop_vector null_vnodeops = {
.vop_lookup = null_lookup,
.vop_open = null_open,
.vop_print =null_print,
+ .vop_read_pgcache = null_read_pgcache,
.vop_reclaim = null_reclaim,
.vop_remove = null_remove,
.vop_rename = null_rename,
___
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: r368076 - head/sys/kern
Author: kib Date: Thu Nov 26 18:13:33 2020 New Revision: 368076 URL: https://svnweb.freebsd.org/changeset/base/368076 Log: vn_read_from_obj(): fix handling of doomed vnodes. There is no reason why vp->v_object cannot be NULL. If it is, it's fine, handle it by delegating to VOP_READ(). Tested by:pho Reviewed by: markj, mjg Sponsored by: The FreeBSD Foundation Differential revision:https://reviews.freebsd.org/D27327 Modified: head/sys/kern/vfs_vnops.c Modified: head/sys/kern/vfs_vnops.c == --- head/sys/kern/vfs_vnops.c Thu Nov 26 18:08:42 2020(r368075) +++ head/sys/kern/vfs_vnops.c Thu Nov 26 18:13:33 2020(r368076) @@ -870,10 +870,10 @@ vn_read_from_obj(struct vnode *vp, struct uio *uio) ssize_t resid; int error, i, j; - obj = vp->v_object; MPASS(uio->uio_resid <= ptoa(io_hold_cnt + 2)); - MPASS(obj != NULL); - MPASS(obj->type == OBJT_VNODE); + obj = atomic_load_ptr(>v_object); + if (obj == NULL) + return (EJUSTRETURN); /* * Depends on type stability of vm_objects. ___ 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: r368074 - head/sys/ufs/ffs
Author: kib
Date: Thu Nov 26 18:03:24 2020
New Revision: 368074
URL: https://svnweb.freebsd.org/changeset/base/368074
Log:
clear_inodedeps: handle ERELOOKUP from ffs_syncvnode().
Reported and tested by: pho
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/ufs/ffs/ffs_softdep.c
Modified: head/sys/ufs/ffs/ffs_softdep.c
==
--- head/sys/ufs/ffs/ffs_softdep.c Thu Nov 26 18:00:26 2020
(r368073)
+++ head/sys/ufs/ffs/ffs_softdep.c Thu Nov 26 18:03:24 2020
(r368074)
@@ -14321,7 +14321,10 @@ clear_inodedeps(mp)
if (VTOI(vp)->i_mode == 0) {
vgone(vp);
} else if (ino == lastino) {
- if ((error = ffs_syncvnode(vp, MNT_WAIT, 0)))
+ do {
+ error = ffs_syncvnode(vp, MNT_WAIT, 0);
+ } while (error == ERELOOKUP);
+ if (error != 0)
softdep_error("clear_inodedeps: fsync1", error);
} else {
if ((error = ffs_syncvnode(vp, MNT_NOWAIT, 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: r368073 - in head/sys: kern sys
Author: kib
Date: Thu Nov 26 18:00:26 2020
New Revision: 368073
URL: https://svnweb.freebsd.org/changeset/base/368073
Log:
Make max ticks for pause in vn_lock_pair() adjustable at runtime.
Reduce default value from hz / 10 to hz / 100.
Reviewed by: markj
Tested by:pho
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/kern/subr_param.c
head/sys/kern/vfs_vnops.c
head/sys/sys/vnode.h
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.c Thu Nov 26 17:39:51 2020(r368072)
+++ head/sys/kern/subr_param.c Thu Nov 26 18:00:26 2020(r368073)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -183,6 +184,10 @@ init_param1(void)
* sign problems sooner.
*/
ticks = INT_MAX - (hz * 10 * 60);
+
+ vn_lock_pair_pause_max = hz / 100;
+ if (vn_lock_pair_pause_max == 0)
+ vn_lock_pair_pause_max = 1;
#ifdef VM_SWZONE_SIZE_MAX
maxswzone = VM_SWZONE_SIZE_MAX;
Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c Thu Nov 26 17:39:51 2020(r368072)
+++ head/sys/kern/vfs_vnops.c Thu Nov 26 18:00:26 2020(r368073)
@@ -3332,11 +3332,16 @@ SYSCTL_ULONG(_debug, OID_AUTO, vn_lock_pair_pause, CTL
_lock_pair_pause_cnt, 0,
"Count of vn_lock_pair deadlocks");
+u_int vn_lock_pair_pause_max;
+SYSCTL_UINT(_debug, OID_AUTO, vn_lock_pair_pause_max, CTLFLAG_RW,
+_lock_pair_pause_max, 0,
+"Max ticks for vn_lock_pair deadlock avoidance sleep");
+
static void
vn_lock_pair_pause(const char *wmesg)
{
atomic_add_long(_lock_pair_pause_cnt, 1);
- pause(wmesg, prng32_bounded(hz / 10));
+ pause(wmesg, prng32_bounded(vn_lock_pair_pause_max));
}
/*
Modified: head/sys/sys/vnode.h
==
--- head/sys/sys/vnode.hThu Nov 26 17:39:51 2020(r368072)
+++ head/sys/sys/vnode.hThu Nov 26 18:00:26 2020(r368073)
@@ -448,6 +448,8 @@ extern u_long desiredvnodes; /* number of
vnodes desi
extern struct uma_zone *namei_zone;
extern struct vattr va_null; /* predefined null vattr structure */
+extern u_int vn_lock_pair_pause_max;
+
#defineVI_LOCK(vp) mtx_lock(&(vp)->v_interlock)
#defineVI_LOCK_FLAGS(vp, flags) mtx_lock_flags(&(vp)->v_interlock,
(flags))
#defineVI_TRYLOCK(vp) mtx_trylock(&(vp)->v_interlock)
___
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: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Author: se Date: Thu Nov 26 17:39:51 2020 New Revision: 368072 URL: https://svnweb.freebsd.org/changeset/base/368072 Log: Update to version 3.2.0 Added: head/contrib/bc/exec-install.sh - copied unchanged from r368069, vendor/bc/dist/exec-install.sh head/contrib/bc/include/bcl.h - copied unchanged from r368069, vendor/bc/dist/include/bcl.h head/contrib/bc/include/library.h - copied unchanged from r368069, vendor/bc/dist/include/library.h head/contrib/bc/manuals/bcl.3 - copied unchanged from r368069, vendor/bc/dist/manuals/bcl.3 head/contrib/bc/manuals/bcl.3.md - copied unchanged from r368069, vendor/bc/dist/manuals/bcl.3.md head/contrib/bc/manuals/header.txt - copied unchanged from r368069, vendor/bc/dist/manuals/header.txt head/contrib/bc/manuals/header_bc.txt - copied unchanged from r368069, vendor/bc/dist/manuals/header_bc.txt head/contrib/bc/manuals/header_bcl.txt - copied unchanged from r368069, vendor/bc/dist/manuals/header_bcl.txt head/contrib/bc/manuals/header_dc.txt - copied unchanged from r368069, vendor/bc/dist/manuals/header_dc.txt head/contrib/bc/src/bc.c - copied unchanged from r368069, vendor/bc/dist/src/bc.c head/contrib/bc/src/bc_lex.c - copied unchanged from r368069, vendor/bc/dist/src/bc_lex.c head/contrib/bc/src/bc_parse.c - copied unchanged from r368069, vendor/bc/dist/src/bc_parse.c head/contrib/bc/src/dc.c - copied unchanged from r368069, vendor/bc/dist/src/dc.c head/contrib/bc/src/dc_lex.c - copied unchanged from r368069, vendor/bc/dist/src/dc_lex.c head/contrib/bc/src/dc_parse.c - copied unchanged from r368069, vendor/bc/dist/src/dc_parse.c head/contrib/bc/src/history.c - copied unchanged from r368069, vendor/bc/dist/src/history.c head/contrib/bc/src/library.c - copied unchanged from r368069, vendor/bc/dist/src/library.c head/contrib/bc/src/rand.c - copied unchanged from r368069, vendor/bc/dist/src/rand.c head/contrib/bc/tests/bcl.c - copied unchanged from r368069, vendor/bc/dist/tests/bcl.c Deleted: head/contrib/bc/install.sh head/contrib/bc/src/bc/ head/contrib/bc/src/dc/ head/contrib/bc/src/history/ head/contrib/bc/src/rand/ Modified: head/contrib/bc/.gitignore head/contrib/bc/Makefile.in head/contrib/bc/NEWS.md head/contrib/bc/README.md head/contrib/bc/configure.sh head/contrib/bc/gen/lib.bc head/contrib/bc/gen/strgen.c head/contrib/bc/gen/strgen.sh head/contrib/bc/include/file.h head/contrib/bc/include/lex.h head/contrib/bc/include/num.h head/contrib/bc/include/parse.h head/contrib/bc/include/rand.h head/contrib/bc/include/status.h head/contrib/bc/include/vector.h head/contrib/bc/include/vm.h head/contrib/bc/manpage.sh head/contrib/bc/manuals/bc.1.md.in head/contrib/bc/manuals/bc/A.1 head/contrib/bc/manuals/bc/A.1.md head/contrib/bc/manuals/bc/E.1 head/contrib/bc/manuals/bc/E.1.md head/contrib/bc/manuals/bc/EH.1 head/contrib/bc/manuals/bc/EH.1.md head/contrib/bc/manuals/bc/EHN.1 head/contrib/bc/manuals/bc/EHN.1.md head/contrib/bc/manuals/bc/EHNP.1 head/contrib/bc/manuals/bc/EHNP.1.md head/contrib/bc/manuals/bc/EHP.1 head/contrib/bc/manuals/bc/EHP.1.md head/contrib/bc/manuals/bc/EN.1 head/contrib/bc/manuals/bc/EN.1.md head/contrib/bc/manuals/bc/ENP.1 head/contrib/bc/manuals/bc/ENP.1.md head/contrib/bc/manuals/bc/EP.1 head/contrib/bc/manuals/bc/EP.1.md head/contrib/bc/manuals/bc/H.1 head/contrib/bc/manuals/bc/H.1.md head/contrib/bc/manuals/bc/HN.1 head/contrib/bc/manuals/bc/HN.1.md head/contrib/bc/manuals/bc/HNP.1 head/contrib/bc/manuals/bc/HNP.1.md head/contrib/bc/manuals/bc/HP.1 head/contrib/bc/manuals/bc/HP.1.md head/contrib/bc/manuals/bc/N.1 head/contrib/bc/manuals/bc/N.1.md head/contrib/bc/manuals/bc/NP.1 head/contrib/bc/manuals/bc/NP.1.md head/contrib/bc/manuals/bc/P.1 head/contrib/bc/manuals/bc/P.1.md head/contrib/bc/manuals/build.md head/contrib/bc/manuals/dc.1.md.in head/contrib/bc/manuals/dc/A.1 head/contrib/bc/manuals/dc/A.1.md head/contrib/bc/manuals/dc/E.1 head/contrib/bc/manuals/dc/E.1.md head/contrib/bc/manuals/dc/EH.1 head/contrib/bc/manuals/dc/EH.1.md head/contrib/bc/manuals/dc/EHN.1 head/contrib/bc/manuals/dc/EHN.1.md head/contrib/bc/manuals/dc/EHNP.1 head/contrib/bc/manuals/dc/EHNP.1.md head/contrib/bc/manuals/dc/EHP.1 head/contrib/bc/manuals/dc/EHP.1.md head/contrib/bc/manuals/dc/EN.1 head/contrib/bc/manuals/dc/EN.1.md head/contrib/bc/manuals/dc/ENP.1 head/contrib/bc/manuals/dc/ENP.1.md head/contrib/bc/manuals/dc/EP.1 head/contrib/bc/manuals/dc/EP.1.md head/contrib/bc/manuals/dc/H.1 head/contrib/bc/manuals/dc/H.1.md head/contrib/bc/manuals/dc/HN.1 head/contrib/bc/manuals/dc/HN.1.md head/contrib/bc/manuals/dc/HNP.1 head/contrib/bc/manuals/dc/HNP.1.md head/contrib/bc/manuals/dc/HP.1 head/contrib/bc/manuals/dc/HP.1.md head/contrib/bc/manuals/dc/N.1
svn commit: r368071 - head/share/mk
Author: arichardson Date: Thu Nov 26 17:37:27 2020 New Revision: 368071 URL: https://svnweb.freebsd.org/changeset/base/368071 Log: bsd.lib.mk: Work around build system raciness We are seeing regular build failures due to libc.so being installed again and another parallel make job tries to read the partially written libc.so at the same time. When building with -j32 or higher this almost always happens on the first clean build (subsequent incremental builds always work fine). Using -S should "fix" the "section header table goes past the end of the file: e_shoff = 0x..." errors that have started to plague our builds. We originally thought this only affected CheriBSD, but I just got the same error while building the latest upstream FreeBSD. The real fix should be to not install libraries twice, but until then this workaround is needed. Original patch by jrtc27@, I only made some minor changes to the comment. Obtained from: CheriBSD (https://github.com/CTSRD-CHERI/cheribsd/commit/49837edd3efd5d02a1b120c47f00cfc2d59a9a8e) Reviewed By: markj, bdrewery Differential Revision: https://reviews.freebsd.org/D27102 Modified: head/share/mk/bsd.lib.mk Modified: head/share/mk/bsd.lib.mk == --- head/share/mk/bsd.lib.mkThu Nov 26 17:37:22 2020(r368070) +++ head/share/mk/bsd.lib.mkThu Nov 26 17:37:27 2020(r368071) @@ -422,7 +422,17 @@ SHLINSTALLFLAGS+= -fschg # Install libraries with -S to avoid risk of modifying in-use libraries when # installing to a running system. It is safe to avoid this for NO_ROOT builds # that are only creating an image. -.if !defined(NO_SAFE_LIBINSTALL) && !defined(NO_ROOT) +# +# XXX: Since Makefile.inc1 ends up building lib/libc both as part of +# _startup_libs and as part of _generic_libs it ends up getting installed a +# second time during the parallel build, and although the .WAIT in lib/Makefile +# stops that mattering for lib, other directories like secure/lib are built in +# parallel at the top level and are unaffected by that, so can sometimes race +# with the libc.so.7 reinstall and see a missing or corrupt file. Ideally the +# build system would be fixed to not build/install libc to WORLDTMP the second +# time round, but for now using -S ensures the install is atomic and thus we +# never see a broken intermediate state, so use it even for NO_ROOT builds. +.if !defined(NO_SAFE_LIBINSTALL) #&& !defined(NO_ROOT) SHLINSTALLFLAGS+= -S SHLINSTALLSYMLINKFLAGS+= -S .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: r368070 - head/sys/riscv/include
Author: arichardson
Date: Thu Nov 26 17:37:22 2020
New Revision: 368070
URL: https://svnweb.freebsd.org/changeset/base/368070
Log:
Add .cfi_{start,end}proc for RISC-V assembly functions
This allows GDB to print more useful backtraces when setting a breakpoint
on an assembly function.
Reviewed By: jhb
Differential Revision: https://reviews.freebsd.org/D27177
Modified:
head/sys/riscv/include/asm.h
Modified: head/sys/riscv/include/asm.h
==
--- head/sys/riscv/include/asm.hThu Nov 26 17:29:16 2020
(r368069)
+++ head/sys/riscv/include/asm.hThu Nov 26 17:37:22 2020
(r368070)
@@ -47,8 +47,8 @@
#define_C_LABEL(x) x
#defineENTRY(sym) \
- .text; .globl sym; .type sym,@function; .align 4; sym:
-#defineEND(sym) .size sym, . - sym
+ .text; .globl sym; .type sym,@function; .align 4; sym: .cfi_startproc;
+#defineEND(sym) .cfi_endproc; .size sym, . - sym
#defineEENTRY(sym) \
.globl sym; sym:
___
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: r368069 - vendor/bc/3.2.0
Author: se Date: Thu Nov 26 17:29:16 2020 New Revision: 368069 URL: https://svnweb.freebsd.org/changeset/base/368069 Log: Tag version 3.2.0 Added: vendor/bc/3.2.0/ - copied from r368068, vendor/bc/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368068 - in vendor/bc/dist: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Author: se Date: Thu Nov 26 17:27:07 2020 New Revision: 368068 URL: https://svnweb.freebsd.org/changeset/base/368068 Log: Import version 3.2.0 Added: vendor/bc/dist/exec-install.sh - copied unchanged from r368067, vendor/bc/dist/install.sh vendor/bc/dist/include/bcl.h (contents, props changed) vendor/bc/dist/include/library.h (contents, props changed) vendor/bc/dist/manuals/bcl.3 (contents, props changed) vendor/bc/dist/manuals/bcl.3.md vendor/bc/dist/manuals/header.txt (contents, props changed) vendor/bc/dist/manuals/header_bc.txt (contents, props changed) vendor/bc/dist/manuals/header_bcl.txt (contents, props changed) vendor/bc/dist/manuals/header_dc.txt (contents, props changed) vendor/bc/dist/src/bc.c - copied, changed from r368067, vendor/bc/dist/src/bc/bc.c vendor/bc/dist/src/bc_lex.c - copied, changed from r368067, vendor/bc/dist/src/bc/lex.c vendor/bc/dist/src/bc_parse.c - copied, changed from r368067, vendor/bc/dist/src/bc/parse.c vendor/bc/dist/src/dc.c - copied, changed from r368067, vendor/bc/dist/src/dc/dc.c vendor/bc/dist/src/dc_lex.c - copied, changed from r368067, vendor/bc/dist/src/dc/lex.c vendor/bc/dist/src/dc_parse.c - copied, changed from r368067, vendor/bc/dist/src/dc/parse.c vendor/bc/dist/src/history.c - copied, changed from r368067, vendor/bc/dist/src/history/history.c vendor/bc/dist/src/library.c (contents, props changed) vendor/bc/dist/src/rand.c - copied, changed from r368067, vendor/bc/dist/src/rand/rand.c vendor/bc/dist/tests/bcl.c (contents, props changed) Deleted: vendor/bc/dist/install.sh vendor/bc/dist/src/bc/ vendor/bc/dist/src/dc/ vendor/bc/dist/src/history/ vendor/bc/dist/src/rand/ Modified: vendor/bc/dist/.gitignore vendor/bc/dist/Makefile.in vendor/bc/dist/NEWS.md vendor/bc/dist/README.md vendor/bc/dist/configure.sh vendor/bc/dist/gen/lib.bc vendor/bc/dist/gen/strgen.c vendor/bc/dist/gen/strgen.sh vendor/bc/dist/include/file.h vendor/bc/dist/include/lex.h vendor/bc/dist/include/num.h vendor/bc/dist/include/parse.h vendor/bc/dist/include/rand.h vendor/bc/dist/include/status.h vendor/bc/dist/include/vector.h vendor/bc/dist/include/vm.h vendor/bc/dist/manpage.sh vendor/bc/dist/manuals/bc.1.md.in vendor/bc/dist/manuals/bc/A.1 vendor/bc/dist/manuals/bc/A.1.md vendor/bc/dist/manuals/bc/E.1 vendor/bc/dist/manuals/bc/E.1.md vendor/bc/dist/manuals/bc/EH.1 vendor/bc/dist/manuals/bc/EH.1.md vendor/bc/dist/manuals/bc/EHN.1 vendor/bc/dist/manuals/bc/EHN.1.md vendor/bc/dist/manuals/bc/EHNP.1 vendor/bc/dist/manuals/bc/EHNP.1.md vendor/bc/dist/manuals/bc/EHP.1 vendor/bc/dist/manuals/bc/EHP.1.md vendor/bc/dist/manuals/bc/EN.1 vendor/bc/dist/manuals/bc/EN.1.md vendor/bc/dist/manuals/bc/ENP.1 vendor/bc/dist/manuals/bc/ENP.1.md vendor/bc/dist/manuals/bc/EP.1 vendor/bc/dist/manuals/bc/EP.1.md vendor/bc/dist/manuals/bc/H.1 vendor/bc/dist/manuals/bc/H.1.md vendor/bc/dist/manuals/bc/HN.1 vendor/bc/dist/manuals/bc/HN.1.md vendor/bc/dist/manuals/bc/HNP.1 vendor/bc/dist/manuals/bc/HNP.1.md vendor/bc/dist/manuals/bc/HP.1 vendor/bc/dist/manuals/bc/HP.1.md vendor/bc/dist/manuals/bc/N.1 vendor/bc/dist/manuals/bc/N.1.md vendor/bc/dist/manuals/bc/NP.1 vendor/bc/dist/manuals/bc/NP.1.md vendor/bc/dist/manuals/bc/P.1 vendor/bc/dist/manuals/bc/P.1.md vendor/bc/dist/manuals/build.md vendor/bc/dist/manuals/dc.1.md.in vendor/bc/dist/manuals/dc/A.1 vendor/bc/dist/manuals/dc/A.1.md vendor/bc/dist/manuals/dc/E.1 vendor/bc/dist/manuals/dc/E.1.md vendor/bc/dist/manuals/dc/EH.1 vendor/bc/dist/manuals/dc/EH.1.md vendor/bc/dist/manuals/dc/EHN.1 vendor/bc/dist/manuals/dc/EHN.1.md vendor/bc/dist/manuals/dc/EHNP.1 vendor/bc/dist/manuals/dc/EHNP.1.md vendor/bc/dist/manuals/dc/EHP.1 vendor/bc/dist/manuals/dc/EHP.1.md vendor/bc/dist/manuals/dc/EN.1 vendor/bc/dist/manuals/dc/EN.1.md vendor/bc/dist/manuals/dc/ENP.1 vendor/bc/dist/manuals/dc/ENP.1.md vendor/bc/dist/manuals/dc/EP.1 vendor/bc/dist/manuals/dc/EP.1.md vendor/bc/dist/manuals/dc/H.1 vendor/bc/dist/manuals/dc/H.1.md vendor/bc/dist/manuals/dc/HN.1 vendor/bc/dist/manuals/dc/HN.1.md vendor/bc/dist/manuals/dc/HNP.1 vendor/bc/dist/manuals/dc/HNP.1.md vendor/bc/dist/manuals/dc/HP.1 vendor/bc/dist/manuals/dc/HP.1.md vendor/bc/dist/manuals/dc/N.1 vendor/bc/dist/manuals/dc/N.1.md vendor/bc/dist/manuals/dc/NP.1 vendor/bc/dist/manuals/dc/NP.1.md vendor/bc/dist/manuals/dc/P.1 vendor/bc/dist/manuals/dc/P.1.md vendor/bc/dist/release.sh vendor/bc/dist/src/args.c vendor/bc/dist/src/data.c vendor/bc/dist/src/file.c vendor/bc/dist/src/lang.c vendor/bc/dist/src/lex.c vendor/bc/dist/src/main.c vendor/bc/dist/src/num.c vendor/bc/dist/src/opt.c vendor/bc/dist/src/parse.c vendor/bc/dist/src/program.c vendor/bc/dist/src/read.c vendor/bc/dist/src/vector.c vendor/bc/dist/src/vm.c
svn commit: r368067 - head/sys/arm/allwinner
Author: manu
Date: Thu Nov 26 17:19:47 2020
New Revision: 368067
URL: https://svnweb.freebsd.org/changeset/base/368067
Log:
arm: allwinner: a23 timer functions are only used for arm64
Modified:
head/sys/arm/allwinner/a10_timer.c
Modified: head/sys/arm/allwinner/a10_timer.c
==
--- head/sys/arm/allwinner/a10_timer.c Thu Nov 26 17:19:30 2020
(r368066)
+++ head/sys/arm/allwinner/a10_timer.c Thu Nov 26 17:19:47 2020
(r368067)
@@ -119,8 +119,10 @@ static uint64_t timer_read_counter64(struct a10_timer_
static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc);
#endif
+#if defined(__aarch64__)
static void a23_timer_timecounter_setup(struct a10_timer_softc *sc);
static u_int a23_timer_get_timecount(struct timecounter *tc);
+#endif
static int a10_timer_irq(void *);
static int a10_timer_probe(device_t);
@@ -138,6 +140,7 @@ static struct timecounter a10_timer_timecounter = {
.tc_quality= 1000,
};
+#if defined(__aarch64__)
static struct timecounter a23_timer_timecounter = {
.tc_name = "a10_timer timer0",
.tc_get_timecount = a23_timer_get_timecount,
@@ -146,6 +149,7 @@ static struct timecounter a23_timer_timecounter = {
/* We want it to be selected over the arm generic timecounter */
.tc_quality= 2000,
};
+#endif
#defineA10_TIMER_MEMRES0
#defineA10_TIMER_IRQRES1
@@ -158,7 +162,9 @@ static struct resource_spec a10_timer_spec[] = {
static struct ofw_compat_data compat_data[] = {
{"allwinner,sun4i-a10-timer", A10_TIMER},
+#if defined(__aarch64__)
{"allwinner,sun8i-a23-timer", A23_TIMER},
+#endif
{NULL, 0},
};
@@ -374,6 +380,7 @@ a10_timer_timer_stop(struct eventtimer *et)
* Timecounter functions for A23 and above
*/
+#if defined(__aarch64__)
static void
a23_timer_timecounter_setup(struct a10_timer_softc *sc)
{
@@ -415,6 +422,7 @@ a23_timer_get_timecount(struct timecounter *tc)
/* Counter count backwards */
return (~0u - val);
}
+#endif
/*
* Timecounter functions for A10 and A13, using the 64 bits counter
___
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: r368066 - head/sys/arm/nvidia/tegra124
Author: manu
Date: Thu Nov 26 17:19:30 2020
New Revision: 368066
URL: https://svnweb.freebsd.org/changeset/base/368066
Log:
arm: tegra: Remove unused variable
Modified:
head/sys/arm/nvidia/tegra124/tegra124_machdep.c
Modified: head/sys/arm/nvidia/tegra124/tegra124_machdep.c
==
--- head/sys/arm/nvidia/tegra124/tegra124_machdep.c Thu Nov 26 17:19:13
2020(r368065)
+++ head/sys/arm/nvidia/tegra124/tegra124_machdep.c Thu Nov 26 17:19:30
2020(r368066)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
PMC_SCRATCH0_MODE_RCM)
static platform_attach_t tegra124_attach;
-static platform_lastaddr_t tegra124_lastaddr;
static platform_devmap_init_t tegra124_devmap_init;
static platform_late_init_t tegra124_late_init;
static platform_cpu_reset_t tegra124_cpu_reset;
___
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: r368065 - head/sys/arm/mv
Author: manu
Date: Thu Nov 26 17:19:13 2020
New Revision: 368065
URL: https://svnweb.freebsd.org/changeset/base/368065
Log:
arm: mv: Remove unused code
Modified:
head/sys/arm/mv/mv_common.c
Modified: head/sys/arm/mv/mv_common.c
==
--- head/sys/arm/mv/mv_common.c Thu Nov 26 17:18:54 2020(r368064)
+++ head/sys/arm/mv/mv_common.c Thu Nov 26 17:19:13 2020(r368065)
@@ -79,7 +79,6 @@ struct soc_node_spec;
static enum soc_family soc_family;
-static int mv_win_cesa_attr(int wng_sel);
static int mv_win_cesa_attr_armv5(int eng_sel);
static int mv_win_cesa_attr_armada38x(int eng_sel);
static int mv_win_cesa_attr_armadaxp(int eng_sel);
@@ -93,7 +92,6 @@ void write_cpu_ctrl_armv7(uint32_t reg, uint32_t val);
static int win_eth_can_remap(int i);
static int decode_win_cesa_valid(void);
-static int decode_win_cpu_valid(void);
static int decode_win_usb_valid(void);
static int decode_win_usb3_valid(void);
static int decode_win_eth_valid(void);
@@ -402,15 +400,6 @@ pm_is_disabled(uint32_t mask)
* machines.
*/
-static int mv_win_cesa_attr(int eng_sel)
-{
-
- if (soc_decode_win_spec->win_cesa_attr != NULL)
- return (soc_decode_win_spec->win_cesa_attr(eng_sel));
-
- return (-1);
-}
-
static int mv_win_cesa_attr_armv5(int eng_sel)
{
@@ -987,15 +976,6 @@ WIN_REG_BASE_IDX_WR(win_eth, br, MV_WIN_ETH_BASE)
WIN_REG_BASE_IDX_WR(win_eth, sz, MV_WIN_ETH_SIZE)
WIN_REG_BASE_IDX_WR(win_eth, har, MV_WIN_ETH_REMAP)
-WIN_REG_BASE_IDX_RD2(win_xor, br, MV_WIN_XOR_BASE)
-WIN_REG_BASE_IDX_RD2(win_xor, sz, MV_WIN_XOR_SIZE)
-WIN_REG_BASE_IDX_RD2(win_xor, har, MV_WIN_XOR_REMAP)
-WIN_REG_BASE_IDX_RD2(win_xor, ctrl, MV_WIN_XOR_CTRL)
-WIN_REG_BASE_IDX_WR2(win_xor, br, MV_WIN_XOR_BASE)
-WIN_REG_BASE_IDX_WR2(win_xor, sz, MV_WIN_XOR_SIZE)
-WIN_REG_BASE_IDX_WR2(win_xor, har, MV_WIN_XOR_REMAP)
-WIN_REG_BASE_IDX_WR2(win_xor, ctrl, MV_WIN_XOR_CTRL)
-
WIN_REG_BASE_RD(win_eth, bare, 0x290)
WIN_REG_BASE_RD(win_eth, epap, 0x294)
WIN_REG_BASE_WR(win_eth, bare, 0x290)
@@ -1014,17 +994,6 @@ WIN_REG_BASE_IDX_WR(pcie_bar, br, MV_PCIE_BAR_BASE);
WIN_REG_BASE_IDX_WR(pcie_bar, brh, MV_PCIE_BAR_BASE_H);
WIN_REG_BASE_IDX_WR(pcie_bar, cr, MV_PCIE_BAR_CTRL);
-WIN_REG_BASE_IDX_RD(win_idma, br, MV_WIN_IDMA_BASE)
-WIN_REG_BASE_IDX_RD(win_idma, sz, MV_WIN_IDMA_SIZE)
-WIN_REG_BASE_IDX_RD(win_idma, har, MV_WIN_IDMA_REMAP)
-WIN_REG_BASE_IDX_RD(win_idma, cap, MV_WIN_IDMA_CAP)
-WIN_REG_BASE_IDX_WR(win_idma, br, MV_WIN_IDMA_BASE)
-WIN_REG_BASE_IDX_WR(win_idma, sz, MV_WIN_IDMA_SIZE)
-WIN_REG_BASE_IDX_WR(win_idma, har, MV_WIN_IDMA_REMAP)
-WIN_REG_BASE_IDX_WR(win_idma, cap, MV_WIN_IDMA_CAP)
-WIN_REG_BASE_RD(win_idma, bare, 0xa80)
-WIN_REG_BASE_WR(win_idma, bare, 0xa80)
-
WIN_REG_BASE_IDX_RD(win_sata, cr, MV_WIN_SATA_CTRL);
WIN_REG_BASE_IDX_RD(win_sata, br, MV_WIN_SATA_BASE);
WIN_REG_BASE_IDX_WR(win_sata, cr, MV_WIN_SATA_CTRL);
@@ -1033,7 +1002,6 @@ WIN_REG_BASE_IDX_WR(win_sata, br, MV_WIN_SATA_BASE);
WIN_REG_BASE_IDX_RD(win_sata_armada38x, sz, MV_WIN_SATA_SIZE_ARMADA38X);
WIN_REG_BASE_IDX_WR(win_sata_armada38x, sz, MV_WIN_SATA_SIZE_ARMADA38X);
WIN_REG_BASE_IDX_RD(win_sata_armada38x, cr, MV_WIN_SATA_CTRL_ARMADA38X);
-WIN_REG_BASE_IDX_RD(win_sata_armada38x, br, MV_WIN_SATA_BASE_ARMADA38X);
WIN_REG_BASE_IDX_WR(win_sata_armada38x, cr, MV_WIN_SATA_CTRL_ARMADA38X);
WIN_REG_BASE_IDX_WR(win_sata_armada38x, br, MV_WIN_SATA_BASE_ARMADA38X);
@@ -1200,65 +1168,6 @@ decode_win_overlap(int win, int win_no, const struct d
}
return (-1);
-}
-
-static int
-decode_win_cpu_valid(void)
-{
- int i, j, rv;
- uint32_t b, e, s;
-
- if (cpu_wins_no > soc_decode_win_spec->mv_win_cpu_max) {
- printf("CPU windows: too many entries: %d\n", cpu_wins_no);
- return (0);
- }
-
- rv = 1;
- for (i = 0; i < cpu_wins_no; i++) {
- if (cpu_wins[i].target == 0) {
- printf("CPU window#%d: DDR target window is not "
- "supposed to be reprogrammed!\n", i);
- rv = 0;
- }
-
- if (cpu_wins[i].remap != ~0 && win_cpu_can_remap(i) != 1) {
- printf("CPU window#%d: not capable of remapping, but "
- "val 0x%08x defined\n", i, cpu_wins[i].remap);
- rv = 0;
- }
-
- s = cpu_wins[i].size;
- b = cpu_wins[i].base;
- e = b + s - 1;
- if (s > (0x - b + 1)) {
- /*
-* XXX this boundary check should account for 64bit
-* and remapping..
-*/
- printf("CPU window#%d: no space for size 0x%08x at "
- "0x%08x\n", i, s, b);
- rv = 0;
- continue;
- }
-
-
svn commit: r368064 - head/sys/arm/ti
Author: manu
Date: Thu Nov 26 17:18:54 2020
New Revision: 368064
URL: https://svnweb.freebsd.org/changeset/base/368064
Log:
arm: ti: Remove unused function ti_first_gpio_bank
Modified:
head/sys/arm/ti/ti_gpio.c
Modified: head/sys/arm/ti/ti_gpio.c
==
--- head/sys/arm/ti/ti_gpio.c Thu Nov 26 17:18:18 2020(r368063)
+++ head/sys/arm/ti/ti_gpio.c Thu Nov 26 17:18:54 2020(r368064)
@@ -134,22 +134,6 @@ static int ti_gpio_detach(device_t);
static int ti_gpio_pic_attach(struct ti_gpio_softc *sc);
static int ti_gpio_pic_detach(struct ti_gpio_softc *sc);
-static u_int
-ti_first_gpio_bank(void)
-{
- switch(ti_chip()) {
-#ifdef SOC_OMAP4
- case CHIP_OMAP_4:
- return (OMAP4_FIRST_GPIO_BANK);
-#endif
-#ifdef SOC_TI_AM335X
- case CHIP_AM335X:
- return (AM335X_FIRST_GPIO_BANK);
-#endif
- }
- return (0);
-}
-
static uint32_t
ti_gpio_rev(void)
{
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368063 - in vendor/bc/dist: . gen include manuals manuals/bc manuals/dc src
Author: se Date: Thu Nov 26 17:18:18 2020 New Revision: 368063 URL: https://svnweb.freebsd.org/changeset/base/368063 Log: Revert incomplete import of version 3.2.0 Modified: vendor/bc/dist/.gitignore vendor/bc/dist/Makefile.in vendor/bc/dist/NEWS.md vendor/bc/dist/README.md vendor/bc/dist/configure.sh vendor/bc/dist/gen/lib.bc vendor/bc/dist/gen/strgen.c vendor/bc/dist/gen/strgen.sh vendor/bc/dist/include/file.h vendor/bc/dist/include/lex.h vendor/bc/dist/include/num.h vendor/bc/dist/include/parse.h vendor/bc/dist/include/rand.h vendor/bc/dist/include/status.h vendor/bc/dist/include/vector.h vendor/bc/dist/include/vm.h vendor/bc/dist/manpage.sh vendor/bc/dist/manuals/bc.1.md.in vendor/bc/dist/manuals/bc/A.1 vendor/bc/dist/manuals/bc/A.1.md vendor/bc/dist/manuals/bc/E.1 vendor/bc/dist/manuals/bc/E.1.md vendor/bc/dist/manuals/bc/EH.1 vendor/bc/dist/manuals/bc/EH.1.md vendor/bc/dist/manuals/bc/EHN.1 vendor/bc/dist/manuals/bc/EHN.1.md vendor/bc/dist/manuals/bc/EHNP.1 vendor/bc/dist/manuals/bc/EHNP.1.md vendor/bc/dist/manuals/bc/EHP.1 vendor/bc/dist/manuals/bc/EHP.1.md vendor/bc/dist/manuals/bc/EN.1 vendor/bc/dist/manuals/bc/EN.1.md vendor/bc/dist/manuals/bc/ENP.1 vendor/bc/dist/manuals/bc/ENP.1.md vendor/bc/dist/manuals/bc/EP.1 vendor/bc/dist/manuals/bc/EP.1.md vendor/bc/dist/manuals/bc/H.1 vendor/bc/dist/manuals/bc/H.1.md vendor/bc/dist/manuals/bc/HN.1 vendor/bc/dist/manuals/bc/HN.1.md vendor/bc/dist/manuals/bc/HNP.1 vendor/bc/dist/manuals/bc/HNP.1.md vendor/bc/dist/manuals/bc/HP.1 vendor/bc/dist/manuals/bc/HP.1.md vendor/bc/dist/manuals/bc/N.1 vendor/bc/dist/manuals/bc/N.1.md vendor/bc/dist/manuals/bc/NP.1 vendor/bc/dist/manuals/bc/NP.1.md vendor/bc/dist/manuals/bc/P.1 vendor/bc/dist/manuals/bc/P.1.md vendor/bc/dist/manuals/build.md vendor/bc/dist/manuals/dc.1.md.in vendor/bc/dist/manuals/dc/A.1 vendor/bc/dist/manuals/dc/A.1.md vendor/bc/dist/manuals/dc/E.1 vendor/bc/dist/manuals/dc/E.1.md vendor/bc/dist/manuals/dc/EH.1 vendor/bc/dist/manuals/dc/EH.1.md vendor/bc/dist/manuals/dc/EHN.1 vendor/bc/dist/manuals/dc/EHN.1.md vendor/bc/dist/manuals/dc/EHNP.1 vendor/bc/dist/manuals/dc/EHNP.1.md vendor/bc/dist/manuals/dc/EHP.1 vendor/bc/dist/manuals/dc/EHP.1.md vendor/bc/dist/manuals/dc/EN.1 vendor/bc/dist/manuals/dc/EN.1.md vendor/bc/dist/manuals/dc/ENP.1 vendor/bc/dist/manuals/dc/ENP.1.md vendor/bc/dist/manuals/dc/EP.1 vendor/bc/dist/manuals/dc/EP.1.md vendor/bc/dist/manuals/dc/H.1 vendor/bc/dist/manuals/dc/H.1.md vendor/bc/dist/manuals/dc/HN.1 vendor/bc/dist/manuals/dc/HN.1.md vendor/bc/dist/manuals/dc/HNP.1 vendor/bc/dist/manuals/dc/HNP.1.md vendor/bc/dist/manuals/dc/HP.1 vendor/bc/dist/manuals/dc/HP.1.md vendor/bc/dist/manuals/dc/N.1 vendor/bc/dist/manuals/dc/N.1.md vendor/bc/dist/manuals/dc/NP.1 vendor/bc/dist/manuals/dc/NP.1.md vendor/bc/dist/manuals/dc/P.1 vendor/bc/dist/manuals/dc/P.1.md vendor/bc/dist/release.sh vendor/bc/dist/src/args.c vendor/bc/dist/src/data.c vendor/bc/dist/src/file.c vendor/bc/dist/src/lang.c vendor/bc/dist/src/lex.c vendor/bc/dist/src/main.c vendor/bc/dist/src/num.c vendor/bc/dist/src/opt.c vendor/bc/dist/src/parse.c vendor/bc/dist/src/program.c vendor/bc/dist/src/read.c vendor/bc/dist/src/vector.c vendor/bc/dist/src/vm.c Modified: vendor/bc/dist/.gitignore == --- vendor/bc/dist/.gitignore Thu Nov 26 16:52:17 2020(r368062) +++ vendor/bc/dist/.gitignore Thu Nov 26 17:18:18 2020(r368063) @@ -9,7 +9,6 @@ bin/*bc bin/*bc.exe bin/*dc bin/*dc.exe -bin/bcl bc.old *.o *.a Modified: vendor/bc/dist/Makefile.in == --- vendor/bc/dist/Makefile.in Thu Nov 26 16:52:17 2020(r368062) +++ vendor/bc/dist/Makefile.in Thu Nov 26 17:18:18 2020(r368063) @@ -29,13 +29,33 @@ # .POSIX: -VERSION = 3.2.0 +VERSION = 3.1.6 SRC = %%SRC%% OBJ = %%OBJ%% GCDA = %%GCDA%% GCNO = %%GCNO%% +BC_SRC = %%BC_SRC%% +BC_OBJ = %%BC_OBJ%% +BC_GCDA = %%BC_GCDA%% +BC_GCNO = %%BC_GCNO%% + +DC_SRC = %%DC_SRC%% +DC_OBJ = %%DC_OBJ%% +DC_GCDA = %%DC_GCDA%% +DC_GCNO = %%DC_GCNO%% + +HISTORY_SRC = %%HISTORY_SRC%% +HISTORY_OBJ = %%HISTORY_OBJ%% +HISTORY_GCDA = %%HISTORY_GCDA%% +HISTORY_GCNO = %%HISTORY_GCNO%% + +RAND_SRC = %%RAND_SRC%% +RAND_OBJ = %%RAND_OBJ%% +RAND_GCDA = %%RAND_GCDA%% +RAND_GCNO = %%RAND_GCNO%% + BC_ENABLED_NAME = BC_ENABLED BC_ENABLED = %%BC_ENABLED%% DC_ENABLED_NAME = DC_ENABLED @@ -82,13 +102,6 @@ DC = dc BC_EXEC = $(BIN)/$(EXEC_PREFIX)$(BC) DC_EXEC = $(BIN)/$(EXEC_PREFIX)$(DC) -LIB = libbcl -LIB_NAME = $(LIB).a -LIBBC = $(BIN)/$(LIB_NAME) -BCL = bcl -BCL_TEST = $(BIN)/$(BCL) -BCL_TEST_C = tests/$(BCL).c - MANUALS = manuals BC_MANPAGE_NAME = $(EXEC_PREFIX)$(BC)$(EXEC_SUFFIX).1 BC_MANPAGE =
svn commit: r368062 - in vendor/bc/dist: . gen include manuals manuals/bc manuals/dc src
Author: se Date: Thu Nov 26 16:52:17 2020 New Revision: 368062 URL: https://svnweb.freebsd.org/changeset/base/368062 Log: Update to version 3.2.0 Modified: vendor/bc/dist/.gitignore vendor/bc/dist/Makefile.in vendor/bc/dist/NEWS.md vendor/bc/dist/README.md vendor/bc/dist/configure.sh vendor/bc/dist/gen/lib.bc vendor/bc/dist/gen/strgen.c vendor/bc/dist/gen/strgen.sh vendor/bc/dist/include/file.h vendor/bc/dist/include/lex.h vendor/bc/dist/include/num.h vendor/bc/dist/include/parse.h vendor/bc/dist/include/rand.h vendor/bc/dist/include/status.h vendor/bc/dist/include/vector.h vendor/bc/dist/include/vm.h vendor/bc/dist/manpage.sh vendor/bc/dist/manuals/bc.1.md.in vendor/bc/dist/manuals/bc/A.1 vendor/bc/dist/manuals/bc/A.1.md vendor/bc/dist/manuals/bc/E.1 vendor/bc/dist/manuals/bc/E.1.md vendor/bc/dist/manuals/bc/EH.1 vendor/bc/dist/manuals/bc/EH.1.md vendor/bc/dist/manuals/bc/EHN.1 vendor/bc/dist/manuals/bc/EHN.1.md vendor/bc/dist/manuals/bc/EHNP.1 vendor/bc/dist/manuals/bc/EHNP.1.md vendor/bc/dist/manuals/bc/EHP.1 vendor/bc/dist/manuals/bc/EHP.1.md vendor/bc/dist/manuals/bc/EN.1 vendor/bc/dist/manuals/bc/EN.1.md vendor/bc/dist/manuals/bc/ENP.1 vendor/bc/dist/manuals/bc/ENP.1.md vendor/bc/dist/manuals/bc/EP.1 vendor/bc/dist/manuals/bc/EP.1.md vendor/bc/dist/manuals/bc/H.1 vendor/bc/dist/manuals/bc/H.1.md vendor/bc/dist/manuals/bc/HN.1 vendor/bc/dist/manuals/bc/HN.1.md vendor/bc/dist/manuals/bc/HNP.1 vendor/bc/dist/manuals/bc/HNP.1.md vendor/bc/dist/manuals/bc/HP.1 vendor/bc/dist/manuals/bc/HP.1.md vendor/bc/dist/manuals/bc/N.1 vendor/bc/dist/manuals/bc/N.1.md vendor/bc/dist/manuals/bc/NP.1 vendor/bc/dist/manuals/bc/NP.1.md vendor/bc/dist/manuals/bc/P.1 vendor/bc/dist/manuals/bc/P.1.md vendor/bc/dist/manuals/build.md vendor/bc/dist/manuals/dc.1.md.in vendor/bc/dist/manuals/dc/A.1 vendor/bc/dist/manuals/dc/A.1.md vendor/bc/dist/manuals/dc/E.1 vendor/bc/dist/manuals/dc/E.1.md vendor/bc/dist/manuals/dc/EH.1 vendor/bc/dist/manuals/dc/EH.1.md vendor/bc/dist/manuals/dc/EHN.1 vendor/bc/dist/manuals/dc/EHN.1.md vendor/bc/dist/manuals/dc/EHNP.1 vendor/bc/dist/manuals/dc/EHNP.1.md vendor/bc/dist/manuals/dc/EHP.1 vendor/bc/dist/manuals/dc/EHP.1.md vendor/bc/dist/manuals/dc/EN.1 vendor/bc/dist/manuals/dc/EN.1.md vendor/bc/dist/manuals/dc/ENP.1 vendor/bc/dist/manuals/dc/ENP.1.md vendor/bc/dist/manuals/dc/EP.1 vendor/bc/dist/manuals/dc/EP.1.md vendor/bc/dist/manuals/dc/H.1 vendor/bc/dist/manuals/dc/H.1.md vendor/bc/dist/manuals/dc/HN.1 vendor/bc/dist/manuals/dc/HN.1.md vendor/bc/dist/manuals/dc/HNP.1 vendor/bc/dist/manuals/dc/HNP.1.md vendor/bc/dist/manuals/dc/HP.1 vendor/bc/dist/manuals/dc/HP.1.md vendor/bc/dist/manuals/dc/N.1 vendor/bc/dist/manuals/dc/N.1.md vendor/bc/dist/manuals/dc/NP.1 vendor/bc/dist/manuals/dc/NP.1.md vendor/bc/dist/manuals/dc/P.1 vendor/bc/dist/manuals/dc/P.1.md vendor/bc/dist/release.sh vendor/bc/dist/src/args.c vendor/bc/dist/src/data.c vendor/bc/dist/src/file.c vendor/bc/dist/src/lang.c vendor/bc/dist/src/lex.c vendor/bc/dist/src/main.c vendor/bc/dist/src/num.c vendor/bc/dist/src/opt.c vendor/bc/dist/src/parse.c vendor/bc/dist/src/program.c vendor/bc/dist/src/read.c vendor/bc/dist/src/vector.c vendor/bc/dist/src/vm.c Modified: vendor/bc/dist/.gitignore == --- vendor/bc/dist/.gitignore Thu Nov 26 16:40:39 2020(r368061) +++ vendor/bc/dist/.gitignore Thu Nov 26 16:52:17 2020(r368062) @@ -9,6 +9,7 @@ bin/*bc bin/*bc.exe bin/*dc bin/*dc.exe +bin/bcl bc.old *.o *.a Modified: vendor/bc/dist/Makefile.in == --- vendor/bc/dist/Makefile.in Thu Nov 26 16:40:39 2020(r368061) +++ vendor/bc/dist/Makefile.in Thu Nov 26 16:52:17 2020(r368062) @@ -29,33 +29,13 @@ # .POSIX: -VERSION = 3.1.6 +VERSION = 3.2.0 SRC = %%SRC%% OBJ = %%OBJ%% GCDA = %%GCDA%% GCNO = %%GCNO%% -BC_SRC = %%BC_SRC%% -BC_OBJ = %%BC_OBJ%% -BC_GCDA = %%BC_GCDA%% -BC_GCNO = %%BC_GCNO%% - -DC_SRC = %%DC_SRC%% -DC_OBJ = %%DC_OBJ%% -DC_GCDA = %%DC_GCDA%% -DC_GCNO = %%DC_GCNO%% - -HISTORY_SRC = %%HISTORY_SRC%% -HISTORY_OBJ = %%HISTORY_OBJ%% -HISTORY_GCDA = %%HISTORY_GCDA%% -HISTORY_GCNO = %%HISTORY_GCNO%% - -RAND_SRC = %%RAND_SRC%% -RAND_OBJ = %%RAND_OBJ%% -RAND_GCDA = %%RAND_GCDA%% -RAND_GCNO = %%RAND_GCNO%% - BC_ENABLED_NAME = BC_ENABLED BC_ENABLED = %%BC_ENABLED%% DC_ENABLED_NAME = DC_ENABLED @@ -102,6 +82,13 @@ DC = dc BC_EXEC = $(BIN)/$(EXEC_PREFIX)$(BC) DC_EXEC = $(BIN)/$(EXEC_PREFIX)$(DC) +LIB = libbcl +LIB_NAME = $(LIB).a +LIBBC = $(BIN)/$(LIB_NAME) +BCL = bcl +BCL_TEST = $(BIN)/$(BCL) +BCL_TEST_C = tests/$(BCL).c + MANUALS = manuals BC_MANPAGE_NAME = $(EXEC_PREFIX)$(BC)$(EXEC_SUFFIX).1 BC_MANPAGE = $(MANUALS)/$(BC).1 @@ -109,16
svn commit: r368058 - head/sbin/ifconfig
Author: hselasky
Date: Thu Nov 26 16:36:50 2020
New Revision: 368058
URL: https://svnweb.freebsd.org/changeset/base/368058
Log:
Ensure consistent error messages from ifconfig(8).
If multiple threads are invoking "ifconfig XXX create" a race may occur
which can lead to two different error messages for the same error.
a) ifconfig: SIOCIFCREATE2: File exists
b) ifconfig: interface XXX already exists
This patch ensures ifconfig prints the same error code
for the same case.
Reviewed by: imp@ and kib@
Differential Revision:https://reviews.freebsd.org/D27380
MFC after:1 week
Sponsored by: Mellanox Technologies // NVIDIA Networking
Modified:
head/sbin/ifconfig/ifclone.c
head/sbin/ifconfig/ifconfig.c
head/sbin/ifconfig/ifconfig.h
head/sbin/ifconfig/ifieee80211.c
head/sbin/ifconfig/iflagg.c
head/sbin/ifconfig/ifvlan.c
head/sbin/ifconfig/ifvxlan.c
Modified: head/sbin/ifconfig/ifclone.c
==
--- head/sbin/ifconfig/ifclone.cThu Nov 26 14:57:30 2020
(r368057)
+++ head/sbin/ifconfig/ifclone.cThu Nov 26 16:36:50 2020
(r368058)
@@ -151,8 +151,7 @@ ifclonecreate(int s, void *arg)
}
if (clone_cb == NULL) {
/* NB: no parameters */
- if (ioctl(s, SIOCIFCREATE2, ) < 0)
- err(1, "SIOCIFCREATE2");
+ ioctl_ifcreate(s, );
} else {
clone_cb(s, );
}
Modified: head/sbin/ifconfig/ifconfig.c
==
--- head/sbin/ifconfig/ifconfig.c Thu Nov 26 14:57:30 2020
(r368057)
+++ head/sbin/ifconfig/ifconfig.c Thu Nov 26 16:36:50 2020
(r368058)
@@ -198,6 +198,19 @@ usage(void)
exit(1);
}
+void
+ioctl_ifcreate(int s, struct ifreq *ifr)
+{
+ if (ioctl(s, SIOCIFCREATE2, ifr) < 0) {
+ switch (errno) {
+ case EEXIST:
+ errx(1, "interface %s already exists", ifr->ifr_name);
+ default:
+ err(1, "SIOCIFCREATE2");
+ }
+ }
+}
+
#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0])
static int
Modified: head/sbin/ifconfig/ifconfig.h
==
--- head/sbin/ifconfig/ifconfig.h Thu Nov 26 14:57:30 2020
(r368057)
+++ head/sbin/ifconfig/ifconfig.h Thu Nov 26 16:36:50 2020
(r368058)
@@ -160,3 +160,4 @@ struct ifmediareq *ifmedia_getstate(int s);
void print_vhid(const struct ifaddrs *, const char *);
+void ioctl_ifcreate(int s, struct ifreq *);
Modified: head/sbin/ifconfig/ifieee80211.c
==
--- head/sbin/ifconfig/ifieee80211.cThu Nov 26 14:57:30 2020
(r368057)
+++ head/sbin/ifconfig/ifieee80211.cThu Nov 26 16:36:50 2020
(r368058)
@@ -5758,8 +5758,7 @@ wlan_create(int s, struct ifreq *ifr)
memcmp(params.icp_bssid, zerobssid, sizeof(zerobssid)) == 0)
errx(1, "no bssid specified for WDS (use wlanbssid)");
ifr->ifr_data = (caddr_t)
- if (ioctl(s, SIOCIFCREATE2, ifr) < 0)
- err(1, "SIOCIFCREATE2");
+ ioctl_ifcreate(s, ifr);
/* XXX preserve original name for ifclonecreate(). */
strlcpy(orig_name, name, sizeof(orig_name));
Modified: head/sbin/ifconfig/iflagg.c
==
--- head/sbin/ifconfig/iflagg.c Thu Nov 26 14:57:30 2020(r368057)
+++ head/sbin/ifconfig/iflagg.c Thu Nov 26 16:36:50 2020(r368058)
@@ -324,8 +324,7 @@ static void
lagg_create(int s, struct ifreq *ifr)
{
ifr->ifr_data = (caddr_t)
- if (ioctl(s, SIOCIFCREATE2, ifr) < 0)
- err(1, "SIOCIFCREATE2");
+ ioctl_ifcreate(s, ifr);
}
static struct cmd lagg_cmds[] = {
Modified: head/sbin/ifconfig/ifvlan.c
==
--- head/sbin/ifconfig/ifvlan.c Thu Nov 26 14:57:30 2020(r368057)
+++ head/sbin/ifconfig/ifvlan.c Thu Nov 26 16:36:50 2020(r368058)
@@ -162,8 +162,7 @@ vlan_create(int s, struct ifreq *ifr)
errx(1, "must specify a parent device for vlan create");
ifr->ifr_data = (caddr_t)
}
- if (ioctl(s, SIOCIFCREATE2, ifr) < 0)
- err(1, "SIOCIFCREATE2");
+ ioctl_ifcreate(s, ifr);
}
static void
Modified: head/sbin/ifconfig/ifvxlan.c
==
--- head/sbin/ifconfig/ifvxlan.cThu Nov 26 14:57:30 2020
(r368057)
+++ head/sbin/ifconfig/ifvxlan.cThu Nov 26 16:36:50 2020
(r368058)
@@ -191,8 +191,7 @@ vxlan_create(int s, struct ifreq *ifr)
vxlan_check_params();
svn commit: r368061 - head/sys/dev/sdhci
Author: manu
Date: Thu Nov 26 16:40:39 2020
New Revision: 368061
URL: https://svnweb.freebsd.org/changeset/base/368061
Log:
sdhci: mmccam: Update vccq in the driver ios
Otherwise we always report that the card is running at 1.2V.
Modified:
head/sys/dev/sdhci/sdhci.c
Modified: head/sys/dev/sdhci/sdhci.c
==
--- head/sys/dev/sdhci/sdhci.c Thu Nov 26 16:40:20 2020(r368060)
+++ head/sys/dev/sdhci/sdhci.c Thu Nov 26 16:40:39 2020(r368061)
@@ -2683,6 +2683,11 @@ sdhci_cam_settran_settings(struct sdhci_slot *slot, un
if (sdhci_debug > 1)
slot_printf(slot, "Bus mode => %d\n", ios->bus_mode);
}
+ if (cts->ios_valid & MMC_VCCQ) {
+ ios->vccq = new_ios->vccq;
+ if (sdhci_debug > 1)
+ slot_printf(slot, "VCCQ => %d\n", ios->vccq);
+ }
/* XXX Provide a way to call a chip-specific IOS update, required for
TI */
return (sdhci_cam_update_ios(slot));
___
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: r368060 - head/sys/dev/sdhci
Author: manu
Date: Thu Nov 26 16:40:20 2020
New Revision: 368060
URL: https://svnweb.freebsd.org/changeset/base/368060
Log:
sdhci: Only print mmccam debug code if hw.sdhci.debug is > 1
Modified:
head/sys/dev/sdhci/sdhci.c
Modified: head/sys/dev/sdhci/sdhci.c
==
--- head/sys/dev/sdhci/sdhci.c Thu Nov 26 16:39:56 2020(r368059)
+++ head/sys/dev/sdhci/sdhci.c Thu Nov 26 16:40:20 2020(r368060)
@@ -2650,31 +2650,38 @@ sdhci_cam_settran_settings(struct sdhci_slot *slot, un
/* Update only requested fields */
if (cts->ios_valid & MMC_CLK) {
ios->clock = sdhci_cam_get_possible_host_clock(slot,
new_ios->clock);
- slot_printf(slot, "Clock => %d\n", ios->clock);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "Clock => %d\n", ios->clock);
}
if (cts->ios_valid & MMC_VDD) {
ios->vdd = new_ios->vdd;
- slot_printf(slot, "VDD => %d\n", ios->vdd);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "VDD => %d\n", ios->vdd);
}
if (cts->ios_valid & MMC_CS) {
ios->chip_select = new_ios->chip_select;
- slot_printf(slot, "CS => %d\n", ios->chip_select);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "CS => %d\n", ios->chip_select);
}
if (cts->ios_valid & MMC_BW) {
ios->bus_width = new_ios->bus_width;
- slot_printf(slot, "Bus width => %d\n", ios->bus_width);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "Bus width => %d\n", ios->bus_width);
}
if (cts->ios_valid & MMC_PM) {
ios->power_mode = new_ios->power_mode;
- slot_printf(slot, "Power mode => %d\n", ios->power_mode);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "Power mode => %d\n",
ios->power_mode);
}
if (cts->ios_valid & MMC_BT) {
ios->timing = new_ios->timing;
- slot_printf(slot, "Timing => %d\n", ios->timing);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "Timing => %d\n", ios->timing);
}
if (cts->ios_valid & MMC_BM) {
ios->bus_mode = new_ios->bus_mode;
- slot_printf(slot, "Bus mode => %d\n", ios->bus_mode);
+ if (sdhci_debug > 1)
+ slot_printf(slot, "Bus mode => %d\n", ios->bus_mode);
}
/* XXX Provide a way to call a chip-specific IOS update, required for
TI */
@@ -2686,7 +2693,8 @@ sdhci_cam_update_ios(struct sdhci_slot *slot)
{
struct mmc_ios *ios = >host.ios;
- slot_printf(slot, "%s: power_mode=%d, clk=%d, bus_width=%d,
timing=%d\n",
+ if (sdhci_debug > 1)
+ slot_printf(slot, "%s: power_mode=%d, clk=%d, bus_width=%d,
timing=%d\n",
__func__, ios->power_mode, ios->clock, ios->bus_width,
ios->timing);
SDHCI_LOCK(slot);
/* Do full reset on bus power down to clear from any state. */
___
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: r368059 - head/sys/cam/mmc
Author: manu
Date: Thu Nov 26 16:39:56 2020
New Revision: 368059
URL: https://svnweb.freebsd.org/changeset/base/368059
Log:
mmccam: We can't sleep during sdda_add_part so use M_NOWAIT
Reviewed by: kibab
Differential Revision:https://reviews.freebsd.org/D25947
Modified:
head/sys/cam/mmc/mmc_da.c
Modified: head/sys/cam/mmc/mmc_da.c
==
--- head/sys/cam/mmc/mmc_da.c Thu Nov 26 16:36:50 2020(r368058)
+++ head/sys/cam/mmc/mmc_da.c Thu Nov 26 16:39:56 2020(r368059)
@@ -202,7 +202,7 @@ static inline bool sdda_get_read_only(struct cam_perip
static uint32_t mmc_get_spec_vers(struct cam_periph *periph);
static uint64_t mmc_get_media_size(struct cam_periph *periph);
static uint32_t mmc_get_cmd6_timeout(struct cam_periph *periph);
-static void sdda_add_part(struct cam_periph *periph, u_int type,
+static bool sdda_add_part(struct cam_periph *periph, u_int type,
const char *name, u_int cnt, off_t media_size, bool ro);
static struct periph_driver sddadriver =
@@ -1502,10 +1502,11 @@ finish_hs_tests:
sdda_process_mmc_partitions(periph, start_ccb);
} else if (mmcp->card_features & CARD_FEATURE_SD20) {
/* For SD[HC] cards, just add one partition that is the whole
card */
- sdda_add_part(periph, 0, "sdda",
+ if (sdda_add_part(periph, 0, "sdda",
periph->unit_number,
mmc_get_media_size(periph),
- sdda_get_read_only(periph, start_ccb));
+ sdda_get_read_only(periph, start_ccb)) == false)
+ return;
softc->part_curr = 0;
}
cam_periph_hold(periph, PRIBIO|PCATCH);
@@ -1521,7 +1522,7 @@ finish_hs_tests:
AC_ADVINFO_CHANGED, sddaasync, periph, periph->path);
}
-static void
+static bool
sdda_add_part(struct cam_periph *periph, u_int type, const char *name,
u_int cnt, off_t media_size, bool ro)
{
@@ -1536,7 +1537,11 @@ sdda_add_part(struct cam_periph *periph, u_int type, c
ro ? "(read-only)" : ""));
part = sc->part[type] = malloc(sizeof(*part), M_DEVBUF,
- M_WAITOK | M_ZERO);
+ M_NOWAIT | M_ZERO);
+ if (part == NULL) {
+ printf("Cannot add partition for sdda\n");
+ return (false);
+ }
part->cnt = cnt;
part->type = type;
@@ -1554,7 +1559,7 @@ sdda_add_part(struct cam_periph *periph, u_int type, c
/* TODO: Create device, assign IOCTL handler */
CAM_DEBUG(periph->path, CAM_DEBUG_PERIPH,
("Don't know what to do with RPMB partitions yet\n"));
- return;
+ return (false);
}
bioq_init(>bio_queue);
@@ -1620,11 +1625,13 @@ sdda_add_part(struct cam_periph *periph, u_int type, c
xpt_print(periph->path, "%s: lost periph during "
"registration!\n", __func__);
cam_periph_lock(periph);
- return;
+ return (false);
}
disk_create(part->disk, DISK_VERSION);
cam_periph_lock(periph);
cam_periph_unhold(periph);
+
+ return (true);
}
/*
___
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: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On Thu, Nov 26, 2020, 8:37 AM Alan Somers wrote: > > > > > > >> > > I think you should add a LINKS=... here so people script which uses >> > > ping6 won't break (and of course adding support in the code to do ipv6 >> > > ping if progname is ping6 if this isn't the case). >> > > >> > > Cheers, >> > > >> > > -- >> > > Emmanuel Vadot >> > > >> > >> > Yes, that would make sense. But for how long? Would the ping6 hard >> link >> > stick around forever, or eventually be removed in some future version of >> > FreeBSD? >> >> I have no opinion on this matter. >> But since ping6 was present for a very long time I guess we're stuck >> with it for a long time too. >> > > Do you have an opinion on whether there should be a /rescue/ping6 link > too? > Yes. It should, imho. Warner > ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On Thu, 26 Nov 2020 08:37:13 -0700 Alan Somers wrote: > > > > > > > I think you should add a LINKS=... here so people script which uses > > > > ping6 won't break (and of course adding support in the code to do ipv6 > > > > ping if progname is ping6 if this isn't the case). > > > > > > > > Cheers, > > > > > > > > -- > > > > Emmanuel Vadot > > > > > > > > > > Yes, that would make sense. But for how long? Would the ping6 hard link > > > stick around forever, or eventually be removed in some future version of > > > FreeBSD? > > > > I have no opinion on this matter. > > But since ping6 was present for a very long time I guess we're stuck > > with it for a long time too. > > > > Do you have an opinion on whether there should be a /rescue/ping6 link too? I'll be honest I don't use ipv6 at all, I've just noticed this problem when reading my morning email :) -- Emmanuel Vadot ___ 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: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
> > > > > I think you should add a LINKS=... here so people script which uses > > > ping6 won't break (and of course adding support in the code to do ipv6 > > > ping if progname is ping6 if this isn't the case). > > > > > > Cheers, > > > > > > -- > > > Emmanuel Vadot > > > > > > > Yes, that would make sense. But for how long? Would the ping6 hard link > > stick around forever, or eventually be removed in some future version of > > FreeBSD? > > I have no opinion on this matter. > But since ping6 was present for a very long time I guess we're stuck > with it for a long time too. > Do you have an opinion on whether there should be a /rescue/ping6 link too? ___ 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: r368057 - stable/12/sys/kern
Author: markj
Date: Thu Nov 26 14:57:30 2020
New Revision: 368057
URL: https://svnweb.freebsd.org/changeset/base/368057
Log:
MFC r367849:
callout(9): Fix a race between CPU migration and callout_drain()
Modified:
stable/12/sys/kern/kern_timeout.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/kern_timeout.c
==
--- stable/12/sys/kern/kern_timeout.c Thu Nov 26 14:42:16 2020
(r368056)
+++ stable/12/sys/kern/kern_timeout.c Thu Nov 26 14:57:30 2020
(r368057)
@@ -1274,7 +1274,7 @@ again:
* just wait for the current invocation to
* finish.
*/
- while (cc_exec_curr(cc, direct) == c) {
+ if (cc_exec_curr(cc, direct) == c) {
/*
* Use direct calls to sleepqueue interface
* instead of cv/msleep in order to avoid
@@ -1322,7 +1322,7 @@ again:
/* Reacquire locks previously released. */
PICKUP_GIANT();
- CC_LOCK(cc);
+ goto again;
}
c->c_flags &= ~CALLOUT_ACTIVE;
} else if (use_lock &&
___
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: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On Thu, 26 Nov 2020 07:36:37 -0700
Alan Somers wrote:
> On Thu, Nov 26, 2020 at 1:27 AM Emmanuel Vadot
> wrote:
>
> >
> > Hi Alan,
> >
> > On Thu, 26 Nov 2020 04:29:31 + (UTC)
> > Alan Somers wrote:
> >
> > > Author: asomers
> > > Date: Thu Nov 26 04:29:30 2020
> > > New Revision: 368045
> > > URL: https://svnweb.freebsd.org/changeset/base/368045
> > >
> > > Log:
> > > Merge ping6 to ping
> > >
> > > There is now a single ping binary, which chooses to use ICMP or ICMPv4
> > > based on the -4 and -6 options, and the format of the address.
> > >
> > > Submitted by: Ján Su?an
> > > Sponsored by: Google LLC (Google Summer of Code 2019)
> > > MFC after: Never
> > > Differential Revision: https://reviews.freebsd.org/D21377
> > >
> > > Added:
> > > head/sbin/ping/main.c (contents, props changed)
> > > head/sbin/ping/main.h (contents, props changed)
> > > head/sbin/ping/ping.h (contents, props changed)
> > > head/sbin/ping/ping6.c
> > > - copied, changed from r368010, head/sbin/ping6/ping6.c
> > > head/sbin/ping/ping6.h (contents, props changed)
> > > head/sbin/ping/tests/ping_6_c1_s8_t1.out
> > > - copied unchanged from r368010,
> > head/sbin/ping6/tests/ping6_c1_s8_t1.out
> > > Deleted:
> > > head/sbin/ping6/Makefile
> > > head/sbin/ping6/Makefile.depend
> > > head/sbin/ping6/ping6.8
> > > head/sbin/ping6/ping6.c
> > > head/sbin/ping6/tests/Makefile
> > > head/sbin/ping6/tests/ping6_c1_s8_t1.out
> > > head/sbin/ping6/tests/ping6_test.sh
> > > Modified:
> > > head/ObsoleteFiles.inc
> > > head/UPDATING
> > > head/etc/mtree/BSD.tests.dist
> > > head/rescue/rescue/Makefile
> > > head/sbin/Makefile
> > > head/sbin/ping/Makefile
> > > head/sbin/ping/ping.8
> > > head/sbin/ping/ping.c
> > > head/sbin/ping/tests/Makefile
> > > head/sbin/ping/tests/ping_test.sh
> > > head/tools/build/mk/OptionalObsoleteFiles.inc
> > >
> > > Modified: head/ObsoleteFiles.inc
> > >
> > ==
> > > --- head/ObsoleteFiles.incThu Nov 26 02:14:52 2020(r368044)
> > > +++ head/ObsoleteFiles.incThu Nov 26 04:29:30 2020(r368045)
> > > @@ -36,6 +36,16 @@
> > > # xargs -n1 | sort | uniq -d;
> > > # done
> > >
> > > +# 20201124: ping6(8) was merged into ping(8)
> > > +OLD_FILES+=sbin/ping6
> > > +OLD_FILES+=rescue/ping6
> > > +OLD_FILES+=usr/lib/debug/sbin/ping6.debug
> > > +OLD_FILES+=usr/share/man/man8/ping6.8.gz
> > > +OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
> > > +OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
> > > +OLD_FILES+=usr/tests/sbin/ping6/ping6_test
> > > +OLD_DIRS+=usr/tests/sbin/ping6
> > > +
> > > # 20201025: Remove cal data files
> > > OLD_FILES+=usr/share/calendar/calendar.all
> > > OLD_FILES+=usr/share/calendar/calendar.australia
> > >
> > > Modified: head/UPDATING
> > >
> > ==
> > > --- head/UPDATING Thu Nov 26 02:14:52 2020(r368044)
> > > +++ head/UPDATING Thu Nov 26 04:29:30 2020(r368045)
> > > @@ -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".)
> > >
> > > +20201124:
> > > + ping6 has been merged into ping. It can now be called as "ping
> > -6".
> > > + See ping(8) for details.
> > > +
> > > 20201108:
> > > Default value of net.add_addr_allfibs has been changed to 0.
> > > If you have multi-fib configuration and rely on existence of all
> > >
> > > Modified: head/etc/mtree/BSD.tests.dist
> > >
> > ==
> > > --- head/etc/mtree/BSD.tests.dist Thu Nov 26 02:14:52 2020
> > (r368044)
> > > +++ head/etc/mtree/BSD.tests.dist Thu Nov 26 04:29:30 2020
> > (r368045)
> > > @@ -448,8 +448,6 @@
> > > ..
> > > ping
> > > ..
> > > -ping6
> > > -..
> > > route
> > > ..
> > > ..
> > >
> > > Modified: head/rescue/rescue/Makefile
> > >
> > ==
> > > --- head/rescue/rescue/Makefile Thu Nov 26 02:14:52 2020
> > (r368044)
> > > +++ head/rescue/rescue/Makefile Thu Nov 26 04:29:30 2020
> > (r368045)
> > > @@ -103,7 +103,6 @@ CRUNCH_PROGS_sbin+= ccdconfig
> > > .endif
> > >
> > > .if ${MK_INET6_SUPPORT} != "no"
> > > -CRUNCH_PROGS_sbin+= ping6
> > > CRUNCH_PROGS_sbin+= rtsol
> > > .endif
> > >
> > >
> > > Modified: head/sbin/Makefile
> > >
> > ==
> > > --- head/sbin/MakefileThu Nov 26 02:14:52 2020(r368044)
> > > +++ head/sbin/MakefileThu Nov 26 04:29:30 2020(r368045)
> > > @@ -73,7 +73,6 @@
svn commit: r368056 - in head: .github/workflows tools/build
Author: uqs
Date: Thu Nov 26 14:42:16 2020
New Revision: 368056
URL: https://svnweb.freebsd.org/changeset/base/368056
Log:
GH Actions: Use pre-installed clang packages
Also fix the run by setting up the environment in non-deprecated way.
Always run with --debug to understand better what sort of stuff is happening
in
the background. Also split out the bmake bootstrap stage (takes about 31s on
ubuntu, but 1m14 on macOS?)
Drops the dependency on coreutils (realpath, nproc) and thus (?) fixes macOS
to
be just as fast (4 logical cores vs 2 physical cores before, go figure.)
Reviewed by: arichardson
Modified:
head/.github/workflows/cross-bootstrap-tools.yml
head/tools/build/make.py
Modified: head/.github/workflows/cross-bootstrap-tools.yml
==
--- head/.github/workflows/cross-bootstrap-tools.ymlThu Nov 26 13:31:57
2020(r368055)
+++ head/.github/workflows/cross-bootstrap-tools.ymlThu Nov 26 14:42:16
2020(r368056)
@@ -1,4 +1,4 @@
-name: Cross-build CI
+name: Cross-build Kernel
on:
push:
@@ -8,28 +8,51 @@ on:
jobs:
build:
-name: ${{ matrix.os }}
+name: ${{ matrix.os }} (${{ matrix.compiler }})
runs-on: ${{ matrix.os }}
strategy:
+ fail-fast: false
matrix:
-os: [ubuntu-18.04, ubuntu-20.04, macOS-latest]
+include:
+ # TODO: both Ubuntu and macOS have bmake packages, we should try
them instead of bootstrapping our own copy.
+ - os: ubuntu-20.04
+compiler: clang-9
+cross-bindir: /usr/lib/llvm-9/bin
+pkgs: bmake libarchive-dev
+ - os: ubuntu-20.04
+compiler: clang-10
+cross-bindir: /usr/lib/llvm-10/bin
+pkgs: bmake libarchive-dev
+ - os: macOS-latest
+compiler: clang-11
+#cross-bindir: /usr/local/Cellar/llvm/11.0.0/bin # script figures
this out automatically
+pkgs: bmake libarchive llvm@11
steps:
- uses: actions/checkout@v2
- - name: install LLVM+libarchive (Ubuntu)
+ - name: install packages (Ubuntu)
+if: runner.os == 'Linux'
run: |
- wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh
- chmod +x /tmp/llvm.sh
- sudo /tmp/llvm.sh 11
- sudo apt install -y libarchive-dev
- echo "::set-env
name=EXTRA_MAKE_ARGS::--cross-bindir=/usr/lib/llvm-11/bin"
-if: ${{ startsWith(matrix.os, 'ubuntu') }}
- - name: install LLVM+libarchive (macOS)
-run: brew install llvm coreutils libarchive xz
-if: ${{ startsWith(matrix.os, 'macOS') }}
- - name: create build dir
-run: rm -rf ../build && mkdir -p ../build
+ sudo apt-get update --quiet || true
+ sudo apt-get -yq --no-install-suggests --no-install-recommends
install ${{ matrix.pkgs }}
+ - name: install packages (macOS)
+if: runner.os == 'macOS'
+run: |
+ brew update --quiet || true
+ brew install ${{ matrix.pkgs }}
+ - name: create environment
+run: |
+ echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
+ if [ -n "${{ matrix.cross-bindir }}" ]; then
+echo "EXTRA_BUILD_ARGS=--cross-bindir=${{ matrix.cross-bindir }}"
>> $GITHUB_ENV
+ fi
+ mkdir -p ../build
+ echo "MAKEOBJDIRPREFIX=${PWD%/*}/build" >> $GITHUB_ENV
+ # heh, works on Linux/BSD/macOS ...
+ echo "NPROC=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf
NPROCESSORS_ONLN 2>/dev/null || echo 1`" >> $GITHUB_ENV
+ - name: bootstrap bmake
+run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64
TARGET_ARCH=amd64 -n
- name: make kernel-toolchain
-run: env MAKEOBJDIRPREFIX=`realpath ../build` ./tools/build/make.py
$EXTRA_MAKE_ARGS TARGET=amd64 TARGET_ARCH=amd64 kernel-toolchain -s -j$(nproc)
+run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64
TARGET_ARCH=amd64 kernel-toolchain -s -j$NPROC
- name: make buildkernel
-run: env MAKEOBJDIRPREFIX=`realpath ../build` ./tools/build/make.py
$EXTRA_MAKE_ARGS TARGET=amd64 TARGET_ARCH=amd64 KERNCONF=GENERIC NO_MODULES=yes
buildkernel -s -j$(nproc)
+run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64
TARGET_ARCH=amd64 KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j$NPROC
$EXTRA_MAKE_ARGS
Modified: head/tools/build/make.py
==
--- head/tools/build/make.pyThu Nov 26 13:31:57 2020(r368055)
+++ head/tools/build/make.pyThu Nov 26 14:42:16 2020(r368056)
@@ -115,6 +115,9 @@ def check_required_make_env_var(varname, binary_name,
" does not exist")
new_env_vars[varname] = guess
debug("Inferred", varname, "as", guess)
+global parsed_args
+if parsed_args.debug:
+
Re: svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On Thu, Nov 26, 2020 at 1:27 AM Emmanuel Vadot
wrote:
>
> Hi Alan,
>
> On Thu, 26 Nov 2020 04:29:31 + (UTC)
> Alan Somers wrote:
>
> > Author: asomers
> > Date: Thu Nov 26 04:29:30 2020
> > New Revision: 368045
> > URL: https://svnweb.freebsd.org/changeset/base/368045
> >
> > Log:
> > Merge ping6 to ping
> >
> > There is now a single ping binary, which chooses to use ICMP or ICMPv4
> > based on the -4 and -6 options, and the format of the address.
> >
> > Submitted by: Ján Su?an
> > Sponsored by: Google LLC (Google Summer of Code 2019)
> > MFC after: Never
> > Differential Revision: https://reviews.freebsd.org/D21377
> >
> > Added:
> > head/sbin/ping/main.c (contents, props changed)
> > head/sbin/ping/main.h (contents, props changed)
> > head/sbin/ping/ping.h (contents, props changed)
> > head/sbin/ping/ping6.c
> > - copied, changed from r368010, head/sbin/ping6/ping6.c
> > head/sbin/ping/ping6.h (contents, props changed)
> > head/sbin/ping/tests/ping_6_c1_s8_t1.out
> > - copied unchanged from r368010,
> head/sbin/ping6/tests/ping6_c1_s8_t1.out
> > Deleted:
> > head/sbin/ping6/Makefile
> > head/sbin/ping6/Makefile.depend
> > head/sbin/ping6/ping6.8
> > head/sbin/ping6/ping6.c
> > head/sbin/ping6/tests/Makefile
> > head/sbin/ping6/tests/ping6_c1_s8_t1.out
> > head/sbin/ping6/tests/ping6_test.sh
> > Modified:
> > head/ObsoleteFiles.inc
> > head/UPDATING
> > head/etc/mtree/BSD.tests.dist
> > head/rescue/rescue/Makefile
> > head/sbin/Makefile
> > head/sbin/ping/Makefile
> > head/sbin/ping/ping.8
> > head/sbin/ping/ping.c
> > head/sbin/ping/tests/Makefile
> > head/sbin/ping/tests/ping_test.sh
> > head/tools/build/mk/OptionalObsoleteFiles.inc
> >
> > Modified: head/ObsoleteFiles.inc
> >
> ==
> > --- head/ObsoleteFiles.incThu Nov 26 02:14:52 2020(r368044)
> > +++ head/ObsoleteFiles.incThu Nov 26 04:29:30 2020(r368045)
> > @@ -36,6 +36,16 @@
> > # xargs -n1 | sort | uniq -d;
> > # done
> >
> > +# 20201124: ping6(8) was merged into ping(8)
> > +OLD_FILES+=sbin/ping6
> > +OLD_FILES+=rescue/ping6
> > +OLD_FILES+=usr/lib/debug/sbin/ping6.debug
> > +OLD_FILES+=usr/share/man/man8/ping6.8.gz
> > +OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
> > +OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
> > +OLD_FILES+=usr/tests/sbin/ping6/ping6_test
> > +OLD_DIRS+=usr/tests/sbin/ping6
> > +
> > # 20201025: Remove cal data files
> > OLD_FILES+=usr/share/calendar/calendar.all
> > OLD_FILES+=usr/share/calendar/calendar.australia
> >
> > Modified: head/UPDATING
> >
> ==
> > --- head/UPDATING Thu Nov 26 02:14:52 2020(r368044)
> > +++ head/UPDATING Thu Nov 26 04:29:30 2020(r368045)
> > @@ -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".)
> >
> > +20201124:
> > + ping6 has been merged into ping. It can now be called as "ping
> -6".
> > + See ping(8) for details.
> > +
> > 20201108:
> > Default value of net.add_addr_allfibs has been changed to 0.
> > If you have multi-fib configuration and rely on existence of all
> >
> > Modified: head/etc/mtree/BSD.tests.dist
> >
> ==
> > --- head/etc/mtree/BSD.tests.dist Thu Nov 26 02:14:52 2020
> (r368044)
> > +++ head/etc/mtree/BSD.tests.dist Thu Nov 26 04:29:30 2020
> (r368045)
> > @@ -448,8 +448,6 @@
> > ..
> > ping
> > ..
> > -ping6
> > -..
> > route
> > ..
> > ..
> >
> > Modified: head/rescue/rescue/Makefile
> >
> ==
> > --- head/rescue/rescue/Makefile Thu Nov 26 02:14:52 2020
> (r368044)
> > +++ head/rescue/rescue/Makefile Thu Nov 26 04:29:30 2020
> (r368045)
> > @@ -103,7 +103,6 @@ CRUNCH_PROGS_sbin+= ccdconfig
> > .endif
> >
> > .if ${MK_INET6_SUPPORT} != "no"
> > -CRUNCH_PROGS_sbin+= ping6
> > CRUNCH_PROGS_sbin+= rtsol
> > .endif
> >
> >
> > Modified: head/sbin/Makefile
> >
> ==
> > --- head/sbin/MakefileThu Nov 26 02:14:52 2020(r368044)
> > +++ head/sbin/MakefileThu Nov 26 04:29:30 2020(r368045)
> > @@ -73,7 +73,6 @@ SUBDIR.${MK_CCD}+= ccdconfig
> > SUBDIR.${MK_CXX}+= devd
> > SUBDIR.${MK_HAST}+= hastctl
> > SUBDIR.${MK_HAST}+= hastd
> > -SUBDIR.${MK_INET6}+= ping6
> > SUBDIR.${MK_INET6}+= rtsol
> > SUBDIR.${MK_IPFILTER}+= ipf
> > SUBDIR.${MK_IPFW}+= ipfw
> >
> > Modified: head/sbin/ping/Makefile
> >
>
svn commit: r368055 - head/contrib/netbsd-tests/lib/libpthread
Author: arichardson
Date: Thu Nov 26 13:31:57 2020
New Revision: 368055
URL: https://svnweb.freebsd.org/changeset/base/368055
Log:
Significantly speed up libthr/mutex_test and make more reliable
Instead of using a simple global++ as the data race, with this change we
perform the increment by loading the global, delaying for a bit and then
storing back the incremented value. If I move the increment outside of the
mutex protected range, I can now see the data race with only 100 iterations
on amd64 in almost all cases. Before this change such a racy test almost
always passed with < 100,000 iterations and only reliably failed with the
current limit of 10 million.
I noticed this poorly written test because the mutex:mutex{2,3} and
timedmutex:mutex{2,3} tests were always timing out on our CheriBSD Jenkins.
Writing good concurrency tests is hard so I won't attempt to do so, but this
change should make the test more likely to fail if pthread_mutex_lock is not
implemented correctly while also significantly reducing the time it takes to
run these four tests. It will also reduce the time it takes for QEMU RISC-V
testsuite runs by almost 40 minutes (out of currently 7 hours).
Reviewed By: brooks, ngie
Differential Revision: https://reviews.freebsd.org/D26473
Modified:
head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
Modified: head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
==
--- head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Thu Nov 26 10:17:56
2020(r368054)
+++ head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Thu Nov 26 13:31:57
2020(r368055)
@@ -35,6 +35,9 @@ __RCSID("$NetBSD: t_mutex.c,v 1.15 2017/01/16 16:23:41
#include /* For UINT16_MAX */
#include
#include
+#ifdef __FreeBSD__
+#include
+#endif
#include
#include
#include
@@ -128,16 +131,41 @@ ATF_TC_BODY(mutex1, tc)
PTHREAD_REQUIRE(pthread_mutex_unlock());
}
+#ifdef __FreeBSD__
+/*
+ * Increment the value using a noinline function that includes a small delay
+ * to increase the window for the RMW data race.
+ */
+__noinline static int
+increment(int value)
+{
+ for (volatile int i = 0; i < 100; i++) {
+ /* Small delay between read+write to increase chance of race */
+ __compiler_membar();
+ }
+ return value + 1;
+}
+
+static volatile bool thread2_started = false;
+#endif
+
static void *
mutex2_threadfunc(void *arg)
{
long count = *(int *)arg;
+#ifdef __FreeBSD__
+ thread2_started = true;
+#endif
printf("2: Second thread (%p). Count is %ld\n", pthread_self(), count);
while (count--) {
PTHREAD_REQUIRE(mutex_lock(, _lengthy));
+#ifdef __FreeBSD__
+ global_x = increment(global_x);
+#else
global_x++;
+#endif
PTHREAD_REQUIRE(pthread_mutex_unlock());
}
@@ -153,16 +181,13 @@ ATF_TC_HEAD(mutex2, tc)
atf_tc_set_md_var(tc, "timeout", "40");
#endif
#endif
-
-#ifdef __FreeBSD__
-#if defined(__riscv)
- atf_tc_set_md_var(tc, "timeout", "600");
-#endif
-#endif
}
ATF_TC_BODY(mutex2, tc)
{
int count, count2;
+#ifdef __FreeBSD__
+ int num_increments;
+#endif
pthread_t new;
void *joinval;
@@ -177,18 +202,39 @@ ATF_TC_BODY(mutex2, tc)
PTHREAD_REQUIRE(pthread_mutex_init(, NULL));
global_x = 0;
+#ifdef __FreeBSD__
+ num_increments = count = count2 = 1000;
+ if (getenv("NUM_ITERATIONS") != NULL) {
+ num_increments = count = count2 =
+ MIN(INT_MAX, strtoul(getenv("NUM_ITERATIONS"), NULL, 10));
+ }
+ printf("Will use %d iterations\n", num_increments);
+#else
count = count2 = 1000;
+#endif
PTHREAD_REQUIRE(mutex_lock(, _lengthy));
+#ifdef __FreeBSD__
+ thread2_started = false;
+#endif
PTHREAD_REQUIRE(pthread_create(, NULL, mutex2_threadfunc, ));
printf("1: Thread %p\n", pthread_self());
-
+#ifdef __FreeBSD__
+ while (!thread2_started) {
+ /* Wait for thread 2 to start to increase chance of race */
+ }
+ printf("1: Unlocking to start increment loop %p\n", pthread_self());
+#endif
PTHREAD_REQUIRE(pthread_mutex_unlock());
while (count--) {
PTHREAD_REQUIRE(mutex_lock(, _lengthy));
+#ifdef __FreeBSD__
+ global_x = increment(global_x);
+#else
global_x++;
+#endif
PTHREAD_REQUIRE(pthread_mutex_unlock());
}
@@ -197,7 +243,14 @@ ATF_TC_BODY(mutex2, tc)
PTHREAD_REQUIRE(mutex_lock(, _lengthy));
printf("1: Thread joined. X was %d. Return value (long) was %ld\n",
global_x, (long)joinval);
+#ifdef __FreeBSD__
+ ATF_REQUIRE_EQ_MSG(count, -1, "%d", count);
+ ATF_REQUIRE_EQ_MSG((long)joinval, -1, "%ld", (long)joinval);
+
svn commit: r368054 - stable/12/sys/net
Author: kp
Date: Thu Nov 26 10:17:56 2020
New Revision: 368054
URL: https://svnweb.freebsd.org/changeset/base/368054
Log:
Add missing NET_EPOCH_EXIT() to if_bridge
In r367706 one return in bridge_input() did not NET_EPOCH_EXIT(), which caused
seemingly random panics on the next use of NET_EPOCH.
Direct commit to stable/12, because this code is different in CURRENT.
Modified:
stable/12/sys/net/if_bridge.c
Modified: stable/12/sys/net/if_bridge.c
==
--- stable/12/sys/net/if_bridge.c Thu Nov 26 09:07:45 2020
(r368053)
+++ stable/12/sys/net/if_bridge.c Thu Nov 26 10:17:56 2020
(r368054)
@@ -2528,6 +2528,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
OR_PFIL_HOOKED_INET6)) { \
if (bridge_pfil(, NULL, ifp, \
PFIL_IN) != 0 || m == NULL) { \
+ NET_EPOCH_EXIT_ET(et); \
return (NULL); \
} \
eh = mtod(m, struct ether_header *);\
___
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"
Câbles et bornes de recharge pour véhicules électrique ou hybride
-30% sur certains articles [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] Voir la version en ligne [https://live.m2xmail.com/preview-html?id=14109906=287863d42e82ff0d171ab74e329c698c=svn-src-all%40freebsd.org] [https://up.m2xmail.com/lnk/385792097/8c52d6777641845b130f542907347b90a35b1e3f/aHR0cDovL3d3dy5iYXRpcmVsLnNob3A] Borne et câbles de recharge [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] pour véhicule électrique ou hybride [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] JUSQU'À [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] -30% [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] Dans la limite des stocks disponibles* [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] Voir les offres [https://up.m2xmail.com/lnk/385792097/2b1f4008f03656e01132dab1f79578e13ab4f3a3/aHR0cDovL3d3dy5ib3V0aXF1ZS5iYXRpcmVsLnNob3A] [https://up.m2xmail.com/lnk/385792097/5ee98ebec03ca6eecea5bebc630c3bc925e885ce/aHR0cDovL3d3dy5ib3JuZXMtZGUtcmVjaGFyZ2UtbW9iaWxlcy5iYXRpcmVsLnNob3A] -30% [https://up.m2xmail.com/lnk/385792097/5ee98ebec03ca6eecea5bebc630c3bc925e885ce/aHR0cDovL3d3dy5ib3JuZXMtZGUtcmVjaGFyZ2UtbW9iaWxlcy5iYXRpcmVsLnNob3A] SUR LES CHARGEURS MOBILE [https://up.m2xmail.com/lnk/385792097/5ee98ebec03ca6eecea5bebc630c3bc925e885ce/aHR0cDovL3d3dy5ib3JuZXMtZGUtcmVjaGFyZ2UtbW9iaWxlcy5iYXRpcmVsLnNob3A] [https://up.m2xmail.com/lnk/385792097/e0847275ba43d1397232b3eb3685d281fffa3228/aHR0cHM6Ly9iYXRpcmVsLmNvbS9ib3JuZXMtZGUtcmVjaGFyZ2UvYm9ybmVzLWRlLXJlY2hhcmdlLW11cmFsZXMv] -30% [https://up.m2xmail.com/lnk/385792097/765841ab1dc963f1231a1be10af61a6abfdaee55/aHR0cDovL3d3dy5ib3JuZXMtZGUtcmVjaGFyZ2UtbXVyYWxlcy5iYXRpcmVsLnNob3A] SUR LES BORNES HOMELOAD ET HUBLOAD [https://up.m2xmail.com/lnk/385792097/765841ab1dc963f1231a1be10af61a6abfdaee55/aHR0cDovL3d3dy5ib3JuZXMtZGUtcmVjaGFyZ2UtbXVyYWxlcy5iYXRpcmVsLnNob3A] [https://up.m2xmail.com/lnk/385792097/7154b6dca4a7629b2b11d2e8f2bbd137b884ec4f/aHR0cDovL3d3dy5jYWJsZXMtZGUtcmVjaGFyZ2UuYmF0aXJlbC5zaG9w] -30% [https://up.m2xmail.com/lnk/385792097/7154b6dca4a7629b2b11d2e8f2bbd137b884ec4f/aHR0cDovL3d3dy5jYWJsZXMtZGUtcmVjaGFyZ2UuYmF0aXJlbC5zaG9w] SUR LES CÂBLES DE RECHARGE [https://up.m2xmail.com/lnk/385792097/7154b6dca4a7629b2b11d2e8f2bbd137b884ec4f/aHR0cDovL3d3dy5jYWJsZXMtZGUtcmVjaGFyZ2UuYmF0aXJlbC5zaG9w] PROFITEZ DU CREDIT D'IMPOOT CITE DE 300€, AVEC UN TAUX DE TVA REDUIT A 5,5%(*) [https://up.m2xmail.com/lnk/385792097/16644536a5db9853ca54e748357443b43c4aa35d/aHR0cDovL3d3dy5mb3JtdWxhaXJlLXByaW1lLWJvcm5lcy1yZWNoYXJnZS5iYXRpcmVsLnNob3A] EN NOUS FAISANT REALISER LA POSE DE VOTRE BORNE CONTACTEZ NOUS [https://up.m2xmail.com/lnk/385792097/ab894aec11fa42b0e1ddc26d139e0daf3eaeb0a0/aHR0cDovL3d3dy5jb250YWN0LWJvdXRpcXVlLmJhdGlyZWwuc2hvcA] ET LA PRIME ADVENIR POUR LES PROFESSIONNELS JUSQU'A 3720€ PAR BORNE(**) CONTACTEZ NOUS [https://up.m2xmail.com/lnk/385792097/16644536a5db9853ca54e748357443b43c4aa35d/aHR0cDovL3d3dy5mb3JtdWxhaXJlLXByaW1lLWJvcm5lcy1yZWNoYXJnZS5iYXRpcmVsLnNob3A] WWW.BATIREL.COM [https://up.m2xmail.com/lnk/385792097/8c52d6777641845b130f542907347b90a35b1e3f/aHR0cDovL3d3dy5iYXRpcmVsLnNob3A] [Map] 17 Rue Pierre et Marie CURIE 77380 COMBS LA VILLE BORNES | CÂBLES | BORNES | DE RECHARGE MURALE OU MOBILE (*) Afin de bénéficier du crédit d'impôt CITE de 300 € et du taux de TVA réduit à 5,5%, la fourniture et la pose doit être effectué par un professionnel labelisés IRVE (BATIREL et ses poseurs sont qualifiés IRVE) [https://up.m2xmail.com/lnk/385792097/ab894aec11fa42b0e1ddc26d139e0daf3eaeb0a0/aHR0cDovL3d3dy5jb250YWN0LWJvdXRpcXVlLmJhdGlyZWwuc2hvcA] (**) Prime ADVENIR de 40% de l'investissement HT, installation effectuée par un professionnel labelisé IRVE [https://up.m2xmail.com/lnk/385792097/16644536a5db9853ca54e748357443b43c4aa35d/aHR0cDovL3d3dy5mb3JtdWxhaXJlLXByaW1lLWJvcm5lcy1yZWNoYXJnZS5iYXRpcmVsLnNob3A](BATIREL et ses poseurs sont qualifiés IRVE) [https://up.m2xmail.com/lnk/385792097/ab894aec11fa42b0e1ddc26d139e0daf3eaeb0a0/aHR0cDovL3d3dy5jb250YWN0LWJvdXRpcXVlLmJhdGlyZWwuc2hvcA] Cliquez ici pour vous désabonner [https://stop.m2xmail.com?c=14109906=svn-src-all@freebsd.org=e2e4c02814c7203cd4cc47430369da05417faa51] ___ svn-src-all@freebsd.org mailing list
Re: svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
On 26 Nov 2020, at 4:29, Alan Somers wrote: Author: asomers Date: Thu Nov 26 04:29:30 2020 New Revision: 368045 URL: https://svnweb.freebsd.org/changeset/base/368045 Log: Merge ping6 to ping There is now a single ping binary, which chooses to use ICMP or ICMPv4 based on the -4 and -6 options, and the format of the address. Submitted by: Ján Sučan Sponsored by: Google LLC (Google Summer of Code 2019) MFC after:Never Differential Revision:https://reviews.freebsd.org/D21377 I don’t have IPv4 anymore. I don’t see any WITHOUT_INET or -DINET checks. How can I compile INET out now? Also can we please have a ping6 [binary, compat shell script, or hardlink] back which defaults to -6 with appropriate option parsing by default? People used that in scripts and whatnot for about 20 years (and there’s even still stuff in tools in our own tree referencing it). /bz ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368053 - head/lib/libsysdecode
Author: kaktus
Date: Thu Nov 26 09:07:45 2020
New Revision: 368053
URL: https://svnweb.freebsd.org/changeset/base/368053
Log:
libsysdecode: account for invalid protection flags
Reported by: jhb
MFC with: r368022
Modified:
head/lib/libsysdecode/flags.c
Modified: head/lib/libsysdecode/flags.c
==
--- head/lib/libsysdecode/flags.c Thu Nov 26 07:34:20 2020
(r368052)
+++ head/lib/libsysdecode/flags.c Thu Nov 26 09:07:45 2020
(r368053)
@@ -662,7 +662,7 @@ sysdecode_mmap_prot(FILE *fp, int prot, int *rem)
printed = false;
protm = PROT_MAX_EXTRACT(prot);
- prot = PROT_EXTRACT(prot);
+ prot &= ~PROT_MAX(protm);
if (protm != 0) {
fputs("PROT_MAX(", fp);
printed = print_mask_int(fp, mmapprot, protm, rem);
___
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: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk
Hi Alan,
On Thu, 26 Nov 2020 04:29:31 + (UTC)
Alan Somers wrote:
> Author: asomers
> Date: Thu Nov 26 04:29:30 2020
> New Revision: 368045
> URL: https://svnweb.freebsd.org/changeset/base/368045
>
> Log:
> Merge ping6 to ping
>
> There is now a single ping binary, which chooses to use ICMP or ICMPv4
> based on the -4 and -6 options, and the format of the address.
>
> Submitted by: Ján Su?an
> Sponsored by: Google LLC (Google Summer of Code 2019)
> MFC after: Never
> Differential Revision: https://reviews.freebsd.org/D21377
>
> Added:
> head/sbin/ping/main.c (contents, props changed)
> head/sbin/ping/main.h (contents, props changed)
> head/sbin/ping/ping.h (contents, props changed)
> head/sbin/ping/ping6.c
> - copied, changed from r368010, head/sbin/ping6/ping6.c
> head/sbin/ping/ping6.h (contents, props changed)
> head/sbin/ping/tests/ping_6_c1_s8_t1.out
> - copied unchanged from r368010, head/sbin/ping6/tests/ping6_c1_s8_t1.out
> Deleted:
> head/sbin/ping6/Makefile
> head/sbin/ping6/Makefile.depend
> head/sbin/ping6/ping6.8
> head/sbin/ping6/ping6.c
> head/sbin/ping6/tests/Makefile
> head/sbin/ping6/tests/ping6_c1_s8_t1.out
> head/sbin/ping6/tests/ping6_test.sh
> Modified:
> head/ObsoleteFiles.inc
> head/UPDATING
> head/etc/mtree/BSD.tests.dist
> head/rescue/rescue/Makefile
> head/sbin/Makefile
> head/sbin/ping/Makefile
> head/sbin/ping/ping.8
> head/sbin/ping/ping.c
> head/sbin/ping/tests/Makefile
> head/sbin/ping/tests/ping_test.sh
> head/tools/build/mk/OptionalObsoleteFiles.inc
>
> Modified: head/ObsoleteFiles.inc
> ==
> --- head/ObsoleteFiles.incThu Nov 26 02:14:52 2020(r368044)
> +++ head/ObsoleteFiles.incThu Nov 26 04:29:30 2020(r368045)
> @@ -36,6 +36,16 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20201124: ping6(8) was merged into ping(8)
> +OLD_FILES+=sbin/ping6
> +OLD_FILES+=rescue/ping6
> +OLD_FILES+=usr/lib/debug/sbin/ping6.debug
> +OLD_FILES+=usr/share/man/man8/ping6.8.gz
> +OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
> +OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
> +OLD_FILES+=usr/tests/sbin/ping6/ping6_test
> +OLD_DIRS+=usr/tests/sbin/ping6
> +
> # 20201025: Remove cal data files
> OLD_FILES+=usr/share/calendar/calendar.all
> OLD_FILES+=usr/share/calendar/calendar.australia
>
> Modified: head/UPDATING
> ==
> --- head/UPDATING Thu Nov 26 02:14:52 2020(r368044)
> +++ head/UPDATING Thu Nov 26 04:29:30 2020(r368045)
> @@ -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".)
>
> +20201124:
> + ping6 has been merged into ping. It can now be called as "ping -6".
> + See ping(8) for details.
> +
> 20201108:
> Default value of net.add_addr_allfibs has been changed to 0.
> If you have multi-fib configuration and rely on existence of all
>
> Modified: head/etc/mtree/BSD.tests.dist
> ==
> --- head/etc/mtree/BSD.tests.dist Thu Nov 26 02:14:52 2020
> (r368044)
> +++ head/etc/mtree/BSD.tests.dist Thu Nov 26 04:29:30 2020
> (r368045)
> @@ -448,8 +448,6 @@
> ..
> ping
> ..
> -ping6
> -..
> route
> ..
> ..
>
> Modified: head/rescue/rescue/Makefile
> ==
> --- head/rescue/rescue/Makefile Thu Nov 26 02:14:52 2020
> (r368044)
> +++ head/rescue/rescue/Makefile Thu Nov 26 04:29:30 2020
> (r368045)
> @@ -103,7 +103,6 @@ CRUNCH_PROGS_sbin+= ccdconfig
> .endif
>
> .if ${MK_INET6_SUPPORT} != "no"
> -CRUNCH_PROGS_sbin+= ping6
> CRUNCH_PROGS_sbin+= rtsol
> .endif
>
>
> Modified: head/sbin/Makefile
> ==
> --- head/sbin/MakefileThu Nov 26 02:14:52 2020(r368044)
> +++ head/sbin/MakefileThu Nov 26 04:29:30 2020(r368045)
> @@ -73,7 +73,6 @@ SUBDIR.${MK_CCD}+= ccdconfig
> SUBDIR.${MK_CXX}+= devd
> SUBDIR.${MK_HAST}+= hastctl
> SUBDIR.${MK_HAST}+= hastd
> -SUBDIR.${MK_INET6}+= ping6
> SUBDIR.${MK_INET6}+= rtsol
> SUBDIR.${MK_IPFILTER}+= ipf
> SUBDIR.${MK_IPFW}+= ipfw
>
> Modified: head/sbin/ping/Makefile
> ==
> --- head/sbin/ping/Makefile Thu Nov 26 02:14:52 2020(r368044)
> +++ head/sbin/ping/Makefile Thu Nov 26 04:29:30 2020(r368045)
> @@ -5,11 +5,17 @@
>
> PACKAGE=runtime
> PROG=ping
> -SRCS=
