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

Commit f3926733 authored by Przemyslaw Patynowski's avatar Przemyslaw Patynowski Committed by Greg Kroah-Hartman
Browse files

i40e: Set RX_ONLY mode for unicast promiscuous on VLAN 



[ Upstream commit 4bd5e02a2ed1575c2f65bd3c557a077dd399f0e8 ]

Trusted VF with unicast promiscuous mode set, could listen to TX
traffic of other VFs.
Set unicast promiscuous mode to RX traffic, if VSI has port VLAN
configured. Rename misleading I40E_AQC_SET_VSI_PROMISC_TX bit to
I40E_AQC_SET_VSI_PROMISC_RX_ONLY. Aligned unicast promiscuous with
VLAN to the one without VLAN.

Fixes: 6c41a760 ("i40e: Add promiscuous on VLAN support")
Fixes: 3b120089 ("i40e: When in promisc mode apply promisc mode to Tx Traffic as well")
Signed-off-by: default avatarPrzemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Signed-off-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 539ae3e0

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes { 
#define I40E_AQC_SET_VSI_PROMISC_BROADCAST	0x04

#define I40E_AQC_SET_VSI_DEFAULT		0x08

#define I40E_AQC_SET_VSI_PROMISC_VLAN		0x10

#define I40E_AQC_SET_VSI_PROMISC_TX		0x8000

#define I40E_AQC_SET_VSI_PROMISC_RX_ONLY	0x8000

	__le16	seid;

#define I40E_AQC_VSI_PROM_CMD_SEID_MASK		0x3FF

	__le16	vlan_tag;

drivers/net/ethernet/intel/i40e/i40e_common.c

+27 −8
Original line number Diff line number Diff line
@@ -1922,6 +1922,21 @@ i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags, 
	return status;

}



/**

 * i40e_is_aq_api_ver_ge

 * @aq: pointer to AdminQ info containing HW API version to compare

 * @maj: API major value

 * @min: API minor value

 *

 * Assert whether current HW API version is greater/equal than provided.

 **/

static bool i40e_is_aq_api_ver_ge(struct i40e_adminq_info *aq, u16 maj,

				  u16 min)

{

	return (aq->api_maj_ver > maj ||

		(aq->api_maj_ver == maj && aq->api_min_ver >= min));

}



/**

 * i40e_aq_add_vsi

 * @hw: pointer to the hw struct
@@ -2047,18 +2062,16 @@ i40e_status i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, 


	if (set) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (rx_only_promisc &&

		    (((hw->aq.api_maj_ver == 1) && (hw->aq.api_min_ver >= 5)) ||

		     (hw->aq.api_maj_ver > 1)))

			flags |= I40E_AQC_SET_VSI_PROMISC_TX;

		if (rx_only_promisc && i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);



	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (((hw->aq.api_maj_ver >= 1) && (hw->aq.api_min_ver >= 5)) ||

	    (hw->aq.api_maj_ver > 1))

		cmd->valid_flags |= cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_TX);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);



	cmd->seid = cpu_to_le16(seid);

	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
@@ -2155,11 +2168,17 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, 
	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_vsi_promiscuous_modes);



	if (enable)

	if (enable) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);

	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);

	cmd->seid = cpu_to_le16(seid);

	cmd->vlan_tag = cpu_to_le16(vid | I40E_AQC_SET_VSI_VLAN_VALID);