svn commit: r363176 - head/usr.sbin
Author: adrian
Date: Tue Jul 14 05:33:23 2020
New Revision: 363176
URL: https://svnweb.freebsd.org/changeset/base/363176
Log:
[pmc] whoops, remove spurious #'s
pointed out by gonzo@, thanks!
Modified:
head/usr.sbin/Makefile
Modified: head/usr.sbin/Makefile
==
--- head/usr.sbin/Makefile Tue Jul 14 05:24:07 2020(r363175)
+++ head/usr.sbin/Makefile Tue Jul 14 05:33:23 2020(r363176)
@@ -186,9 +186,9 @@ SUBDIR.${MK_NTP}+= ntp
SUBDIR.${MK_OPENSSL}+= keyserv
SUBDIR.${MK_PF}+= ftp-proxy
SUBDIR.${MK_PKGBOOTSTRAP}+=pkg
-#.if ${COMPILER_FEATURES:Mc++11}
-#SUBDIR.${MK_PMC}+=pmc
-#.endif
+.if ${COMPILER_FEATURES:Mc++11}
+SUBDIR.${MK_PMC}+= pmc
+.endif
SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy
SUBDIR.${MK_PORTSNAP}+=portsnap
SUBDIR.${MK_PPP}+= ppp
___
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: r363175 - stable/12/contrib/ldns/drill
Author: gonzo
Date: Tue Jul 14 05:24:07 2020
New Revision: 363175
URL: https://svnweb.freebsd.org/changeset/base/363175
Log:
MFC r362516:
Fix crash in drill(1) when IP has two subsequent dots
Cherry-pick crash fix from the upstream repo
PR: 226575
Reported by: Goran Mekić
Obtained from:https://git.nlnetlabs.nl/ldns/commit/?id=98291475
Modified:
stable/12/contrib/ldns/drill/drill.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/contrib/ldns/drill/drill.c
==
--- stable/12/contrib/ldns/drill/drill.cTue Jul 14 05:10:50 2020
(r363174)
+++ stable/12/contrib/ldns/drill/drill.cTue Jul 14 05:24:07 2020
(r363175)
@@ -787,15 +787,17 @@ main(int argc, char *argv[])
qname = ldns_dname_new_frm_str(ip6_arpa_str);
} else {
qname = ldns_dname_new_frm_str(name);
- qname_tmp = ldns_dname_reverse(qname);
- ldns_rdf_deep_free(qname);
- qname = qname_tmp;
- qname_tmp =
ldns_dname_new_frm_str("in-addr.arpa.");
- status = ldns_dname_cat(qname, qname_tmp);
- if (status != LDNS_STATUS_OK) {
- error("%s", "could not create reverse
address for ip4: %s\n", ldns_get_errorstr_by_id(status));
+ if (qname) {
+ qname_tmp = ldns_dname_reverse(qname);
+ ldns_rdf_deep_free(qname);
+ qname = qname_tmp;
+ qname_tmp =
ldns_dname_new_frm_str("in-addr.arpa.");
+ status = ldns_dname_cat(qname,
qname_tmp);
+ if (status != LDNS_STATUS_OK) {
+ error("%s", "could not create
reverse address for ip4: %s\n", ldns_get_errorstr_by_id(status));
+ }
+ ldns_rdf_deep_free(qname_tmp);
}
- ldns_rdf_deep_free(qname_tmp);
}
if (!qname) {
error("%s", "-x implies an ip address");
___
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: r363174 - head/usr.sbin
Author: adrian
Date: Tue Jul 14 05:10:50 2020
New Revision: 363174
URL: https://svnweb.freebsd.org/changeset/base/363174
Log:
[hwpmc] Compile 'pmc' only if we have C++11.
I noticed when compiling with ye olde gcc-6.3.0 on mips that it tripped over
a lack of C++11 bits. This allows it to compile fine.
Modified:
head/usr.sbin/Makefile
Modified: head/usr.sbin/Makefile
==
--- head/usr.sbin/Makefile Tue Jul 14 05:07:16 2020(r363173)
+++ head/usr.sbin/Makefile Tue Jul 14 05:10:50 2020(r363174)
@@ -186,9 +186,9 @@ SUBDIR.${MK_NTP}+= ntp
SUBDIR.${MK_OPENSSL}+= keyserv
SUBDIR.${MK_PF}+= ftp-proxy
SUBDIR.${MK_PKGBOOTSTRAP}+=pkg
-.if ${COMPILER_FEATURES:Mc++11}
-SUBDIR.${MK_PMC}+= pmc
-.endif
+#.if ${COMPILER_FEATURES:Mc++11}
+#SUBDIR.${MK_PMC}+=pmc
+#.endif
SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy
SUBDIR.${MK_PORTSNAP}+=portsnap
SUBDIR.${MK_PPP}+= ppp
___
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: r363173 - head/sbin/ipfw
Author: adrian
Date: Tue Jul 14 05:07:16 2020
New Revision: 363173
URL: https://svnweb.freebsd.org/changeset/base/363173
Log:
[ipfw] quieten maybe-uninitialized errors in ipfw when compiled under
mips-gcc-6.3.0.
This is mostly an exercise to set variables to NULL/0 when declared, but
one was ensuring a string variable was set before printing it.
We should never see "" in a printed rule; if we do then this code
definitely has some bugs that need addressing.
Modified:
head/sbin/ipfw/dummynet.c
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/nat64lsn.c
head/sbin/ipfw/tables.c
Modified: head/sbin/ipfw/dummynet.c
==
--- head/sbin/ipfw/dummynet.c Tue Jul 14 05:02:18 2020(r363172)
+++ head/sbin/ipfw/dummynet.c Tue Jul 14 05:07:16 2020(r363173)
@@ -1279,8 +1279,8 @@ ipfw_config_pipe(int ac, char **av)
struct dn_profile *pf = NULL;
struct ipfw_flow_id *mask = NULL;
#ifdef NEW_AQM
- struct dn_extra_parms *aqm_extra;
- struct dn_extra_parms *sch_extra;
+ struct dn_extra_parms *aqm_extra = NULL;
+ struct dn_extra_parms *sch_extra = NULL;
int lmax_extra;
#endif
Modified: head/sbin/ipfw/ipfw2.c
==
--- head/sbin/ipfw/ipfw2.c Tue Jul 14 05:02:18 2020(r363172)
+++ head/sbin/ipfw/ipfw2.c Tue Jul 14 05:07:16 2020(r363173)
@@ -1618,6 +1618,9 @@ print_instruction(struct buf_pr *bp, const struct form
case O_TCPWIN:
s = "tcpwin";
break;
+ default:
+ s = "";
+ break;
}
bprintf(bp, " %s %u", s, cmd->arg1);
} else
@@ -4003,7 +4006,7 @@ chkarg:
struct addrinfo *res;
char *s, *end;
int family;
- u_short port_number;
+ u_short port_number = 0;
NEED1("missing forward address[:port]");
@@ -5600,7 +5603,7 @@ ifinfo_cmp(const void *a, const void *b)
static void
ipfw_list_tifaces(void)
{
- ipfw_obj_lheader *olh;
+ ipfw_obj_lheader *olh = NULL;
ipfw_iface_info *info;
uint32_t i;
int error;
@@ -5608,7 +5611,6 @@ ipfw_list_tifaces(void)
if ((error = ipfw_get_tracked_ifaces()) != 0)
err(EX_OSERR, "Unable to request ipfw tracked interface list");
-
qsort(olh + 1, olh->count, olh->objsize, ifinfo_cmp);
info = (ipfw_iface_info *)(olh + 1);
@@ -5625,7 +5627,3 @@ ipfw_list_tifaces(void)
free(olh);
}
-
-
-
-
Modified: head/sbin/ipfw/nat64lsn.c
==
--- head/sbin/ipfw/nat64lsn.c Tue Jul 14 05:02:18 2020(r363172)
+++ head/sbin/ipfw/nat64lsn.c Tue Jul 14 05:07:16 2020(r363173)
@@ -99,6 +99,7 @@ nat64lsn_print_states(void *buf)
stg = (ipfw_nat64lsn_stg_v1 *)(od + 1);
sz = od->head.length - sizeof(*od);
next_idx = 0;
+ proto = NULL;
while (sz > 0 && next_idx != 0xFF) {
next_idx = stg->next.index;
sz -= sizeof(*stg);
Modified: head/sbin/ipfw/tables.c
==
--- head/sbin/ipfw/tables.c Tue Jul 14 05:02:18 2020(r363172)
+++ head/sbin/ipfw/tables.c Tue Jul 14 05:07:16 2020(r363173)
@@ -847,7 +847,7 @@ table_show_info(ipfw_xtable_info *i, void *arg)
static int
table_show_one(ipfw_xtable_info *i, void *arg)
{
- ipfw_obj_header *oh;
+ ipfw_obj_header *oh = NULL;
int error;
int is_all;
@@ -1179,7 +1179,7 @@ tentry_fill_key_type(char *arg, ipfw_obj_tentry *tentr
struct servent *sent;
int masklen;
- masklen = 0;
+ mask = masklen = 0;
af = 0;
paddr = (struct in6_addr *)>k;
___
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: r363172 - head/contrib/bc/src
Author: adrian
Date: Tue Jul 14 05:02:18 2020
New Revision: 363172
URL: https://svnweb.freebsd.org/changeset/base/363172
Log:
[bc] Fix a "maybe uninitialized" compiler warning under mips-gcc-6.3.0.
I guess this didn't like the case statements.. ? But this does quieten
the compiler error.
Modified:
head/contrib/bc/src/program.c
Modified: head/contrib/bc/src/program.c
==
--- head/contrib/bc/src/program.c Tue Jul 14 05:00:08 2020
(r363171)
+++ head/contrib/bc/src/program.c Tue Jul 14 05:02:18 2020
(r363172)
@@ -180,7 +180,7 @@ static inline BcVec* bc_program_vec(const BcProgram *p
static BcNum* bc_program_num(BcProgram *p, BcResult *r) {
- BcNum *n;
+ BcNum *n = NULL;
switch (r->t) {
___
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: r363171 - head/contrib/flex/src
Author: adrian
Date: Tue Jul 14 05:00:08 2020
New Revision: 363171
URL: https://svnweb.freebsd.org/changeset/base/363171
Log:
[flex] Fix compilation issue under mips-gcc-6.4
This was triggering a pointer-losing-constness error.
Modified:
head/contrib/flex/src/main.c
Modified: head/contrib/flex/src/main.c
==
--- head/contrib/flex/src/main.cTue Jul 14 01:54:24 2020
(r363170)
+++ head/contrib/flex/src/main.cTue Jul 14 05:00:08 2020
(r363171)
@@ -342,7 +342,7 @@ void check_options (void)
/* Setup the filter chain. */
output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
if ( !(m4 = getenv("M4"))) {
- char *slash;
+ const char *slash;
m4 = M4;
if ((slash = strrchr(M4, '/')) != NULL) {
m4 = slash+1;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363170 - in head: contrib/byacc contrib/byacc/package contrib/byacc/package/debian contrib/byacc/package/pkgsrc contrib/byacc/test contrib/byacc/test/btyacc contrib/byacc/test/yacc usr...
Author: jkim Date: Tue Jul 14 01:54:24 2020 New Revision: 363170 URL: https://svnweb.freebsd.org/changeset/base/363170 Log: MFV: r362513 Update byacc to 20200330. Added: head/contrib/byacc/test/btyacc/calc_code_all.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_all.error head/contrib/byacc/test/btyacc/calc_code_all.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_all.output head/contrib/byacc/test/btyacc/calc_code_all.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_all.tab.c head/contrib/byacc/test/btyacc/calc_code_all.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_all.tab.h head/contrib/byacc/test/btyacc/calc_code_default.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_default.error head/contrib/byacc/test/btyacc/calc_code_default.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_default.output head/contrib/byacc/test/btyacc/calc_code_default.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_default.tab.c head/contrib/byacc/test/btyacc/calc_code_default.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_default.tab.h head/contrib/byacc/test/btyacc/calc_code_imports.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_imports.error head/contrib/byacc/test/btyacc/calc_code_imports.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_imports.output head/contrib/byacc/test/btyacc/calc_code_imports.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_imports.tab.c head/contrib/byacc/test/btyacc/calc_code_imports.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_imports.tab.h head/contrib/byacc/test/btyacc/calc_code_provides.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_provides.error head/contrib/byacc/test/btyacc/calc_code_provides.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_provides.output head/contrib/byacc/test/btyacc/calc_code_provides.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_provides.tab.c head/contrib/byacc/test/btyacc/calc_code_provides.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_provides.tab.h head/contrib/byacc/test/btyacc/calc_code_requires.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_requires.error head/contrib/byacc/test/btyacc/calc_code_requires.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_requires.output head/contrib/byacc/test/btyacc/calc_code_requires.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_requires.tab.c head/contrib/byacc/test/btyacc/calc_code_requires.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_requires.tab.h head/contrib/byacc/test/btyacc/calc_code_top.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_top.error head/contrib/byacc/test/btyacc/calc_code_top.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_top.output head/contrib/byacc/test/btyacc/calc_code_top.tab.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/calc_code_top.tab.c head/contrib/byacc/test/btyacc/calc_code_top.tab.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/calc_code_top.tab.h head/contrib/byacc/test/btyacc/defines1.calc.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/defines1.calc.c head/contrib/byacc/test/btyacc/defines1.calc.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines1.calc.h head/contrib/byacc/test/btyacc/defines1.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines1.error head/contrib/byacc/test/btyacc/defines1.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines1.output head/contrib/byacc/test/btyacc/defines2.calc.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/defines2.calc.c head/contrib/byacc/test/btyacc/defines2.calc.h - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines2.calc.h head/contrib/byacc/test/btyacc/defines2.error - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines2.error head/contrib/byacc/test/btyacc/defines2.output - copied unchanged from r362513, vendor/byacc/dist/test/btyacc/defines2.output head/contrib/byacc/test/btyacc/defines3.calc.c - copied, changed from r362513, vendor/byacc/dist/test/btyacc/defines3.calc.c head/contrib/byacc/test/btyacc/defines3.calc.h -
svn commit: r363169 - head/usr.sbin/periodic/etc/daily
Author: allanjude Date: Tue Jul 14 00:46:20 2020 New Revision: 363169 URL: https://svnweb.freebsd.org/changeset/base/363169 Log: Actually install the new 221.backup-gpart periodic script Submitted by: Rob Fairbanks Reported by: Michael Butler MFC with: r363110 Sponsored by: Klara Inc. Modified: head/usr.sbin/periodic/etc/daily/Makefile Modified: head/usr.sbin/periodic/etc/daily/Makefile == --- head/usr.sbin/periodic/etc/daily/Makefile Mon Jul 13 19:28:10 2020 (r363168) +++ head/usr.sbin/periodic/etc/daily/Makefile Tue Jul 14 00:46:20 2020 (r363169) @@ -10,6 +10,7 @@ CONFS=100.clean-disks \ 140.clean-rwho \ 200.backup-passwd \ 210.backup-aliases \ + 221.backup-gpart \ 330.news \ 400.status-disks \ 401.status-graid \ ___ 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: r363168 - stable/12/usr.sbin/iovctl
Sorry, this has to be MFC r362808: iovctl(8): Correct a typo in the manpage and correct the SYNOPSIS --Gordon On Mon, Jul 13, 2020 at 07:28:10PM +, Gordon Bergling wrote: > Author: gbe (doc committer) > Date: Mon Jul 13 19:28:10 2020 > New Revision: 363168 > URL: https://svnweb.freebsd.org/changeset/base/363168 > > Log: > iovctl(8): Correct a typo in the manpage and correct the SYNOPSIS > > PR: 246831 > Submitted by: Jose Luis Duran > Reviewed by:bcr (mentor) > Approved by:bcr (mentor) > > Modified: > stable/12/usr.sbin/iovctl/iovctl.8 > stable/12/usr.sbin/iovctl/iovctl.conf.5 > Directory Properties: > stable/12/ (props changed) > > Modified: stable/12/usr.sbin/iovctl/iovctl.8 > == > --- stable/12/usr.sbin/iovctl/iovctl.8Mon Jul 13 19:15:29 2020 > (r363167) > +++ stable/12/usr.sbin/iovctl/iovctl.8Mon Jul 13 19:28:10 2020 > (r363168) > @@ -25,7 +25,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd July 8, 2015 > +.Dd May 31, 2020 > .Dt IOVCTL 8 > .Os > .Sh NAME > @@ -34,7 +34,7 @@ > .Sh SYNOPSIS > .Nm > .Fl C > -.Op Fl f Ar config-file > +.Fl f Ar config-file > .Op Fl n > .Nm > .Fl D > > Modified: stable/12/usr.sbin/iovctl/iovctl.conf.5 > == > --- stable/12/usr.sbin/iovctl/iovctl.conf.5 Mon Jul 13 19:15:29 2020 > (r363167) > +++ stable/12/usr.sbin/iovctl/iovctl.conf.5 Mon Jul 13 19:28:10 2020 > (r363168) > @@ -25,7 +25,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd July 8, 2015 > +.Dd May 29, 2020 > .Dt IOVCTL.CONF 5 > .Os > .Sh NAME > @@ -43,7 +43,7 @@ device. > To configure SR-IOV on multiple PF devices, use one configuration file for > each > PF. > The locations of all > -.Xr iovctl 9 > +.Xr iovctl 8 > configuration files are specified in > .Xr rc.conf 5 . > .Pp > ___ > svn-src-stable...@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12 > To unsubscribe, send any mail to "svn-src-stable-12-unsubscr...@freebsd.org" -- ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363168 - stable/12/usr.sbin/iovctl
Author: gbe (doc committer) Date: Mon Jul 13 19:28:10 2020 New Revision: 363168 URL: https://svnweb.freebsd.org/changeset/base/363168 Log: iovctl(8): Correct a typo in the manpage and correct the SYNOPSIS PR: 246831 Submitted by: Jose Luis Duran Reviewed by: bcr (mentor) Approved by: bcr (mentor) Modified: stable/12/usr.sbin/iovctl/iovctl.8 stable/12/usr.sbin/iovctl/iovctl.conf.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/iovctl/iovctl.8 == --- stable/12/usr.sbin/iovctl/iovctl.8 Mon Jul 13 19:15:29 2020 (r363167) +++ stable/12/usr.sbin/iovctl/iovctl.8 Mon Jul 13 19:28:10 2020 (r363168) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2015 +.Dd May 31, 2020 .Dt IOVCTL 8 .Os .Sh NAME @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Fl C -.Op Fl f Ar config-file +.Fl f Ar config-file .Op Fl n .Nm .Fl D Modified: stable/12/usr.sbin/iovctl/iovctl.conf.5 == --- stable/12/usr.sbin/iovctl/iovctl.conf.5 Mon Jul 13 19:15:29 2020 (r363167) +++ stable/12/usr.sbin/iovctl/iovctl.conf.5 Mon Jul 13 19:28:10 2020 (r363168) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2015 +.Dd May 29, 2020 .Dt IOVCTL.CONF 5 .Os .Sh NAME @@ -43,7 +43,7 @@ device. To configure SR-IOV on multiple PF devices, use one configuration file for each PF. The locations of all -.Xr iovctl 9 +.Xr iovctl 8 configuration files are specified in .Xr rc.conf 5 . .Pp ___ 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: r363167 - head/sys/dev/cxgbe
Author: np
Date: Mon Jul 13 19:15:29 2020
New Revision: 363167
URL: https://svnweb.freebsd.org/changeset/base/363167
Log:
cxgbev(4): Compare at most 16 bytes of the Ethernet header when trying
to coalesce tx work requests.
Note that Coverity will still treat this as an out-of-bounds access. We
do want to compare 16B starting from ethmacdst but cmp_l2hdr was was
going beyond that by 2B.
cmp_l2hdr was introduced in r362905.
Reported by: Coverity (CID 1430284)
Sponsored by: Chelsio Communications
Modified:
head/sys/dev/cxgbe/t4_sge.c
Modified: head/sys/dev/cxgbe/t4_sge.c
==
--- head/sys/dev/cxgbe/t4_sge.c Mon Jul 13 19:10:16 2020(r363166)
+++ head/sys/dev/cxgbe/t4_sge.c Mon Jul 13 19:15:29 2020(r363167)
@@ -4700,6 +4700,8 @@ csum_to_ctrl(struct adapter *sc, struct mbuf *m)
return (ctrl);
}
+#define VM_TX_L2HDR_LEN16 /* ethmacdst to vlantci */
+
/*
* Write a VM txpkt WR for this packet to the hardware descriptors, update the
* software descriptor, and advance the pidx. It is guaranteed that enough
@@ -4748,7 +4750,7 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq *
* conditional. Also, it seems that we do not have to set
* vlantci or fake the ethtype when doing VLAN tag insertion.
*/
- m_copydata(m0, 0, sizeof(struct ether_header) + 2, wr->ethmacdst);
+ m_copydata(m0, 0, VM_TX_L2HDR_LEN, wr->ethmacdst);
if (needs_tso(m0)) {
struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);
@@ -4985,10 +4987,10 @@ cmp_l2hdr(struct txpkts *txp, struct mbuf *m)
int len;
MPASS(txp->npkt > 0);
- MPASS(m->m_len >= 16); /* type1 implies 1 GL with all of the frame. */
+ MPASS(m->m_len >= VM_TX_L2HDR_LEN);
if (txp->ethtype == be16toh(ETHERTYPE_VLAN))
- len = sizeof(struct ether_vlan_header);
+ len = VM_TX_L2HDR_LEN;
else
len = sizeof(struct ether_header);
@@ -4998,9 +5000,9 @@ cmp_l2hdr(struct txpkts *txp, struct mbuf *m)
static inline void
save_l2hdr(struct txpkts *txp, struct mbuf *m)
{
- MPASS(m->m_len >= 16); /* type1 implies 1 GL with all of the frame. */
+ MPASS(m->m_len >= VM_TX_L2HDR_LEN);
- memcpy(>ethmacdst[0], mtod(m, const void *), 16);
+ memcpy(>ethmacdst[0], mtod(m, const void *), VM_TX_L2HDR_LEN);
}
static 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: r363166 - head/sbin/ipfw
Author: markj
Date: Mon Jul 13 19:10:16 2020
New Revision: 363166
URL: https://svnweb.freebsd.org/changeset/base/363166
Log:
ipfw(8): Handle unaligned pointers in pr_u64.
struct _ipfw_dyn_rule is defined as packed, and as a result, its
uint64_t fields are misaligned on some 32-bit platforms. Since
pr_u64() is explicitly supposed to handle this case, avoid using a
uint64_t * for the input pointer to make sure that the compiler won't
(correctly) warn about the misalignment.
Reported by: jenkins
MFC with: r363164
Modified:
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/ipfw2.h
Modified: head/sbin/ipfw/ipfw2.c
==
--- head/sbin/ipfw/ipfw2.c Mon Jul 13 18:19:02 2020(r363165)
+++ head/sbin/ipfw/ipfw2.c Mon Jul 13 19:10:16 2020(r363166)
@@ -501,7 +501,7 @@ bprint_uint_arg(struct buf_pr *bp, const char *str, ui
* otherwise, return the required width.
*/
int
-pr_u64(struct buf_pr *b, uint64_t *pd, int width)
+pr_u64(struct buf_pr *b, void *pd, int width)
{
#ifdef TCC
#define U64_FMT "I64"
Modified: head/sbin/ipfw/ipfw2.h
==
--- head/sbin/ipfw/ipfw2.h Mon Jul 13 18:19:02 2020(r363165)
+++ head/sbin/ipfw/ipfw2.h Mon Jul 13 19:10:16 2020(r363166)
@@ -328,7 +328,7 @@ struct buf_pr {
size_t needed; /* length needed */
};
-int pr_u64(struct buf_pr *bp, uint64_t *pd, int width);
+int pr_u64(struct buf_pr *bp, void *pd, int width);
int bp_alloc(struct buf_pr *b, size_t size);
void bp_free(struct buf_pr *b);
int bprintf(struct buf_pr *b, const char *format, ...);
___
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: r363165 - head/lib/libc/tests/gen
Author: lwhsu
Date: Mon Jul 13 18:19:02 2020
New Revision: 363165
URL: https://svnweb.freebsd.org/changeset/base/363165
Log:
Revert r351416 to let lib.libc.gen.getmntinfo_test.getmntinfo_test get more
test
This is supposed to be fixed by r363068
PR: 240049
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/libc/tests/gen/getmntinfo_test.c
Modified: head/lib/libc/tests/gen/getmntinfo_test.c
==
--- head/lib/libc/tests/gen/getmntinfo_test.c Mon Jul 13 17:51:04 2020
(r363164)
+++ head/lib/libc/tests/gen/getmntinfo_test.c Mon Jul 13 18:19:02 2020
(r363165)
@@ -57,9 +57,6 @@ ATF_TC_BODY(getmntinfo_test, tc)
int nmnts;
struct statfs *mntinfo;
- if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
- atf_tc_skip("https://bugs.freebsd.org/240049;);
-
/* Test bogus mode */
nmnts = getmntinfo(, 199);
ATF_REQUIRE_MSG(nmnts == 0 && errno == EINVAL,
___
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: r363164 - head/sbin/ipfw
Author: markj
Date: Mon Jul 13 17:51:04 2020
New Revision: 363164
URL: https://svnweb.freebsd.org/changeset/base/363164
Log:
ipfw(8): Fix most warnings with the default WARNS level.
- Add missing const and static qualifiers.
- Avoid shadowing the global "co" by renaming it to "g_co".
- Avoid mixing signedness in loop bound checks.
- Leave -Wcast-align warnings disabled for now.
Reviewed by: ae, melifaro
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D25456
Modified:
head/sbin/ipfw/Makefile
head/sbin/ipfw/altq.c
head/sbin/ipfw/dummynet.c
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/ipfw2.h
head/sbin/ipfw/ipv6.c
head/sbin/ipfw/main.c
head/sbin/ipfw/nat.c
head/sbin/ipfw/nat64clat.c
head/sbin/ipfw/nat64lsn.c
head/sbin/ipfw/nat64stl.c
head/sbin/ipfw/nptv6.c
head/sbin/ipfw/tables.c
Modified: head/sbin/ipfw/Makefile
==
--- head/sbin/ipfw/Makefile Mon Jul 13 17:20:20 2020(r363163)
+++ head/sbin/ipfw/Makefile Mon Jul 13 17:51:04 2020(r363164)
@@ -6,7 +6,6 @@ PACKAGE=ipfw
PROG= ipfw
SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c tables.c
SRCS+= nat64clat.c nat64lsn.c nat64stl.c nptv6.c
-WARNS?=2
.if ${MK_PF} != "no"
SRCS+= altq.c
@@ -17,3 +16,5 @@ LIBADD= jail util
MAN= ipfw.8
.include
+
+CWARNFLAGS+= -Wno-cast-align
Modified: head/sbin/ipfw/altq.c
==
--- head/sbin/ipfw/altq.c Mon Jul 13 17:20:20 2020(r363163)
+++ head/sbin/ipfw/altq.c Mon Jul 13 17:51:04 2020(r363164)
@@ -140,7 +140,7 @@ altq_qid_to_name(u_int32_t qid)
}
void
-print_altq_cmd(struct buf_pr *bp, ipfw_insn_altq *altqptr)
+print_altq_cmd(struct buf_pr *bp, const ipfw_insn_altq *altqptr)
{
if (altqptr) {
const char *qname;
Modified: head/sbin/ipfw/dummynet.c
==
--- head/sbin/ipfw/dummynet.c Mon Jul 13 17:20:20 2020(r363163)
+++ head/sbin/ipfw/dummynet.c Mon Jul 13 17:51:04 2020(r363164)
@@ -166,8 +166,8 @@ enum {
#define PIE_SCALE (1Lid);
break;
case DN_SCH: {
@@ -636,7 +636,7 @@ list_pipes(struct dn_id *oid, struct dn_id *end)
sprintf(bwbuf, "%7.3f bit/s ", b);
if (humanize_number(burst, sizeof(burst), p->burst,
- "", HN_AUTOSCALE, 0) < 0 || co.verbose)
+ "", HN_AUTOSCALE, 0) < 0 || g_co.verbose)
sprintf(burst, "%d", (int)p->burst);
sprintf(buf, "%05d: %s %4d ms burst %s",
p->link_nr % DN_MAX_ID, bwbuf, p->delay, burst);
@@ -1317,7 +1317,7 @@ ipfw_config_pipe(int ac, char **av)
o_next(, sizeof(struct dn_id), DN_CMD_CONFIG);
base->id = DN_API_VERSION;
- switch (co.do_pipe) {
+ switch (g_co.do_pipe) {
case 1: /* "pipe N config ..." */
/* Allocate space for the WF2Q+ scheduler, its link
* and the FIFO flowset. Set the number, but leave
@@ -1893,7 +1893,7 @@ parse_range(int ac, char *av[], uint32_t *v, int len)
}
n++;
/* translate if 'pipe list' */
- if (co.do_pipe == 1) {
+ if (g_co.do_pipe == 1) {
v[0] += DN_MAX_ID;
v[1] += DN_MAX_ID;
}
@@ -1947,7 +1947,7 @@ dummynet_list(int ac, char *av[], int show_counters)
if (max_size < sizeof(struct dn_flow))
max_size = sizeof(struct dn_flow);
- switch (co.do_pipe) {
+ switch (g_co.do_pipe) {
case 1:
oid->subtype = DN_LINK; /* list pipe */
break;
Modified: head/sbin/ipfw/ipfw2.c
==
--- head/sbin/ipfw/ipfw2.c Mon Jul 13 17:20:20 2020(r363163)
+++ head/sbin/ipfw/ipfw2.c Mon Jul 13 17:51:04 2020(r363164)
@@ -57,7 +57,7 @@
#include
#include
-struct cmdline_opts co;/* global options */
+struct cmdline_opts g_co; /* global options */
struct format_opts {
int bcwidth;
@@ -74,7 +74,7 @@ struct format_opts {
int resvd_set_number = RESVD_SET;
-int ipfw_socket = -1;
+static int ipfw_socket = -1;
#defineCHECK_LENGTH(v, len) do { \
if ((v) < (len))\
@@ -395,8 +395,8 @@ static int ipfw_show_config(struct cmdline_opts *co, s
static void ipfw_list_tifaces(void);
struct tidx;
-static uint16_t pack_object(struct tidx *tstate, char *name, int otype);
-static uint16_t pack_table(struct tidx *tstate, char *name);
+static uint16_t pack_object(struct tidx *tstate, const char *name, int otype);
+static uint16_t pack_table(struct tidx *tstate, const char
svn commit: r363163 - stable/12/sys/net
Author: mav Date: Mon Jul 13 17:20:20 2020 New Revision: 363163 URL: https://svnweb.freebsd.org/changeset/base/363163 Log: MFC r358995 (by pkelsey): Fix iflib freelist state corruption This fixes a bug in iflib freelist management that breaks the required correspondence between freelist indexes and driver ring slots. PR: 243126, 243392, 240628 Modified: stable/12/sys/net/iflib.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c == --- stable/12/sys/net/iflib.c Mon Jul 13 17:05:44 2020(r363162) +++ stable/12/sys/net/iflib.c Mon Jul 13 17:20:20 2020(r363163) @@ -2122,7 +2122,9 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int coun bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ctx->isc_rxd_flush(ctx->ifc_softc, fl->ifl_rxq->ifr_id, fl->ifl_id, pidx); - fl->ifl_fragidx = frag_idx; + fl->ifl_fragidx = frag_idx + 1; + if (fl->ifl_fragidx == fl->ifl_size) + fl->ifl_fragidx = 0; return (n == -1 ? 0 : IFLIB_RXEOF_EMPTY); } ___ 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: r363162 - head/sys/arm64/arm64
Author: markj
Date: Mon Jul 13 17:05:44 2020
New Revision: 363162
URL: https://svnweb.freebsd.org/changeset/base/363162
Log:
Print arm64 physmem info during boot.
PR: 243682
Reviewed by: andrew, emaste
MFC after:1 week
Event:July 2020 Bugathon
Differential Revision:https://reviews.freebsd.org/D25625
Modified:
head/sys/arm64/arm64/machdep.c
Modified: head/sys/arm64/arm64/machdep.c
==
--- head/sys/arm64/arm64/machdep.c Mon Jul 13 16:43:23 2020
(r363161)
+++ head/sys/arm64/arm64/machdep.c Mon Jul 13 17:05:44 2020
(r363162)
@@ -62,11 +62,14 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
+#include
#include
#include
#include
+#include
#include
#include
#include
@@ -170,6 +173,26 @@ has_hyp(void)
static void
cpu_startup(void *dummy)
{
+ vm_paddr_t size;
+ int i;
+
+ printf("real memory = %ju (%ju MB)\n", ptoa((uintmax_t)realmem),
+ ptoa((uintmax_t)realmem) / 1024 / 1024);
+
+ if (bootverbose) {
+ printf("Physical memory chunk(s):\n");
+ for (i = 0; phys_avail[i + 1] != 0; i += 2) {
+ size = phys_avail[i + 1] - phys_avail[i];
+ printf("%#016jx - %#016jx, %ju bytes (%ju pages)\n",
+ (uintmax_t)phys_avail[i],
+ (uintmax_t)phys_avail[i + 1] - 1,
+ (uintmax_t)size, (uintmax_t)size / PAGE_SIZE);
+ }
+ }
+
+ printf("avail memory = %ju (%ju MB)\n",
+ ptoa((uintmax_t)vm_free_count()),
+ ptoa((uintmax_t)vm_free_count()) / 1024 / 1024);
undef_init();
install_cpu_errata();
___
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: r363161 - in stable/12/sys: compat/freebsd32 kern
Author: markj
Date: Mon Jul 13 16:43:23 2020
New Revision: 363161
URL: https://svnweb.freebsd.org/changeset/base/363161
Log:
MFC r362970, r362971:
Permit cpuset_(get|set)domain() in capability mode.
Modified:
stable/12/sys/compat/freebsd32/freebsd32_sysent.c
stable/12/sys/kern/capabilities.conf
stable/12/sys/kern/init_sysent.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/compat/freebsd32/freebsd32_sysent.c
==
--- stable/12/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 13 16:42:30
2020(r363160)
+++ stable/12/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 13 16:43:23
2020(r363161)
@@ -644,8 +644,8 @@ struct sysent freebsd32_sysent[] = {
{ AS(freebsd32_mknodat_args), (sy_call_t *)freebsd32_mknodat,
AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 559 =
freebsd32_mknodat */
#endif
{ AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_KEVENT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },/* 560 = freebsd32_kevent */
- { AS(freebsd32_cpuset_getdomain_args), (sy_call_t
*)freebsd32_cpuset_getdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 561 = freebsd32_cpuset_getdomain */
- { AS(freebsd32_cpuset_setdomain_args), (sy_call_t
*)freebsd32_cpuset_setdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 562 = freebsd32_cpuset_setdomain */
+ { AS(freebsd32_cpuset_getdomain_args), (sy_call_t
*)freebsd32_cpuset_getdomain, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 561 = freebsd32_cpuset_getdomain */
+ { AS(freebsd32_cpuset_setdomain_args), (sy_call_t
*)freebsd32_cpuset_setdomain, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 562 = freebsd32_cpuset_setdomain */
{ AS(getrandom_args), (sy_call_t *)sys_getrandom, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC },/* 563 = getrandom */
{ AS(getfhat_args), (sy_call_t *)sys_getfhat, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 564 = getfhat */
{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 565 = fhlink */
Modified: stable/12/sys/kern/capabilities.conf
==
--- stable/12/sys/kern/capabilities.confMon Jul 13 16:42:30 2020
(r363160)
+++ stable/12/sys/kern/capabilities.confMon Jul 13 16:43:23 2020
(r363161)
@@ -142,8 +142,10 @@ connectat
##
#cpuset
cpuset_getaffinity
+cpuset_getdomain
#cpuset_getid
cpuset_setaffinity
+cpuset_setdomain
#cpuset_setid
##
Modified: stable/12/sys/kern/init_sysent.c
==
--- stable/12/sys/kern/init_sysent.cMon Jul 13 16:42:30 2020
(r363160)
+++ stable/12/sys/kern/init_sysent.cMon Jul 13 16:43:23 2020
(r363161)
@@ -610,8 +610,8 @@ struct sysent sysent[] = {
{ AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0,
0, 0, SY_THR_STATIC }, /* 558 = fhstatfs */
{ AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = mknodat */
{ AS(kevent_args), (sy_call_t *)sys_kevent, AUE_KEVENT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC },/* 560 = kevent */
- { AS(cpuset_getdomain_args), (sy_call_t *)sys_cpuset_getdomain,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 561 = cpuset_getdomain */
- { AS(cpuset_setdomain_args), (sy_call_t *)sys_cpuset_setdomain,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 562 = cpuset_setdomain */
+ { AS(cpuset_getdomain_args), (sy_call_t *)sys_cpuset_getdomain,
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 561 =
cpuset_getdomain */
+ { AS(cpuset_setdomain_args), (sy_call_t *)sys_cpuset_setdomain,
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 562 =
cpuset_setdomain */
{ AS(getrandom_args), (sy_call_t *)sys_getrandom, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC },/* 563 = getrandom */
{ AS(getfhat_args), (sy_call_t *)sys_getfhat, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 564 = getfhat */
{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 565 = fhlink */
___
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: r363160 - stable/12/sys/kern
Author: markj Date: Mon Jul 13 16:42:30 2020 New Revision: 363160 URL: https://svnweb.freebsd.org/changeset/base/363160 Log: MFC r362968: Allow accesses of the caller's CPU and domain sets in capability mode. Modified: stable/12/sys/kern/kern_cpuset.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/kern_cpuset.c == --- stable/12/sys/kern/kern_cpuset.cMon Jul 13 16:41:58 2020 (r363159) +++ stable/12/sys/kern/kern_cpuset.cMon Jul 13 16:42:30 2020 (r363160) @@ -1595,7 +1595,9 @@ cpuset_check_capabilities(struct thread *td, cpulevel_ return (ECAPMODE); if (which != CPU_WHICH_TID && which != CPU_WHICH_PID) return (ECAPMODE); - if (id != -1) + if (id != -1 && + !(which == CPU_WHICH_TID && id == td->td_tid) && + !(which == CPU_WHICH_PID && id == td->td_proc->p_pid)) return (ECAPMODE); } return (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: r363159 - stable/12/sys/kern
Author: markj
Date: Mon Jul 13 16:41:58 2020
New Revision: 363159
URL: https://svnweb.freebsd.org/changeset/base/363159
Log:
MFC r362966:
Lift cpuset Capsicum checks into a subroutine.
Modified:
stable/12/sys/kern/kern_cpuset.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/kern_cpuset.c
==
--- stable/12/sys/kern/kern_cpuset.cMon Jul 13 16:39:27 2020
(r363158)
+++ stable/12/sys/kern/kern_cpuset.cMon Jul 13 16:41:58 2020
(r363159)
@@ -1582,6 +1582,25 @@ cpuset_setproc_update_set(struct proc *p, struct cpuse
return (0);
}
+/*
+ * In Capability mode, the only accesses that are permitted are to the current
+ * thread and process' CPU and domain sets.
+ */
+static int
+cpuset_check_capabilities(struct thread *td, cpulevel_t level, cpuwhich_t
which,
+id_t id)
+{
+ if (IN_CAPABILITY_MODE(td)) {
+ if (level != CPU_LEVEL_WHICH)
+ return (ECAPMODE);
+ if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
+ return (ECAPMODE);
+ if (id != -1)
+ return (ECAPMODE);
+ }
+ return (0);
+}
+
#ifndef _SYS_SYSPROTO_H_
struct cpuset_args {
cpusetid_t *setid;
@@ -1739,15 +1758,9 @@ kern_cpuset_getaffinity(struct thread *td, cpulevel_t
if (cpusetsize < sizeof(cpuset_t) || cpusetsize > CPU_MAXSIZE / NBBY)
return (ERANGE);
- /* In Capability mode, you can only get your own CPU set. */
- if (IN_CAPABILITY_MODE(td)) {
- if (level != CPU_LEVEL_WHICH)
- return (ECAPMODE);
- if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
- return (ECAPMODE);
- if (id != -1)
- return (ECAPMODE);
- }
+ error = cpuset_check_capabilities(td, level, which, id);
+ if (error != 0)
+ return (error);
size = cpusetsize;
mask = malloc(size, M_TEMP, M_WAITOK | M_ZERO);
error = cpuset_which(which, id, , , );
@@ -1856,15 +1869,9 @@ kern_cpuset_setaffinity(struct thread *td, cpulevel_t
if (cpusetsize < sizeof(cpuset_t) || cpusetsize > CPU_MAXSIZE / NBBY)
return (ERANGE);
- /* In Capability mode, you can only set your own CPU set. */
- if (IN_CAPABILITY_MODE(td)) {
- if (level != CPU_LEVEL_WHICH)
- return (ECAPMODE);
- if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
- return (ECAPMODE);
- if (id != -1)
- return (ECAPMODE);
- }
+ error = cpuset_check_capabilities(td, level, which, id);
+ if (error != 0)
+ return (error);
mask = malloc(cpusetsize, M_TEMP, M_WAITOK | M_ZERO);
error = copyin(maskp, mask, cpusetsize);
if (error)
@@ -1987,15 +1994,9 @@ kern_cpuset_getdomain(struct thread *td, cpulevel_t le
if (domainsetsize < sizeof(domainset_t) ||
domainsetsize > DOMAINSET_MAXSIZE / NBBY)
return (ERANGE);
- /* In Capability mode, you can only get your own domain set. */
- if (IN_CAPABILITY_MODE(td)) {
- if (level != CPU_LEVEL_WHICH)
- return (ECAPMODE);
- if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
- return (ECAPMODE);
- if (id != -1)
- return (ECAPMODE);
- }
+ error = cpuset_check_capabilities(td, level, which, id);
+ if (error != 0)
+ return (error);
mask = malloc(domainsetsize, M_TEMP, M_WAITOK | M_ZERO);
bzero(, sizeof(outset));
error = cpuset_which(which, id, , , );
@@ -2122,15 +2123,9 @@ kern_cpuset_setdomain(struct thread *td, cpulevel_t le
if (policy <= DOMAINSET_POLICY_INVALID ||
policy > DOMAINSET_POLICY_MAX)
return (EINVAL);
- /* In Capability mode, you can only set your own CPU set. */
- if (IN_CAPABILITY_MODE(td)) {
- if (level != CPU_LEVEL_WHICH)
- return (ECAPMODE);
- if (which != CPU_WHICH_TID && which != CPU_WHICH_PID)
- return (ECAPMODE);
- if (id != -1)
- return (ECAPMODE);
- }
+ error = cpuset_check_capabilities(td, level, which, id);
+ if (error != 0)
+ return (error);
memset(, 0, sizeof(domain));
mask = malloc(domainsetsize, M_TEMP, M_WAITOK | M_ZERO);
error = copyin(maskp, mask, domainsetsize);
___
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: r363158 - head/sys/vm
Author: markj
Date: Mon Jul 13 16:39:27 2020
New Revision: 363158
URL: https://svnweb.freebsd.org/changeset/base/363158
Log:
Add vm_map_valid_range_KBI().
This is required for standalone module builds.
Reported by: hselasky
Reviewed by: dougm, hselasky, kib
MFC after:3 days
Differential Revision:https://reviews.freebsd.org/D25650
Modified:
head/sys/vm/vm_map.c
head/sys/vm/vm_map.h
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cMon Jul 13 16:23:02 2020(r363157)
+++ head/sys/vm/vm_map.cMon Jul 13 16:39:27 2020(r363158)
@@ -5014,6 +5014,13 @@ vm_map_pmap_KBI(vm_map_t map)
return (map->pmap);
}
+bool
+vm_map_range_valid_KBI(vm_map_t map, vm_offset_t start, vm_offset_t end)
+{
+
+ return (vm_map_range_valid(map, start, end));
+}
+
#ifdef INVARIANTS
static void
_vm_map_assert_consistent(vm_map_t map, int check)
Modified: head/sys/vm/vm_map.h
==
--- head/sys/vm/vm_map.hMon Jul 13 16:23:02 2020(r363157)
+++ head/sys/vm/vm_map.hMon Jul 13 16:39:27 2020(r363158)
@@ -229,6 +229,8 @@ struct vm_map {
#definevm_map_max(map) vm_map_max_KBI((map))
#definevm_map_min(map) vm_map_min_KBI((map))
#definevm_map_pmap(map)vm_map_pmap_KBI((map))
+#definevm_map_range_valid(map, start, end) \
+ vm_map_range_valid_KBI((map), (start), (end))
#else
static __inline vm_offset_t
vm_map_max(const struct vm_map *map)
@@ -330,6 +332,7 @@ void vm_map_wait_busy(vm_map_t map);
vm_offset_t vm_map_max_KBI(const struct vm_map *map);
vm_offset_t vm_map_min_KBI(const struct vm_map *map);
pmap_t vm_map_pmap_KBI(vm_map_t map);
+bool vm_map_range_valid_KBI(vm_map_t map, vm_offset_t start, vm_offset_t end);
#definevm_map_lock(map)_vm_map_lock(map, LOCK_FILE, LOCK_LINE)
#definevm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE,
LOCK_LINE)
___
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: r362361 - in head/sys: compat/linuxkpi/common/src vm
On Mon, Jul 13, 2020 at 05:27:06PM +0200, Hans Petter Selasky wrote:
> On 2020-06-19 05:32, Mark Johnston wrote:
> > +++ head/sys/vm/vm_map.hFri Jun 19 03:32:04 2020(r362361)
> > @@ -255,6 +255,17 @@ vm_map_modflags(vm_map_t map, vm_flags_t set, vm_flags
> > {
> > map->flags = (map->flags | set) & ~clear;
> > }
> > +
> > +static inline bool
> > +vm_map_range_valid(vm_map_t map, vm_offset_t start, vm_offset_t end)
> > +{
>
> Hi Mark,
>
> Don't you also need to add:
>
> #define vm_map_range_valid(map, start, end)vm_map_pmap_KBI(map,
> start, end)
>
> And implement the _KBI function?
>
> Building the LinuxKPI from the command line is now broken:
Thanks, fixed in r363158.
___
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: r363157 - in head/lib/libpmc/pmu-events/arch/x86: . amdfam17h amdzen1 amdzen2
Author: mav
Date: Mon Jul 13 16:23:02 2020
New Revision: 363157
URL: https://svnweb.freebsd.org/changeset/base/363157
Log:
Update AMD Zen1 and add Zen2 events mapping.
MFC after:2 weeks
Added:
- copied from r363156, head/lib/libpmc/pmu-events/arch/x86/amdfam17h/
head/lib/libpmc/pmu-events/arch/x86/amdzen1/branch.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/branch.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/cache.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/core.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/floating-point.json (contents,
props changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/memory.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/other.json (contents, props
changed)
Directory Properties:
head/lib/libpmc/pmu-events/arch/x86/amdzen1/ (props changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen2/ (props changed)
Deleted:
head/lib/libpmc/pmu-events/arch/x86/amdfam17h/
Modified:
head/lib/libpmc/pmu-events/arch/x86/amdzen1/cache.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen1/core.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen1/floating-point.json (contents,
props changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen1/memory.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/amdzen1/other.json (contents, props
changed)
head/lib/libpmc/pmu-events/arch/x86/mapfile.csv
Added: head/lib/libpmc/pmu-events/arch/x86/amdzen1/branch.json
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libpmc/pmu-events/arch/x86/amdzen1/branch.json Mon Jul 13
16:23:02 2020(r363157)
@@ -0,0 +1,23 @@
+[
+ {
+"EventName": "bp_l1_btb_correct",
+"EventCode": "0x8a",
+"BriefDescription": "L1 BTB Correction."
+ },
+ {
+"EventName": "bp_l2_btb_correct",
+"EventCode": "0x8b",
+"BriefDescription": "L2 BTB Correction."
+ },
+ {
+"EventName": "bp_dyn_ind_pred",
+"EventCode": "0x8e",
+"BriefDescription": "Dynamic Indirect Predictions.",
+"PublicDescription": "Indirect Branch Prediction for potential
multi-target branch (speculative)."
+ },
+ {
+"EventName": "bp_de_redirect",
+"EventCode": "0x91",
+"BriefDescription": "Decoder Overrides Existing Branch Prediction
(speculative)."
+ }
+]
Modified: head/lib/libpmc/pmu-events/arch/x86/amdzen1/cache.json
==
--- head/lib/libpmc/pmu-events/arch/x86/amdfam17h/cache.jsonMon Jul 13
15:52:57 2020(r363156)
+++ head/lib/libpmc/pmu-events/arch/x86/amdzen1/cache.json Mon Jul 13
16:23:02 2020(r363157)
@@ -1,332 +1,294 @@
[
- {
- "EventName": "ic_fw32",
- "EventCode": "0x80",
- "BriefDescription": "The number of 32B fetch windows transferred from IC pipe
to DE instruction decoder (includes non-cacheable and cacheable fill
responses)."
- },
- {
- "EventName": "ic_fw32_miss",
- "EventCode": "0x81",
- "BriefDescription": "The number of 32B fetch windows tried to read the L1 IC
and missed in the full tag."
- },
- {
- "EventName": "ic_cache_fill_l2",
- "EventCode": "0x82",
- "BriefDescription": "The number of 64 byte instruction cache line was
fulfilled from the L2 cache."
- },
- {
- "EventName": "ic_cache_fill_sys",
- "EventCode": "0x83",
- "BriefDescription": "The number of 64 byte instruction cache line fulfilled
from system memory or another cache."
- },
- {
- "EventName": "bp_l1_tlb_miss_l2_hit",
- "EventCode": "0x84",
- "BriefDescription": "The number of instruction fetches that miss in the L1
ITLB but hit in the L2 ITLB."
- },
- {
- "EventName": "bp_l1_tlb_miss_l2_miss",
- "EventCode": "0x85",
- "BriefDescription": "The number of instruction fetches that miss in both the
L1 and L2 TLBs."
- },
- {
- "EventName": "bp_snp_re_sync",
- "EventCode": "0x86",
- "BriefDescription": "The number of pipeline restarts caused by invalidating
probes that hit on the instruction stream currently being executed. This would
happen if the active instruction stream was being modified by another processor
in an MP system - typically a highly unlikely event."
- },
- {
- "EventName": "ic_fetch_stall.ic_stall_any",
- "EventCode": "0x87",
- "BriefDescription": "IC pipe was stalled during this clock cycle for any
reason (nothing valid in pipe ICM1).",
- "PublicDescription": "Instruction Pipe Stall. IC pipe was stalled during this
clock cycle for any reason (nothing valid in pipe ICM1).",
- "UMask": "0x4"
- },
- {
- "EventName": "ic_fetch_stall.ic_stall_dq_empty",
- "EventCode": "0x87",
- "BriefDescription": "IC pipe was stalled during this clock cycle (including
IC to OC fetches) due to DQ empty.",
- "PublicDescription":
svn commit: r363156 - head/lib/libc/sys
Author: gbe (doc committer) Date: Mon Jul 13 15:52:57 2020 New Revision: 363156 URL: https://svnweb.freebsd.org/changeset/base/363156 Log: lseek(2): Document the seek behavior better and update the POSIX compliance In certain situations lseek(2) will return successful although if no seek was performed. This can happen when operating on devices that don't support seeking (older tape drives) or when operating on changeable media devices (such as DVD or Blu-ray devices) without a medium inserted. Document this within the man page and update the POSIX compliance while here. PR: 162765 Submitted by: arundel@ Reported by: arundel@ Reviewed by: bcr (mentor) Approved by: bcr (mentor) MFC after:1 week Differential Revision:https://reviews.freebsd.org/D25646 Modified: head/lib/libc/sys/lseek.2 Modified: head/lib/libc/sys/lseek.2 == --- head/lib/libc/sys/lseek.2 Mon Jul 13 15:41:55 2020(r363155) +++ head/lib/libc/sys/lseek.2 Mon Jul 13 15:52:57 2020(r363156) @@ -28,7 +28,7 @@ .\" @(#)lseek.28.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd February 18, 2016 +.Dd July 13, 2020 .Dt LSEEK 2 .Os .Sh NAME @@ -113,11 +113,10 @@ of the existing end-of-file of the file. If data is later written at this point, subsequent reads of the data in the gap return bytes of zeros (until data is actually written into the gap). +However, the +.Fn lseek +system call does not, by itself, extend the size of a file. .Pp -Some devices are incapable of seeking. -The value of the pointer -associated with such a device is undefined. -.Pp A .Qq hole is defined as a contiguous range of bytes in a file, all having the value of @@ -205,13 +204,43 @@ is associated with a pipe, socket, or FIFO. The .Fn lseek system call is expected to conform to -.St -p1003.1-90 . +.St -p1003.1-2008 . +.Pp +The +.Dv SEEK_HOLE +and +.Dv SEEK_DATA +directives, along with the +.Er ENXIO +error, are extensions to that specification. .Sh HISTORY The .Fn lseek function appeared in .At v7 . .Sh BUGS +If the +.Fn lseek +system call is operating on a device which is incapable of seeking, +it will request the seek operation and return successfully, +even though no seek was performed. +Because the +.Ar offset +argument will be stored unconditionally in the file descriptor of that device, +there is no way to confirm if the seek operation succeeded or not +(e.g. using the +.Fn ftell +function). +Device types which are known to be incapable of seeking include +tape drives. +.Pp +The +.Fn lseek +system call will not detect whether media are present in changeable +media devices such as DVD or Blu-ray devices. +A requested seek operation will therefore return sucessfully when no +medium is present. +.Pp This document's use of .Fa whence is incorrect English, but is maintained for historical reasons. ___ 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: r363155 - stable/11/sys/compat/linuxkpi/common/include/linux
Author: hselasky Date: Mon Jul 13 15:41:55 2020 New Revision: 363155 URL: https://svnweb.freebsd.org/changeset/base/363155 Log: MFC r362781 and r362794: Implement is_signed(), type_max() and type_min() function macros in the LinuxKPI. Sponsored by: Mellanox Technologies Modified: stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h == --- stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jul 13 15:40:55 2020(r363154) +++ stable/11/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jul 13 15:41:55 2020(r363155) @@ -536,4 +536,33 @@ linux_ratelimited(linux_ratelimit_t *rl) #define__is_constexpr(x) \ __builtin_constant_p(x) +/* + * The is_signed() macro below returns true if the passed data type is + * signed. Else false is returned. + */ +#defineis_signed(datatype) (((datatype)-1 / (datatype)2) == (datatype)0) + +/* + * The type_max() macro below returns the maxium positive value the + * passed data type can hold. + */ +#definetype_max(datatype) ( \ + (sizeof(datatype) >= 8) ? (is_signed(datatype) ? INT64_MAX : UINT64_MAX) : \ + (sizeof(datatype) >= 4) ? (is_signed(datatype) ? INT32_MAX : UINT32_MAX) : \ + (sizeof(datatype) >= 2) ? (is_signed(datatype) ? INT16_MAX : UINT16_MAX) : \ + (is_signed(datatype) ? INT8_MAX : UINT8_MAX) \ +) + +/* + * The type_min() macro below returns the minimum value the passed + * data type can hold. For unsigned types the minimum value is always + * zero. For signed types it may vary. + */ +#definetype_min(datatype) ( \ + (sizeof(datatype) >= 8) ? (is_signed(datatype) ? INT64_MIN : 0) : \ + (sizeof(datatype) >= 4) ? (is_signed(datatype) ? INT32_MIN : 0) : \ + (sizeof(datatype) >= 2) ? (is_signed(datatype) ? INT16_MIN : 0) : \ + (is_signed(datatype) ? INT8_MIN : 0) \ +) + #endif /* _LINUX_KERNEL_H_ */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363154 - stable/12/sys/compat/linuxkpi/common/include/linux
Author: hselasky Date: Mon Jul 13 15:40:55 2020 New Revision: 363154 URL: https://svnweb.freebsd.org/changeset/base/363154 Log: MFC r362781 and r362794: Implement is_signed(), type_max() and type_min() function macros in the LinuxKPI. Sponsored by: Mellanox Technologies Modified: stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h == --- stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jul 13 15:37:59 2020(r363153) +++ stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h Mon Jul 13 15:40:55 2020(r363154) @@ -543,4 +543,33 @@ linux_ratelimited(linux_ratelimit_t *rl) #define__is_constexpr(x) \ __builtin_constant_p(x) +/* + * The is_signed() macro below returns true if the passed data type is + * signed. Else false is returned. + */ +#defineis_signed(datatype) (((datatype)-1 / (datatype)2) == (datatype)0) + +/* + * The type_max() macro below returns the maxium positive value the + * passed data type can hold. + */ +#definetype_max(datatype) ( \ + (sizeof(datatype) >= 8) ? (is_signed(datatype) ? INT64_MAX : UINT64_MAX) : \ + (sizeof(datatype) >= 4) ? (is_signed(datatype) ? INT32_MAX : UINT32_MAX) : \ + (sizeof(datatype) >= 2) ? (is_signed(datatype) ? INT16_MAX : UINT16_MAX) : \ + (is_signed(datatype) ? INT8_MAX : UINT8_MAX) \ +) + +/* + * The type_min() macro below returns the minimum value the passed + * data type can hold. For unsigned types the minimum value is always + * zero. For signed types it may vary. + */ +#definetype_min(datatype) ( \ + (sizeof(datatype) >= 8) ? (is_signed(datatype) ? INT64_MIN : 0) : \ + (sizeof(datatype) >= 4) ? (is_signed(datatype) ? INT32_MIN : 0) : \ + (sizeof(datatype) >= 2) ? (is_signed(datatype) ? INT16_MIN : 0) : \ + (is_signed(datatype) ? INT8_MIN : 0) \ +) + #endif /* _LINUX_KERNEL_H_ */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363153 - stable/11/sys/compat/linuxkpi/common/src
Author: hselasky
Date: Mon Jul 13 15:37:59 2020
New Revision: 363153
URL: https://svnweb.freebsd.org/changeset/base/363153
Log:
MFC r362829:
The "pid" field in the LinuxKPI task struct is typically set to the thread ID
and not the process ID. Make sure the linux_task_exiting() function uses
tdfind()
to lookup the BSD procedure structure pointer by the "pid" field, and only
fallback to pfind() when no match is found! This makes linux_task_exiting()
in line with the rest of the code.
Differential Revision: https://reviews.freebsd.org/D25509
Submitted by: Greg V
Sponsored by: Mellanox Technologies
Modified:
stable/11/sys/compat/linuxkpi/common/src/linux_current.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/compat/linuxkpi/common/src/linux_current.c
==
--- stable/11/sys/compat/linuxkpi/common/src/linux_current.cMon Jul 13
15:36:57 2020(r363152)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_current.cMon Jul 13
15:37:59 2020(r363153)
@@ -218,11 +218,21 @@ linux_get_pid_task(pid_t pid)
bool
linux_task_exiting(struct task_struct *task)
{
+ struct thread *td;
struct proc *p;
bool ret;
ret = false;
- p = pfind(task->pid);
+
+ /* try to find corresponding thread */
+ td = tdfind(task->pid, -1);
+ if (td != NULL) {
+ p = td->td_proc;
+ } else {
+ /* try to find corresponding procedure */
+ p = pfind(task->pid);
+ }
+
if (p != NULL) {
if ((p->p_flag & P_WEXIT) != 0)
ret = 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"
svn commit: r363152 - stable/12/sys/compat/linuxkpi/common/src
Author: hselasky
Date: Mon Jul 13 15:36:57 2020
New Revision: 363152
URL: https://svnweb.freebsd.org/changeset/base/363152
Log:
MFC r362829:
The "pid" field in the LinuxKPI task struct is typically set to the thread ID
and not the process ID. Make sure the linux_task_exiting() function uses
tdfind()
to lookup the BSD procedure structure pointer by the "pid" field, and only
fallback to pfind() when no match is found! This makes linux_task_exiting()
in line with the rest of the code.
Differential Revision: https://reviews.freebsd.org/D25509
Submitted by: Greg V
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/compat/linuxkpi/common/src/linux_current.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/compat/linuxkpi/common/src/linux_current.c
==
--- stable/12/sys/compat/linuxkpi/common/src/linux_current.cMon Jul 13
15:34:47 2020(r363151)
+++ stable/12/sys/compat/linuxkpi/common/src/linux_current.cMon Jul 13
15:36:57 2020(r363152)
@@ -206,11 +206,21 @@ linux_get_pid_task(pid_t pid)
bool
linux_task_exiting(struct task_struct *task)
{
+ struct thread *td;
struct proc *p;
bool ret;
ret = false;
- p = pfind(task->pid);
+
+ /* try to find corresponding thread */
+ td = tdfind(task->pid, -1);
+ if (td != NULL) {
+ p = td->td_proc;
+ } else {
+ /* try to find corresponding procedure */
+ p = pfind(task->pid);
+ }
+
if (p != NULL) {
if ((p->p_flag & P_WEXIT) != 0)
ret = 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"
svn commit: r363151 - in stable/11/sys: dev/mlx4/mlx4_core dev/mlx4/mlx4_en dev/mlx4/mlx4_ib dev/mlx5/mlx5_core dev/mlx5/mlx5_en dev/mlx5/mlx5_fpga_tools dev/mlx5/mlx5_ib dev/mthca ofed/drivers/inf...
Author: hselasky Date: Mon Jul 13 15:34:47 2020 New Revision: 363151 URL: https://svnweb.freebsd.org/changeset/base/363151 Log: MFC r362953: Infiniband clients must be attached and detached in a specific order in ibcore. Currently the linking order of the infiniband, IB, modules decide in which order the clients are attached and detached. For example one IB client may use resources from another IB client. This can lead to a potential deadlock at shutdown. For example if the ipoib is unregistered after the ib_multicast client is detached, then if ipoib is using multicast addresses a deadlock may happen, because ib_multicast will wait for all its resources to be freed before returning from the remove method. Fix this by using module_xxx_order() instead of module_xxx(). Differential Revision:https://reviews.freebsd.org/D23973 Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/mlx4/mlx4_core/mlx4_main.c stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_main.c stable/11/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c stable/11/sys/dev/mlx5/mlx5_fpga_tools/mlx5fpga_tools_main.c stable/11/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c stable/11/sys/dev/mthca/mthca_main.c stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c stable/11/sys/ofed/drivers/infiniband/core/ib_device.c stable/11/sys/ofed/drivers/infiniband/core/ib_iwcm.c stable/11/sys/ofed/drivers/infiniband/core/ib_ucm.c stable/11/sys/ofed/drivers/infiniband/core/ib_ucma.c stable/11/sys/ofed/drivers/infiniband/core/ib_user_mad.c stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c stable/11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c stable/11/sys/ofed/drivers/infiniband/util/madeye.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mlx4/mlx4_core/mlx4_main.c == --- stable/11/sys/dev/mlx4/mlx4_core/mlx4_main.cMon Jul 13 15:33:06 2020(r363150) +++ stable/11/sys/dev/mlx4/mlx4_core/mlx4_main.cMon Jul 13 15:34:47 2020(r363151) @@ -4217,8 +4217,8 @@ static void __exit mlx4_cleanup(void) destroy_workqueue(mlx4_wq); } -module_init(mlx4_init); -module_exit(mlx4_cleanup); +module_init_order(mlx4_init, SI_ORDER_FIRST); +module_exit_order(mlx4_cleanup, SI_ORDER_FIRST); static int mlx4_evhand(module_t mod, int event, void *arg) Modified: stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_main.c == --- stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_main.c Mon Jul 13 15:33:06 2020(r363150) +++ stable/11/sys/dev/mlx4/mlx4_en/mlx4_en_main.c Mon Jul 13 15:34:47 2020(r363151) @@ -304,8 +304,8 @@ static void __exit mlx4_en_cleanup(void) mlx4_unregister_interface(_en_interface); } -module_init(mlx4_en_init); -module_exit(mlx4_en_cleanup); +module_init_order(mlx4_en_init, SI_ORDER_SIXTH); +module_exit_order(mlx4_en_cleanup, SI_ORDER_SIXTH); static int mlx4en_evhand(module_t mod, int event, void *arg) Modified: stable/11/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c == --- stable/11/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c Mon Jul 13 15:33:06 2020(r363150) +++ stable/11/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c Mon Jul 13 15:34:47 2020(r363151) @@ -3320,8 +3320,8 @@ static void __exit mlx4_ib_cleanup(void) destroy_workqueue(wq); } -module_init_order(mlx4_ib_init, SI_ORDER_THIRD); -module_exit(mlx4_ib_cleanup); +module_init_order(mlx4_ib_init, SI_ORDER_SEVENTH); +module_exit_order(mlx4_ib_cleanup, SI_ORDER_SEVENTH); static int mlx4ib_evhand(module_t mod, int event, void *arg) Modified: stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c == --- stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.cMon Jul 13 15:33:06 2020(r363150) +++ stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.cMon Jul 13 15:34:47 2020(r363151) @@ -2007,5 +2007,5 @@ static void __exit cleanup(void) pci_unregister_driver(_core_driver); } -module_init(init); -module_exit(cleanup); +module_init_order(init, SI_ORDER_FIRST); +module_exit_order(cleanup, SI_ORDER_FIRST); Modified: stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c == --- stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jul 13 15:33:06 2020(r363150) +++ stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jul 13 15:34:47 2020(r363151) @@ -4193,8 +4193,8 @@ mlx5e_show_version(void __unused *arg) } SYSINIT(mlx5e_show_version, SI_SUB_DRIVERS, SI_ORDER_ANY, mlx5e_show_version,
svn commit: r363150 - in stable/12/sys: dev/mlx4/mlx4_core dev/mlx4/mlx4_en dev/mlx4/mlx4_ib dev/mlx5/mlx5_core dev/mlx5/mlx5_en dev/mlx5/mlx5_fpga_tools dev/mlx5/mlx5_ib dev/mthca ofed/drivers/inf...
Author: hselasky Date: Mon Jul 13 15:33:06 2020 New Revision: 363150 URL: https://svnweb.freebsd.org/changeset/base/363150 Log: MFC r362953: Infiniband clients must be attached and detached in a specific order in ibcore. Currently the linking order of the infiniband, IB, modules decide in which order the clients are attached and detached. For example one IB client may use resources from another IB client. This can lead to a potential deadlock at shutdown. For example if the ipoib is unregistered after the ib_multicast client is detached, then if ipoib is using multicast addresses a deadlock may happen, because ib_multicast will wait for all its resources to be freed before returning from the remove method. Fix this by using module_xxx_order() instead of module_xxx(). Differential Revision:https://reviews.freebsd.org/D23973 Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/mlx4/mlx4_core/mlx4_main.c stable/12/sys/dev/mlx4/mlx4_en/mlx4_en_main.c stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c stable/12/sys/dev/mlx5/mlx5_fpga_tools/mlx5fpga_tools_main.c stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c stable/12/sys/dev/mthca/mthca_main.c stable/12/sys/ofed/drivers/infiniband/core/ib_cm.c stable/12/sys/ofed/drivers/infiniband/core/ib_cma.c stable/12/sys/ofed/drivers/infiniband/core/ib_device.c stable/12/sys/ofed/drivers/infiniband/core/ib_iwcm.c stable/12/sys/ofed/drivers/infiniband/core/ib_ucm.c stable/12/sys/ofed/drivers/infiniband/core/ib_ucma.c stable/12/sys/ofed/drivers/infiniband/core/ib_user_mad.c stable/12/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c stable/12/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c stable/12/sys/ofed/drivers/infiniband/util/madeye.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/mlx4/mlx4_core/mlx4_main.c == --- stable/12/sys/dev/mlx4/mlx4_core/mlx4_main.cMon Jul 13 15:29:11 2020(r363149) +++ stable/12/sys/dev/mlx4/mlx4_core/mlx4_main.cMon Jul 13 15:33:06 2020(r363150) @@ -4217,8 +4217,8 @@ static void __exit mlx4_cleanup(void) destroy_workqueue(mlx4_wq); } -module_init(mlx4_init); -module_exit(mlx4_cleanup); +module_init_order(mlx4_init, SI_ORDER_FIRST); +module_exit_order(mlx4_cleanup, SI_ORDER_FIRST); static int mlx4_evhand(module_t mod, int event, void *arg) Modified: stable/12/sys/dev/mlx4/mlx4_en/mlx4_en_main.c == --- stable/12/sys/dev/mlx4/mlx4_en/mlx4_en_main.c Mon Jul 13 15:29:11 2020(r363149) +++ stable/12/sys/dev/mlx4/mlx4_en/mlx4_en_main.c Mon Jul 13 15:33:06 2020(r363150) @@ -304,8 +304,8 @@ static void __exit mlx4_en_cleanup(void) mlx4_unregister_interface(_en_interface); } -module_init(mlx4_en_init); -module_exit(mlx4_en_cleanup); +module_init_order(mlx4_en_init, SI_ORDER_SIXTH); +module_exit_order(mlx4_en_cleanup, SI_ORDER_SIXTH); static int mlx4en_evhand(module_t mod, int event, void *arg) Modified: stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c == --- stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c Mon Jul 13 15:29:11 2020(r363149) +++ stable/12/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c Mon Jul 13 15:33:06 2020(r363150) @@ -3319,8 +3319,8 @@ static void __exit mlx4_ib_cleanup(void) destroy_workqueue(wq); } -module_init_order(mlx4_ib_init, SI_ORDER_THIRD); -module_exit(mlx4_ib_cleanup); +module_init_order(mlx4_ib_init, SI_ORDER_SEVENTH); +module_exit_order(mlx4_ib_cleanup, SI_ORDER_SEVENTH); static int mlx4ib_evhand(module_t mod, int event, void *arg) Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c == --- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.cMon Jul 13 15:29:11 2020(r363149) +++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.cMon Jul 13 15:33:06 2020(r363150) @@ -2025,5 +2025,5 @@ static void __exit cleanup(void) pci_unregister_driver(_core_driver); } -module_init(init); -module_exit(cleanup); +module_init_order(init, SI_ORDER_FIRST); +module_exit_order(cleanup, SI_ORDER_FIRST); Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c == --- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jul 13 15:29:11 2020(r363149) +++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jul 13 15:33:06 2020(r363150) @@ -4503,8 +4503,8 @@ mlx5e_show_version(void __unused *arg) } SYSINIT(mlx5e_show_version, SI_SUB_DRIVERS, SI_ORDER_ANY, mlx5e_show_version,
svn commit: r363149 - stable/11/sys/compat/linuxkpi/common/include/linux
Author: hselasky Date: Mon Jul 13 15:29:11 2020 New Revision: 363149 URL: https://svnweb.freebsd.org/changeset/base/363149 Log: MFC r362946: Fix include file order in io.h in the LinuxKPI. Make sure sys/types.h is included before machine/vm.h. PR: 247775 Submitted by: pkubaj@ Sponsored by: Mellanox Technologies Modified: stable/11/sys/compat/linuxkpi/common/include/linux/io.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linuxkpi/common/include/linux/io.h == --- stable/11/sys/compat/linuxkpi/common/include/linux/io.h Mon Jul 13 15:28:06 2020(r363148) +++ stable/11/sys/compat/linuxkpi/common/include/linux/io.h Mon Jul 13 15:29:11 2020(r363149) @@ -31,9 +31,10 @@ #ifndef_LINUX_IO_H_ #define_LINUX_IO_H_ -#include #include #include + +#include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363148 - stable/12/sys/compat/linuxkpi/common/include/linux
Author: hselasky Date: Mon Jul 13 15:28:06 2020 New Revision: 363148 URL: https://svnweb.freebsd.org/changeset/base/363148 Log: MFC r362946: Fix include file order in io.h in the LinuxKPI. Make sure sys/types.h is included before machine/vm.h. PR: 247775 Submitted by: pkubaj@ Sponsored by: Mellanox Technologies Modified: stable/12/sys/compat/linuxkpi/common/include/linux/io.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linuxkpi/common/include/linux/io.h == --- stable/12/sys/compat/linuxkpi/common/include/linux/io.h Mon Jul 13 15:17:29 2020(r363147) +++ stable/12/sys/compat/linuxkpi/common/include/linux/io.h Mon Jul 13 15:28:06 2020(r363148) @@ -31,9 +31,10 @@ #ifndef_LINUX_IO_H_ #define_LINUX_IO_H_ -#include #include #include + +#include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r362361 - in head/sys: compat/linuxkpi/common/src vm
On 2020-06-19 05:32, Mark Johnston wrote:
+++ head/sys/vm/vm_map.hFri Jun 19 03:32:04 2020(r362361)
@@ -255,6 +255,17 @@ vm_map_modflags(vm_map_t map, vm_flags_t set, vm_flags
{
map->flags = (map->flags | set) & ~clear;
}
+
+static inline bool
+vm_map_range_valid(vm_map_t map, vm_offset_t start, vm_offset_t end)
+{
Hi Mark,
Don't you also need to add:
#define vm_map_range_valid(map, start, end)vm_map_pmap_KBI(map,
start, end)
And implement the _KBI function?
Building the LinuxKPI from the command line is now broken:
env CC=`which clang10` make -m $PWD/share/mk/ -C sys/modules/linuxkpi/
/usr/local/bin/clang10 -O2 -pipe -fno-common -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I/usr/img/freebsd.12/sys/compat/linuxkpi/common/include -I/usr/img/freebsd.12/sys/contrib/ck/include -I. -I/usr/img/freebsd.12/sys -I/usr/img/freebsd.12/sys/contrib/ck/include -fno-common -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fdebug-prefix-map=./machine=/usr/img/freebsd.12/sys/amd64/include -fdebug-prefix-map=./x86=/usr/img/freebsd.12/sys/x86/include -MD -MF.depend.linux_page.o -MTlinux_page.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-err
or-unused-function -Wno-error-pointer-sign -Wno-error-shift-negative-value
-Wno-address-of-packed-member -mno-aes -mno-avx -std=iso9899:1999 -c
/usr/img/freebsd.12/sys/compat/linuxkpi/common/src/linux_page.c -o linux_page.o
/usr/img/freebsd.12/sys/compat/linuxkpi/common/src/linux_page.c:237:7: error:
implicit declaration of function 'vm_map_range_valid' is invalid in
C99 [-Werror,-Wimplicit-function-declaration]
if (!vm_map_range_valid(map, start, end))
^
1 error generated.
*** Error code 1
--HPS
___
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: r363147 - head/lib/libc/gen
Author: gbe (doc committer) Date: Mon Jul 13 15:17:29 2020 New Revision: 363147 URL: https://svnweb.freebsd.org/changeset/base/363147 Log: gethostname(3): Correct the reference of the undefined value HOST_NAME_MAX PR: 143472 Submitted by: bcran@ Reported by: Jeremy Huddleston Reviewed by: bcr (mentor) Approved by: bcr (mentor) MFC after:1 week Differential Revision:https://reviews.freebsd.org/D25647 Modified: head/lib/libc/gen/gethostname.3 Modified: head/lib/libc/gen/gethostname.3 == --- head/lib/libc/gen/gethostname.3 Mon Jul 13 15:06:29 2020 (r363146) +++ head/lib/libc/gen/gethostname.3 Mon Jul 13 15:17:29 2020 (r363147) @@ -28,7 +28,7 @@ .\" @(#)gethostname.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 18, 2003 +.Dd July 13, 2020 .Dt GETHOSTNAME 3 .Os .Sh NAME @@ -68,9 +68,9 @@ which has length This call is restricted to the super-user and is normally used only when the system is bootstrapped. .Pp -Host names are limited to -.Brq Dv HOST_NAME_MAX -characters, not including the trailing null, currently 255. +Applications should use +.Fn sysconf _SC_HOST_NAME_MAX +to find the maximum length of a host name (not including the terminating null). .Sh RETURN VALUES .Rv -std .Sh ERRORS ___ 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: r363146 - head/usr.sbin/arp
Author: gbe (doc committer) Date: Mon Jul 13 15:06:29 2020 New Revision: 363146 URL: https://svnweb.freebsd.org/changeset/base/363146 Log: arp(8) clarify the use of the '-a flag' PR: 238146 Submitted by: Andrew Stevenson Reported by: Andrew Stevenson Reviewed by: bcr (mentor) Approved by: bcr (mentor) MFC after:1 week Differential Revision:https://reviews.freebsd.org/D25645 Modified: head/usr.sbin/arp/arp.8 Modified: head/usr.sbin/arp/arp.8 == --- head/usr.sbin/arp/arp.8 Mon Jul 13 14:30:08 2020(r363145) +++ head/usr.sbin/arp/arp.8 Mon Jul 13 15:06:29 2020(r363146) @@ -28,7 +28,7 @@ .\" @(#)arp.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd April 6, 2017 +.Dd July 13, 2020 .Dt ARP 8 .Os .Sh NAME @@ -87,7 +87,9 @@ See .Xr xo_parse_args 3 for details on command line arguments. .It Fl a -The program displays or deletes all of the current +The program displays or, if it is used with the +.Fl d +flag, deletes all of the current .Tn ARP entries. .It Fl d ___ 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: r363144 - head/lib/libpmc/pmu-events/arch/x86
Author: mav Date: Mon Jul 13 14:25:25 2020 New Revision: 363144 URL: https://svnweb.freebsd.org/changeset/base/363144 Log: Minor textual fixes. MFC after:1 week Modified: head/lib/libpmc/pmu-events/arch/x86/mapfile.csv Modified: head/lib/libpmc/pmu-events/arch/x86/mapfile.csv == --- head/lib/libpmc/pmu-events/arch/x86/mapfile.csv Mon Jul 13 13:58:21 2020(r363143) +++ head/lib/libpmc/pmu-events/arch/x86/mapfile.csv Mon Jul 13 14:25:25 2020(r363144) @@ -24,19 +24,15 @@ GenuineIntel-6-1E,v2,nehalemep,core GenuineIntel-6-1F,v2,nehalemep,core GenuineIntel-6-1A,v2,nehalemep,core GenuineIntel-6-2E,v2,nehalemex,core -GenuineIntel-6-4E,v24,skylake,core -GenuineIntel-6-5E,v24,skylake,core -GenuineIntel-6-8E,v24,skylake,core -GenuineIntel-6-9E,v24,skylake,core +GenuineIntel-6-[4589]E,v24,skylake,core GenuineIntel-6-37,v13,silvermont,core GenuineIntel-6-4D,v13,silvermont,core GenuineIntel-6-4C,v13,silvermont,core GenuineIntel-6-2A,v15,sandybridge,core GenuineIntel-6-2C,v2,westmereep-dp,core -GenuineIntel-6-2C,v2,westmereep-dp,core GenuineIntel-6-25,v2,westmereep-sp,core GenuineIntel-6-2F,v2,westmereex,core -GenuineIntel-6-55,v1,skylakex,core +GenuineIntel-6-55-[01234],v1,skylakex,core GenuineIntel-6-55-[56789ABCDEF],v1,cascadelakex,core GenuineIntel-6-7D,v1,icelake,core GenuineIntel-6-7E,v1,icelake,core ___ 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: r363143 - svnadmin/conf
Author: mjg Date: Mon Jul 13 13:58:21 2020 New Revision: 363143 URL: https://svnweb.freebsd.org/changeset/base/363143 Log: Release tmunro from mentorship. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Mon Jul 13 13:44:54 2020(r363142) +++ svnadmin/conf/mentors Mon Jul 13 13:58:21 2020(r363143) @@ -24,5 +24,4 @@ ram ken Co-mentor: mav rschefftuexen Co-mentor: rgrimes scottphscottl Co-mentor: emaste, jhb thjjtl Co-mentor: bz -tmunro mjg Co-mentor: allanjude wosch cem ___ 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: r363103 - head/usr.sbin/bsdinstall/scripts
On 2020-07-12 13:32, Enji Cooper wrote: > >> On Jul 11, 2020, at 10:20 AM, Allan Jude wrote: >> >> Author: allanjude >> Date: Sat Jul 11 17:20:17 2020 >> New Revision: 363103 >> URL: https://svnweb.freebsd.org/changeset/base/363103 >> >> Log: >> bsdinstall: only kill the dhclient for the interface we are restarting >> >> PR: 205821 >> Reported by:mjg >> MFC after: 2 weeks >> Sponsored by: Klara Inc. >> Event: July 2020 Bugathon >> >> Modified: >> head/usr.sbin/bsdinstall/scripts/netconfig_ipv4 > > Allan, > Thank you so very much for doing this!!! This has been an annoying > nitpick of mine with sysinstall/bsdinstall, for many moons :). > It looks like equivalent logic doesn’t need to be implemented for IPv6. > Yay :). > Cheers! > -Enji > Someone else wrote the patch, although I had a similar idea previously. Mark Johnston came up with the pkill -F part, that made it only kill dhclient for the correct interface. -- Allan Jude signature.asc Description: OpenPGP digital signature
svn commit: r363142 - head/libexec/rc/rc.d
Author: allanjude Date: Mon Jul 13 13:44:54 2020 New Revision: 363142 URL: https://svnweb.freebsd.org/changeset/base/363142 Log: Remove excess spaces from rc.d scripts The space between words is already being echoed by the space between quoted strings: % echo 'foo' 'bar' foo bar % echo 'foo' ' baz' foo baz Found in `ipfw` and `mountlate` messages. PR: 247948 Submitted by: Jose Luis Duran MFC after:2 weeks Sponsored by: Klara Inc. Modified: head/libexec/rc/rc.d/ipfw head/libexec/rc/rc.d/mountlate Modified: head/libexec/rc/rc.d/ipfw == --- head/libexec/rc/rc.d/ipfw Mon Jul 13 13:35:36 2020(r363141) +++ head/libexec/rc/rc.d/ipfw Mon Jul 13 13:44:54 2020(r363142) @@ -63,7 +63,7 @@ ipfw_start() echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ - ' firewall rules are not enabled.' + 'firewall rules are not enabled.' echo ' All ip services are disabled.' fi Modified: head/libexec/rc/rc.d/mountlate == --- head/libexec/rc/rc.d/mountlate Mon Jul 13 13:35:36 2020 (r363141) +++ head/libexec/rc/rc.d/mountlate Mon Jul 13 13:44:54 2020 (r363142) @@ -32,7 +32,7 @@ mountlate_start() ;; *) echo 'Mounting /etc/fstab filesystems failed,' \ - ' startup aborted' + 'startup aborted' stop_boot true ;; esac ___ 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: r363141 - head/sys/netpfil/ipfw
Author: thj
Date: Mon Jul 13 13:35:36 2020
New Revision: 363141
URL: https://svnweb.freebsd.org/changeset/base/363141
Log:
Don't print VNET pointer when initializing dummynet
When dummynet initializes it prints a debug message with the current VNET
pointer unnecessarily revealing kernel memory layout. This appears to be left
over from when the first pieces of vimage support were added.
PR: 238658
Submitted by: huangfq.dax...@gmail.com
Reviewed by: markj, bz, gnn, kp, melifaro
Approved by: jtl (co-mentor), bz (co-mentor)
Event:July 2020 Bugathon
MFC after:3 days
Differential Revision:https://reviews.freebsd.org/D25619
Modified:
head/sys/netpfil/ipfw/ip_dummynet.c
Modified: head/sys/netpfil/ipfw/ip_dummynet.c
==
--- head/sys/netpfil/ipfw/ip_dummynet.c Mon Jul 13 02:24:31 2020
(r363140)
+++ head/sys/netpfil/ipfw/ip_dummynet.c Mon Jul 13 13:35:36 2020
(r363141)
@@ -2511,7 +2511,6 @@ ip_dn_init(void)
{
if (dn_cfg.init_done)
return;
- printf("DUMMYNET %p with IPv6 initialized (100409)\n", curvnet);
dn_cfg.init_done = 1;
/* Set defaults here. MSVC does not accept initializers,
* and this is also useful for vimages
___
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: r363125 - head/sys/compat/linux
Quoting Conrad Meyer (from Sun, 12 Jul 2020 16:27:49 -0700): Hi Alexander, On Sun, Jul 12, 2020 at 2:51 AM Alexander Leidinger wrote: Author: netchild Date: Sun Jul 12 09:51:09 2020 New Revision: 363125 URL: https://svnweb.freebsd.org/changeset/base/363125 Log: Implement CLOCK_MONOTONIC_RAW (linux >= 2.6.28). It is documented as a raw hardware-based clock not subject to NTP or incremental adjustments. With this "not as precise as CLOCK_MONOTONIC" description in mind, map it to our CLOCK_MONOTNIC_FAST (the same mapping as for the linux CLOCK_MONOTONIC_COARSE). Can you point at the documentation suggesting CLOCK_MONOTONIC_RAW is any less precise than CLOCK_MONOTONIC? I'm looking at the Linux manual page and it does not seem to contain any language to that effect. It depends what each of us means by "less precise". I only had a look at the man page online, and what I refer to her in terms of precision is the "not subject to NTP or incremental adjustments". I understand this as: MONOTINIC is rather precise about the rate of change (e.g. it is close to the rate of change as far as you can get with NTP and the hardware you have), whereas MONOTIC_RAW may increase faster or slower than MONOTONIC, but it stays monotonic. This is needed for the webcomponent of steam (chromium) and some other steam component or game. The linux-steam-utils port contains a LD_PRELOAD based fix for this. There this is mapped to CLOCK_MONOTONIC. As an untrained ear/eye (= the majority of people) is normaly not noticing a difference of jitter in the 10-20 ms range, specially if you don't pay attention like for example in a browser session while watching a video stream, the mapping to CLOCK_MONOTONIC_FAST seems more appropriate than to CLOCK_MONOTONIC. I don't know how these programs use the clock, but 10-20 ms of jitter in the UI is noticeable to even casual users. (In FreeBSD these A german DIY electronic magazine had once (about 20 years ago) a little device with which you was able to test your sensitivity between two audio or visual events. It simply activated the left and right device for a short moment of time (LED or a click in the headphone). It displayed how far in time the two events were apart (the scale was from 10ms to 100ms in 10ms steps). I should have still this device somehere... In my twenties, I tested it. I was able to distinguish 2 different events which were 40-60ms apart (don't remember if I was able to detect shorter pauses in the audio test or in the visual test, but both weren't at the same level). They told with age your ability gets worse. This device was able to train your abilities in this regard. The training mode did the same, but instead of only one type of test, you was testing both (audio + visual). This not onlxy brought the slower of both down to the level of the faster one (when testing afterwards only one of the types), but with some repetition you was able to distinguish two different events which were too close in time to each other before. I was able to get down to 20ms (and sometimes 10ms). But I had to be concentrated on the test. So I have first hand experience of being able to notice two events which are 20ms apart... 20 years ago, after some days of training. And this is the sole reason why I mentioned 10-20ms in the commit log. See further down before commenting on this sentence. Bring me 3 people which swear that they notice a difference when running steam / linux-chrome (comparing MONOTONIC_FAST vs MONOTONIC), and which tell that it annoys them, and I fully agree to switch to MONOTONIC. Please see below before commenting on this sentence. functions are purportedly accurate to 1 timer tick, which is 1ms on HZ=1000 (amd64) — much better than 10-20ms.) However, I'm concerned Our MONOTONIC_FAST is documented to have an accuracy of one timer tick. So we _are_ with this setting at 1ms (with HZ=1000). This accuracy is a worst case accuracy. If your call to get the clock is 0.1ms after the update of the value MONOTONIC_FAST reads out, you are as accurate as 0.1ms... So the accuracy we achieve with the mapping to MONOTONIC_FAST is between 0ms and 1ms (with HZ=1000). To come back to what I said before and change it a little bit: if you bring 3 people which swear they notice a difference of upto 1ms in their use of steam / linux-chrome which annoys them, and if they switch to MONOTONIC and they do not notice a difference anymore, I fully agree to switch to MONOTONIC. Until them I'm sceptical that this can be noticed. this is still insufficient precision compared with the documented behavior of the Linux functions. I think regular CLOCK_MONOTONIC is the closest thing we've got to Linux's CLOCK_MONOTONIC_RAW. The Linux analog of _FAST is _COARSE. I do not know which one is closer. I consider the linux man page I've read online as not detailed enough to be
