From: Martin Lau <kafai@fb.com>
To: Hechao Li <hechaol@fb.com>
Cc: "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Kernel Team <Kernel-team@fb.com>
Subject: Re: [PATCH v2 bpf-next 2/2] bpf: use libbpf_num_possible_cpus in bpftool and selftests
Date: Thu, 6 Jun 2019 17:17:29 +0000 [thread overview]
Message-ID: <20190606171727.ozcf2guzd3brxho5@kafai-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20190606165837.2042247-3-hechaol@fb.com>
On Thu, Jun 06, 2019 at 09:58:37AM -0700, Hechao Li wrote:
> Use the newly added bpf_num_possible_cpus() in bpftool and selftests
> and remove duplicate implementations.
>
> Signed-off-by: Hechao Li <hechaol@fb.com>
> ---
> tools/bpf/bpftool/common.c | 53 +++-----------------------
> tools/testing/selftests/bpf/bpf_util.h | 37 +++---------------
> 2 files changed, 10 insertions(+), 80 deletions(-)
>
> diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
> index f7261fad45c1..0b1c56758cd9 100644
> --- a/tools/bpf/bpftool/common.c
> +++ b/tools/bpf/bpftool/common.c
> @@ -21,6 +21,7 @@
> #include <sys/vfs.h>
>
> #include <bpf.h>
> +#include <libbpf.h> /* libbpf_num_possible_cpus */
>
> #include "main.h"
>
> @@ -439,57 +440,13 @@ unsigned int get_page_size(void)
>
> unsigned int get_possible_cpus(void)
> {
> - static unsigned int result;
> - char buf[128];
> - long int n;
> - char *ptr;
> - int fd;
> -
> - if (result)
> - return result;
> -
> - fd = open("/sys/devices/system/cpu/possible", O_RDONLY);
> - if (fd < 0) {
> - p_err("can't open sysfs possible cpus");
> - exit(-1);
> - }
> -
> - n = read(fd, buf, sizeof(buf));
> - if (n < 2) {
> - p_err("can't read sysfs possible cpus");
> - exit(-1);
> - }
> - close(fd);
> + int cpus = libbpf_num_possible_cpus();
>
> - if (n == sizeof(buf)) {
> - p_err("read sysfs possible cpus overflow");
> + if (cpus <= 0) {
> + p_err("can't get # of possible cpus");
> exit(-1);
> }
> -
> - ptr = buf;
> - n = 0;
> - while (*ptr && *ptr != '\n') {
> - unsigned int a, b;
> -
> - if (sscanf(ptr, "%u-%u", &a, &b) == 2) {
> - n += b - a + 1;
> -
> - ptr = strchr(ptr, '-') + 1;
> - } else if (sscanf(ptr, "%u", &a) == 1) {
> - n++;
> - } else {
> - assert(0);
> - }
> -
> - while (isdigit(*ptr))
> - ptr++;
> - if (*ptr == ',')
> - ptr++;
> - }
> -
> - result = n;
> -
> - return result;
> + return cpus;
> }
>
> static char *
> diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h
> index a29206ebbd13..9ad9c7595f93 100644
> --- a/tools/testing/selftests/bpf/bpf_util.h
> +++ b/tools/testing/selftests/bpf/bpf_util.h
> @@ -6,44 +6,17 @@
> #include <stdlib.h>
> #include <string.h>
> #include <errno.h>
> +#include <libbpf.h>
>
> static inline unsigned int bpf_num_possible_cpus(void)
> {
> - static const char *fcpu = "/sys/devices/system/cpu/possible";
> - unsigned int start, end, possible_cpus = 0;
> - char buff[128];
> - FILE *fp;
> - int len, n, i, j = 0;
> + int possible_cpus = libbpf_num_possible_cpus();
>
> - fp = fopen(fcpu, "r");
> - if (!fp) {
> - printf("Failed to open %s: '%s'!\n", fcpu, strerror(errno));
> + if (possible_cpus <= 0) {
hmmm... so it seems that possible_cpus could be 0?
or libbpf_num_possible_cpus() should never return 0?
> + printf("Failed to get # of possible cpus: '%s'!\n",
> + strerror(-possible_cpus));
strerror(0) does not seem right.
> exit(1);
> }
> -
> - if (!fgets(buff, sizeof(buff), fp)) {
> - printf("Failed to read %s!\n", fcpu);
> - exit(1);
> - }
> -
> - len = strlen(buff);
> - for (i = 0; i <= len; i++) {
> - if (buff[i] == ',' || buff[i] == '\0') {
> - buff[i] = '\0';
> - n = sscanf(&buff[j], "%u-%u", &start, &end);
> - if (n <= 0) {
> - printf("Failed to retrieve # possible CPUs!\n");
> - exit(1);
> - } else if (n == 1) {
> - end = start;
> - }
> - possible_cpus += end - start + 1;
> - j = i + 1;
> - }
> - }
> -
> - fclose(fp);
> -
> return possible_cpus;
> }
>
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-06-06 17:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190606165837.2042247-1-hechaol@fb.com>
[not found] ` <20190606165837.2042247-2-hechaol@fb.com>
2019-06-06 17:14 ` [PATCH v2 bpf-next 1/2] bpf: add a new API libbpf_num_possible_cpus() Martin Lau
[not found] ` <20190606165837.2042247-3-hechaol@fb.com>
2019-06-06 17:17 ` Martin Lau [this message]
2019-06-06 17:17 ` [PATCH v2 bpf-next 2/2] bpf: use libbpf_num_possible_cpus in bpftool and selftests Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190606171727.ozcf2guzd3brxho5@kafai-mbp.dhcp.thefacebook.com \
--to=kafai@fb.com \
--cc=Kernel-team@fb.com \
--cc=bpf@vger.kernel.org \
--cc=hechaol@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).