[v5] selftests: ncdevmem: Add ncdevmem to ksft

[PATCH net-next v5 03/12] selftests: ncdevmem: Unify error handling

Posted by Stanislav Fomichev 1 month ago

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..07222bfcdb07 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, pton, "%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

Re: [PATCH net-next v5 03/12] selftests: ncdevmem: Unify error handling

Posted by Jakub Kicinski 3 weeks, 5 days ago

On Wed, 23 Oct 2024 08:43:53 -0700 Stanislav Fomichev wrote:
>  	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, pton, "%s: [FAIL, create socket]\n", TEST_PREFIX);

Looks like sched_ext broke our build_tools check, I think I pushed a
fix, but I also see here:

ncdevmem.c: In function ‘do_server’:
ncdevmem.c:343:26: error: ‘pton’ undeclared (first use in this function)
  343 |                 error(1, pton, "%s: [FAIL, create socket]\n", TEST_PREFIX);
      |                          ^~~~
-- 
pw-bot: cr

Re: [PATCH net-next v5 03/12] selftests: ncdevmem: Unify error handling

Posted by Stanislav Fomichev 3 weeks, 5 days ago

On 10/29, Jakub Kicinski wrote:
> On Wed, 23 Oct 2024 08:43:53 -0700 Stanislav Fomichev wrote:
> >  	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, pton, "%s: [FAIL, create socket]\n", TEST_PREFIX);
> 
> Looks like sched_ext broke our build_tools check, I think I pushed a
> fix, but I also see here:
> 
> ncdevmem.c: In function ‘do_server’:
> ncdevmem.c:343:26: error: ‘pton’ undeclared (first use in this function)
>   343 |                 error(1, pton, "%s: [FAIL, create socket]\n", TEST_PREFIX);
>       |                          ^~~~
> -- 
> pw-bot: cr

Oh, thanks, will double check. This looks silly.