Commit f8ff1464 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: function to reconfigure RSS queues and rebuild 



This is the second of 3 patches that allows for changing
the number of queues in the driver on the fly.

This patch adds a function that calls the reinit flow for the
main VSI after making changes to the RSS queue count as requested
by the user.

Change-Id: I82dee91e9fe90eeb4e84a7369f4b8b342155dd85
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bc7d338f

drivers/net/ethernet/intel/i40e/i40e.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -199,6 +199,7 @@ struct i40e_pf { 
	u16 num_tc_qps;            /* num queue pairs per TC */

	u16 num_tc_qps;            /* num queue pairs per TC */

	u16 num_lan_qps;           /* num lan queues this pf has set up */

	u16 num_lan_qps;           /* num lan queues this pf has set up */

	u16 num_lan_msix;          /* num queue vectors for the base pf vsi */

	u16 num_lan_msix;          /* num queue vectors for the base pf vsi */

	int queues_left;           /* queues left unclaimed */

	u16 rss_size;              /* num queues in the RSS array */

	u16 rss_size;              /* num queues in the RSS array */

	u16 rss_size_max;          /* HW defined max RSS queues */

	u16 rss_size_max;          /* HW defined max RSS queues */

	u16 fdir_pf_filter_count;  /* num of guaranteed filters for this PF */

	u16 fdir_pf_filter_count;  /* num of guaranteed filters for this PF */
@@ -530,6 +531,7 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
int i40e_vsi_release(struct i40e_vsi *vsi);

int i40e_vsi_release(struct i40e_vsi *vsi);

struct i40e_vsi *i40e_vsi_lookup(struct i40e_pf *pf, enum i40e_vsi_type type,

struct i40e_vsi *i40e_vsi_lookup(struct i40e_pf *pf, enum i40e_vsi_type type,

				 struct i40e_vsi *start_vsi);

				 struct i40e_vsi *start_vsi);

int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count);

struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,

struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,

				u16 downlink_seid, u8 enabled_tc);

				u16 downlink_seid, u8 enabled_tc);

void i40e_veb_release(struct i40e_veb *veb);

void i40e_veb_release(struct i40e_veb *veb);

drivers/net/ethernet/intel/i40e/i40e_main.c

+48 −8
Original line number Original line Diff line number Diff line
@@ -5411,15 +5411,18 @@ static int i40e_init_msix(struct i40e_pf *pf) 
	/* The number of vectors we'll request will be comprised of:

	/* The number of vectors we'll request will be comprised of:

	 *   - Add 1 for "other" cause for Admin Queue events, etc.

	 *   - Add 1 for "other" cause for Admin Queue events, etc.

	 *   - The number of LAN queue pairs

	 *   - The number of LAN queue pairs

	 *        already adjusted for the number of cpus in the system

	 *	- Queues being used for RSS.

	 *        assumes symmetric Tx/Rx pairing

	 *		We don't need as many as max_rss_size vectors.

	 *		use rss_size instead in the calculation since that

	 *		is governed by number of cpus in the system.

	 *	- assumes symmetric Tx/Rx pairing

	 *   - The number of VMDq pairs

	 *   - The number of VMDq pairs

	 * Once we count this up, try the request.

	 * Once we count this up, try the request.

	 *

	 *

	 * If we can't get what we want, we'll simplify to nearly nothing

	 * If we can't get what we want, we'll simplify to nearly nothing

	 * and try again.  If that still fails, we punt.

	 * and try again.  If that still fails, we punt.

	 */

	 */

	pf->num_lan_msix = pf->num_lan_qps;

	pf->num_lan_msix = pf->num_lan_qps - (pf->rss_size_max - pf->rss_size);

	pf->num_vmdq_msix = pf->num_vmdq_qps;

	pf->num_vmdq_msix = pf->num_vmdq_qps;

	v_budget = 1 + pf->num_lan_msix;

	v_budget = 1 + pf->num_lan_msix;

	v_budget += (pf->num_vmdq_vsis * pf->num_vmdq_msix);

	v_budget += (pf->num_vmdq_vsis * pf->num_vmdq_msix);
@@ -5699,6 +5702,42 @@ static int i40e_config_rss(struct i40e_pf *pf) 
	return 0;

	return 0;

}

}





