Commit fe1c5ca2 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by David S. Miller
Browse files

ice: implement num_msix field per VF 



Store the amount of MSI-X per VF instead of storing it in pf struct. It
is used to calculate number of q_vectors (and queues) for VF VSI.

This is necessary because with follow up changes the number of MSI-X can
be different between VFs. Use it instead of using pf->vf_msix value in
all cases.

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31642d28

drivers/net/ethernet/intel/ice/ice_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi) 
		 * of queues vectors, subtract 1 (ICE_NONQ_VECS_VF) from the

		 * original vector count

		 */

		vsi->num_q_vectors = pf->vfs.num_msix_per - ICE_NONQ_VECS_VF;

		vsi->num_q_vectors = vf->num_msix - ICE_NONQ_VECS_VF;

		break;

	case ICE_VSI_CTRL:

		vsi->alloc_txq = 1;

drivers/net/ethernet/intel/ice/ice_sriov.c

+9 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void ice_free_vf_res(struct ice_vf *vf) 
		vf->num_mac = 0;

	}



	last_vector_idx = vf->first_vector_idx + pf->vfs.num_msix_per - 1;

	last_vector_idx = vf->first_vector_idx + vf->num_msix - 1;



	/* clear VF MDD event information */

	memset(&vf->mdd_tx_events, 0, sizeof(vf->mdd_tx_events));
@@ -102,7 +102,7 @@ static void ice_dis_vf_mappings(struct ice_vf *vf) 
	wr32(hw, VPINT_ALLOC_PCI(vf->vf_id), 0);



	first = vf->first_vector_idx;

	last = first + pf->vfs.num_msix_per - 1;

	last = first + vf->num_msix - 1;

	for (v = first; v <= last; v++) {

		u32 reg;
@@ -280,12 +280,12 @@ static void ice_ena_vf_msix_mappings(struct ice_vf *vf) 


	hw = &pf->hw;

	pf_based_first_msix = vf->first_vector_idx;

	pf_based_last_msix = (pf_based_first_msix + pf->vfs.num_msix_per) - 1;

	pf_based_last_msix = (pf_based_first_msix + vf->num_msix) - 1;



	device_based_first_msix = pf_based_first_msix +

		pf->hw.func_caps.common_cap.msix_vector_first_id;

	device_based_last_msix =

		(device_based_first_msix + pf->vfs.num_msix_per) - 1;

		(device_based_first_msix + vf->num_msix) - 1;

	device_based_vf_id = vf->vf_id + hw->func_caps.vf_base_id;



	reg = (((device_based_first_msix << VPINT_ALLOC_FIRST_S) &
@@ -825,6 +825,11 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs) 


		pci_dev_get(vfdev);



		/* set default number of MSI-X */

		vf->num_msix = pf->vfs.num_msix_per;

		vf->num_vf_qs = pf->vfs.num_qps_per;

		ice_vc_set_default_allowlist(vf);



		hash_add_rcu(vfs->table, &vf->entry, vf_id);

	}

drivers/net/ethernet/intel/ice/ice_vf_lib.h

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct ice_vfs { 
	struct mutex table_lock;	/* Lock for protecting the hash table */

	u16 num_supported;		/* max supported VFs on this PF */

	u16 num_qps_per;		/* number of queue pairs per VF */

	u16 num_msix_per;		/* number of MSI-X vectors per VF */

	u16 num_msix_per;		/* default MSI-X vectors per VF */

	unsigned long last_printed_mdd_jiffies;	/* MDD message rate limit */

};
@@ -136,6 +136,8 @@ struct ice_vf { 


	/* devlink port data */

	struct devlink_port devlink_port;



	u16 num_msix;			/* num of MSI-X configured on this VF */

};



/* Flags for controlling behavior of ice_reset_vf */

drivers/net/ethernet/intel/ice/ice_virtchnl.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg) 
	vfres->num_vsis = 1;

	/* Tx and Rx queue are equal for VF */

	vfres->num_queue_pairs = vsi->num_txq;

	vfres->max_vectors = vf->pf->vfs.num_msix_per;

	vfres->max_vectors = vf->num_msix;

	vfres->rss_key_size = ICE_VSIQF_HKEY_ARRAY_SIZE;

	vfres->rss_lut_size = ICE_LUT_VSI_SIZE;

	vfres->max_mtu = ice_vc_get_max_frame_size(vf);