Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77f192af authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: consolidate the configuration of spoof checking 



Consolidate the logic behind configuring spoof checking:

Move the setting of the MAC, VLAN and Ethertype spoof checking into
ixgbe_ndo_set_vf_spoofchk().

Change ixgbe_set_mac_anti_spoofing() to set MAC spoofing per VF similar
to the VLAN and Ethertype functions - this allows us to call the helper
functions in ixgbe_ndo_set_vf_spoofchk() for all spoof check types and
only disable MAC spoof checking when creating MACVLAN.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 10d3be56

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+11 −29
Original line number Diff line number Diff line
@@ -3310,43 +3310,25 @@ s32 ixgbe_get_wwn_prefix_generic(struct ixgbe_hw *hw, u16 *wwnn_prefix, 
/**

 *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing

 *  @hw: pointer to hardware structure

 *  @enable: enable or disable switch for anti-spoofing

 *  @pf: Physical Function pool - do not enable anti-spoofing for the PF

 *  @enable: enable or disable switch for MAC anti-spoofing

 *  @vf: Virtual Function pool - VF Pool to set for MAC anti-spoofing

 *

 **/

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf)

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)

{

	int j;

	int pf_target_reg = pf >> 3;

	int pf_target_shift = pf % 8;

	u32 pfvfspoof = 0;

	int vf_target_reg = vf >> 3;

	int vf_target_shift = vf % 8;

	u32 pfvfspoof;



	if (hw->mac.type == ixgbe_mac_82598EB)

		return;



	pfvfspoof = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));

	if (enable)

		pfvfspoof = IXGBE_SPOOF_MACAS_MASK;



	/*

	 * PFVFSPOOF register array is size 8 with 8 bits assigned to

	 * MAC anti-spoof enables in each register array element.

	 */

	for (j = 0; j < pf_target_reg; j++)

		IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(j), pfvfspoof);



	/*

	 * The PF should be allowed to spoof so that it can support

	 * emulation mode NICs.  Do not set the bits assigned to the PF

	 */

	pfvfspoof &= (1 << pf_target_shift) - 1;

	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(j), pfvfspoof);



	/*

	 * Remaining pools belong to the PF so they do not need to have

	 * anti-spoofing enabled.

	 */

	for (j++; j < IXGBE_PFVFSPOOF_REG_COUNT; j++)

		IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(j), 0);

		pfvfspoof |= BIT(vf_target_shift);

	else

		pfvfspoof &= ~BIT(vf_target_shift);

	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), pfvfspoof);

}



/**

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ s32 prot_autoc_write_generic(struct ixgbe_hw *hw, u32 reg_val, bool locked); 


s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index);

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int pf);

void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);

void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);

s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps);

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −27
Original line number Diff line number Diff line
@@ -3776,34 +3776,10 @@ static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter) 


	IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);





	/* Enable MAC Anti-Spoofing */

	hw->mac.ops.set_mac_anti_spoofing(hw, (adapter->num_vfs != 0),

					  adapter->num_vfs);



	/* Ensure LLDP and FC is set for Ethertype Antispoofing if we will be

	 * calling set_ethertype_anti_spoofing for each VF in loop below

	 */

	if (hw->mac.ops.set_ethertype_anti_spoofing) {

		IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_LLDP),

				(IXGBE_ETQF_FILTER_EN    |

				 IXGBE_ETQF_TX_ANTISPOOF |

				 IXGBE_ETH_P_LLDP));



		IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FC),

				(IXGBE_ETQF_FILTER_EN |

				 IXGBE_ETQF_TX_ANTISPOOF |

				 ETH_P_PAUSE));

	}



	/* For VFs that have spoof checking turned off */

	for (i = 0; i < adapter->num_vfs; i++) {

		if (!adapter->vfinfo[i].spoofchk_enabled)

			ixgbe_ndo_set_vf_spoofchk(adapter->netdev, i, false);



		/* enable ethertype anti spoofing if hw supports it */

		if (hw->mac.ops.set_ethertype_anti_spoofing)

			hw->mac.ops.set_ethertype_anti_spoofing(hw, true, i);

		/* configure spoof checking */

		ixgbe_ndo_set_vf_spoofchk(adapter->netdev, i,

					  adapter->vfinfo[i].spoofchk_enabled);



		/* Enable/Disable RSS query feature  */

		ixgbe_ndo_set_vf_rss_query_en(adapter->netdev, i,

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

+27 −16
Original line number Diff line number Diff line
@@ -964,8 +964,11 @@ static int ixgbe_set_vf_macvlan_msg(struct ixgbe_adapter *adapter, 
		 * If the VF is allowed to set MAC filters then turn off

		 * anti-spoofing to avoid false positives.

		 */

		if (adapter->vfinfo[vf].spoofchk_enabled)

			ixgbe_ndo_set_vf_spoofchk(adapter->netdev, vf, false);

		if (adapter->vfinfo[vf].spoofchk_enabled) {

			struct ixgbe_hw *hw = &adapter->hw;



			hw->mac.ops.set_mac_anti_spoofing(hw, false, vf);

		}

	}



	err = ixgbe_set_vf_macvlan(adapter, vf, index, new_mac);
@@ -1525,27 +1528,35 @@ int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate, 
int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	int vf_target_reg = vf >> 3;

	int vf_target_shift = vf % 8;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 regval;



	if (vf >= adapter->num_vfs)

		return -EINVAL;



	adapter->vfinfo[vf].spoofchk_enabled = setting;



	regval = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));

	regval &= ~(1 << vf_target_shift);

	regval |= (setting << vf_target_shift);

	IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), regval);



	if (adapter->vfinfo[vf].vlan_count) {

		vf_target_shift += IXGBE_SPOOF_VLANAS_SHIFT;

		regval = IXGBE_READ_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg));

		regval &= ~(1 << vf_target_shift);

		regval |= (setting << vf_target_shift);

		IXGBE_WRITE_REG(hw, IXGBE_PFVFSPOOF(vf_target_reg), regval);

	/* configure MAC spoofing */

	hw->mac.ops.set_mac_anti_spoofing(hw, setting, vf);



	/* configure VLAN spoofing */

	if (adapter->vfinfo[vf].vlan_count)

		hw->mac.ops.set_vlan_anti_spoofing(hw, setting, vf);



	/* Ensure LLDP and FC is set for Ethertype Antispoofing if we will be

	 * calling set_ethertype_anti_spoofing for each VF in loop below

	 */

	if (hw->mac.ops.set_ethertype_anti_spoofing) {

		IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_LLDP),

				(IXGBE_ETQF_FILTER_EN    |

				 IXGBE_ETQF_TX_ANTISPOOF |

				 IXGBE_ETH_P_LLDP));



		IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FC),

				(IXGBE_ETQF_FILTER_EN |

				 IXGBE_ETQF_TX_ANTISPOOF |

				 ETH_P_PAUSE));



		hw->mac.ops.set_ethertype_anti_spoofing(hw, setting, vf);

	}



	return 0;