/**

 * i40e_reconfig_rss_queues - change number of queues for rss and rebuild

 * @pf: board private structure

 * @queue_count: the requested queue count for rss.

 *

 * returns 0 if rss is not enabled, if enabled returns the final rss queue

 * count which may be different from the requested queue count.

 **/

int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)

{

	if (!(pf->flags & I40E_FLAG_RSS_ENABLED))

		return 0;



	queue_count = min_t(int, queue_count, pf->rss_size_max);

	queue_count = rounddown_pow_of_two(queue_count);



	if (queue_count != pf->rss_size) {

		if (pf->queues_left < (queue_count - pf->rss_size)) {

			dev_info(&pf->pdev->dev,

				"Not enough queues to do RSS on %d queues: remaining queues %d\n",

				queue_count, pf->queues_left);

			return pf->rss_size;

		}

		i40e_prep_for_reset(pf);



		pf->num_lan_qps += (queue_count - pf->rss_size);

		pf->queues_left -= (queue_count - pf->rss_size);

		pf->rss_size = queue_count;



		i40e_reset_and_rebuild(pf, true);

		i40e_config_rss(pf);

	}

	dev_info(&pf->pdev->dev, "RSS count:  %d\n", pf->rss_size);

	return pf->rss_size;

}



/**

/**

 * i40e_sw_init - Initialize general software structures (struct i40e_pf)

 * i40e_sw_init - Initialize general software structures (struct i40e_pf)

 * @pf: board private structure to initialize

 * @pf: board private structure to initialize
@@ -5880,7 +5919,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	int etherdev_size;

	int etherdev_size;





	etherdev_size = sizeof(struct i40e_netdev_priv);

	etherdev_size = sizeof(struct i40e_netdev_priv);

	netdev = alloc_etherdev_mq(etherdev_size, vsi->num_queue_pairs);

	netdev = alloc_etherdev_mq(etherdev_size, vsi->alloc_queue_pairs);

	if (!netdev)

	if (!netdev)

		return -ENOMEM;

		return -ENOMEM;
@@ -7180,7 +7219,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
		pf->rss_size = i40e_set_rss_size(pf, queues_left);

		pf->rss_size = i40e_set_rss_size(pf, queues_left);





		queues_left -= pf->rss_size;

		queues_left -= pf->rss_size;

		pf->num_lan_qps = pf->rss_size;

		pf->num_lan_qps = pf->rss_size_max;





	} else if (pf->flags & I40E_FLAG_RSS_ENABLED	  &&

	} else if (pf->flags & I40E_FLAG_RSS_ENABLED	  &&

		   !(pf->flags & I40E_FLAG_FDIR_ENABLED)  &&

		   !(pf->flags & I40E_FLAG_FDIR_ENABLED)  &&
@@ -7199,7 +7238,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
			return;

			return;

		}

		}





		pf->num_lan_qps = pf->rss_size + accum_tc_size;

		pf->num_lan_qps = pf->rss_size_max + accum_tc_size;





	} else if (pf->flags & I40E_FLAG_RSS_ENABLED   &&

	} else if (pf->flags & I40E_FLAG_RSS_ENABLED   &&

		  (pf->flags & I40E_FLAG_FDIR_ENABLED) &&

		  (pf->flags & I40E_FLAG_FDIR_ENABLED) &&
@@ -7215,7 +7254,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
			return;

			return;

		}

		}





		pf->num_lan_qps = pf->rss_size;

		pf->num_lan_qps = pf->rss_size_max;





	} else if (pf->flags & I40E_FLAG_RSS_ENABLED   &&

	} else if (pf->flags & I40E_FLAG_RSS_ENABLED   &&

		  (pf->flags & I40E_FLAG_FDIR_ENABLED) &&

		  (pf->flags & I40E_FLAG_FDIR_ENABLED) &&
@@ -7235,7 +7274,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
			return;

			return;

		}

		}





		pf->num_lan_qps = pf->rss_size + accum_tc_size;

		pf->num_lan_qps = pf->rss_size_max + accum_tc_size;





	} else {

	} else {

		dev_info(&pf->pdev->dev,

		dev_info(&pf->pdev->dev,
@@ -7257,6 +7296,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
		queues_left -= (pf->num_vmdq_vsis * pf->num_vmdq_qps);

		queues_left -= (pf->num_vmdq_vsis * pf->num_vmdq_qps);

	}

	}





	pf->queues_left = queues_left;

	return;

	return;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE