Commit 7d1643eb authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by David S. Miller
Browse files

net: mvneta: drop all fragments in XDP_DROP 



Release all consumed pages if the eBPF program returns XDP_DROP for XDP
multi-buffers

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afda408b

drivers/net/ethernet/marvell/mvneta.c

+12 −14
Original line number Diff line number Diff line
@@ -2172,13 +2172,13 @@ mvneta_xdp_xmit(struct net_device *dev, int num_frame, 
static int

mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,

	       struct bpf_prog *prog, struct xdp_buff *xdp,

	       struct mvneta_stats *stats)

	       u32 frame_sz, struct mvneta_stats *stats)

{

	unsigned int len, sync;

	struct page *page;

	unsigned int len, data_len, sync;

	u32 ret, act;



	len = xdp->data_end - xdp->data_hard_start - pp->rx_offset_correction;

	data_len = xdp->data_end - xdp->data;

	act = bpf_prog_run_xdp(prog, xdp);



	/* Due xdp_adjust_tail: DMA sync for_device cover max len CPU touch */
@@ -2194,9 +2194,8 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, 


		err = xdp_do_redirect(pp->dev, xdp, prog);

		if (unlikely(err)) {

			mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);

			ret = MVNETA_XDP_DROPPED;

			page = virt_to_head_page(xdp->data);

			page_pool_put_page(rxq->page_pool, page, sync, true);

		} else {

			ret = MVNETA_XDP_REDIR;

			stats->xdp_redirect++;
@@ -2205,10 +2204,8 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, 
	}

	case XDP_TX:

		ret = mvneta_xdp_xmit_back(pp, xdp);

		if (ret != MVNETA_XDP_TX) {

			page = virt_to_head_page(xdp->data);

			page_pool_put_page(rxq->page_pool, page, sync, true);

		}

		if (ret != MVNETA_XDP_TX)

			mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);

		break;

	default:

		bpf_warn_invalid_xdp_action(act);
@@ -2217,14 +2214,13 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, 
		trace_xdp_exception(pp->dev, prog, act);

		/* fall through */

	case XDP_DROP:

		page = virt_to_head_page(xdp->data);

		page_pool_put_page(rxq->page_pool, page, sync, true);

		mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);

		ret = MVNETA_XDP_DROPPED;

		stats->xdp_drop++;

		break;

	}



	stats->rx_bytes += xdp->data_end - xdp->data;

	stats->rx_bytes += frame_sz + xdp->data_end - xdp->data - data_len;

	stats->rx_packets++;



	return ret;
@@ -2355,7 +2351,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, 
	};

	struct mvneta_stats ps = {};

	struct bpf_prog *xdp_prog;

	u32 desc_status;

	u32 desc_status, frame_sz;



	/* Get number of received packets */

	rx_todo = mvneta_rxq_busy_desc_num_get(pp, rxq);
@@ -2384,7 +2380,9 @@ static int mvneta_rx_swbm(struct napi_struct *napi, 
				goto next;

			}



			frame_sz = rx_desc->data_size - ETH_FCS_LEN;

			desc_status = rx_desc->status;



			mvneta_swbm_rx_frame(pp, rx_desc, rxq, &xdp_buf, page,

					     &ps);

		} else {
@@ -2406,7 +2404,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, 
		}



		if (xdp_prog &&

		    mvneta_run_xdp(pp, rxq, xdp_prog, &xdp_buf, &ps))

		    mvneta_run_xdp(pp, rxq, xdp_prog, &xdp_buf, frame_sz, &ps))

			goto next;



		skb = mvneta_swbm_build_skb(pp, rxq, &xdp_buf, desc_status);

CRA Git | Maintained and supported by SUSTech CRA and CCSE