Page MenuHomeFreeBSD
Differential D38046

ifnet/API: Move struct ifnet definition to a <net/if_private.h>
AbandonedPublic
Actions

Authored by jhibbits on Jan 13 2023, 9:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 24, 9:51 PM
Unknown Object (File)
Feb 24 2025, 8:19 AM
Unknown Object (File)
Feb 10 2025, 9:51 PM
Unknown Object (File)
Feb 7 2025, 11:03 PM
Unknown Object (File)
Jan 23 2025, 3:22 PM
Unknown Object (File)
Jan 12 2025, 1:18 AM
Unknown Object (File)
Dec 25 2024, 9:44 PM
Unknown Object (File)
Dec 15 2024, 4:23 PM
View All 51 Files
Subscribers
ae
imp
melifaro

Details

Reviewers
glebius
shurd
melifaro
Group Reviewers
network
iflib
Commits
rG2c2b37ad251d: ifnet/API: Move struct ifnet definition to a <net/if_private.h>
Summary

Hide the ifnet structure definition, no user serviceable parts inside,
it's a netstack implementation detail. Include it temporarily in
<net/if_var.h> until all drivers are updated to use the accessors
exclusively.

Sponsored by: Juniper Networks, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 49099
Build 45988: arc lint + arc unit

Event Timeline

jhibbits created this revision.Jan 13 2023, 9:43 PM
Herald added a reviewer: shurd. · View Herald TranscriptJan 13 2023, 9:43 PM
Herald added a reviewer: iflib. · View Herald Transcript
Herald added subscribers: melifaro, ae, imp. · View Herald Transcript
jhibbits requested review of this revision.Jan 13 2023, 9:43 PM
Harbormaster completed remote builds in B49099: Diff 115115.Jan 13 2023, 9:43 PM
melifaro added inline comments.Jan 13 2023, 10:56 PM
sys/net/if_private.h
37

You probably want to wrap it into _KERNEL, otherwise buildworld headercheck will be unhappy

jhibbits added inline comments.Jan 14 2023, 1:40 AM
sys/net/if_private.h
37

Good point, will have it in my next update, with any other feedback I get.

glebius accepted this revision as: glebius.Jan 23 2023, 5:13 PM
glebius added inline comments.
sys/net/route/route_rtentry.c
51

This doesn't seem related. If it truly is, why not just remove the line?

jhibbits added inline comments.Jan 23 2023, 5:17 PM
sys/net/route/route_rtentry.c
51

You're right, this include should be removed. The header isn't needed, and this header is the only reason if_private.h would be needed in this file.

jhibbits removed a reviewer: iflib.Jan 23 2023, 6:44 PM
This comment was removed by jhibbits.
This revision is now accepted and ready to land.Jan 23 2023, 6:44 PM
Herald added a reviewer: iflib. · View Herald TranscriptJan 23 2023, 6:44 PM
This revision now requires review to proceed.Jan 23 2023, 6:44 PM
jhibbits abandoned this revision.Jan 25 2023, 9:29 PM

Have to close it somehow.

jhibbits added a commit: rG2c2b37ad251d: ifnet/API: Move struct ifnet definition to a <net/if_private.h>.Sep 7 2023, 12:35 PM
Herald added a reviewer: melifaro. · View Herald TranscriptSep 7 2023, 12:35 PM

Revision Contents
Changeset List

Diff 115115

View Options

sys/net/altq/altq_cbq.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */ #endif /* not lint */
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h>
jbeichUnsubmitted
Done
Inline Actions

style(9) doesn't allow both <sys/types.h> and <sys/param.h> included at the same time.

jbeich: style(9) doesn't allow both `<sys/types.h>` and `<sys/param.h>` included at the same time.
mjgUnsubmitted
Not Done
Inline Actions

sys/types.h must be included prior to sys/wait.h.

mjg: sys/types.h must be included prior to sys/wait.h.
#include <sys/sysctl.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <paths.h> #include <paths.h>
#include <regex.h> #include <regex.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "pathnames.h" #include "pathnames.h"
#define BASE_DECIMAL 10
jbeichUnsubmitted
Not Done
Inline Actions

Why? Other uses of strtou*() in the file or across the base don't use macros for integer bases.

usr.bin/xargs/xargs.c:                  Rflag = strtol(optarg, &endptr, 10);
usr.bin/xargs/xargs.c:                  Sflag = strtoul(optarg, &endptr, 10);

http://bxr.su/search?refs=strtou*&project=FreeBSD

jbeich: Why? Other uses of `strtou*()` in the file or across the base don't use macros for integer…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

This was recommended by davide@
I can change all of the references, or remove the macro.

allanjude: This was recommended by davide@ I can change all of the references, or remove the macro.
jbeichUnsubmitted
Not Done
Inline Actions

@davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback here, in the bug or on freebsd-current maillist.

jbeich: @davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

