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

ice: Refactor spoofcheck configuration functions 



Add functions to configure Tx VLAN antispoof based on iproute
configuration and/or VLAN mode and VF driver support. This is needed
later so the driver can control when it can be configured. Also, add
functions that can be used to enable and disable MAC and VLAN
spoofcheck. Move spoofchk configuration during VSI setup into the
SR-IOV initialization path and into the post VSI rebuild flow for VF
VSIs.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1710b52d

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

+0 −19
Original line number Diff line number Diff line
@@ -1168,25 +1168,6 @@ static int ice_vsi_init(struct ice_vsi *vsi, bool init_vsi) 
				cpu_to_le16(ICE_AQ_VSI_PROP_RXQ_MAP_VALID);

	}



	/* enable/disable MAC and VLAN anti-spoof when spoofchk is on/off

	 * respectively

	 */

	if (vsi->type == ICE_VSI_VF) {

		ctxt->info.valid_sections |=

			cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);

		if (pf->vf[vsi->vf_id].spoofchk) {

			ctxt->info.sec_flags |=

				ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF |

				(ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

				 ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S);

		} else {

			ctxt->info.sec_flags &=

				~(ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF |

				  (ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

				   ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S));

		}

	}



	/* Allow control frames out of main VSI */

	if (vsi->type == ICE_VSI_PF) {

		ctxt->info.sec_flags |= ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD;

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

+128 −31
Original line number Diff line number Diff line
@@ -837,6 +837,114 @@ static int ice_vf_rebuild_host_vlan_cfg(struct ice_vf *vf) 
	return 0;

}



static int ice_cfg_vlan_antispoof(struct ice_vsi *vsi, bool enable)

{

	struct ice_vsi_ctx *ctx;

	int err;



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

		return -ENOMEM;



	ctx->info.sec_flags = vsi->info.sec_flags;

	ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);



	if (enable)

		ctx->info.sec_flags |= ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

			ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S;

	else

		ctx->info.sec_flags &= ~(ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

					 ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S);



	err = ice_update_vsi(&vsi->back->hw, vsi->idx, ctx, NULL);

	if (err)

		dev_err(ice_pf_to_dev(vsi->back), "Failed to configure Tx VLAN anti-spoof %s for VSI %d, error %d\n",

			enable ? "ON" : "OFF", vsi->vsi_num, err);

	else

		vsi->info.sec_flags = ctx->info.sec_flags;



	kfree(ctx);



	return err;

}



static int ice_cfg_mac_antispoof(struct ice_vsi *vsi, bool enable)

{

	struct ice_vsi_ctx *ctx;

	int err;



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

		return -ENOMEM;



	ctx->info.sec_flags = vsi->info.sec_flags;

	ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);



	if (enable)

		ctx->info.sec_flags |= ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;

	else

		ctx->info.sec_flags &= ~ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;



	err = ice_update_vsi(&vsi->back->hw, vsi->idx, ctx, NULL);

	if (err)

		dev_err(ice_pf_to_dev(vsi->back), "Failed to configure Tx MAC anti-spoof %s for VSI %d, error %d\n",

			enable ? "ON" : "OFF", vsi->vsi_num, err);

	else

		vsi->info.sec_flags = ctx->info.sec_flags;



	kfree(ctx);



	return err;

}



/**

 * ice_vsi_ena_spoofchk - enable Tx spoof checking for this VSI

 * @vsi: VSI to enable Tx spoof checking for

 */

static int ice_vsi_ena_spoofchk(struct ice_vsi *vsi)

{

	int err;



	err = ice_cfg_vlan_antispoof(vsi, true);

	if (err)

		return err;



	return ice_cfg_mac_antispoof(vsi, true);

}



/**

 * ice_vsi_dis_spoofchk - disable Tx spoof checking for this VSI

 * @vsi: VSI to disable Tx spoof checking for

 */

static int ice_vsi_dis_spoofchk(struct ice_vsi *vsi)

{

	int err;



	err = ice_cfg_vlan_antispoof(vsi, false);

	if (err)

		return err;



	return ice_cfg_mac_antispoof(vsi, false);

}



/**

 * ice_vf_set_spoofchk_cfg - apply Tx spoof checking setting

 * @vf: VF set spoofchk for

 * @vsi: VSI associated to the VF

 */

static int

ice_vf_set_spoofchk_cfg(struct ice_vf *vf, struct ice_vsi *vsi)

{

	int err;



	if (vf->spoofchk)

		err = ice_vsi_ena_spoofchk(vsi);

	else

		err = ice_vsi_dis_spoofchk(vsi);



	return err;

}



/**

 * ice_vf_rebuild_host_mac_cfg - add broadcast and the VF's perm_addr/LAA

 * @vf: VF to add MAC filters for
@@ -1346,6 +1454,10 @@ static void ice_vf_rebuild_host_cfg(struct ice_vf *vf) 
		dev_err(dev, "failed to rebuild Tx rate limiting configuration for VF %u\n",

			vf->vf_id);



	if (ice_vf_set_spoofchk_cfg(vf, vsi))

		dev_err(dev, "failed to rebuild spoofchk configuration for VF %d\n",

			vf->vf_id);



	/* rebuild aggregator node config for main VF VSI */

	ice_vf_rebuild_aggregator_node_cfg(vsi);

}
@@ -1760,6 +1872,13 @@ static int ice_init_vf_vsi_res(struct ice_vf *vf) 
		goto release_vsi;

	}



	err = ice_vf_set_spoofchk_cfg(vf, vsi);

	if (err) {

		dev_warn(dev, "Failed to initialize spoofchk setting for VF %d\n",

			 vf->vf_id);

		goto release_vsi;

	}



	vf->num_mac = 1;



	return 0;
@@ -2892,7 +3011,6 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) 
{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_pf *pf = np->vsi->back;

	struct ice_vsi_ctx *ctx;

	struct ice_vsi *vf_vsi;

	struct device *dev;

	struct ice_vf *vf;
@@ -2925,37 +3043,16 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) 
		return 0;

	}



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

		return -ENOMEM;



	ctx->info.sec_flags = vf_vsi->info.sec_flags;

	ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);

	if (ena) {

		ctx->info.sec_flags |=

			ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF |

			(ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

			 ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S);

	} else {

		ctx->info.sec_flags &=

			~(ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF |

			  (ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<

			   ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S));

	}



	ret = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);

	if (ret) {

		dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d\n",

			ena ? "en" : "dis", vf->vf_id, vf_vsi->vsi_num, ret);

		goto out;

	}



	/* only update spoofchk state and VSI context on success */

	vf_vsi->info.sec_flags = ctx->info.sec_flags;

	if (ena)

		ret = ice_vsi_ena_spoofchk(vf_vsi);

	else

		ret = ice_vsi_dis_spoofchk(vf_vsi);

	if (ret)

		dev_err(dev, "Failed to set spoofchk %s for VF %d VSI %d\n error %d\n",

			ena ? "ON" : "OFF", vf->vf_id, vf_vsi->vsi_num, ret);

	else

		vf->spoofchk = ena;



out:

	kfree(ctx);

	return ret;

}