samples: bpf: Fix tracex7 error raised on the missing argument
Subsystems (3)
PATCH v2 1/2 samples: bpf: Fix tracex7 error raised on the missing argument
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.
---
Change in v2:
- change directory remove option from -rf to -r
samples/bpf/test_override_return.sh | 1 + samples/bpf/tracex7_user.c | 5 +++++ 2 files changed, 6 insertions(+)
samples/bpf/test_override_return.sh +1 -0
@@ -1,5 +1,6 @@ #!/bin/bash +rm -r tmpmnt rm -f testfile.img dd if=/dev/zero of=testfile.img bs=1M seek=1000 count=1 DEVICE=$(losetup --show -f testfile.img)
samples/bpf/tracex7_user.c +5 -0
@@ -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)) {
Signature · 1 line
2.27.0
PATCH v2 2/2 samples: bpf: Add the omitted xdp samples to .gitignore
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.
--- samples/bpf/.gitignore | 2 ++ 1 file changed, 2 insertions(+)
samples/bpf/.gitignore +2 -0
@@ -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
Signature · 1 line
2.27.0
This series was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This series was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 11 lines · On Tue, 27 Jul 2021 04:10:55 +0000 you 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.
[...]
Here is the summary with links:
- [bpf-next,v2,1/2] samples: bpf: Fix tracex7 error raised on the missing argument
https://git.kernel.org/bpf/bpf-next/c/7d07006f0592 - [bpf-next,v2,2/2] samples: bpf: Add the omitted xdp samples to .gitignore https://git.kernel.org/bpf/bpf-next/c/05e9b4f60d31
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html