Commit f4fd706f authored by Geliang Tang's avatar Geliang Tang Committed by Daniel Borkmann
Browse files

selftests/bpf: Drop duplicate max/min definitions 



Drop duplicate macros min() and MAX() definitions in prog_tests and use
MIN() or MAX() in sys/param.h instead.

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/1ae276da9925c2de59b5bdc93b693b4c243e692e.1649462033.git.geliang.tang@suse.com
parent dd642ccb

tools/testing/selftests/bpf/prog_tests/bpf_iter.c

+1 −3
Original line number Diff line number Diff line
@@ -1192,8 +1192,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 +1227,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

+2 −4
Original line number Diff line number Diff line
@@ -10,8 +10,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 +51,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 +144,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

+1 −3
Original line number Diff line number Diff line
@@ -83,8 +83,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 +93,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

+0 −1
Original line number Diff line number Diff line
@@ -949,7 +949,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,

tools/testing/selftests/bpf/test_progs.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ typedef __u16 __sum16; 
#include <sys/wait.h>

#include <sys/types.h>

#include <sys/time.h>

#include <sys/param.h>

#include <fcntl.h>

#include <pthread.h>

#include <linux/bpf.h>