redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

samples/bpf: fix XDP_FLAGS_SKB_MODE detach for xdp_tx_iptunnel 

The xdp_tx_iptunnel program can be terminated in two ways, after
N-seconds or via Ctrl-C SIGINT.  The SIGINT code path does not
handle detatching the correct XDP program, in-case the program
was attached with XDP_FLAGS_SKB_MODE.

Fix this by storing the XDP flags as a global variable, which is
available for the SIGINT handler function.

Fixes: 3993f2cb98 ("samples/bpf: Add support for SKB_MODE to xdp1 and xdp_tx_iptunnel")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
Jesper Dangaard Brouer 2017-05-01 11:26:20 +02:00 committed by David S. Miller
parent 6387d0111c
commit f76254a845
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/bpf/xdp_tx_iptunnel_user.c
View File

@ -25,11 +25,12 @@
#define STATS_INTERVAL_S 2U
static int ifindex = -1;
static __u32 xdp_flags = 0;
static void int_exit(int sig)
{
if (ifindex > -1)
set_link_xdp_fd(ifindex, -1, 0);
set_link_xdp_fd(ifindex, -1, xdp_flags);
exit(0);
}
@ -142,7 +143,6 @@ int main(int argc, char **argv)
struct iptnl_info tnl = {};
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
struct vip vip = {};
__u32 xdp_flags = 0;
char filename[256];
int opt;
int i;