Yeah, it was on IRC:
<davide> AllanJude: you don't do upper bound validation on the number of processes
<davide> AllanJude: '10' is hardcoded and makes hard to understand what that's actually about
<AllanJude> the 10 is the 'base'
<AllanJude> it is a standard argument to strtol
<davide> AllanJude: I can read the manpage
<davide> AllanJude: it should be a macro
<AllanJude> there is a macro for decimal?
<davide> #define BLAH 10 ?
<AllanJude> so, I should make one?
<davide> otherwise, lgtm

allanjude: Yeah, it was on IRC: <davide> AllanJude: you don't do upper bound validation on the number of…
mjgUnsubmitted
Not Done
Inline Actions

I also don't see what's the point of of this deifne.

mjg: I also don't see what's the point of of this deifne.
static void parse_input(int, char *[]); static void parse_input(int, char *[]);
static void prerun(int, char *[]); static void prerun(int, char *[]);
static int prompt(void); static int prompt(void);
static void run(char **); static void run(char **);
static void usage(void); static void usage(void);
void strnsubst(char **, const char *, const char *, size_t); void strnsubst(char **, const char *, const char *, size_t);
static pid_t xwait(int block, int *status); static pid_t xwait(int block, int *status);
static void xexit(const char *, const int); static void xexit(const char *, const int);
Show All 21 Lines
extern char **environ; extern char **environ;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
long arg_max; long arg_max;
int ch, Jflag, nargs, nflag, nline; int ch, Jflag, nargs, nflag, nline;
size_t linelen; size_t linelen;
size_t proclen;
mjgUnsubmitted
Not Done
Inline Actions

I would rename this to rl or rlimit, as a nit.

mjg: I would rename this to rl or rlimit, as a nit.
int proclim;
char *endptr; char *endptr;
inpline = replstr = NULL; inpline = replstr = NULL;
ep = environ; ep = environ;
eofstr = ""; eofstr = "";
Jflag = nflag = 0; Jflag = nflag = 0;
mjgUnsubmitted
Not Done
Inline Actions

Why is this set here?

mjg: Why is this set here?
(void)setlocale(LC_ALL, ""); (void)setlocale(LC_ALL, "");
/* /*
* POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that * POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that
* caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given * caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given
* that the smallest argument is 2 bytes in length, this means that * that the smallest argument is 2 bytes in length, this means that
* the number of arguments is limited to: * the number of arguments is limited to:
* *
Show All 36 Lines case 'n':
nflag = 1; nflag = 1;
if ((nargs = atoi(optarg)) <= 0) if ((nargs = atoi(optarg)) <= 0)
errx(1, "illegal argument count"); errx(1, "illegal argument count");
break; break;
case 'o': case 'o':
oflag = 1; oflag = 1;
break; break;
case 'P': case 'P':
if ((maxprocs = atoi(optarg)) <= 0) proclen = sizeof(proclim);
errx(1, "max. processes must be >0"); sysctlbyname("kern.maxproc", &proclim, &proclen, NULL, 0);
jbeichUnsubmitted
Done
Inline Actions

Why allow value larger than RLIMIT_NPROC or _SC_CHILD_MAX? Soft limit would cap number of processes sooner. And kern.maxproc can be larger than "infinity" hard limit.

$ limits -Su 50 sh -c "yes | xargs -n1 -P0 yes foo" >/dev/null &
$ pgrep -f foo | wc -l
       6

$ limits -Su
Resource limits (current):
  maxprocesses-cur          100
$ limits -Hu
Resource limits (current):
  maxprocesses-max         1458
$ sysctl kern.max{proc,users}
kern.maxproc: 1620 # (20 + 16 * maxusers)
kern.maxusers: 100
jbeich: Why allow value larger than `RLIMIT_NPROC` or `_SC_CHILD_MAX`? Soft limit would cap number of…
maxprocs = strtol(optarg, &endptr, BASE_DECIMAL);
if (*endptr != '\0')
errx(1, "max processes must be a number");
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

We should probably use the same sysctl instead of nargs for the upper bounds as well

allanjude: We should probably use the same sysctl instead of nargs for the upper bounds as well
if (maxprocs >= proclim)
errx(1, "max processes must be less than kern.maxproc: %d", proclim);
bjkUnsubmitted
Done
Inline Actions

I do not see how nargs is the correct value to use here; it has a different meaning to the program, and can be overridden by other command-line arguments, giving a bizzare behavior change if -n 1 -P 0 are passed in different orders.

bjk: I do not see how nargs is the correct value to use here; it has a different meaning to the…
lifanov_mail.lifanov.comUnsubmitted
Done
Inline Actions

Good point. I didn't trip this up by pure coincidence.
Let me think of a different value to use.

lifanov_mail.lifanov.com: Good point. I didn't trip this up by pure coincidence. Let me think of a different value to use.
lifanov_mail.lifanov.comUnsubmitted
Not Done
Inline Actions

RLIMIT_NPROC won't mean anything to the end user.
How about changing the line to just:
errx(1, "max processes must be less than %d", proclim);?

lifanov_mail.lifanov.com: RLIMIT_NPROC won't mean anything to the end user. How about changing the line to just: errx(1…
if (maxprocs < 1)
maxprocs = proclim;
break; break;
mjgUnsubmitted
Not Done
Inline Actions

The code form user perspective should behave just like gnu xargs, unless there is a good reason to deviate, which I don't see.

In this particular case, they have "unlimited" for an argument == 0, specified limit for > 0 and error out for non-numbers and negative values. Here negative values are accepted for some reason.

One big not-user-visible difference is the fact that gnu xargs dynamically resizes the process table, while our xargs allocates it upfront. This means we have to have a reasonable limit which can pose as "unlimited" for practical purposes.

getrlimit seen here is fine enough.

However, the code must not complain about passed limit being bigger. It should internally cap it to getrlimit so that user-visible behaviour is identical with gnu in this respect.

As a result the code should explicitly coompare maxprocs to 0 (as opposed to < 1), proclim variable has no use. Fetch rlimit /after/ maxprocs is validated. If (maxprocs == 0 || maxprocs > reslimit.rlim_cur) maxprocs = reslimit.rlim_cur;

getrlimit realistically should never fail, so a failure with err(1, "getrlimit"); should be fine enough for surprising cases.

mjg: The code form user perspective should behave just like gnu xargs, unless there is a good reason…
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'R': case 'R':
Rflag = strtol(optarg, &endptr, 10); Rflag = strtol(optarg, &endptr, 10);
if (*endptr != '\0') if (*endptr != '\0')
errx(1, "replacements must be a number"); errx(1, "replacements must be a number");
break; break;
▲ Show 20 Lines • Show All 600 Lines • Show Last 20 Lines
View Options

sys/net/altq/altq_codel.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */ #endif /* not lint */
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h>
jbeichUnsubmitted
Done
Inline Actions

