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

selftests: xsk: Simplify cleanup of ifobjects

Browse Source 
Simpify the cleanup of ifobjects right before the program exits by
introducing functions for creating and destroying these objects.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210825093722.10219-13-magnus.karlsson@gmail.com
This commit is contained in:
Magnus Karlsson 2021-08-25 11:37:18 +02:00 committed by Alexei Starovoitov
parent ab7c95abb5
commit 1034b03e54
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
tools/testing/selftests/bpf/xdpxceiver.c
View File

@ -1039,62 +1039,70 @@ static void run_pkt_test(int mode, int type)
} }
} }
static struct ifobject *ifobject_create(void)
{
struct ifobject *ifobj;
ifobj = calloc(1, sizeof(struct ifobject));
if (!ifobj)
return NULL;
ifobj->xsk_arr = calloc(2, sizeof(struct xsk_socket_info *));
if (!ifobj->xsk_arr)
goto out_xsk_arr;
ifobj->umem_arr = calloc(2, sizeof(struct xsk_umem_info *));
if (!ifobj->umem_arr)
goto out_umem_arr;
return ifobj;
out_umem_arr:
free(ifobj->xsk_arr);
out_xsk_arr:
free(ifobj);
return NULL;
}
static void ifobject_delete(struct ifobject *ifobj)
{
free(ifobj->umem_arr);
free(ifobj->xsk_arr);
free(ifobj);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct rlimit _rlim = { RLIM_INFINITY, RLIM_INFINITY }; struct rlimit _rlim = { RLIM_INFINITY, RLIM_INFINITY };
bool failure = false;
int i, j; int i, j;
if (setrlimit(RLIMIT_MEMLOCK, &_rlim)) if (setrlimit(RLIMIT_MEMLOCK, &_rlim))
exit_with_error(errno); exit_with_error(errno);
for (int i = 0; i < MAX_INTERFACES; i++) { for (i = 0; i < MAX_INTERFACES; i++) {
ifdict[i] = malloc(sizeof(struct ifobject)); ifdict[i] = ifobject_create();
if (!ifdict[i]) if (!ifdict[i])
exit_with_error(errno); exit_with_error(ENOMEM);
ifdict[i]->ifdict_index = i;
ifdict[i]->xsk_arr = calloc(2, sizeof(struct xsk_socket_info *));
if (!ifdict[i]->xsk_arr) {
failure = true;
goto cleanup;
}
ifdict[i]->umem_arr = calloc(2, sizeof(struct xsk_umem_info *));
if (!ifdict[i]->umem_arr) {
failure = true;
goto cleanup;
}
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
parse_command_line(argc, argv); parse_command_line(argc, argv);
init_iface(ifdict[0], MAC1, MAC2, IP1, IP2, UDP_PORT1, UDP_PORT2, tx); init_iface(ifdict[tx], MAC1, MAC2, IP1, IP2, UDP_PORT1, UDP_PORT2, tx);
init_iface(ifdict[1], MAC2, MAC1, IP2, IP1, UDP_PORT2, UDP_PORT1, rx); init_iface(ifdict[rx], MAC2, MAC1, IP2, IP1, UDP_PORT2, UDP_PORT1, rx);
ksft_set_plan(TEST_MODE_MAX * TEST_TYPE_MAX); ksft_set_plan(TEST_MODE_MAX * TEST_TYPE_MAX);
for (i = 0; i < TEST_MODE_MAX; i++) { for (i = 0; i < TEST_MODE_MAX; i++)
for (j = 0; j < TEST_TYPE_MAX; j++) { for (j = 0; j < TEST_TYPE_MAX; j++) {
run_pkt_test(i, j); run_pkt_test(i, j);
usleep(USLEEP_MAX); usleep(USLEEP_MAX);
} }
}
cleanup: for (i = 0; i < MAX_INTERFACES; i++)
for (int i = 0; i < MAX_INTERFACES; i++) { ifobject_delete(ifdict[i]);
if (ifdict[i]->ns_fd != -1)
close(ifdict[i]->ns_fd);
free(ifdict[i]->xsk_arr);
free(ifdict[i]->umem_arr);
free(ifdict[i]);
}
if (failure)
exit_with_error(errno);
ksft_exit_pass(); ksft_exit_pass();
return 0; return 0;
} }

1
tools/testing/selftests/bpf/xdpxceiver.h
View File

@ -122,7 +122,6 @@ struct ifobject {
void *(*func_ptr)(void *arg); void *(*func_ptr)(void *arg);
struct flow_vector fv; struct flow_vector fv;
int ns_fd; int ns_fd;
int ifdict_index;
u32 dst_ip; u32 dst_ip;
u32 src_ip; u32 src_ip;
u16 src_port; u16 src_port;