xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: simplify xdp_convert_ctx_access for xdp_rxq_info

Browse Source 
As pointed out by Daniel Borkmann, using bpf_target_off() is not
necessary for xdp_rxq_info when extracting queue_index and
ifindex, as these members are u32 like BPF_W.

Also fix trivial spelling mistake introduced in same commit.

Fixes: 02dd3291b2 ("bpf: finally expose xdp_rxq_info to XDP bpf-programs")
Reported-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jesper Dangaard Brouer
2018-01-11 17:39:09 +01:00
committed by Daniel Borkmann
parent 6bd39bc3da
commit daaf24c634
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/bpf.h
View File

@@ -899,7 +899,7 @@ struct xdp_md {
__u32 data; __u32 data;
__u32 data_end; __u32 data_end;
__u32 data_meta; __u32 data_meta;
/* Below access go though struct xdp_rxq_info */ /* Below access go through struct xdp_rxq_info */
__u32 ingress_ifindex; /* rxq->dev->ifindex */ __u32 ingress_ifindex; /* rxq->dev->ifindex */
__u32 rx_queue_index; /* rxq->queue_index */ __u32 rx_queue_index; /* rxq->queue_index */
}; };

7
net/core/filter.c
View File

@@ -4310,16 +4310,15 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type,
si->dst_reg, si->dst_reg, si->dst_reg, si->dst_reg,
offsetof(struct xdp_rxq_info, dev)); offsetof(struct xdp_rxq_info, dev));
*insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->dst_reg, *insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->dst_reg,
bpf_target_off(struct net_device, offsetof(struct net_device, ifindex));
ifindex, 4, target_size));
break; break;
case offsetof(struct xdp_md, rx_queue_index): case offsetof(struct xdp_md, rx_queue_index):
*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct xdp_buff, rxq), *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct xdp_buff, rxq),
si->dst_reg, si->src_reg, si->dst_reg, si->src_reg,
offsetof(struct xdp_buff, rxq)); offsetof(struct xdp_buff, rxq));
*insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->dst_reg, *insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->dst_reg,
bpf_target_off(struct xdp_rxq_info, offsetof(struct xdp_rxq_info,
queue_index, 4, target_size)); queue_index));
break; break;
} }