style(9) doesn't allow both <sys/types.h> and <sys/param.h> included at the same time.

jbeich: style(9) doesn't allow both `<sys/types.h>` and `<sys/param.h>` included at the same time.
mjgUnsubmitted
Not Done
Inline Actions

sys/types.h must be included prior to sys/wait.h.

mjg: sys/types.h must be included prior to sys/wait.h.
#include <sys/sysctl.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <paths.h> #include <paths.h>
#include <regex.h> #include <regex.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "pathnames.h" #include "pathnames.h"
#define BASE_DECIMAL 10
jbeichUnsubmitted
Not Done
Inline Actions

Why? Other uses of strtou*() in the file or across the base don't use macros for integer bases.

usr.bin/xargs/xargs.c:                  Rflag = strtol(optarg, &endptr, 10);
usr.bin/xargs/xargs.c:                  Sflag = strtoul(optarg, &endptr, 10);

http://bxr.su/search?refs=strtou*&project=FreeBSD

jbeich: Why? Other uses of `strtou*()` in the file or across the base don't use macros for integer…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

This was recommended by davide@
I can change all of the references, or remove the macro.

allanjude: This was recommended by davide@ I can change all of the references, or remove the macro.
jbeichUnsubmitted
Not Done
Inline Actions

@davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback here, in the bug or on freebsd-current maillist.

jbeich: @davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

Yeah, it was on IRC:
<davide> AllanJude: you don't do upper bound validation on the number of processes
<davide> AllanJude: '10' is hardcoded and makes hard to understand what that's actually about
<AllanJude> the 10 is the 'base'
<AllanJude> it is a standard argument to strtol
<davide> AllanJude: I can read the manpage
<davide> AllanJude: it should be a macro
<AllanJude> there is a macro for decimal?
<davide> #define BLAH 10 ?
<AllanJude> so, I should make one?
<davide> otherwise, lgtm

allanjude: Yeah, it was on IRC: <davide> AllanJude: you don't do upper bound validation on the number of…
mjgUnsubmitted
Not Done
Inline Actions

I also don't see what's the point of of this deifne.

mjg: I also don't see what's the point of of this deifne.
static void parse_input(int, char *[]); static void parse_input(int, char *[]);
static void prerun(int, char *[]); static void prerun(int, char *[]);
static int prompt(void); static int prompt(void);
static void run(char **); static void run(char **);
static void usage(void); static void usage(void);
void strnsubst(char **, const char *, const char *, size_t); void strnsubst(char **, const char *, const char *, size_t);
static pid_t xwait(int block, int *status); static pid_t xwait(int block, int *status);
static void xexit(const char *, const int); static void xexit(const char *, const int);
Show All 21 Lines
extern char **environ; extern char **environ;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
long arg_max; long arg_max;
int ch, Jflag, nargs, nflag, nline; int ch, Jflag, nargs, nflag, nline;
size_t linelen; size_t linelen;
size_t proclen;
mjgUnsubmitted
Not Done
Inline Actions

