| Message ID | 20241104181430.228682-4-sdf@fomichev.me (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests: ncdevmem: Add ncdevmem to ksft | expand |
On Mon, Nov 04, 2024 at 10:14:21AM -0800, Stanislav Fomichev wrote: > There is a bunch of places where error() calls look out of place. > Use the same error(1, errno, ...) pattern everywhere. > > Reviewed-by: Mina Almasry <almasrymina@google.com> > Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> > --- > tools/testing/selftests/net/ncdevmem.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c > index 3e7ef2eedd60..4733d1a0aab5 100644 > --- a/tools/testing/selftests/net/ncdevmem.c > +++ b/tools/testing/selftests/net/ncdevmem.c > @@ -339,33 +339,33 @@ int do_server(struct memory_buffer *mem) > server_sin.sin_port = htons(atoi(port)); > > ret = inet_pton(server_sin.sin_family, server_ip, &server_sin.sin_addr); > - if (socket < 0) > - error(79, 0, "%s: [FAIL, create socket]\n", TEST_PREFIX); > + if (ret < 0) > + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > socket_fd = socket(server_sin.sin_family, SOCK_STREAM, 0); > - if (socket < 0) > - error(errno, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > + if (socket_fd < 0) > + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEPORT, &opt, > sizeof(opt)); > if (ret) > - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &opt, > sizeof(opt)); > if (ret) > - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); A minor nit (definitely not worth re-sending for this on its own): it might be helpful to add which of the sockopts failed to the error message REUSEADDR or REUSEPORT. Reviewed-by: Joe Damato <jdamato@fastly.com>
On 11/04, Joe Damato wrote: > On Mon, Nov 04, 2024 at 10:14:21AM -0800, Stanislav Fomichev wrote: > > There is a bunch of places where error() calls look out of place. > > Use the same error(1, errno, ...) pattern everywhere. > > > > Reviewed-by: Mina Almasry <almasrymina@google.com> > > Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> > > --- > > tools/testing/selftests/net/ncdevmem.c | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c > > index 3e7ef2eedd60..4733d1a0aab5 100644 > > --- a/tools/testing/selftests/net/ncdevmem.c > > +++ b/tools/testing/selftests/net/ncdevmem.c > > @@ -339,33 +339,33 @@ int do_server(struct memory_buffer *mem) > > server_sin.sin_port = htons(atoi(port)); > > > > ret = inet_pton(server_sin.sin_family, server_ip, &server_sin.sin_addr); > > - if (socket < 0) > > - error(79, 0, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > + if (ret < 0) > > + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > > > socket_fd = socket(server_sin.sin_family, SOCK_STREAM, 0); > > - if (socket < 0) > > - error(errno, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > + if (socket_fd < 0) > > + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); > > > > ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEPORT, &opt, > > sizeof(opt)); > > if (ret) > > - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > > > ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &opt, > > sizeof(opt)); > > if (ret) > > - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); > > A minor nit (definitely not worth re-sending for this on its own): > it might be helpful to add which of the sockopts failed to the error > message REUSEADDR or REUSEPORT. > > Reviewed-by: Joe Damato <jdamato@fastly.com> Thank you for the review! I later move these two under enable_reuseaddr and make it even less debuggable :-( Let me maybe keep the calls to error() inside the enable_reuseaddr.
diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c index 3e7ef2eedd60..4733d1a0aab5 100644 --- a/tools/testing/selftests/net/ncdevmem.c +++ b/tools/testing/selftests/net/ncdevmem.c @@ -339,33 +339,33 @@ int do_server(struct memory_buffer *mem) server_sin.sin_port = htons(atoi(port)); ret = inet_pton(server_sin.sin_family, server_ip, &server_sin.sin_addr); - if (socket < 0) - error(79, 0, "%s: [FAIL, create socket]\n", TEST_PREFIX); + if (ret < 0) + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); socket_fd = socket(server_sin.sin_family, SOCK_STREAM, 0); - if (socket < 0) - error(errno, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); + if (socket_fd < 0) + error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX); ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)); if (ret) - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); if (ret) - error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); + error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX); 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) - error(errno, errno, "%s: [FAIL, bind]\n", TEST_PREFIX); + error(1, errno, "%s: [FAIL, bind]\n", TEST_PREFIX); ret = listen(socket_fd, 1); if (ret) - error(errno, errno, "%s: [FAIL, listen]\n", TEST_PREFIX); + error(1, errno, "%s: [FAIL, listen]\n", TEST_PREFIX); client_addr_len = sizeof(client_addr);