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: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index f61002273c3081cb74946101387f8552c6ef1fb5..4b1e56396293a40098ee9956241e3536efd6074e 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -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;

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 4ae59c59e22bcc74f91bb8cffc451541def94589..d345f5d8635baef4357ae22d984de8fb5b8a1ee3 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -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);
        }
 

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
index 628396aa4a04538d9789d936fd1f10a5194d649a..93c774f2f4376e3b024750e009d5b028f288a672 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
@@ -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 */

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index 01e88b6e43a1ece660d09bd4bba3931d8b53e7cd..cdf17b1e2f252bf833eb5743d35a868780885b59 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -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);