Commit cc71de8f authored by Brett Creeley's avatar Brett Creeley Committed by Tony Nguyen
Browse files

ice: Add support for VIRTCHNL_VF_OFFLOAD_VLAN_V2 



Add support for the VF driver to be able to request
VIRTCHNL_VF_OFFLOAD_VLAN_V2, negotiate its VLAN capabilities via
VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS, add/delete VLAN filters, and
enable/disable VLAN offloads.

VFs supporting VIRTCHNL_OFFLOAD_VLAN_V2 will be able to use the
following virtchnl opcodes:

VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS
VIRTCHNL_OP_ADD_VLAN_V2
VIRTCHNL_OP_DEL_VLAN_V2
VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2
VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2
VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2
VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2

Legacy VF drivers may expect the initial VLAN stripping settings to be
configured by the PF, so the PF initializes VLAN stripping based on the
VIRTCHNL_OP_GET_VF_RESOURCES opcode. However, with VLAN support via
VIRTCHNL_VF_OFFLOAD_VLAN_V2, this function is only expected to be used
for VFs that only support VIRTCHNL_VF_OFFLOAD_VLAN, which will only
be supported when a port VLAN is configured. Update the function
based on the new expectations. Also, change the message when the PF
can't enable/disable VLAN stripping to a dev_dbg() as this isn't fatal.

When a VF isn't in a port VLAN and it only supports
VIRTCHNL_VF_OFFLOAD_VLAN when Double VLAN Mode (DVM) is enabled, then
the PF needs to reject the VIRTCHNL_VF_OFFLOAD_VLAN capability and
configure the VF in software only VLAN mode. To do this add the new
function ice_vf_vsi_cfg_legacy_vlan_mode(), which updates the VF's
inner and outer ice_vsi_vlan_ops functions and sets up software only
VLAN mode.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0d54d8f7

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "ice_base.h"

#include "ice_lib.h"

#include "ice_dcb_lib.h"

#include "ice_virtchnl_pf.h"



static bool ice_alloc_rx_buf_zc(struct ice_rx_ring *rx_ring)

{

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

+115 −0
Original line number Diff line number Diff line
@@ -14,9 +14,20 @@ noop_vlan_arg(struct ice_vsi __always_unused *vsi, 
	return 0;

}



static int

noop_vlan(struct ice_vsi __always_unused *vsi)

{

	return 0;

}



/**

 * ice_vf_vsi_init_vlan_ops - Initialize default VSI VLAN ops for VF VSI

 * @vsi: VF's VSI being configured

 *

 * If Double VLAN Mode (DVM) is enabled, assume that the VF supports the new

 * VIRTCHNL_VF_VLAN_OFFLOAD_V2 capability and set up the VLAN ops accordingly.

 * If SVM is enabled maintain the same level of VLAN support previous to

 * VIRTCHNL_VF_VLAN_OFFLOAD_V2.

 */

void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi)

{
@@ -44,6 +55,20 @@ void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi) 
			vlan_ops = &vsi->inner_vlan_ops;

			vlan_ops->add_vlan = noop_vlan_arg;

			vlan_ops->del_vlan = noop_vlan_arg;

			vlan_ops->ena_stripping = ice_vsi_ena_inner_stripping;

			vlan_ops->dis_stripping = ice_vsi_dis_inner_stripping;

			vlan_ops->ena_insertion = ice_vsi_ena_inner_insertion;

			vlan_ops->dis_insertion = ice_vsi_dis_inner_insertion;

		} else {

			vlan_ops->del_vlan = ice_vsi_del_vlan;

			vlan_ops->ena_stripping = ice_vsi_ena_outer_stripping;

			vlan_ops->dis_stripping = ice_vsi_dis_outer_stripping;

			vlan_ops->ena_insertion = ice_vsi_ena_outer_insertion;

			vlan_ops->dis_insertion = ice_vsi_dis_outer_insertion;



			/* setup inner VLAN ops */

			vlan_ops = &vsi->inner_vlan_ops;



			vlan_ops->ena_stripping = ice_vsi_ena_inner_stripping;

			vlan_ops->dis_stripping = ice_vsi_dis_inner_stripping;

			vlan_ops->ena_insertion = ice_vsi_ena_inner_insertion;
@@ -70,3 +95,93 @@ void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi) 
		}

	}

}



/**

 * ice_vf_vsi_cfg_dvm_legacy_vlan_mode - Config VLAN mode for old VFs in DVM

 * @vsi: VF's VSI being configured

 *

 * This should only be called when Double VLAN Mode (DVM) is enabled, there

 * is not a port VLAN enabled on this VF, and the VF negotiates

 * VIRTCHNL_VF_OFFLOAD_VLAN.

 *

 * This function sets up the VF VSI's inner and outer ice_vsi_vlan_ops and also

 * initializes software only VLAN mode (i.e. allow all VLANs). Also, use no-op

 * implementations for any functions that may be called during the lifetime of

 * the VF so these methods do nothing and succeed.

 */

void ice_vf_vsi_cfg_dvm_legacy_vlan_mode(struct ice_vsi *vsi)

