| Message ID | 20240930171753.2572922-2-sdf@fomichev.me (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | selftests: ncdevmem: Add ncdevmem to ksft | expand |
On Mon, Sep 30, 2024 at 10:17 AM Stanislav Fomichev <sdf@fomichev.me> wrote: > > That should make it possible to do expected payload validation on > the caller side. > > Cc: Mina Almasry <almasrymina@google.com> > Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> Reviewed-by: Mina Almasry <almasrymina@google.com> > --- > tools/testing/selftests/net/ncdevmem.c | 61 +++++++++++++------------- > 1 file changed, 30 insertions(+), 31 deletions(-) > > diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c > index 64d6805381c5..9245d3f158dd 100644 > --- a/tools/testing/selftests/net/ncdevmem.c > +++ b/tools/testing/selftests/net/ncdevmem.c > @@ -88,7 +88,6 @@ void print_nonzero_bytes(void *ptr, size_t size) > > for (i = 0; i < size; i++) > putchar(p[i]); > - printf("\n"); > } > > void validate_buffer(void *line, size_t size) > @@ -120,7 +119,7 @@ void validate_buffer(void *line, size_t size) > char command[256]; \ > memset(command, 0, sizeof(command)); \ > snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \ > - printf("Running: %s\n", command); \ > + fprintf(stderr, "Running: %s\n", command); \ > system(command); \ > }) > > @@ -128,22 +127,22 @@ static int reset_flow_steering(void) > { > 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) > 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) > { > - 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"); > } > > 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) > @@ -153,7 +152,7 @@ static int configure_channels(unsigned int rx, unsigned int tx) > > 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); > } > > @@ -187,7 +186,7 @@ static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, > goto err_close; > } > > - printf("got dmabuf id=%d\n", rsp->id); > + fprintf(stderr, "got dmabuf id=%d\n", rsp->id); > dmabuf_id = rsp->id; > > netdev_bind_rx_req_free(req); > @@ -314,8 +313,8 @@ int do_server(void) > if (ret) > error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > - printf("binding to address %s:%d\n", server_ip, > - ntohs(server_sin.sin_port)); > + fprintf(stderr, "binding to address %s:%d\n", server_ip, > + ntohs(server_sin.sin_port)); > > ret = bind(socket_fd, &server_sin, sizeof(server_sin)); > if (ret) > @@ -329,14 +328,14 @@ int do_server(void) > > inet_ntop(server_sin.sin_family, &server_sin.sin_addr, buffer, > sizeof(buffer)); > - printf("Waiting or connection on %s:%d\n", buffer, > - ntohs(server_sin.sin_port)); > + fprintf(stderr, "Waiting or connection on %s:%d\n", buffer, > + ntohs(server_sin.sin_port)); > client_fd = accept(socket_fd, &client_addr, &client_addr_len); > > inet_ntop(client_addr.sin_family, &client_addr.sin_addr, buffer, > sizeof(buffer)); > - printf("Got connection from %s:%d\n", buffer, > - ntohs(client_addr.sin_port)); > + fprintf(stderr, "Got connection from %s:%d\n", buffer, > + ntohs(client_addr.sin_port)); > > while (1) { > struct iovec iov = { .iov_base = iobuf, > @@ -349,14 +348,13 @@ int do_server(void) > ssize_t ret; > > is_devmem = false; > - printf("\n\n"); > > msg.msg_iov = &iov; > msg.msg_iovlen = 1; > msg.msg_control = ctrl_data; > msg.msg_controllen = sizeof(ctrl_data); > 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)) > continue; > if (ret < 0) { > @@ -364,7 +362,7 @@ int do_server(void) > continue; > } > if (ret == 0) { > - printf("client exited\n"); > + fprintf(stderr, "client exited\n"); > goto cleanup; > } > > @@ -373,7 +371,7 @@ int do_server(void) > if (cm->cmsg_level != SOL_SOCKET || > (cm->cmsg_type != SCM_DEVMEM_DMABUF && > cm->cmsg_type != SCM_DEVMEM_LINEAR)) { > - fprintf(stdout, "skipping non-devmem cmsg\n"); > + fprintf(stderr, "skipping non-devmem cmsg\n"); > continue; > } > > @@ -384,7 +382,7 @@ int do_server(void) > /* TODO: process data copied from skb's linear > * buffer. > */ > - fprintf(stdout, > + fprintf(stderr, > "SCM_DEVMEM_LINEAR. dmabuf_cmsg->frag_size=%u\n", > dmabuf_cmsg->frag_size); > > @@ -395,12 +393,13 @@ int do_server(void) > token.token_count = 1; > > 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", > - dmabuf_cmsg->frag_offset >> PAGE_SHIFT, > - dmabuf_cmsg->frag_offset % getpagesize(), > - dmabuf_cmsg->frag_offset, dmabuf_cmsg->frag_size, > - dmabuf_cmsg->frag_token, total_received, > - dmabuf_cmsg->dmabuf_id); > + fprintf(stderr, > + "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 >> PAGE_SHIFT, > + dmabuf_cmsg->frag_offset % getpagesize(), > + dmabuf_cmsg->frag_offset, > + dmabuf_cmsg->frag_size, dmabuf_cmsg->frag_token, > + total_received, dmabuf_cmsg->dmabuf_id); > > if (dmabuf_cmsg->dmabuf_id != dmabuf_id) > error(1, 0, > @@ -438,15 +437,15 @@ int do_server(void) > if (!is_devmem) > 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); > > - 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); > > cleanup: > @@ -551,7 +550,7 @@ int main(int argc, char *argv[]) > ifname = optarg; > break; > case '?': > - printf("unknown option: %c\n", optopt); > + fprintf(stderr, "unknown option: %c\n", optopt); > break; > } > } > @@ -559,7 +558,7 @@ int main(int argc, char *argv[]) > ifindex = if_nametoindex(ifname); > > for (; optind < argc; optind++) > - printf("extra arguments: %s\n", argv[optind]); > + fprintf(stderr, "extra arguments: %s\n", argv[optind]); > > run_devmem_tests(); > > -- > 2.46.0 >
diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c index 64d6805381c5..9245d3f158dd 100644 --- a/tools/testing/selftests/net/ncdevmem.c +++ b/tools/testing/selftests/net/ncdevmem.c @@ -88,7 +88,6 @@ void print_nonzero_bytes(void *ptr, size_t size) for (i = 0; i < size; i++) putchar(p[i]); - printf("\n"); } void validate_buffer(void *line, size_t size) @@ -120,7 +119,7 @@ void validate_buffer(void *line, size_t size) char command[256]; \ memset(command, 0, sizeof(command)); \ snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \ - printf("Running: %s\n", command); \ + fprintf(stderr, "Running: %s\n", command); \ system(command); \ }) @@ -128,22 +127,22 @@ static int reset_flow_steering(void) { 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) 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) { - 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"); } 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) @@ -153,7 +152,7 @@ static int configure_channels(unsigned int rx, unsigned int tx) 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); } @@ -187,7 +186,7 @@ static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd, goto err_close; } - printf("got dmabuf id=%d\n", rsp->id); + fprintf(stderr, "got dmabuf id=%d\n", rsp->id); dmabuf_id = rsp->id; netdev_bind_rx_req_free(req); @@ -314,8 +313,8 @@ int do_server(void) if (ret) error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); - printf("binding to address %s:%d\n", server_ip, - ntohs(server_sin.sin_port)); + fprintf(stderr, "binding to address %s:%d\n", server_ip, + ntohs(server_sin.sin_port)); ret = bind(socket_fd, &server_sin, sizeof(server_sin)); if (ret) @@ -329,14 +328,14 @@ int do_server(void) inet_ntop(server_sin.sin_family, &server_sin.sin_addr, buffer, sizeof(buffer)); - printf("Waiting or connection on %s:%d\n", buffer, - ntohs(server_sin.sin_port)); + fprintf(stderr, "Waiting or connection on %s:%d\n", buffer, + ntohs(server_sin.sin_port)); client_fd = accept(socket_fd, &client_addr, &client_addr_len); inet_ntop(client_addr.sin_family, &client_addr.sin_addr, buffer, sizeof(buffer)); - printf("Got connection from %s:%d\n", buffer, - ntohs(client_addr.sin_port)); + fprintf(stderr, "Got connection from %s:%d\n", buffer, + ntohs(client_addr.sin_port)); while (1) { struct iovec iov = { .iov_base = iobuf, @@ -349,14 +348,13 @@ int do_server(void) ssize_t ret; is_devmem = false; - printf("\n\n"); msg.msg_iov = &iov; msg.msg_iovlen = 1; msg.msg_control = ctrl_data; msg.msg_controllen = sizeof(ctrl_data); 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)) continue; if (ret < 0) { @@ -364,7 +362,7 @@ int do_server(void) continue; } if (ret == 0) { - printf("client exited\n"); + fprintf(stderr, "client exited\n"); goto cleanup; } @@ -373,7 +371,7 @@ int do_server(void) if (cm->cmsg_level != SOL_SOCKET || (cm->cmsg_type != SCM_DEVMEM_DMABUF && cm->cmsg_type != SCM_DEVMEM_LINEAR)) { - fprintf(stdout, "skipping non-devmem cmsg\n"); + fprintf(stderr, "skipping non-devmem cmsg\n"); continue; } @@ -384,7 +382,7 @@ int do_server(void) /* TODO: process data copied from skb's linear * buffer. */ - fprintf(stdout, + fprintf(stderr, "SCM_DEVMEM_LINEAR. dmabuf_cmsg->frag_size=%u\n", dmabuf_cmsg->frag_size); @@ -395,12 +393,13 @@ int do_server(void) token.token_count = 1; 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", - dmabuf_cmsg->frag_offset >> PAGE_SHIFT, - dmabuf_cmsg->frag_offset % getpagesize(), - dmabuf_cmsg->frag_offset, dmabuf_cmsg->frag_size, - dmabuf_cmsg->frag_token, total_received, - dmabuf_cmsg->dmabuf_id); + fprintf(stderr, + "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 >> PAGE_SHIFT, + dmabuf_cmsg->frag_offset % getpagesize(), + dmabuf_cmsg->frag_offset, + dmabuf_cmsg->frag_size, dmabuf_cmsg->frag_token, + total_received, dmabuf_cmsg->dmabuf_id); if (dmabuf_cmsg->dmabuf_id != dmabuf_id) error(1, 0, @@ -438,15 +437,15 @@ int do_server(void) if (!is_devmem) 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); - 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); cleanup: @@ -551,7 +550,7 @@ int main(int argc, char *argv[]) ifname = optarg; break; case '?': - printf("unknown option: %c\n", optopt); + fprintf(stderr, "unknown option: %c\n", optopt); break; } } @@ -559,7 +558,7 @@ int main(int argc, char *argv[]) ifindex = if_nametoindex(ifname); for (; optind < argc; optind++) - printf("extra arguments: %s\n", argv[optind]); + fprintf(stderr, "extra arguments: %s\n", argv[optind]); run_devmem_tests();
That should make it possible to do expected payload validation on the caller side. Cc: Mina Almasry <almasrymina@google.com> Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> --- tools/testing/selftests/net/ncdevmem.c | 61 +++++++++++++------------- 1 file changed, 30 insertions(+), 31 deletions(-)