leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests/bpf: Make bpf_util work on uniprocessor systems

Browse Source 
The current implementation fails to work on uniprocessor systems.
Fix the parser to also handle the uniprocessor case.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
Thomas Meyer 2017-09-08 13:19:23 +02:00 committed by Shuah Khan
parent 6f0003363a
commit 56a268cd4a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/testing/selftests/bpf/bpf_util.h
View File

@ -12,6 +12,7 @@ static inline unsigned int bpf_num_possible_cpus(void)
unsigned int start, end, possible_cpus = 0; unsigned int start, end, possible_cpus = 0;
char buff[128]; char buff[128];
FILE *fp; FILE *fp;
int n;
fp = fopen(fcpu, "r"); fp = fopen(fcpu, "r");
if (!fp) { if (!fp) {
@ -20,17 +21,17 @@ static inline unsigned int bpf_num_possible_cpus(void)
} }
while (fgets(buff, sizeof(buff), fp)) { while (fgets(buff, sizeof(buff), fp)) {
if (sscanf(buff, "%u-%u", &start, &end) == 2) { n = sscanf(buff, "%u-%u", &start, &end);
possible_cpus = start == 0 ? end + 1 : 0; if (n == 0) {
break; printf("Failed to retrieve # possible CPUs!\n");
exit(1);
} else if (n == 1) {
end = start;
} }
possible_cpus = start == 0 ? end + 1 : 0;
break;
} }
fclose(fp); fclose(fp);
if (!possible_cpus) {
printf("Failed to retrieve # possible CPUs!\n");
exit(1);
}
return possible_cpus; return possible_cpus;
} }