drop duplicate max/min definitions
Subsystems (3)
v2 cover drop duplicate max/min definitions
Two small cleanups for selftests, drop duplicate max/min definitions.
v2:
- do more cleanups as Daniel suggested.
v1:
- "selftests: bpf: use MIN for TCP CC tests"
Geliang Tang (2):
selftests: bpf: drop duplicate max/min definitions
selftests: mqueue: drop duplicate min definition
tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 7 +++---- tools/testing/selftests/bpf/prog_tests/snprintf.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- tools/testing/selftests/mqueue/mq_perf_tests.c | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 selftests: bpf: drop duplicate max/min definitions
Drop duplicate macros min() and MAX() definitions in prog_tests, use MIN() or MAX() in sys/param.h instead.
--- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 7 +++---- tools/testing/selftests/bpf/prog_tests/snprintf.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +2 -3
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020 Facebook */ +#include <sys/param.h> #include <test_progs.h> #include "bpf_iter_ipv6_route.skel.h" #include "bpf_iter_netlink.skel.h"
@@ -1192,8 +1193,6 @@ static void str_strip_first_line(char *str) *dst ='\0' ; } -#define min (a, b) ((a) < (b) ? (a) : (b)) -static void test_task_vma (void ) {int err, iter_fd =-1 , proc_maps_fd =-1 ;
@@ -1229,7 +1228,7 @@ static void test_task_vma(void) len =0 ;while (len <CMP_BUFFER_SIZE ) { err =read_fd_into_buffer (iter_fd, task_vma_output + len, -min (read_size,CMP_BUFFER_SIZE - len)); +MIN (read_size,CMP_BUFFER_SIZE - len));if (!err)break ;if (CHECK (err <0 ,"read_iter_fd" ,"read_iter_fd failed\n" ))
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +3 -4
@@ -3,6 +3,7 @@#include <linux/err.h> #include <netinet/tcp.h> +#include <sys/param.h> #include <test_progs.h> #include "network_helpers.h" #include "bpf_dctcp.skel.h"
@@ -10,8 +11,6 @@#include "bpf_tcp_nogpl.skel.h" #include "bpf_dctcp_release.skel.h" -#define min (a, b) ((a) < (b) ? (a) : (b)) -#ifndef ENOTSUPP #define ENOTSUPP 524#endif
@@ -53,7 +52,7 @@ static void *server(void *arg)while (bytes < total_bytes && !READ_ONCE (stop)) { nr_sent =send (fd, &batch, -min (total_bytes - bytes,sizeof (batch)),0 ); +MIN (total_bytes - bytes,sizeof (batch)),0 );if (nr_sent ==-1 && errno ==EINTR )continue ;if (nr_sent ==-1 ) {
@@ -146,7 +145,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)/* recv total_bytes */ while (bytes < total_bytes && !READ_ONCE (stop)) { nr_recv =recv (fd, &batch, -min (total_bytes - bytes,sizeof (batch)),0 ); +MIN (total_bytes - bytes,sizeof (batch)),0 );if (nr_recv ==-1 && errno ==EINTR )continue ;if (nr_recv ==-1 )
tools/testing/selftests/bpf/prog_tests/snprintf.c +2 -3
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2021 Google LLC. */ +#include <sys/param.h> #include <test_progs.h> #include "test_snprintf.skel.h" #include "test_snprintf_single.skel.h"
@@ -83,8 +84,6 @@ static void test_snprintf_positive(void)test_snprintf__destroy (skel); } -#define min (a, b) ((a) < (b) ? (a) : (b)) -/* Loads an eBPF object calling bpf_snprintf with up to 10 characters of fmt */ static int load_single_snprintf (char *fmt) {
@@ -95,7 +94,7 @@ static int load_single_snprintf(char *fmt)if (!skel)return -EINVAL ; -memcpy (skel->rodata->fmt, fmt,min (strlen (fmt) +1 ,10 )); +memcpy (skel->rodata->fmt, fmt,MIN (strlen (fmt) +1 ,10 )); ret =test_snprintf_single__load (skel);test_snprintf_single__destroy (skel);
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1 -1
@@ -20,6 +20,7 @@#include <stdbool.h> #include <stdio.h> #include <sys/stat.h> +#include <sys/param.h> #include <unistd.h> #include "test_progs.h"
@@ -949,7 +950,6 @@ static int tun_open(char *name)return -1 ; } -#define MAX (a, b) ((a) > (b) ? (a) : (b))enum {SRC_TO_TARGET =0 ,TARGET_TO_SRC =1 ,
Signature · 1 line
2.34.1
PATCH v2 2/2 selftests: mqueue: drop duplicate min definition
In reply to Geliang TangDrop duplicate macro min() definition in mq_perf_tests.c, use MIN() in sys/param.h instead.
--- tools/testing/selftests/mqueue/mq_perf_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/mqueue/mq_perf_tests.c +2 -2
@@ -35,6 +35,7 @@#include <sys/time.h> #include <sys/resource.h> #include <sys/stat.h> +#include <sys/param.h> #include <mqueue.h> #include <popt.h> #include <error.h>
@@ -73,7 +74,6 @@ static char *usage =char *MAX_MSGS ="/proc/sys/fs/mqueue/msg_max" ;char *MAX_MSGSIZE ="/proc/sys/fs/mqueue/msgsize_max" ; -#define min (a, b) ((a) < (b) ? (a) : (b))#define MAX_CPUS 64char *cpu_option_string;int cpus_to_pin[MAX_CPUS ];
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])perror ("sysconf(_SC_NPROCESSORS_ONLN)" );exit (1 ); } - cpus_online =min (MAX_CPUS ,sysconf (_SC_NPROCESSORS_ONLN)); + cpus_online =MIN (MAX_CPUS ,sysconf (_SC_NPROCESSORS_ONLN)); cpu_set =CPU_ALLOC (cpus_online);if (cpu_set ==NULL ) {perror ("CPU_ALLOC()" );
Signature · 1 line
2.34.1
Re: [PATCH v2 1/2] selftests: bpf: drop duplicate max/min definitions
In reply to Geliang TangQuoted 11 lines · Geliang Tang
Drop duplicate macros
min()andMAX()definitions inprog_tests, useMIN()orMAX()insys/param.hinstead.Signed-off-by Geliang Tang <[email protected]>--- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 7 +++---- tools/testing/selftests/bpf/prog_tests/snprintf.c | 5 ++--- tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-)
Looks good to me. Thanks for cleaning these up.
thanks,
-- Shuah
Shuah Khan
maintainerRe: [PATCH v2 2/2] selftests: mqueue: drop duplicate min definition
In reply to Geliang TangQuoted 5 lines · Geliang Tang
Drop duplicate macro
min()definition inmq_perf_tests.c, useMIN()insys/param.hinstead.Signed-off-by Geliang Tang <[email protected]>---
Thank you. I will apply this for next.
thanks,
-- Shuah
Daniel Borkmann
maintainerRe: [PATCH v2 1/2] selftests: bpf: drop duplicate max/min definitions
In reply to Geliang TangQuoted 4 lines · Geliang Tang
Drop duplicate macros
min()andMAX()definitions inprog_tests, useMIN()orMAX()insys/param.hinstead.Signed-off-by Geliang Tang <[email protected]>
[...]
Thanks Geliang! One small final nit and then it's good to go to bpf-next:
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +1
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020 Facebook */ +#include <sys/param.h> #include <test_progs.h> #include "bpf_iter_ipv6_route.skel.h" #include "bpf_iter_netlink.skel.h"
[...]
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +1
-0@@ -3,6 +3,7 @@#include <linux/err.h> #include <netinet/tcp.h> +#include <sys/param.h> #include <test_progs.h> #include "network_helpers.h" #include "bpf_dctcp.skel.h"
[...]
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/snprintf.c +1
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2021 Google LLC. */ +#include <sys/param.h> #include <test_progs.h> #include "test_snprintf.skel.h" #include "test_snprintf_single.skel.h" @@ -83,8 +84,6 @@ static void test_snprintf_positive(void)
[...]
tools/testing/selftests/bpf/prog_tests/tc_redirect.c line 26
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0@@ -20,6 +20,7 @@#include <stdbool.h> #include <stdio.h> #include <sys/stat.h> +#include <sys/param.h> #include <unistd.h> #include "test_progs.h"
Just add the sys/param.h to the test_progs.h header in BPF selftests where we also pull in other sys headers; then all the duplicate includes above are not needed.
Thanks,
Daniel
Re: [PATCH v2 2/2] selftests: mqueue: drop duplicate min definition
In reply to Shuah KhanQuoted 8 lines · Shuah Khan
Quoted 5 lines · Geliang Tang
Drop duplicate macro
min()definition inmq_perf_tests.c, useMIN()insys/param.hinstead.Signed-off-by Geliang Tang <[email protected]>---
Thank you. I will apply this for next.
Thanks very much.
I had sent a v3 of this patch, but it's the same as this one. So apply any one is OK.
Thanks,
-Geliang
Quoted 4 lines
thanks,
-- Shuah