ice: save RSS hash configuration for migration

The VF can program the RSS hash configuration over virtchnl. It does this
by sending a u64 bitmask which represents the current hash configuration.

It is not trivial to reverse the hardware configuration back to this hash
set for migration. Instead, save the value to the ice_vf structure when its
modified by the VF.

The rss_hashcfg value is an 8-byte field. Make room for it in ice_vf by
re-arranging some of the existing fields. There is a 4-byte gap after the
first_vector_idx, and a 4-byte gap between max_tx_rate and vf_states. Move
first_vector_idx into the later 4-byte gap, creating an 8 byte area where
rss_hashcfg can be placed. Also move the num_msix field near min_tx_rate,
filling 2 bytes of a 3 byte hole.

The end result of these changes enables placing the rss_hashcfg field into
the structure while also saving 8 bytes in size. It looks like there are a
handful of more possible cleanups to reduce the size even further, but
those have been left as a future cleanup.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Madhu Chittim <madhu.chittim@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index 48cd533e93b74356cabdfa4d79cb9db439b33e1f..c639ce716d32f8bdcbb735d7413ec1ec45ee9bb3 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -1022,6 +1022,9 @@ void ice_initialize_vf_entry(struct ice_vf *vf)
        vf->num_msix = vfs->num_msix_per;
        vf->num_vf_qs = vfs->num_qps_per;
 
+       /* set default RSS hash configuration */
+       vf->rss_hashcfg = ICE_DEFAULT_RSS_HASHCFG;
+
        /* ctrl_vsi_idx will be set to a valid value only when iAVF
         * creates its first fdir rule.
         */

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
index 482f4285fd350f3e1410b3c34eb8fdda43842fcf..a5ee380f8c9e53d6e5ac029b9942db380829a84f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
@@ -106,8 +106,7 @@ struct ice_vf {
        u16 ctrl_vsi_idx;
        struct ice_vf_fdir fdir;
        struct ice_fdir_prof_info fdir_prof_info[ICE_MAX_PTGS];
-       /* first vector index of this VF in the PF space */
-       int first_vector_idx;
+       u64 rss_hashcfg;                /* RSS hash configuration */
        struct ice_sw *vf_sw_id;        /* switch ID the VF VSIs connect to */
        struct virtchnl_version_info vf_ver;
        u32 driver_caps;                /* reported by VF driver */
@@ -126,10 +125,14 @@ struct ice_vf {
        u8 link_up:1;                   /* only valid if VF link is forced */
        u8 lldp_tx_ena:1;
 
+       u16 num_msix;                   /* num of MSI-X configured on this VF */
+
        u32 ptp_caps;
 
        unsigned int min_tx_rate;       /* Minimum Tx bandwidth limit in Mbps */
        unsigned int max_tx_rate;       /* Maximum Tx bandwidth limit in Mbps */
+       /* first vector index of this VF in the PF space */
+       int first_vector_idx;
        DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */
 
        unsigned long vf_caps;          /* VF's adv. capabilities */
@@ -154,7 +157,6 @@ struct ice_vf {
        u16 lldp_recipe_id;
        u16 lldp_rule_id;
 
-       u16 num_msix;                   /* num of MSI-X configured on this VF */
        struct ice_vf_qs_bw qs_bw[ICE_MAX_RSS_QS_PER_VF];
 };
 

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index 24426dcd8aa2a1ffbca78e32b09cb7a6041e3229..0a8f15ecac1f7d6770357a89f1ecdf18c636f88f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -3094,6 +3094,10 @@ static int ice_vc_set_rss_hashcfg(struct ice_vf *vf, u8 *msg)
                v_ret = ice_err_to_virt_err(status);
        }
 
+       /* save the requested VF configuration */
+       if (!v_ret)
+               vf->rss_hashcfg = vrh->hashcfg;
+
        /* send the response to the VF */
 err:
        return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_SET_RSS_HASHCFG, v_ret,