* [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument
@ 2021-07-24 15:21 Juhee Kang
2021-07-24 15:21 ` [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore Juhee Kang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Juhee Kang @ 2021-07-24 15:21 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko; +Cc: netdev, bpf
The current behavior of 'tracex7' doesn't consist with other bpf samples
tracex{1..6}. Other samples do not require any argument to run with, but
tracex7 should be run with btrfs device argument. (it should be executed
with test_override_return.sh)
Currently, tracex7 doesn't have any description about how to run this
program and raises an unexpected error. And this result might be
confusing since users might not have a hunch about how to run this
program.
// Current behavior
# ./tracex7
sh: 1: Syntax error: word unexpected (expecting ")")
// Fixed behavior
# ./tracex7
ERROR: Run with the btrfs device argument!
In order to fix this error, this commit adds logic to report a message
and exit when running this program with a missing argument.
Additionally in test_override_return.sh, there is a problem with
multiple directory(tmpmnt) creation. So in this commit adds a line with
removing the directory with every execution.
Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
---
samples/bpf/test_override_return.sh | 1 +
samples/bpf/tracex7_user.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/samples/bpf/test_override_return.sh b/samples/bpf/test_override_return.sh
index e68b9ee6814b..6480b55502c7 100755
--- a/samples/bpf/test_override_return.sh
+++ b/samples/bpf/test_override_return.sh
@@ -1,5 +1,6 @@
#!/bin/bash
+rm -rf tmpmnt
rm -f testfile.img
dd if=/dev/zero of=testfile.img bs=1M seek=1000 count=1
DEVICE=$(losetup --show -f testfile.img)
diff --git a/samples/bpf/tracex7_user.c b/samples/bpf/tracex7_user.c
index fdcd6580dd73..8be7ce18d3ba 100644
--- a/samples/bpf/tracex7_user.c
+++ b/samples/bpf/tracex7_user.c
@@ -14,6 +14,11 @@ int main(int argc, char **argv)
int ret = 0;
FILE *f;
+ if (!argv[1]) {
+ fprintf(stderr, "ERROR: Run with the btrfs device argument!\n");
+ return 0;
+ }
+
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
obj = bpf_object__open_file(filename, NULL);
if (libbpf_get_error(obj)) {
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore
2021-07-24 15:21 [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Juhee Kang
@ 2021-07-24 15:21 ` Juhee Kang
2021-07-26 2:34 ` Yonghong Song
2021-07-26 2:34 ` [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Yonghong Song
2021-07-26 20:08 ` Andrii Nakryiko
2 siblings, 1 reply; 6+ messages in thread
From: Juhee Kang @ 2021-07-24 15:21 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko; +Cc: netdev, bpf
There are recently added xdp samples (xdp_redirect_map_multi and
xdpsock_ctrl_proc) which are not managed by .gitignore.
This commit adds these files to .gitignore.
Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
---
samples/bpf/.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/samples/bpf/.gitignore b/samples/bpf/.gitignore
index 0b9548ea8477..fcba217f0ae2 100644
--- a/samples/bpf/.gitignore
+++ b/samples/bpf/.gitignore
@@ -45,11 +45,13 @@ xdp_monitor
xdp_redirect
xdp_redirect_cpu
xdp_redirect_map
+xdp_redirect_map_multi
xdp_router_ipv4
xdp_rxq_info
xdp_sample_pkts
xdp_tx_iptunnel
xdpsock
+xdpsock_ctrl_proc
xsk_fwd
testfile.img
hbm_out.log
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument
2021-07-24 15:21 [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Juhee Kang
2021-07-24 15:21 ` [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore Juhee Kang
@ 2021-07-26 2:34 ` Yonghong Song
2021-07-26 20:08 ` Andrii Nakryiko
2 siblings, 0 replies; 6+ messages in thread
From: Yonghong Song @ 2021-07-26 2:34 UTC (permalink / raw)
To: Juhee Kang, Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko
Cc: netdev, bpf
On 7/24/21 8:21 AM, Juhee Kang wrote:
> The current behavior of 'tracex7' doesn't consist with other bpf samples
> tracex{1..6}. Other samples do not require any argument to run with, but
> tracex7 should be run with btrfs device argument. (it should be executed
> with test_override_return.sh)
>
> Currently, tracex7 doesn't have any description about how to run this
> program and raises an unexpected error. And this result might be
> confusing since users might not have a hunch about how to run this
> program.
>
> // Current behavior
> # ./tracex7
> sh: 1: Syntax error: word unexpected (expecting ")")
> // Fixed behavior
> # ./tracex7
> ERROR: Run with the btrfs device argument!
>
> In order to fix this error, this commit adds logic to report a message
> and exit when running this program with a missing argument.
>
> Additionally in test_override_return.sh, there is a problem with
> multiple directory(tmpmnt) creation. So in this commit adds a line with
> removing the directory with every execution.
>
> Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
Acked-by: Yonghong Song <yhs@fb.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore
2021-07-24 15:21 ` [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore Juhee Kang
@ 2021-07-26 2:34 ` Yonghong Song
0 siblings, 0 replies; 6+ messages in thread
From: Yonghong Song @ 2021-07-26 2:34 UTC (permalink / raw)
To: Juhee Kang, Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko
Cc: netdev, bpf
On 7/24/21 8:21 AM, Juhee Kang wrote:
> There are recently added xdp samples (xdp_redirect_map_multi and
> xdpsock_ctrl_proc) which are not managed by .gitignore.
>
> This commit adds these files to .gitignore.
>
> Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
Acked-by: Yonghong Song <yhs@fb.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument
2021-07-24 15:21 [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Juhee Kang
2021-07-24 15:21 ` [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore Juhee Kang
2021-07-26 2:34 ` [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Yonghong Song
@ 2021-07-26 20:08 ` Andrii Nakryiko
2021-07-27 3:32 ` Juhee Kang
2 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2021-07-26 20:08 UTC (permalink / raw)
To: Juhee Kang
Cc: Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko, Networking, bpf
On Sat, Jul 24, 2021 at 8:21 AM Juhee Kang <claudiajkang@gmail.com> wrote:
>
> The current behavior of 'tracex7' doesn't consist with other bpf samples
> tracex{1..6}. Other samples do not require any argument to run with, but
> tracex7 should be run with btrfs device argument. (it should be executed
> with test_override_return.sh)
>
> Currently, tracex7 doesn't have any description about how to run this
> program and raises an unexpected error. And this result might be
> confusing since users might not have a hunch about how to run this
> program.
>
> // Current behavior
> # ./tracex7
> sh: 1: Syntax error: word unexpected (expecting ")")
> // Fixed behavior
> # ./tracex7
> ERROR: Run with the btrfs device argument!
>
> In order to fix this error, this commit adds logic to report a message
> and exit when running this program with a missing argument.
>
> Additionally in test_override_return.sh, there is a problem with
> multiple directory(tmpmnt) creation. So in this commit adds a line with
> removing the directory with every execution.
>
> Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
> ---
> samples/bpf/test_override_return.sh | 1 +
> samples/bpf/tracex7_user.c | 5 +++++
> 2 files changed, 6 insertions(+)
>
> diff --git a/samples/bpf/test_override_return.sh b/samples/bpf/test_override_return.sh
> index e68b9ee6814b..6480b55502c7 100755
> --- a/samples/bpf/test_override_return.sh
> +++ b/samples/bpf/test_override_return.sh
> @@ -1,5 +1,6 @@
> #!/bin/bash
>
> +rm -rf tmpmnt
Do we need -rf or -r would do?
> rm -f testfile.img
> dd if=/dev/zero of=testfile.img bs=1M seek=1000 count=1
> DEVICE=$(losetup --show -f testfile.img)
> diff --git a/samples/bpf/tracex7_user.c b/samples/bpf/tracex7_user.c
> index fdcd6580dd73..8be7ce18d3ba 100644
> --- a/samples/bpf/tracex7_user.c
> +++ b/samples/bpf/tracex7_user.c
> @@ -14,6 +14,11 @@ int main(int argc, char **argv)
> int ret = 0;
> FILE *f;
>
> + if (!argv[1]) {
> + fprintf(stderr, "ERROR: Run with the btrfs device argument!\n");
> + return 0;
> + }
> +
> snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
> obj = bpf_object__open_file(filename, NULL);
> if (libbpf_get_error(obj)) {
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument
2021-07-26 20:08 ` Andrii Nakryiko
@ 2021-07-27 3:32 ` Juhee Kang
0 siblings, 0 replies; 6+ messages in thread
From: Juhee Kang @ 2021-07-27 3:32 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko, Networking, bpf
On Tue, Jul 27, 2021 at 5:08 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Sat, Jul 24, 2021 at 8:21 AM Juhee Kang <claudiajkang@gmail.com> wrote:
> >
> > The current behavior of 'tracex7' doesn't consist with other bpf samples
> > tracex{1..6}. Other samples do not require any argument to run with, but
> > tracex7 should be run with btrfs device argument. (it should be executed
> > with test_override_return.sh)
> >
> > Currently, tracex7 doesn't have any description about how to run this
> > program and raises an unexpected error. And this result might be
> > confusing since users might not have a hunch about how to run this
> > program.
> >
> > // Current behavior
> > # ./tracex7
> > sh: 1: Syntax error: word unexpected (expecting ")")
> > // Fixed behavior
> > # ./tracex7
> > ERROR: Run with the btrfs device argument!
> >
> > In order to fix this error, this commit adds logic to report a message
> > and exit when running this program with a missing argument.
> >
> > Additionally in test_override_return.sh, there is a problem with
> > multiple directory(tmpmnt) creation. So in this commit adds a line with
> > removing the directory with every execution.
> >
> > Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
> > ---
> > samples/bpf/test_override_return.sh | 1 +
> > samples/bpf/tracex7_user.c | 5 +++++
> > 2 files changed, 6 insertions(+)
> >
> > diff --git a/samples/bpf/test_override_return.sh b/samples/bpf/test_override_return.sh
> > index e68b9ee6814b..6480b55502c7 100755
> > --- a/samples/bpf/test_override_return.sh
> > +++ b/samples/bpf/test_override_return.sh
> > @@ -1,5 +1,6 @@
> > #!/bin/bash
> >
> > +rm -rf tmpmnt
>
> Do we need -rf or -r would do?
>
It works properly using only -r.
Thanks for pointing it out! I will stick to this method.
I will send the next version as soon as possible.
> > rm -f testfile.img
> > dd if=/dev/zero of=testfile.img bs=1M seek=1000 count=1
> > DEVICE=$(losetup --show -f testfile.img)
> > diff --git a/samples/bpf/tracex7_user.c b/samples/bpf/tracex7_user.c
> > index fdcd6580dd73..8be7ce18d3ba 100644
> > --- a/samples/bpf/tracex7_user.c
> > +++ b/samples/bpf/tracex7_user.c
> > @@ -14,6 +14,11 @@ int main(int argc, char **argv)
> > int ret = 0;
> > FILE *f;
> >
> > + if (!argv[1]) {
> > + fprintf(stderr, "ERROR: Run with the btrfs device argument!\n");
> > + return 0;
> > + }
> > +
> > snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
> > obj = bpf_object__open_file(filename, NULL);
> > if (libbpf_get_error(obj)) {
> > --
> > 2.27.0
> >
--
Best regards,
Juhee Kang
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-27 3:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-24 15:21 [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Juhee Kang
2021-07-24 15:21 ` [bpf-next 2/2] samples: bpf: Add the omitted xdp samples to .gitignore Juhee Kang
2021-07-26 2:34 ` Yonghong Song
2021-07-26 2:34 ` [bpf-next 1/2] samples: bpf: Fix tracex7 error raised on the missing argument Yonghong Song
2021-07-26 20:08 ` Andrii Nakryiko
2021-07-27 3:32 ` Juhee Kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.