I would rename this to rl or rlimit, as a nit.

mjg: I would rename this to rl or rlimit, as a nit.
int proclim;
char *endptr; char *endptr;
inpline = replstr = NULL; inpline = replstr = NULL;
ep = environ; ep = environ;
eofstr = ""; eofstr = "";
Jflag = nflag = 0; Jflag = nflag = 0;
mjgUnsubmitted
Not Done
Inline Actions

Why is this set here?

mjg: Why is this set here?
(void)setlocale(LC_ALL, ""); (void)setlocale(LC_ALL, "");
/* /*
* POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that * POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that
* caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given * caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given
* that the smallest argument is 2 bytes in length, this means that * that the smallest argument is 2 bytes in length, this means that
* the number of arguments is limited to: * the number of arguments is limited to:
* *
Show All 36 Lines case 'n':
nflag = 1; nflag = 1;
if ((nargs = atoi(optarg)) <= 0) if ((nargs = atoi(optarg)) <= 0)
errx(1, "illegal argument count"); errx(1, "illegal argument count");
break; break;
case 'o': case 'o':
oflag = 1; oflag = 1;
break; break;
case 'P': case 'P':
if ((maxprocs = atoi(optarg)) <= 0) proclen = sizeof(proclim);
errx(1, "max. processes must be >0"); sysctlbyname("kern.maxproc", &proclim, &proclen, NULL, 0);
jbeichUnsubmitted
Done
Inline Actions

Why allow value larger than RLIMIT_NPROC or _SC_CHILD_MAX? Soft limit would cap number of processes sooner. And kern.maxproc can be larger than "infinity" hard limit.

$ limits -Su 50 sh -c "yes | xargs -n1 -P0 yes foo" >/dev/null &
$ pgrep -f foo | wc -l
       6

$ limits -Su
Resource limits (current):
  maxprocesses-cur          100
$ limits -Hu
Resource limits (current):
  maxprocesses-max         1458
$ sysctl kern.max{proc,users}
kern.maxproc: 1620 # (20 + 16 * maxusers)
kern.maxusers: 100
jbeich: Why allow value larger than `RLIMIT_NPROC` or `_SC_CHILD_MAX`? Soft limit would cap number of…
maxprocs = strtol(optarg, &endptr, BASE_DECIMAL);
if (*endptr != '\0')
errx(1, "max processes must be a number");
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

We should probably use the same sysctl instead of nargs for the upper bounds as well

allanjude: We should probably use the same sysctl instead of nargs for the upper bounds as well
if (maxprocs >= proclim)
errx(1, "max processes must be less than kern.maxproc: %d", proclim);
bjkUnsubmitted
Done
Inline Actions

I do not see how nargs is the correct value to use here; it has a different meaning to the program, and can be overridden by other command-line arguments, giving a bizzare behavior change if -n 1 -P 0 are passed in different orders.

bjk: I do not see how nargs is the correct value to use here; it has a different meaning to the…
lifanov_mail.lifanov.comUnsubmitted
Done
Inline Actions

Good point. I didn't trip this up by pure coincidence.
Let me think of a different value to use.

lifanov_mail.lifanov.com: Good point. I didn't trip this up by pure coincidence. Let me think of a different value to use.
lifanov_mail.lifanov.comUnsubmitted
Not Done
Inline Actions

RLIMIT_NPROC won't mean anything to the end user.
How about changing the line to just:
errx(1, "max processes must be less than %d", proclim);?

lifanov_mail.lifanov.com: RLIMIT_NPROC won't mean anything to the end user. How about changing the line to just: errx(1…
if (maxprocs < 1)
maxprocs = proclim;
break; break;
mjgUnsubmitted
Not Done
Inline Actions

The code form user perspective should behave just like gnu xargs, unless there is a good reason to deviate, which I don't see.

In this particular case, they have "unlimited" for an argument == 0, specified limit for > 0 and error out for non-numbers and negative values. Here negative values are accepted for some reason.

One big not-user-visible difference is the fact that gnu xargs dynamically resizes the process table, while our xargs allocates it upfront. This means we have to have a reasonable limit which can pose as "unlimited" for practical purposes.

getrlimit seen here is fine enough.

However, the code must not complain about passed limit being bigger. It should internally cap it to getrlimit so that user-visible behaviour is identical with gnu in this respect.

As a result the code should explicitly coompare maxprocs to 0 (as opposed to < 1), proclim variable has no use. Fetch rlimit /after/ maxprocs is validated. If (maxprocs == 0 || maxprocs > reslimit.rlim_cur) maxprocs = reslimit.rlim_cur;

getrlimit realistically should never fail, so a failure with err(1, "getrlimit"); should be fine enough for surprising cases.

mjg: The code form user perspective should behave just like gnu xargs, unless there is a good reason…
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'R': case 'R':
Rflag = strtol(optarg, &endptr, 10); Rflag = strtol(optarg, &endptr, 10);
if (*endptr != '\0') if (*endptr != '\0')
errx(1, "replacements must be a number"); errx(1, "replacements must be a number");
break; break;
▲ Show 20 Lines • Show All 600 Lines • Show Last 20 Lines
View Options

sys/net/altq/altq_fairq.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */ #endif /* not lint */
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h>
jbeichUnsubmitted
Done
Inline Actions

