From: Stanislav Fomichev <sdf@fomichev.me>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, andrew+netdev@lunn.ch,
shuah@kernel.org, horms@kernel.org, sdf@fomichev.me,
almasrymina@google.com, willemb@google.com, petrm@nvidia.com
Subject: [PATCH net-next v6 03/12] selftests: ncdevmem: Unify error handling
Date: Wed, 30 Oct 2024 07:27:13 -0700 [thread overview]
Message-ID: <20241030142722.2901744-4-sdf@fomichev.me> (raw)
In-Reply-To: <20241030142722.2901744-1-sdf@fomichev.me>
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 9b3ca6398a9d..b89b62445158 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);
--
2.47.0
next prev parent reply other threads:[~2024-10-30 14:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-30 14:27 [PATCH net-next v6 00/12] selftests: ncdevmem: Add ncdevmem to ksft Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 01/12] selftests: ncdevmem: Redirect all non-payload output to stderr Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 02/12] selftests: ncdevmem: Separate out dmabuf provider Stanislav Fomichev
2024-10-30 14:27 ` Stanislav Fomichev [this message]
2024-10-30 14:27 ` [PATCH net-next v6 04/12] selftests: ncdevmem: Make client_ip optional Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 05/12] selftests: ncdevmem: Remove default arguments Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 06/12] selftests: ncdevmem: Switch to AF_INET6 Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 07/12] selftests: ncdevmem: Properly reset flow steering Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 08/12] selftests: ncdevmem: Use YNL to enable TCP header split Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 09/12] selftests: ncdevmem: Remove hard-coded queue numbers Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 10/12] selftests: ncdevmem: Run selftest when none of the -s or -c has been provided Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 11/12] selftests: ncdevmem: Move ncdevmem under drivers/net/hw Stanislav Fomichev
2024-10-30 14:27 ` [PATCH net-next v6 12/12] selftests: ncdevmem: Add automated test Stanislav Fomichev
2024-10-30 14:59 ` [PATCH net-next v6 00/12] selftests: ncdevmem: Add ncdevmem to ksft Mina Almasry
2024-10-30 15:13 ` Stanislav Fomichev
2024-10-30 15:19 ` Mina Almasry
2024-10-30 15:37 ` Stanislav Fomichev
2024-10-31 16:45 ` Mina Almasry
2024-10-31 17:20 ` Mina Almasry
2024-10-31 19:41 ` Stanislav Fomichev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241030142722.2901744-4-sdf@fomichev.me \
--to=sdf@fomichev.me \
--cc=almasrymina@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=shuah@kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox