| Message ID | 153434503438.22833.15753974916276608956.stgit@firesoul |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] samples/bpf: all XDP samples should unload xdp/bpf prog on SIGTERM | expand |
On Wed, Aug 15, 2018 at 7:57 AM, Jesper Dangaard Brouer <brouer@redhat.com> wrote: > It is common XDP practice to unload/deattach the XDP bpf program, > when the XDP sample program is Ctrl-C interrupted (SIGINT) or > killed (SIGTERM). > > The samples/bpf programs xdp_redirect_cpu and xdp_rxq_info, > forgot to trap signal SIGTERM (which is the default signal used > by the kill command). > > This was discovered by Red Hat QA, which automated scripts depend > on killing the XDP sample program after a timeout period. > > Fixes: fad3917e361b ("samples/bpf: add cpumap sample program xdp_redirect_cpu") > Fixes: 0fca931a6f21 ("samples/bpf: program demonstrating access to xdp_rxq_info") > Reported-by: Jean-Tsung Hsiao <jhsiao@redhat.com> > Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Yonghong Song <yhs@fb.com> > --- > samples/bpf/xdp_redirect_cpu_user.c | 3 ++- > samples/bpf/xdp_rxq_info_user.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-)
On 08/15/2018 05:47 PM, Y Song wrote: > On Wed, Aug 15, 2018 at 7:57 AM, Jesper Dangaard Brouer > <brouer@redhat.com> wrote: >> It is common XDP practice to unload/deattach the XDP bpf program, >> when the XDP sample program is Ctrl-C interrupted (SIGINT) or >> killed (SIGTERM). >> >> The samples/bpf programs xdp_redirect_cpu and xdp_rxq_info, >> forgot to trap signal SIGTERM (which is the default signal used >> by the kill command). >> >> This was discovered by Red Hat QA, which automated scripts depend >> on killing the XDP sample program after a timeout period. >> >> Fixes: fad3917e361b ("samples/bpf: add cpumap sample program xdp_redirect_cpu") >> Fixes: 0fca931a6f21 ("samples/bpf: program demonstrating access to xdp_rxq_info") >> Reported-by: Jean-Tsung Hsiao <jhsiao@redhat.com> >> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> > > Acked-by: Yonghong Song <yhs@fb.com> Applied to bpf, thanks Jesper!
On Wed, Aug 15, 2018 at 8:47 AM, Y Song <ys114321@gmail.com> wrote: > On Wed, Aug 15, 2018 at 7:57 AM, Jesper Dangaard Brouer > <brouer@redhat.com> wrote: >> It is common XDP practice to unload/deattach the XDP bpf program, >> when the XDP sample program is Ctrl-C interrupted (SIGINT) or >> killed (SIGTERM). >> >> The samples/bpf programs xdp_redirect_cpu and xdp_rxq_info, >> forgot to trap signal SIGTERM (which is the default signal used >> by the kill command). >> >> This was discovered by Red Hat QA, which automated scripts depend >> on killing the XDP sample program after a timeout period. >> >> Fixes: fad3917e361b ("samples/bpf: add cpumap sample program xdp_redirect_cpu") >> Fixes: 0fca931a6f21 ("samples/bpf: program demonstrating access to xdp_rxq_info") >> Reported-by: Jean-Tsung Hsiao <jhsiao@redhat.com> >> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> > > Acked-by: Yonghong Song <yhs@fb.com> Reviewed-by: Song Liu <songliubraving@fb.com> > >> --- >> samples/bpf/xdp_redirect_cpu_user.c | 3 ++- >> samples/bpf/xdp_rxq_info_user.c | 3 ++- >> 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c index 9a6c7e0a6dd1..2d23054aaccf 100644 --- a/samples/bpf/xdp_redirect_cpu_user.c +++ b/samples/bpf/xdp_redirect_cpu_user.c @@ -679,8 +679,9 @@ int main(int argc, char **argv) return EXIT_FAIL_OPTION; } - /* Remove XDP program when program is interrupted */ + /* Remove XDP program when program is interrupted or killed */ signal(SIGINT, int_exit); + signal(SIGTERM, int_exit); if (bpf_set_link_xdp_fd(ifindex, prog_fd[prog_num], xdp_flags) < 0) { fprintf(stderr, "link set xdp fd failed\n"); diff --git a/samples/bpf/xdp_rxq_info_user.c b/samples/bpf/xdp_rxq_info_user.c index 248a7eab9531..ef26f882f92f 100644 --- a/samples/bpf/xdp_rxq_info_user.c +++ b/samples/bpf/xdp_rxq_info_user.c @@ -567,8 +567,9 @@ int main(int argc, char **argv) exit(EXIT_FAIL_BPF); } - /* Remove XDP program when program is interrupted */ + /* Remove XDP program when program is interrupted or killed */ signal(SIGINT, int_exit); + signal(SIGTERM, int_exit); if (bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags) < 0) { fprintf(stderr, "link set xdp fd failed\n");
It is common XDP practice to unload/deattach the XDP bpf program, when the XDP sample program is Ctrl-C interrupted (SIGINT) or killed (SIGTERM). The samples/bpf programs xdp_redirect_cpu and xdp_rxq_info, forgot to trap signal SIGTERM (which is the default signal used by the kill command). This was discovered by Red Hat QA, which automated scripts depend on killing the XDP sample program after a timeout period. Fixes: fad3917e361b ("samples/bpf: add cpumap sample program xdp_redirect_cpu") Fixes: 0fca931a6f21 ("samples/bpf: program demonstrating access to xdp_rxq_info") Reported-by: Jean-Tsung Hsiao <jhsiao@redhat.com> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> --- samples/bpf/xdp_redirect_cpu_user.c | 3 ++- samples/bpf/xdp_rxq_info_user.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)