style(9) doesn't allow both <sys/types.h> and <sys/param.h> included at the same time.

jbeich: style(9) doesn't allow both `<sys/types.h>` and `<sys/param.h>` included at the same time.
mjgUnsubmitted
Not Done
Inline Actions

sys/types.h must be included prior to sys/wait.h.

mjg: sys/types.h must be included prior to sys/wait.h.
#include <sys/sysctl.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <paths.h> #include <paths.h>
#include <regex.h> #include <regex.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "pathnames.h" #include "pathnames.h"
#define BASE_DECIMAL 10
jbeichUnsubmitted
Not Done
Inline Actions

Why? Other uses of strtou*() in the file or across the base don't use macros for integer bases.

usr.bin/xargs/xargs.c:                  Rflag = strtol(optarg, &endptr, 10);
usr.bin/xargs/xargs.c:                  Sflag = strtoul(optarg, &endptr, 10);

http://bxr.su/search?refs=strtou*&project=FreeBSD

jbeich: Why? Other uses of `strtou*()` in the file or across the base don't use macros for integer…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

This was recommended by davide@
I can change all of the references, or remove the macro.

allanjude: This was recommended by davide@ I can change all of the references, or remove the macro.
jbeichUnsubmitted
Not Done
Inline Actions

@davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback here, in the bug or on freebsd-current maillist.

jbeich: @davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

Yeah, it was on IRC:
<davide> AllanJude: you don't do upper bound validation on the number of processes
<davide> AllanJude: '10' is hardcoded and makes hard to understand what that's actually about
<AllanJude> the 10 is the 'base'
<AllanJude> it is a standard argument to strtol
<davide> AllanJude: I can read the manpage
<davide> AllanJude: it should be a macro
<AllanJude> there is a macro for decimal?
<davide> #define BLAH 10 ?
<AllanJude> so, I should make one?
<davide> otherwise, lgtm

allanjude: Yeah, it was on IRC: <davide> AllanJude: you don't do upper bound validation on the number of…
mjgUnsubmitted
Not Done
Inline Actions

I also don't see what's the point of of this deifne.

mjg: I also don't see what's the point of of this deifne.
static void parse_input(int, char *[]); static void parse_input(int, char *[]);
static void prerun(int, char *[]); static void prerun(int, char *[]);
static int prompt(void); static int prompt(void);
static void run(char **); static void run(char **);
static void usage(void); static void usage(void);
void strnsubst(char **, const char *, const char *, size_t); void strnsubst(char **, const char *, const char *, size_t);
static pid_t xwait(int block, int *status); static pid_t xwait(int block, int *status);
static void xexit(const char *, const int); static void xexit(const char *, const int);
Show All 21 Lines
extern char **environ; extern char **environ;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
long arg_max; long arg_max;
int ch, Jflag, nargs, nflag, nline; int ch, Jflag, nargs, nflag, nline;
size_t linelen; size_t linelen;
size_t proclen;
mjgUnsubmitted
Not Done
Inline Actions

I would rename this to rl or rlimit, as a nit.

mjg: I would rename this to rl or rlimit, as a nit.
int proclim;
char *endptr; char *endptr;
inpline = replstr = NULL; inpline = replstr = NULL;
ep = environ; ep = environ;
eofstr = ""; eofstr = "";
Jflag = nflag = 0; Jflag = nflag = 0;
mjgUnsubmitted
Not Done
Inline Actions

Why is this set here?

mjg: Why is this set here?
(void)setlocale(LC_ALL, ""); (void)setlocale(LC_ALL, "");
/* /*
* POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that * POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that
* caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given * caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given
* that the smallest argument is 2 bytes in length, this means that * that the smallest argument is 2 bytes in length, this means that
* the number of arguments is limited to: * the number of arguments is limited to:
* *
Show All 36 Lines case 'n':
nflag = 1; nflag = 1;
if ((nargs = atoi(optarg)) <= 0) if ((nargs = atoi(optarg)) <= 0)
errx(1, "illegal argument count"); errx(1, "illegal argument count");
break; break;
case 'o': case 'o':
oflag = 1; oflag = 1;
break; break;
case 'P': case 'P':
if ((maxprocs = atoi(optarg)) <= 0) proclen = sizeof(proclim);
errx(1, "max. processes must be >0"); sysctlbyname("kern.maxproc", &proclim, &proclen, NULL, 0);
jbeichUnsubmitted
Done
Inline Actions

Why allow value larger than RLIMIT_NPROC or _SC_CHILD_MAX? Soft limit would cap number of processes sooner. And kern.maxproc can be larger than "infinity" hard limit.

$ limits -Su 50 sh -c "yes | xargs -n1 -P0 yes foo" >/dev/null &
$ pgrep -f foo | wc -l
       6

$ limits -Su
Resource limits (current):
  maxprocesses-cur          100
$ limits -Hu
Resource limits (current):
  maxprocesses-max         1458
$ sysctl kern.max{proc,users}
kern.maxproc: 1620 # (20 + 16 * maxusers)
kern.maxusers: 100
jbeich: Why allow value larger than `RLIMIT_NPROC` or `_SC_CHILD_MAX`? Soft limit would cap number of…
maxprocs = strtol(optarg, &endptr, BASE_DECIMAL);
if (*endptr != '\0')
errx(1, "max processes must be a number");
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

We should probably use the same sysctl instead of nargs for the upper bounds as well

allanjude: We should probably use the same sysctl instead of nargs for the upper bounds as well
if (maxprocs >= proclim)
errx(1, "max processes must be less than kern.maxproc: %d", proclim);
bjkUnsubmitted
Done
Inline Actions

I do not see how nargs is the correct value to use here; it has a different meaning to the program, and can be overridden by other command-line arguments, giving a bizzare behavior change if -n 1 -P 0 are passed in different orders.

bjk: I do not see how nargs is the correct value to use here; it has a different meaning to the…
lifanov_mail.lifanov.comUnsubmitted
Done
Inline Actions

Good point. I didn't trip this up by pure coincidence.
Let me think of a different value to use.

lifanov_mail.lifanov.com: Good point. I didn't trip this up by pure coincidence. Let me think of a different value to use.
lifanov_mail.lifanov.comUnsubmitted
Not Done
Inline Actions

RLIMIT_NPROC won't mean anything to the end user.
How about changing the line to just:
errx(1, "max processes must be less than %d", proclim);?

lifanov_mail.lifanov.com: RLIMIT_NPROC won't mean anything to the end user. How about changing the line to just: errx(1…
if (maxprocs < 1)
maxprocs = proclim;
break; break;
mjgUnsubmitted
Not Done
Inline Actions

The code form user perspective should behave just like gnu xargs, unless there is a good reason to deviate, which I don't see.

In this particular case, they have "unlimited" for an argument == 0, specified limit for > 0 and error out for non-numbers and negative values. Here negative values are accepted for some reason.

One big not-user-visible difference is the fact that gnu xargs dynamically resizes the process table, while our xargs allocates it upfront. This means we have to have a reasonable limit which can pose as "unlimited" for practical purposes.

getrlimit seen here is fine enough.

However, the code must not complain about passed limit being bigger. It should internally cap it to getrlimit so that user-visible behaviour is identical with gnu in this respect.

As a result the code should explicitly coompare maxprocs to 0 (as opposed to < 1), proclim variable has no use. Fetch rlimit /after/ maxprocs is validated. If (maxprocs == 0 || maxprocs > reslimit.rlim_cur) maxprocs = reslimit.rlim_cur;

getrlimit realistically should never fail, so a failure with err(1, "getrlimit"); should be fine enough for surprising cases.

mjg: The code form user perspective should behave just like gnu xargs, unless there is a good reason…
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'R': case 'R':
Rflag = strtol(optarg, &endptr, 10); Rflag = strtol(optarg, &endptr, 10);
if (*endptr != '\0') if (*endptr != '\0')
errx(1, "replacements must be a number"); errx(1, "replacements must be a number");
break; break;
▲ Show 20 Lines • Show All 600 Lines • Show Last 20 Lines
View Options

sys/net/altq/altq_hfsc.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */ #endif /* not lint */
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h>
jbeichUnsubmitted
Done
Inline Actions

style(9) doesn't allow both <sys/types.h> and <sys/param.h> included at the same time.

jbeich: style(9) doesn't allow both `<sys/types.h>` and `<sys/param.h>` included at the same time.
mjgUnsubmitted
Not Done
Inline Actions

sys/types.h must be included prior to sys/wait.h.

mjg: sys/types.h must be included prior to sys/wait.h.
#include <sys/sysctl.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <paths.h> #include <paths.h>
#include <regex.h> #include <regex.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "pathnames.h" #include "pathnames.h"
#define BASE_DECIMAL 10
jbeichUnsubmitted
Not Done
Inline Actions

Why? Other uses of strtou*() in the file or across the base don't use macros for integer bases.

usr.bin/xargs/xargs.c:                  Rflag = strtol(optarg, &endptr, 10);
usr.bin/xargs/xargs.c:                  Sflag = strtoul(optarg, &endptr, 10);

http://bxr.su/search?refs=strtou*&project=FreeBSD

jbeich: Why? Other uses of `strtou*()` in the file or across the base don't use macros for integer…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

This was recommended by davide@
I can change all of the references, or remove the macro.