{

	struct ice_vf *vf = &vsi->back->vf[vsi->vf_id];

	struct device *dev = ice_pf_to_dev(vf->pf);

	struct ice_vsi_vlan_ops *vlan_ops;



	if (!ice_is_dvm_ena(&vsi->back->hw) || ice_vf_is_port_vlan_ena(vf))

		return;



	vlan_ops = &vsi->outer_vlan_ops;



	/* Rx VLAN filtering always disabled to allow software offloaded VLANs

	 * for VFs that only support VIRTCHNL_VF_OFFLOAD_VLAN and don't have a

	 * port VLAN configured

	 */

	vlan_ops->dis_rx_filtering = ice_vsi_dis_rx_vlan_filtering;

	/* Don't fail when attempting to enable Rx VLAN filtering */

	vlan_ops->ena_rx_filtering = noop_vlan;



	/* Tx VLAN filtering always disabled to allow software offloaded VLANs

	 * for VFs that only support VIRTCHNL_VF_OFFLOAD_VLAN and don't have a

	 * port VLAN configured

	 */

	vlan_ops->dis_tx_filtering = ice_vsi_dis_tx_vlan_filtering;

	/* Don't fail when attempting to enable Tx VLAN filtering */

	vlan_ops->ena_tx_filtering = noop_vlan;



	if (vlan_ops->dis_rx_filtering(vsi))

		dev_dbg(dev, "Failed to disable Rx VLAN filtering for old VF without VIRTCHNL_VF_OFFLOAD_VLAN_V2 support\n");

	if (vlan_ops->dis_tx_filtering(vsi))

		dev_dbg(dev, "Failed to disable Tx VLAN filtering for old VF without VIRTHCNL_VF_OFFLOAD_VLAN_V2 support\n");



	/* All outer VLAN offloads must be disabled */

	vlan_ops->dis_stripping = ice_vsi_dis_outer_stripping;

	vlan_ops->dis_insertion = ice_vsi_dis_outer_insertion;



	if (vlan_ops->dis_stripping(vsi))

		dev_dbg(dev, "Failed to disable outer VLAN stripping for old VF without VIRTCHNL_VF_OFFLOAD_VLAN_V2 support\n");



	if (vlan_ops->dis_insertion(vsi))

		dev_dbg(dev, "Failed to disable outer VLAN insertion for old VF without VIRTCHNL_VF_OFFLOAD_VLAN_V2 support\n");



	/* All inner VLAN offloads must be disabled */

	vlan_ops = &vsi->inner_vlan_ops;



	vlan_ops->dis_stripping = ice_vsi_dis_outer_stripping;

	vlan_ops->dis_insertion = ice_vsi_dis_outer_insertion;



	if (vlan_ops->dis_stripping(vsi))

		dev_dbg(dev, "Failed to disable inner VLAN stripping for old VF without VIRTCHNL_VF_OFFLOAD_VLAN_V2 support\n");



	if (vlan_ops->dis_insertion(vsi))

		dev_dbg(dev, "Failed to disable inner VLAN insertion for old VF without VIRTCHNL_VF_OFFLOAD_VLAN_V2 support\n");

}



/**

 * ice_vf_vsi_cfg_svm_legacy_vlan_mode - Config VLAN mode for old VFs in SVM

 * @vsi: VF's VSI being configured

 *

 * This should only be called when Single VLAN Mode (SVM) is enabled, there is

 * not a port VLAN enabled on this VF, and the VF negotiates

 * VIRTCHNL_VF_OFFLOAD_VLAN.

 *

 * All of the normal SVM VLAN ops are identical for this case. However, by

 * default Rx VLAN filtering should be turned off by default in this case.

 */

void ice_vf_vsi_cfg_svm_legacy_vlan_mode(struct ice_vsi *vsi)

{

	struct ice_vf *vf = &vsi->back->vf[vsi->vf_id];



	if (ice_is_dvm_ena(&vsi->back->hw) || ice_vf_is_port_vlan_ena(vf))

		return;



	if (vsi->inner_vlan_ops.dis_rx_filtering(vsi))

		dev_dbg(ice_pf_to_dev(vf->pf), "Failed to disable Rx VLAN filtering for old VF with VIRTCHNL_VF_OFFLOAD_VLAN support\n");

}

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 


struct ice_vsi;



void ice_vf_vsi_cfg_dvm_legacy_vlan_mode(struct ice_vsi *vsi);

void ice_vf_vsi_cfg_svm_legacy_vlan_mode(struct ice_vsi *vsi);



#ifdef CONFIG_PCI_IOV

void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi);

#else

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

+10 −0
Original line number Diff line number Diff line
@@ -55,6 +55,15 @@ static const u32 vlan_allowlist_opcodes[] = { 
	VIRTCHNL_OP_ENABLE_VLAN_STRIPPING, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING,

};



/* VIRTCHNL_VF_OFFLOAD_VLAN_V2 */

static const u32 vlan_v2_allowlist_opcodes[] = {

	VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS, VIRTCHNL_OP_ADD_VLAN_V2,

	VIRTCHNL_OP_DEL_VLAN_V2, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2,

	VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2,

	VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2,

	VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2,

};



/* VIRTCHNL_VF_OFFLOAD_RSS_PF */

static const u32 rss_pf_allowlist_opcodes[] = {

	VIRTCHNL_OP_CONFIG_RSS_KEY, VIRTCHNL_OP_CONFIG_RSS_LUT,
@@ -89,6 +98,7 @@ static const struct allowlist_opcode_info allowlist_opcodes[] = { 
	ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_RSS_PF, rss_pf_allowlist_opcodes),

	ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF, adv_rss_pf_allowlist_opcodes),

	ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_FDIR_PF, fdir_pf_allowlist_opcodes),

	ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_VLAN_V2, vlan_v2_allowlist_opcodes),

};



/**

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

+1089 −43

File changed.

Preview size limit exceeded, changes collapsed.