i40e: Fix virtchnl_queue_select bitmap validation (d9d6a9ae) · Commits · 戴 / test

Currently in i40e_vc_disable_queues_msg() we are incorrectly validating the virtchnl queue select bitmaps. The virtchnl_queue_select rx_queues and tx_queue bitmap is being compared against ICE_MAX_VF_QUEUES, but the problem is that these bitmaps can have a value greater than I40E_MAX_VF_QUEUES. Fix this by comparing the bitmaps against BIT(I40E_MAX_VF_QUEUES). Also, add the function i40e_vc_validate_vqs_bitmaps() that checks to see if both virtchnl_queue_select bitmaps are empty along with checking that the bitmaps only have valid bits set. This function can then be used in both the queue enable and disable flows. Suggested-by:

Arkady Gilinksky <arkady.gilinsky@harmonicinc.com> Signed-off-by:

Brett Creeley <brett.creeley@intel.com> Tested-by:

Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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

+18 −4

Original line number	Diff line number	Diff line
		@@ -2321,6 +2321,22 @@ static int i40e_ctrl_vf_rx_rings(struct i40e_vsi *vsi, unsigned long q_map,
		return ret;
		}

		/**
		* i40e_vc_validate_vqs_bitmaps - validate Rx/Tx queue bitmaps from VIRTHCHNL
		* @vqs: virtchnl_queue_select structure containing bitmaps to validate
		*
		* Returns true if validation was successful, else false.
		*/
		static bool i40e_vc_validate_vqs_bitmaps(struct virtchnl_queue_select *vqs)
		{
		if ((!vqs->rx_queues && !vqs->tx_queues) \|\|
		vqs->rx_queues >= BIT(I40E_MAX_VF_QUEUES) \|\|
		vqs->tx_queues >= BIT(I40E_MAX_VF_QUEUES))
		return false;

		return true;
		}

		/**
		* i40e_vc_enable_queues_msg
		* @vf: pointer to the VF info
		@@ -2346,7 +2362,7 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf vf, u8 msg)
		goto error_param;
		}

		if ((0 == vqs->rx_queues) && (0 == vqs->tx_queues)) {
		if (i40e_vc_validate_vqs_bitmaps(vqs)) {
		aq_ret = I40E_ERR_PARAM;
		goto error_param;
		}
		@@ -2408,9 +2424,7 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf vf, u8 msg)
		goto error_param;
		}

		if ((vqs->rx_queues == 0 && vqs->tx_queues == 0) \|\|
		vqs->rx_queues > I40E_MAX_VF_QUEUES \|\|
		vqs->tx_queues > I40E_MAX_VF_QUEUES) {
		if (i40e_vc_validate_vqs_bitmaps(vqs)) {
		aq_ret = I40E_ERR_PARAM;
		goto error_param;
		}

Admin message