allanjude: This was recommended by davide@ I can change all of the references, or remove the macro.
jbeichUnsubmitted
Not Done
Inline Actions

@davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback here, in the bug or on freebsd-current maillist.

jbeich: @davide has phabricator account. Let's ask him for the the rationale. I don't see his feedback…
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

Yeah, it was on IRC:
<davide> AllanJude: you don't do upper bound validation on the number of processes
<davide> AllanJude: '10' is hardcoded and makes hard to understand what that's actually about
<AllanJude> the 10 is the 'base'
<AllanJude> it is a standard argument to strtol
<davide> AllanJude: I can read the manpage
<davide> AllanJude: it should be a macro
<AllanJude> there is a macro for decimal?
<davide> #define BLAH 10 ?
<AllanJude> so, I should make one?
<davide> otherwise, lgtm

allanjude: Yeah, it was on IRC: <davide> AllanJude: you don't do upper bound validation on the number of…
mjgUnsubmitted
Not Done
Inline Actions

I also don't see what's the point of of this deifne.

mjg: I also don't see what's the point of of this deifne.
static void parse_input(int, char *[]); static void parse_input(int, char *[]);
static void prerun(int, char *[]); static void prerun(int, char *[]);
static int prompt(void); static int prompt(void);
static void run(char **); static void run(char **);
static void usage(void); static void usage(void);
void strnsubst(char **, const char *, const char *, size_t); void strnsubst(char **, const char *, const char *, size_t);
static pid_t xwait(int block, int *status); static pid_t xwait(int block, int *status);
static void xexit(const char *, const int); static void xexit(const char *, const int);
Show All 21 Lines
extern char **environ; extern char **environ;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
long arg_max; long arg_max;
int ch, Jflag, nargs, nflag, nline; int ch, Jflag, nargs, nflag, nline;
size_t linelen; size_t linelen;
size_t proclen;
mjgUnsubmitted
Not Done
Inline Actions

I would rename this to rl or rlimit, as a nit.

mjg: I would rename this to rl or rlimit, as a nit.
int proclim;
char *endptr; char *endptr;
inpline = replstr = NULL; inpline = replstr = NULL;
ep = environ; ep = environ;
eofstr = ""; eofstr = "";
Jflag = nflag = 0; Jflag = nflag = 0;
mjgUnsubmitted
Not Done
Inline Actions

Why is this set here?

