tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: ncdevmem: Redirect all non-payload output to stderr

Browse Source 
[ Upstream commit 6891f0b523e1ef452523ba43d67ca2a654760e78 ]

That should make it possible to do expected payload validation on
the caller side.

Reviewed-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20241107181211.3934153-2-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Stanislav Fomichev
2024-11-07 10:12:00 -08:00
committed by Greg Kroah-Hartman
parent d4d1561d17
commit f3380d119f
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/testing/selftests/net/ncdevmem.c
+30 -31
View File
@@ -88,7 +88,6 @@ void print_nonzero_bytes(void *ptr, size_t size)
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
putchar(p[i]); putchar(p[i]);
printf("\n");
} }
void validate_buffer(void *line, size_t size) void validate_buffer(void *line, size_t size)
@@ -120,7 +119,7 @@ void validate_buffer(void *line, size_t size)
char command[256]; \ char command[256]; \
memset(command, 0, sizeof(command)); \ memset(command, 0, sizeof(command)); \
snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \ snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \
printf("Running: %s\n", command); \ fprintf(stderr, "Running: %s\n", command); \
system(command); \ system(command); \
}) })
@@ -128,22 +127,22 @@ static int reset_flow_steering(void)
{ {
int ret = 0; int ret = 0;
ret = run_command("sudo ethtool -K %s ntuple off", ifname); ret = run_command("sudo ethtool -K %s ntuple off >&2", ifname);
if (ret) if (ret)
return ret; return ret;
return run_command("sudo ethtool -K %s ntuple on", ifname); return run_command("sudo ethtool -K %s ntuple on >&2", ifname);
} }
static int configure_headersplit(bool on) static int configure_headersplit(bool on)
{ {
return run_command("sudo ethtool -G %s tcp-data-split %s", ifname, return run_command("sudo ethtool -G %s tcp-data-split %s >&2", ifname,
on ? "on" : "off"); on ? "on" : "off");
} }
static int configure_rss(void) static int configure_rss(void)
{ {
return run_command("sudo ethtool -X %s equal %d", ifname, start_queue); return run_command("sudo ethtool -X %s equal %d >&2", ifname, start_queue);
} }
static int configure_channels(unsigned int rx, unsigned int tx) static int configure_channels(unsigned int rx, unsigned int tx)
@@ -153,7 +152,7 @@ static int configure_channels(unsigned int rx, unsigned int tx)
static int configure_flow_steering(void) static int configure_flow_steering(void)
{ {
return run_command("sudo ethtool -N %s flow-type tcp4 src-ip %s dst-ip %s src-port %s dst-port %s queue %d", return run_command("sudo ethtool -N %s flow-type tcp4 src-ip %s dst-ip %s src-port %s dst-port %s queue %d >&2",
ifname, client_ip, server_ip, port, port, start_queue); ifname, client_ip, server_ip, port, port, start_queue);
} }
@@ -187,7 +186,7 @@ static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd,
goto err_close; goto err_close;
} }
printf("got dmabuf id=%d\n", rsp->id); fprintf(stderr, "got dmabuf id=%d\n", rsp->id);
dmabuf_id = rsp->id; dmabuf_id = rsp->id;
netdev_bind_rx_req_free(req); netdev_bind_rx_req_free(req);
@@ -314,8 +313,8 @@ int do_server(void)
if (ret) if (ret)
error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX);
printf("binding to address %s:%d\n", server_ip, fprintf(stderr, "binding to address %s:%d\n", server_ip,
ntohs(server_sin.sin_port)); ntohs(server_sin.sin_port));
ret = bind(socket_fd, &server_sin, sizeof(server_sin)); ret = bind(socket_fd, &server_sin, sizeof(server_sin));
if (ret) if (ret)
@@ -329,14 +328,14 @@ int do_server(void)
inet_ntop(server_sin.sin_family, &server_sin.sin_addr, buffer, inet_ntop(server_sin.sin_family, &server_sin.sin_addr, buffer,
sizeof(buffer)); sizeof(buffer));
printf("Waiting or connection on %s:%d\n", buffer, fprintf(stderr, "Waiting or connection on %s:%d\n", buffer,
ntohs(server_sin.sin_port)); ntohs(server_sin.sin_port));
client_fd = accept(socket_fd, &client_addr, &client_addr_len); client_fd = accept(socket_fd, &client_addr, &client_addr_len);
inet_ntop(client_addr.sin_family, &client_addr.sin_addr, buffer, inet_ntop(client_addr.sin_family, &client_addr.sin_addr, buffer,
sizeof(buffer)); sizeof(buffer));
printf("Got connection from %s:%d\n", buffer, fprintf(stderr, "Got connection from %s:%d\n", buffer,
ntohs(client_addr.sin_port)); ntohs(client_addr.sin_port));
while (1) { while (1) {
struct iovec iov = { .iov_base = iobuf, struct iovec iov = { .iov_base = iobuf,
@@ -349,14 +348,13 @@ int do_server(void)
ssize_t ret; ssize_t ret;
is_devmem = false; is_devmem = false;
printf("\n\n");
msg.msg_iov = &iov; msg.msg_iov = &iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
msg.msg_control = ctrl_data; msg.msg_control = ctrl_data;
msg.msg_controllen = sizeof(ctrl_data); msg.msg_controllen = sizeof(ctrl_data);
ret = recvmsg(client_fd, &msg, MSG_SOCK_DEVMEM); ret = recvmsg(client_fd, &msg, MSG_SOCK_DEVMEM);
printf("recvmsg ret=%ld\n", ret); fprintf(stderr, "recvmsg ret=%ld\n", ret);
if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
continue; continue;
if (ret < 0) { if (ret < 0) {
@@ -364,7 +362,7 @@ int do_server(void)
continue; continue;
} }
if (ret == 0) { if (ret == 0) {
printf("client exited\n"); fprintf(stderr, "client exited\n");
goto cleanup; goto cleanup;
} }
@@ -373,7 +371,7 @@ int do_server(void)
if (cm->cmsg_level != SOL_SOCKET || if (cm->cmsg_level != SOL_SOCKET ||
(cm->cmsg_type != SCM_DEVMEM_DMABUF && (cm->cmsg_type != SCM_DEVMEM_DMABUF &&
cm->cmsg_type != SCM_DEVMEM_LINEAR)) { cm->cmsg_type != SCM_DEVMEM_LINEAR)) {
fprintf(stdout, "skipping non-devmem cmsg\n"); fprintf(stderr, "skipping non-devmem cmsg\n");
continue; continue;
} }
@@ -384,7 +382,7 @@ int do_server(void)
/* TODO: process data copied from skb's linear /* TODO: process data copied from skb's linear
* buffer. * buffer.
*/ */
fprintf(stdout, fprintf(stderr,
"SCM_DEVMEM_LINEAR. dmabuf_cmsg->frag_size=%u\n", "SCM_DEVMEM_LINEAR. dmabuf_cmsg->frag_size=%u\n",
dmabuf_cmsg->frag_size); dmabuf_cmsg->frag_size);
@@ -395,12 +393,13 @@ int do_server(void)
token.token_count = 1; token.token_count = 1;
total_received += dmabuf_cmsg->frag_size; total_received += dmabuf_cmsg->frag_size;
printf("received frag_page=%llu, in_page_offset=%llu, frag_offset=%llu, frag_size=%u, token=%u, total_received=%lu, dmabuf_id=%u\n", fprintf(stderr,
dmabuf_cmsg->frag_offset >> PAGE_SHIFT, "received frag_page=%llu, in_page_offset=%llu, frag_offset=%llu, frag_size=%u, token=%u, total_received=%lu, dmabuf_id=%u\n",
dmabuf_cmsg->frag_offset % getpagesize(), dmabuf_cmsg->frag_offset >> PAGE_SHIFT,
dmabuf_cmsg->frag_offset, dmabuf_cmsg->frag_size, dmabuf_cmsg->frag_offset % getpagesize(),
dmabuf_cmsg->frag_token, total_received, dmabuf_cmsg->frag_offset,
dmabuf_cmsg->dmabuf_id); dmabuf_cmsg->frag_size, dmabuf_cmsg->frag_token,
total_received, dmabuf_cmsg->dmabuf_id);
if (dmabuf_cmsg->dmabuf_id != dmabuf_id) if (dmabuf_cmsg->dmabuf_id != dmabuf_id)
error(1, 0, error(1, 0,
@@ -438,15 +437,15 @@ int do_server(void)
if (!is_devmem) if (!is_devmem)
error(1, 0, "flow steering error\n"); error(1, 0, "flow steering error\n");
printf("total_received=%lu\n", total_received); fprintf(stderr, "total_received=%lu\n", total_received);
} }
fprintf(stdout, "%s: ok\n", TEST_PREFIX); fprintf(stderr, "%s: ok\n", TEST_PREFIX);
fprintf(stdout, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n", fprintf(stderr, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n",
page_aligned_frags, non_page_aligned_frags); page_aligned_frags, non_page_aligned_frags);
fprintf(stdout, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n", fprintf(stderr, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n",
page_aligned_frags, non_page_aligned_frags); page_aligned_frags, non_page_aligned_frags);
cleanup: cleanup:
@@ -551,7 +550,7 @@ int main(int argc, char *argv[])
ifname = optarg; ifname = optarg;
break; break;
case '?': case '?':
printf("unknown option: %c\n", optopt); fprintf(stderr, "unknown option: %c\n", optopt);
break; break;
} }
} }
@@ -559,7 +558,7 @@ int main(int argc, char *argv[])
ifindex = if_nametoindex(ifname); ifindex = if_nametoindex(ifname);
for (; optind < argc; optind++) for (; optind < argc; optind++)
printf("extra arguments: %s\n", argv[optind]); fprintf(stderr, "extra arguments: %s\n", argv[optind]);
run_devmem_tests(); run_devmem_tests();