Commit 2e80aeae authored by Praveen Kaligineedi's avatar Praveen Kaligineedi Committed by David S. Miller
Browse files

gve: XDP support GQI-QPL: helper function changes 



This patch adds/modifies helper functions needed to add XDP
support.

Signed-off-by: default avatarPraveen Kaligineedi <pkaligineedi@google.com>
Reviewed-by: default avatarJeroen de Borst <jeroendb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec4040ae

drivers/net/ethernet/google/gve/gve.h

+5 −0
Original line number Diff line number Diff line
@@ -855,6 +855,11 @@ static inline bool gve_is_gqi(struct gve_priv *priv) 
		priv->queue_format == GVE_GQI_QPL_FORMAT;

}



static inline u32 gve_num_tx_queues(struct gve_priv *priv)

{

	return priv->tx_cfg.num_queues;

}



/* buffers */

int gve_alloc_page(struct gve_priv *priv, struct device *dev,

		   struct page **page, dma_addr_t *dma,

drivers/net/ethernet/google/gve/gve_ethtool.c

+17 −9
Original line number Diff line number Diff line
@@ -81,8 +81,10 @@ static void gve_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
{

	struct gve_priv *priv = netdev_priv(netdev);

	char *s = (char *)data;

	int num_tx_queues;

	int i, j;



	num_tx_queues = gve_num_tx_queues(priv);

	switch (stringset) {

	case ETH_SS_STATS:

		memcpy(s, *gve_gstrings_main_stats,
@@ -97,7 +99,7 @@ static void gve_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
			}

		}



		for (i = 0; i < priv->tx_cfg.num_queues; i++) {

		for (i = 0; i < num_tx_queues; i++) {

			for (j = 0; j < NUM_GVE_TX_CNTS; j++) {

				snprintf(s, ETH_GSTRING_LEN,

					 gve_gstrings_tx_stats[j], i);
@@ -124,12 +126,14 @@ static void gve_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
static int gve_get_sset_count(struct net_device *netdev, int sset)

{

	struct gve_priv *priv = netdev_priv(netdev);

	int num_tx_queues;



	num_tx_queues = gve_num_tx_queues(priv);

	switch (sset) {

	case ETH_SS_STATS:

		return GVE_MAIN_STATS_LEN + GVE_ADMINQ_STATS_LEN +

		       (priv->rx_cfg.num_queues * NUM_GVE_RX_CNTS) +

		       (priv->tx_cfg.num_queues * NUM_GVE_TX_CNTS);

		       (num_tx_queues * NUM_GVE_TX_CNTS);

	case ETH_SS_PRIV_FLAGS:

		return GVE_PRIV_FLAGS_STR_LEN;

	default:
@@ -153,18 +157,20 @@ gve_get_ethtool_stats(struct net_device *netdev, 
	struct gve_priv *priv;

	bool skip_nic_stats;

	unsigned int start;

	int num_tx_queues;

	int ring;

	int i, j;



	ASSERT_RTNL();



	priv = netdev_priv(netdev);

	num_tx_queues = gve_num_tx_queues(priv);

	report_stats = priv->stats_report->stats;

	rx_qid_to_stats_idx = kmalloc_array(priv->rx_cfg.num_queues,

					    sizeof(int), GFP_KERNEL);

	if (!rx_qid_to_stats_idx)

		return;

	tx_qid_to_stats_idx = kmalloc_array(priv->tx_cfg.num_queues,

	tx_qid_to_stats_idx = kmalloc_array(num_tx_queues,

					    sizeof(int), GFP_KERNEL);

	if (!tx_qid_to_stats_idx) {

		kfree(rx_qid_to_stats_idx);
@@ -195,7 +201,7 @@ gve_get_ethtool_stats(struct net_device *netdev, 
		}

	}

	for (tx_pkts = 0, tx_bytes = 0, tx_dropped = 0, ring = 0;

	     ring < priv->tx_cfg.num_queues; ring++) {

	     ring < num_tx_queues; ring++) {

		if (priv->tx) {

			do {

				start =
@@ -232,7 +238,7 @@ gve_get_ethtool_stats(struct net_device *netdev, 
	i = GVE_MAIN_STATS_LEN;



	/* For rx cross-reporting stats, start from nic rx stats in report */

	base_stats_idx = GVE_TX_STATS_REPORT_NUM * priv->tx_cfg.num_queues +

	base_stats_idx = GVE_TX_STATS_REPORT_NUM * num_tx_queues +

		GVE_RX_STATS_REPORT_NUM * priv->rx_cfg.num_queues;

	max_stats_idx = NIC_RX_STATS_REPORT_NUM * priv->rx_cfg.num_queues +

		base_stats_idx;
@@ -298,7 +304,7 @@ gve_get_ethtool_stats(struct net_device *netdev, 


	/* For tx cross-reporting stats, start from nic tx stats in report */

	base_stats_idx = max_stats_idx;

	max_stats_idx = NIC_TX_STATS_REPORT_NUM * priv->tx_cfg.num_queues +

	max_stats_idx = NIC_TX_STATS_REPORT_NUM * num_tx_queues +

		max_stats_idx;

	/* Preprocess the stats report for tx, map queue id to start index */

	skip_nic_stats = false;
@@ -316,7 +322,7 @@ gve_get_ethtool_stats(struct net_device *netdev, 
	}

	/* walk TX rings */

	if (priv->tx) {

		for (ring = 0; ring < priv->tx_cfg.num_queues; ring++) {

		for (ring = 0; ring < num_tx_queues; ring++) {

			struct gve_tx_ring *tx = &priv->tx[ring];



			if (gve_is_gqi(priv)) {
@@ -355,7 +361,7 @@ gve_get_ethtool_stats(struct net_device *netdev, 
			}

		}

	} else {

		i += priv->tx_cfg.num_queues * NUM_GVE_TX_CNTS;

		i += num_tx_queues * NUM_GVE_TX_CNTS;

	}



	kfree(rx_qid_to_stats_idx);
@@ -502,7 +508,9 @@ static int gve_set_priv_flags(struct net_device *netdev, u32 flags) 
{

	struct gve_priv *priv = netdev_priv(netdev);

	u64 ori_flags, new_flags;

	int num_tx_queues;



	num_tx_queues = gve_num_tx_queues(priv);

	ori_flags = READ_ONCE(priv->ethtool_flags);

	new_flags = ori_flags;
@@ -522,7 +530,7 @@ static int gve_set_priv_flags(struct net_device *netdev, u32 flags) 
	/* delete report stats timer. */

	if (!(flags & BIT(0)) && (ori_flags & BIT(0))) {

		int tx_stats_num = GVE_TX_STATS_REPORT_NUM *

			priv->tx_cfg.num_queues;

			num_tx_queues;

		int rx_stats_num = GVE_RX_STATS_REPORT_NUM *

			priv->rx_cfg.num_queues;

drivers/net/ethernet/google/gve/gve_main.c

+16 −11
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s) 
	struct gve_priv *priv = netdev_priv(dev);

	unsigned int start;

	u64 packets, bytes;

	int num_tx_queues;

	int ring;



	num_tx_queues = gve_num_tx_queues(priv);

	if (priv->rx) {

		for (ring = 0; ring < priv->rx_cfg.num_queues; ring++) {

			do {
@@ -106,7 +108,7 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s) 
		}

	}

	if (priv->tx) {

		for (ring = 0; ring < priv->tx_cfg.num_queues; ring++) {

		for (ring = 0; ring < num_tx_queues; ring++) {

			do {

				start =

				  u64_stats_fetch_begin(&priv->tx[ring].statss);
@@ -180,7 +182,7 @@ static int gve_alloc_stats_report(struct gve_priv *priv) 
	int tx_stats_num, rx_stats_num;



	tx_stats_num = (GVE_TX_STATS_REPORT_NUM + NIC_TX_STATS_REPORT_NUM) *

		       priv->tx_cfg.num_queues;

		       gve_num_tx_queues(priv);

	rx_stats_num = (GVE_RX_STATS_REPORT_NUM + NIC_RX_STATS_REPORT_NUM) *

		       priv->rx_cfg.num_queues;

	priv->stats_report_len = struct_size(priv->stats_report, stats,
@@ -622,20 +624,21 @@ static int gve_unregister_qpls(struct gve_priv *priv) 


static int gve_create_rings(struct gve_priv *priv)

{

	int num_tx_queues = gve_num_tx_queues(priv);

	int err;

	int i;



	err = gve_adminq_create_tx_queues(priv, priv->tx_cfg.num_queues);

	err = gve_adminq_create_tx_queues(priv, num_tx_queues);

	if (err) {

		netif_err(priv, drv, priv->dev, "failed to create %d tx queues\n",

			  priv->tx_cfg.num_queues);

			  num_tx_queues);

		/* This failure will trigger a reset - no need to clean

		 * up

		 */

		return err;

	}

	netif_dbg(priv, drv, priv->dev, "created %d tx queues\n",

		  priv->tx_cfg.num_queues);

		  num_tx_queues);



	err = gve_adminq_create_rx_queues(priv, priv->rx_cfg.num_queues);

	if (err) {
@@ -675,7 +678,7 @@ static void add_napi_init_sync_stats(struct gve_priv *priv, 
	int i;



	/* Add tx napi & init sync stats*/

	for (i = 0; i < priv->tx_cfg.num_queues; i++) {

	for (i = 0; i < gve_num_tx_queues(priv); i++) {

		int ntfy_idx = gve_tx_idx_to_ntfy(priv, i);



		u64_stats_init(&priv->tx[i].statss);
@@ -753,9 +756,10 @@ static int gve_alloc_rings(struct gve_priv *priv) 


static int gve_destroy_rings(struct gve_priv *priv)

{

	int num_tx_queues = gve_num_tx_queues(priv);

	int err;



	err = gve_adminq_destroy_tx_queues(priv, priv->tx_cfg.num_queues);

	err = gve_adminq_destroy_tx_queues(priv, num_tx_queues);

	if (err) {

		netif_err(priv, drv, priv->dev,

			  "failed to destroy tx queues\n");
@@ -784,11 +788,12 @@ static void gve_rx_free_rings(struct gve_priv *priv) 


static void gve_free_rings(struct gve_priv *priv)

{

	int num_tx_queues = gve_num_tx_queues(priv);

	int ntfy_idx;

	int i;



	if (priv->tx) {

		for (i = 0; i < priv->tx_cfg.num_queues; i++) {

		for (i = 0; i < num_tx_queues; i++) {

			ntfy_idx = gve_tx_idx_to_ntfy(priv, i);

			gve_remove_napi(priv, ntfy_idx);

		}
@@ -1118,7 +1123,7 @@ static void gve_turndown(struct gve_priv *priv) 
		return;



	/* Disable napi to prevent more work from coming in */

	for (idx = 0; idx < priv->tx_cfg.num_queues; idx++) {

	for (idx = 0; idx < gve_num_tx_queues(priv); idx++) {

		int ntfy_idx = gve_tx_idx_to_ntfy(priv, idx);

		struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
@@ -1146,7 +1151,7 @@ static void gve_turnup(struct gve_priv *priv) 
	netif_tx_start_all_queues(priv->dev);



	/* Enable napi and unmask interrupts for all queues */

	for (idx = 0; idx < priv->tx_cfg.num_queues; idx++) {

	for (idx = 0; idx < gve_num_tx_queues(priv); idx++) {

		int ntfy_idx = gve_tx_idx_to_ntfy(priv, idx);

		struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
@@ -1306,7 +1311,7 @@ void gve_handle_report_stats(struct gve_priv *priv) 
	be64_add_cpu(&priv->stats_report->written_count, 1);

	/* tx stats */

	if (priv->tx) {

		for (idx = 0; idx < priv->tx_cfg.num_queues; idx++) {

		for (idx = 0; idx < gve_num_tx_queues(priv); idx++) {

			u32 last_completion = 0;

			u32 tx_frames = 0;

drivers/net/ethernet/google/gve/gve_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static struct sk_buff *gve_rx_skb(struct gve_priv *priv, struct gve_rx_ring *rx, 


	if (len <= priv->rx_copybreak && is_only_frag)  {

		/* Just copy small packets */

		skb = gve_rx_copy(netdev, napi, page_info, len, GVE_RX_PAD);

		skb = gve_rx_copy(netdev, napi, page_info, len);

		if (skb) {

			u64_stats_update_begin(&rx->statss);

			rx->rx_copied_pkt++;

drivers/net/ethernet/google/gve/gve_rx_dqo.c

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static int gve_rx_dqo(struct napi_struct *napi, struct gve_rx_ring *rx, 


	if (eop && buf_len <= priv->rx_copybreak) {

		rx->ctx.skb_head = gve_rx_copy(priv->dev, napi,

					       &buf_state->page_info, buf_len, 0);

					       &buf_state->page_info, buf_len);

		if (unlikely(!rx->ctx.skb_head))

			goto error;

		rx->ctx.skb_tail = rx->ctx.skb_head;