mjg: Why is this set here?
(void)setlocale(LC_ALL, ""); (void)setlocale(LC_ALL, "");
/* /*
* POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that * POSIX.2 limits the exec line length to ARG_MAX - 2K. Running that
* caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given * caused some E2BIG errors, so it was changed to ARG_MAX - 4K. Given
* that the smallest argument is 2 bytes in length, this means that * that the smallest argument is 2 bytes in length, this means that
* the number of arguments is limited to: * the number of arguments is limited to:
* *
Show All 36 Lines case 'n':
nflag = 1; nflag = 1;
if ((nargs = atoi(optarg)) <= 0) if ((nargs = atoi(optarg)) <= 0)
errx(1, "illegal argument count"); errx(1, "illegal argument count");
break; break;
case 'o': case 'o':
oflag = 1; oflag = 1;
break; break;
case 'P': case 'P':
if ((maxprocs = atoi(optarg)) <= 0) proclen = sizeof(proclim);
errx(1, "max. processes must be >0"); sysctlbyname("kern.maxproc", &proclim, &proclen, NULL, 0);
jbeichUnsubmitted
Done
Inline Actions

Why allow value larger than RLIMIT_NPROC or _SC_CHILD_MAX? Soft limit would cap number of processes sooner. And kern.maxproc can be larger than "infinity" hard limit.

$ limits -Su 50 sh -c "yes | xargs -n1 -P0 yes foo" >/dev/null &
$ pgrep -f foo | wc -l
       6

$ limits -Su
Resource limits (current):
  maxprocesses-cur          100
$ limits -Hu
Resource limits (current):
  maxprocesses-max         1458
$ sysctl kern.max{proc,users}
kern.maxproc: 1620 # (20 + 16 * maxusers)
kern.maxusers: 100
jbeich: Why allow value larger than `RLIMIT_NPROC` or `_SC_CHILD_MAX`? Soft limit would cap number of…
maxprocs = strtol(optarg, &endptr, BASE_DECIMAL);
if (*endptr != '\0')
errx(1, "max processes must be a number");
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

We should probably use the same sysctl instead of nargs for the upper bounds as well

allanjude: We should probably use the same sysctl instead of nargs for the upper bounds as well
if (maxprocs >= proclim)
errx(1, "max processes must be less than kern.maxproc: %d", proclim);
bjkUnsubmitted
Done
Inline Actions

I do not see how nargs is the correct value to use here; it has a different meaning to the program, and can be overridden by other command-line arguments, giving a bizzare behavior change if -n 1 -P 0 are passed in different orders.

bjk: I do not see how nargs is the correct value to use here; it has a different meaning to the…
lifanov_mail.lifanov.comUnsubmitted
Done
Inline Actions

Good point. I didn't trip this up by pure coincidence.
Let me think of a different value to use.

lifanov_mail.lifanov.com: Good point. I didn't trip this up by pure coincidence. Let me think of a different value to use.
lifanov_mail.lifanov.comUnsubmitted
Not Done
Inline Actions

RLIMIT_NPROC won't mean anything to the end user.
How about changing the line to just:
errx(1, "max processes must be less than %d", proclim);?

lifanov_mail.lifanov.com: RLIMIT_NPROC won't mean anything to the end user. How about changing the line to just: errx(1…
if (maxprocs < 1)
maxprocs = proclim;
break; break;
mjgUnsubmitted
Not Done
Inline Actions

The code form user perspective should behave just like gnu xargs, unless there is a good reason to deviate, which I don't see.

In this particular case, they have "unlimited" for an argument == 0, specified limit for > 0 and error out for non-numbers and negative values. Here negative values are accepted for some reason.

One big not-user-visible difference is the fact that gnu xargs dynamically resizes the process table, while our xargs allocates it upfront. This means we have to have a reasonable limit which can pose as "unlimited" for practical purposes.

getrlimit seen here is fine enough.

However, the code must not complain about passed limit being bigger. It should internally cap it to getrlimit so that user-visible behaviour is identical with gnu in this respect.

As a result the code should explicitly coompare maxprocs to 0 (as opposed to < 1), proclim variable has no use. Fetch rlimit /after/ maxprocs is validated. If (maxprocs == 0 || maxprocs > reslimit.rlim_cur) maxprocs = reslimit.rlim_cur;

getrlimit realistically should never fail, so a failure with err(1, "getrlimit"); should be fine enough for surprising cases.

mjg: The code form user perspective should behave just like gnu xargs, unless there is a good reason…
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'R': case 'R':
Rflag = strtol(optarg, &endptr, 10); Rflag = strtol(optarg, &endptr, 10);
if (*endptr != '\0') if (*endptr != '\0')
errx(1, "replacements must be a number"); errx(1, "replacements must be a number");
break; break;
▲ Show 20 Lines • Show All 600 Lines • Show Last 20 Lines
View Options

sys/net/altq/altq_priq.c

Loading...
View Options

sys/net/altq/altq_rmclass.c

Loading...
View Options

sys/net/altq/altq_subr.c

Loading...
View Options

sys/net/bpf.c

Loading...
View Options

sys/net/bridgestp.c

Loading...
View Options

sys/net/debugnet.c

Loading...
View Options

sys/net/debugnet_inet.c

Loading...
View Options

sys/net/ieee8023ad_lacp.c

Loading...
View Options

sys/net/if.c

Loading...
View Options

sys/net/if_bridge.c

Loading...
View Options

sys/net/if_clone.c

Loading...
View Options

sys/net/if_dead.c

Loading...
View Options

sys/net/if_disc.c

Loading...
View Options

sys/net/if_edsc.c

Loading...
View Options

sys/net/if_enc.c

Loading...
View Options

sys/net/if_epair.c

Loading...
View Options

sys/net/if_ethersubr.c

Loading...
View Options

sys/net/if_fwsubr.c

Loading...
View Options

sys/net/if_gif.c

Loading...
View Options

sys/net/if_gre.c

Loading...
View Options

sys/net/if_infiniband.c

Loading...
View Options

sys/net/if_ipsec.c

Loading...
View Options

sys/net/if_lagg.c

Loading...
View Options

sys/net/if_llatbl.c

Loading...
View Options

sys/net/if_loop.c

Loading...
View Options

sys/net/if_me.c

Loading...
View Options

sys/net/if_media.c

Loading...
View Options

sys/net/if_mib.c

Loading...
View Options

sys/net/if_ovpn.c

Loading...
View Options

sys/net/if_private.h

Loading...
View Options

sys/net/if_stf.c

Loading...
View Options

sys/net/if_tuntap.c

Loading...
View Options

sys/net/if_var.h

Loading...
View Options

sys/net/if_vlan.c

Loading...
View Options

sys/net/if_vxlan.c

Loading...
View Options

sys/net/iflib.c

Loading...
View Options

sys/net/iflib_clone.c

Loading...
View Options

sys/net/netisr.c

Loading...
View Options

sys/net/route.c

Loading...
View Options

sys/net/route/nhgrp_ctl.c

Loading...
View Options

sys/net/route/nhop_ctl.c

Loading...
View Options

sys/net/route/route_ctl.c

Loading...
View Options

sys/net/route/route_ddb.c

Loading...
View Options

sys/net/route/route_ifaddrs.c

Loading...
View Options

sys/net/route/route_rtentry.c

Loading...
View Options

sys/net/rtsock.c

Loading...