net: netsec: add xdp tx return bulking support (c3bc2adb) · Commits · 戴 / test

drivers/net/ethernet/socionext/netsec.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -631,6 +631,7 @@ static void netsec_set_rx_de(struct netsec_priv *priv,
		static bool netsec_clean_tx_dring(struct netsec_priv *priv)
		{
		struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_TX];
		struct xdp_frame_bulk bq;
		struct netsec_de *entry;
		int tail = dring->tail;
		unsigned int bytes;
		@@ -639,8 +640,11 @@ static bool netsec_clean_tx_dring(struct netsec_priv *priv)
		spin_lock(&dring->lock);

		bytes = 0;
		xdp_frame_bulk_init(&bq);
		entry = dring->vaddr + DESC_SZ * tail;

		rcu_read_lock(); /* need for xdp_return_frame_bulk */

		while (!(entry->attr & (1U << NETSEC_TX_SHIFT_OWN_FIELD)) &&
		cnt < DESC_NUM) {
		struct netsec_desc *desc;
		@@ -665,7 +669,10 @@ static bool netsec_clean_tx_dring(struct netsec_priv *priv)
		dev_kfree_skb(desc->skb);
		} else {
		bytes += desc->xdpf->len;
		xdp_return_frame(desc->xdpf);
		if (desc->buf_type == TYPE_NETSEC_XDP_TX)
		xdp_return_frame_rx_napi(desc->xdpf);
		else
		xdp_return_frame_bulk(desc->xdpf, &bq);
		}
		next:
		/* clean up so netsec_uninit_pkt_dring() won't free the skb
		@@ -684,6 +691,9 @@ next:
		entry = dring->vaddr + DESC_SZ * tail;
		cnt++;
		}
		xdp_flush_frame_bulk(&bq);

		rcu_read_unlock();

		spin_unlock(&dring->lock);