UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'XDP-fixes-for-socionext-driver' 

Lorenzo Bianconi says:

====================
XDP fixes for socionext driver

Fix possible user-after-in XDP rx path
Fix rx statistics accounting if no bpf program is attached
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-01-27 11:05:42 +01:00
parent 09917a126d 02758cb6da
commit 0e6223ea90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/socionext/netsec.c
View File

@ -935,7 +935,6 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)
struct netsec_rx_pkt_info rx_info; struct netsec_rx_pkt_info rx_info;
enum dma_data_direction dma_dir; enum dma_data_direction dma_dir;
struct bpf_prog *xdp_prog; struct bpf_prog *xdp_prog;
struct sk_buff *skb = NULL;
u16 xdp_xmit = 0; u16 xdp_xmit = 0;
u32 xdp_act = 0; u32 xdp_act = 0;
int done = 0; int done = 0;
@ -949,7 +948,8 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)
struct netsec_de *de = dring->vaddr + (DESC_SZ * idx); struct netsec_de *de = dring->vaddr + (DESC_SZ * idx);
struct netsec_desc *desc = &dring->desc[idx]; struct netsec_desc *desc = &dring->desc[idx];
struct page *page = virt_to_page(desc->addr); struct page *page = virt_to_page(desc->addr);
u32 xdp_result = XDP_PASS; u32 xdp_result = NETSEC_XDP_PASS;
struct sk_buff *skb = NULL;
u16 pkt_len, desc_len; u16 pkt_len, desc_len;
dma_addr_t dma_handle; dma_addr_t dma_handle;
struct xdp_buff xdp; struct xdp_buff xdp;