Commit b43471cc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mana-XDP-counters' 



Haiyang Zhang says:

====================
net: mana: Add XDP counters, reuse dropped pages

Add drop, tx counters for XDP.
Reuse dropped pages
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 780bf05f a6bf5703

drivers/net/ethernet/microsoft/mana/mana.h

+12 −3
Original line number Diff line number Diff line
@@ -48,7 +48,15 @@ enum TRI_STATE { 


#define MAX_PORTS_IN_MANA_DEV 256



struct mana_stats {

struct mana_stats_rx {

	u64 packets;

	u64 bytes;

	u64 xdp_drop;

	u64 xdp_tx;

	struct u64_stats_sync syncp;

};



struct mana_stats_tx {

	u64 packets;

	u64 bytes;

	struct u64_stats_sync syncp;
@@ -76,7 +84,7 @@ struct mana_txq { 


	atomic_t pending_sends;



	struct mana_stats stats;

	struct mana_stats_tx stats;

};



/* skb data and frags dma mappings */
@@ -298,10 +306,11 @@ struct mana_rxq { 


	u32 buf_index;



	struct mana_stats stats;

	struct mana_stats_rx stats;



	struct bpf_prog __rcu *bpf_prog;

	struct xdp_rxq_info xdp_rxq;

	struct page *xdp_save_page;



	/* MUST BE THE LAST MEMBER:

	 * Each receive buffer has an associated mana_recv_buf_oob.

drivers/net/ethernet/microsoft/mana/mana_en.c

+41 −19
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
	bool ipv4 = false, ipv6 = false;

	struct mana_tx_package pkg = {};

	struct netdev_queue *net_txq;

	struct mana_stats *tx_stats;

	struct mana_stats_tx *tx_stats;

	struct gdma_queue *gdma_sq;

	unsigned int csum_type;

	struct mana_txq *txq;
@@ -299,7 +299,8 @@ static void mana_get_stats64(struct net_device *ndev, 
{

	struct mana_port_context *apc = netdev_priv(ndev);

	unsigned int num_queues = apc->num_queues;

	struct mana_stats *stats;

	struct mana_stats_rx *rx_stats;

	struct mana_stats_tx *tx_stats;

	unsigned int start;

	u64 packets, bytes;

	int q;
@@ -310,26 +311,26 @@ static void mana_get_stats64(struct net_device *ndev, 
	netdev_stats_to_stats64(st, &ndev->stats);



	for (q = 0; q < num_queues; q++) {

		stats = &apc->rxqs[q]->stats;

		rx_stats = &apc->rxqs[q]->stats;



		do {

			start = u64_stats_fetch_begin_irq(&stats->syncp);

			packets = stats->packets;

			bytes = stats->bytes;

		} while (u64_stats_fetch_retry_irq(&stats->syncp, start));

			start = u64_stats_fetch_begin_irq(&rx_stats->syncp);

			packets = rx_stats->packets;

			bytes = rx_stats->bytes;

		} while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));



		st->rx_packets += packets;

		st->rx_bytes += bytes;

	}



	for (q = 0; q < num_queues; q++) {

		stats = &apc->tx_qp[q].txq.stats;

		tx_stats = &apc->tx_qp[q].txq.stats;



		do {

			start = u64_stats_fetch_begin_irq(&stats->syncp);

			packets = stats->packets;

			bytes = stats->bytes;

		} while (u64_stats_fetch_retry_irq(&stats->syncp, start));

			start = u64_stats_fetch_begin_irq(&tx_stats->syncp);

			packets = tx_stats->packets;

			bytes = tx_stats->bytes;

		} while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));



		st->tx_packets += packets;

		st->tx_bytes += bytes;
@@ -986,7 +987,7 @@ static struct sk_buff *mana_build_skb(void *buf_va, uint pkt_len, 
static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,

			struct mana_rxq *rxq)

{

	struct mana_stats *rx_stats = &rxq->stats;

	struct mana_stats_rx *rx_stats = &rxq->stats;

	struct net_device *ndev = rxq->ndev;

	uint pkt_len = cqe->ppi[0].pkt_len;

	u16 rxq_idx = rxq->rxq_idx;
@@ -1007,7 +1008,7 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe, 
	act = mana_run_xdp(ndev, rxq, &xdp, buf_va, pkt_len);



	if (act != XDP_PASS && act != XDP_TX)

		goto drop;

		goto drop_xdp;



	skb = mana_build_skb(buf_va, pkt_len, &xdp);
@@ -1034,6 +1035,14 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe, 
			skb_set_hash(skb, hash_value, PKT_HASH_TYPE_L3);

	}



	u64_stats_update_begin(&rx_stats->syncp);

	rx_stats->packets++;

	rx_stats->bytes += pkt_len;



	if (act == XDP_TX)

		rx_stats->xdp_tx++;

	u64_stats_update_end(&rx_stats->syncp);



	if (act == XDP_TX) {

		skb_set_queue_mapping(skb, rxq_idx);

		mana_xdp_tx(skb, ndev);
@@ -1042,15 +1051,19 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe, 


	napi_gro_receive(napi, skb);



	return;



drop_xdp:

	u64_stats_update_begin(&rx_stats->syncp);

	rx_stats->packets++;

	rx_stats->bytes += pkt_len;

	rx_stats->xdp_drop++;

	u64_stats_update_end(&rx_stats->syncp);

	return;



drop:

	free_page((unsigned long)buf_va);

	WARN_ON_ONCE(rxq->xdp_save_page);

	rxq->xdp_save_page = virt_to_page(buf_va);



	++ndev->stats.rx_dropped;



	return;

}
@@ -1105,7 +1118,13 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, 
	rxbuf_oob = &rxq->rx_oobs[curr];

	WARN_ON_ONCE(rxbuf_oob->wqe_inf.wqe_size_in_bu != 1);



	/* Reuse XDP dropped page if available */

	if (rxq->xdp_save_page) {

		new_page = rxq->xdp_save_page;

		rxq->xdp_save_page = NULL;

	} else {

		new_page = alloc_page(GFP_ATOMIC);

	}



	if (new_page) {

		da = dma_map_page(dev, new_page, XDP_PACKET_HEADROOM, rxq->datasize,
@@ -1392,6 +1411,9 @@ static void mana_destroy_rxq(struct mana_port_context *apc, 


	mana_deinit_cq(apc, &rxq->rx_cq);



	if (rxq->xdp_save_page)

		__free_page(rxq->xdp_save_page);



	for (i = 0; i < rxq->num_rx_buf; i++) {

		rx_oob = &rxq->rx_oobs[i];

drivers/net/ethernet/microsoft/mana/mana_ethtool.c

+23 −12
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static int mana_get_sset_count(struct net_device *ndev, int stringset) 
	if (stringset != ETH_SS_STATS)

		return -EINVAL;



	return ARRAY_SIZE(mana_eth_stats) + num_queues * 4;

	return ARRAY_SIZE(mana_eth_stats) + num_queues * 6;

}



static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
@@ -46,6 +46,10 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data) 
		p += ETH_GSTRING_LEN;

		sprintf(p, "rx_%d_bytes", i);

		p += ETH_GSTRING_LEN;

		sprintf(p, "rx_%d_xdp_drop", i);

		p += ETH_GSTRING_LEN;

		sprintf(p, "rx_%d_xdp_tx", i);

		p += ETH_GSTRING_LEN;

	}



	for (i = 0; i < num_queues; i++) {
@@ -62,9 +66,12 @@ static void mana_get_ethtool_stats(struct net_device *ndev, 
	struct mana_port_context *apc = netdev_priv(ndev);

	unsigned int num_queues = apc->num_queues;

	void *eth_stats = &apc->eth_stats;

	struct mana_stats *stats;

	struct mana_stats_rx *rx_stats;

	struct mana_stats_tx *tx_stats;

	unsigned int start;

	u64 packets, bytes;

	u64 xdp_drop;

	u64 xdp_tx;

	int q, i = 0;



	if (!apc->port_is_up)
@@ -74,26 +81,30 @@ static void mana_get_ethtool_stats(struct net_device *ndev, 
		data[i++] = *(u64 *)(eth_stats + mana_eth_stats[q].offset);



	for (q = 0; q < num_queues; q++) {

		stats = &apc->rxqs[q]->stats;

		rx_stats = &apc->rxqs[q]->stats;



		do {

			start = u64_stats_fetch_begin_irq(&stats->syncp);

			packets = stats->packets;

			bytes = stats->bytes;

		} while (u64_stats_fetch_retry_irq(&stats->syncp, start));

			start = u64_stats_fetch_begin_irq(&rx_stats->syncp);

			packets = rx_stats->packets;

			bytes = rx_stats->bytes;

			xdp_drop = rx_stats->xdp_drop;

			xdp_tx = rx_stats->xdp_tx;

		} while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));



		data[i++] = packets;

		data[i++] = bytes;

		data[i++] = xdp_drop;

		data[i++] = xdp_tx;

	}



	for (q = 0; q < num_queues; q++) {

		stats = &apc->tx_qp[q].txq.stats;

		tx_stats = &apc->tx_qp[q].txq.stats;



		do {

			start = u64_stats_fetch_begin_irq(&stats->syncp);

			packets = stats->packets;

			bytes = stats->bytes;

		} while (u64_stats_fetch_retry_irq(&stats->syncp, start));

			start = u64_stats_fetch_begin_irq(&tx_stats->syncp);

			packets = tx_stats->packets;

			bytes = tx_stats->bytes;

		} while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));



		data[i++] = packets;

		data[i++] = bytes;