From: Jesper Dangaard Brouer <brouer@redhat.com>
To: bpf@vger.kernel.org, Stanislav Fomichev <sdf@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>,
netdev@vger.kernel.org, martin.lau@kernel.org, ast@kernel.org,
daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev,
song@kernel.org, yhs@fb.com, john.fastabend@gmail.com,
dsahern@gmail.com, willemb@google.com, void@manifault.com,
kuba@kernel.org, xdp-hints@xdp-project.net
Subject: [xdp-hints] [PATCH bpf-next V2 3/4] selftests/bpf: xdp_hw_metadata correct status value in error(3)
Date: Wed, 01 Feb 2023 18:32:00 +0100 [thread overview]
Message-ID: <167527272038.937063.9137108142012298120.stgit@firesoul> (raw)
In-Reply-To: <167527267453.937063.6000918625343592629.stgit@firesoul>
The glibc error reporting function error():
void error(int status, int errnum, const char *format, ...);
The status argument should be a positive value between 0-255 as it
is passed over to the exit(3) function as the value as the shell exit
status. The least significant byte of status (i.e., status & 0xFF) is
returned to the shell parent.
Fix this by using 1 instead of -1. As 1 corresponds to C standard
constant EXIT_FAILURE.
Fixes: 297a3f124155 ("selftests/bpf: Simple program to dump XDP RX metadata")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
tools/testing/selftests/bpf/xdp_hw_metadata.c | 28 +++++++++++++------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
index 438083e34cce..58fde35abad7 100644
--- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
+++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
@@ -165,7 +165,7 @@ static void verify_skb_metadata(int fd)
hdr.msg_controllen = sizeof(cmsg_buf);
if (recvmsg(fd, &hdr, 0) < 0)
- error(-1, errno, "recvmsg");
+ error(1, errno, "recvmsg");
for (cmsg = CMSG_FIRSTHDR(&hdr); cmsg != NULL;
cmsg = CMSG_NXTHDR(&hdr, cmsg)) {
@@ -275,11 +275,11 @@ static int rxq_num(const char *ifname)
fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd < 0)
- error(-1, errno, "socket");
+ error(1, errno, "socket");
ret = ioctl(fd, SIOCETHTOOL, &ifr);
if (ret < 0)
- error(-1, errno, "ioctl(SIOCETHTOOL)");
+ error(1, errno, "ioctl(SIOCETHTOOL)");
close(fd);
@@ -296,11 +296,11 @@ static void hwtstamp_ioctl(int op, const char *ifname, struct hwtstamp_config *c
fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd < 0)
- error(-1, errno, "socket");
+ error(1, errno, "socket");
ret = ioctl(fd, op, &ifr);
if (ret < 0)
- error(-1, errno, "ioctl(%d)", op);
+ error(1, errno, "ioctl(%d)", op);
close(fd);
}
@@ -360,7 +360,7 @@ static void timestamping_enable(int fd, int val)
ret = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, &val, sizeof(val));
if (ret < 0)
- error(-1, errno, "setsockopt(SO_TIMESTAMPING)");
+ error(1, errno, "setsockopt(SO_TIMESTAMPING)");
}
int main(int argc, char *argv[])
@@ -386,13 +386,13 @@ int main(int argc, char *argv[])
rx_xsk = malloc(sizeof(struct xsk) * rxq);
if (!rx_xsk)
- error(-1, ENOMEM, "malloc");
+ error(1, ENOMEM, "malloc");
for (i = 0; i < rxq; i++) {
printf("open_xsk(%s, %p, %d)\n", ifname, &rx_xsk[i], i);
ret = open_xsk(ifindex, &rx_xsk[i], i);
if (ret)
- error(-1, -ret, "open_xsk");
+ error(1, -ret, "open_xsk");
printf("xsk_socket__fd() -> %d\n", xsk_socket__fd(rx_xsk[i].socket));
}
@@ -400,7 +400,7 @@ int main(int argc, char *argv[])
printf("open bpf program...\n");
bpf_obj = xdp_hw_metadata__open();
if (libbpf_get_error(bpf_obj))
- error(-1, libbpf_get_error(bpf_obj), "xdp_hw_metadata__open");
+ error(1, libbpf_get_error(bpf_obj), "xdp_hw_metadata__open");
prog = bpf_object__find_program_by_name(bpf_obj->obj, "rx");
bpf_program__set_ifindex(prog, ifindex);
@@ -409,12 +409,12 @@ int main(int argc, char *argv[])
printf("load bpf program...\n");
ret = xdp_hw_metadata__load(bpf_obj);
if (ret)
- error(-1, -ret, "xdp_hw_metadata__load");
+ error(1, -ret, "xdp_hw_metadata__load");
printf("prepare skb endpoint...\n");
server_fd = start_server(AF_INET6, SOCK_DGRAM, NULL, 9092, 1000);
if (server_fd < 0)
- error(-1, errno, "start_server");
+ error(1, errno, "start_server");
timestamping_enable(server_fd,
SOF_TIMESTAMPING_SOFTWARE |
SOF_TIMESTAMPING_RAW_HARDWARE);
@@ -427,7 +427,7 @@ int main(int argc, char *argv[])
printf("map[%d] = %d\n", queue_id, sock_fd);
ret = bpf_map_update_elem(bpf_map__fd(bpf_obj->maps.xsk), &queue_id, &sock_fd, 0);
if (ret)
- error(-1, -ret, "bpf_map_update_elem");
+ error(1, -ret, "bpf_map_update_elem");
}
printf("attach bpf program...\n");
@@ -435,12 +435,12 @@ int main(int argc, char *argv[])
bpf_program__fd(bpf_obj->progs.rx),
XDP_FLAGS, NULL);
if (ret)
- error(-1, -ret, "bpf_xdp_attach");
+ error(1, -ret, "bpf_xdp_attach");
signal(SIGINT, handle_signal);
ret = verify_metadata(rx_xsk, rxq, server_fd);
close(server_fd);
cleanup();
if (ret)
- error(-1, -ret, "verify_metadata");
+ error(1, -ret, "verify_metadata");
}
next prev parent reply other threads:[~2023-02-01 17:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 17:31 [xdp-hints] [PATCH bpf-next V2 0/4] selftests/bpf: xdp_hw_metadata fixes series Jesper Dangaard Brouer
2023-02-01 17:31 ` [xdp-hints] [PATCH bpf-next V2 1/4] selftests/bpf: xdp_hw_metadata clear metadata when -EOPNOTSUPP Jesper Dangaard Brouer
2023-02-01 17:31 ` [xdp-hints] [PATCH bpf-next V2 2/4] selftests/bpf: xdp_hw_metadata cleanup cause segfault Jesper Dangaard Brouer
2023-02-01 17:46 ` [xdp-hints] " Martin KaFai Lau
2023-02-01 17:53 ` Jesper Dangaard Brouer
2023-02-01 17:32 ` Jesper Dangaard Brouer [this message]
2023-02-01 17:32 ` [xdp-hints] [PATCH bpf-next V2 4/4] selftests/bpf: xdp_hw_metadata use strncpy for ifname Jesper Dangaard Brouer
2023-02-01 19:11 ` [xdp-hints] Re: [PATCH bpf-next V2 0/4] selftests/bpf: xdp_hw_metadata fixes series Stanislav Fomichev
2023-02-02 0:00 ` patchwork-bot+netdevbpf
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
List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=167527272038.937063.9137108142012298120.stgit@firesoul \
--to=brouer@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=martin.lau@kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=void@manifault.com \
--cc=willemb@google.com \
--cc=xdp-hints@xdp-project.net \
--cc=yhs@fb.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