ice: Fix disabling Rx VLAN filtering with port VLAN enabled

[ Upstream commit c793f8ea15e312789b5b6b4a5e7b0b92315be5cb ]

If the user turns on the vf-true-promiscuous-support flag, then Rx VLAN
filtering will be disabled if the VF requests to enable promiscuous
mode. When the VF is in a port VLAN, this is the incorrect behavior
because it will allow the VF to receive traffic outside of its port VLAN
domain. Fortunately this only resulted in the VF(s) receiving broadcast
traffic outside of the VLAN domain because all of the VLAN promiscuous
rules are based on the port VLAN ID. Fix this by setting the
.disable_rx_filtering VLAN op to a no-op when a port VLAN is enabled on
the VF.

Also, make sure to make this fix for both Single VLAN Mode and Double
VLAN Mode enabled devices.

Fixes: c31af68a1b94 ("ice: Add outer_vlan_ops and VSI specific VLAN ops implementations")
Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Karen Ostrowska <karen.ostrowska@intel.com>
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c b/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
index 5ecc0ee9a78e0f701259149fd4ab1a82334166b9..b1ffb81893d48e4f4663ad87e1dea7d1f4948732 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
@@ -44,13 +44,17 @@ void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi)
 
                /* outer VLAN ops regardless of port VLAN config */
                vlan_ops->add_vlan = ice_vsi_add_vlan;
-               vlan_ops->dis_rx_filtering = ice_vsi_dis_rx_vlan_filtering;
                vlan_ops->ena_tx_filtering = ice_vsi_ena_tx_vlan_filtering;
                vlan_ops->dis_tx_filtering = ice_vsi_dis_tx_vlan_filtering;
 
                if (ice_vf_is_port_vlan_ena(vf)) {
                        /* setup outer VLAN ops */
                        vlan_ops->set_port_vlan = ice_vsi_set_outer_port_vlan;
+                       /* all Rx traffic should be in the domain of the
+                        * assigned port VLAN, so prevent disabling Rx VLAN
+                        * filtering
+                        */
+                       vlan_ops->dis_rx_filtering = noop_vlan;
                        vlan_ops->ena_rx_filtering =
                                ice_vsi_ena_rx_vlan_filtering;
 
@@ -63,6 +67,9 @@ void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi)
                        vlan_ops->ena_insertion = ice_vsi_ena_inner_insertion;
                        vlan_ops->dis_insertion = ice_vsi_dis_inner_insertion;
                } else {
+                       vlan_ops->dis_rx_filtering =
+                               ice_vsi_dis_rx_vlan_filtering;
+
                        if (!test_bit(ICE_FLAG_VF_VLAN_PRUNING, pf->flags))
                                vlan_ops->ena_rx_filtering = noop_vlan;
                        else
@@ -96,7 +103,14 @@ void ice_vf_vsi_init_vlan_ops(struct ice_vsi *vsi)
                        vlan_ops->set_port_vlan = ice_vsi_set_inner_port_vlan;
                        vlan_ops->ena_rx_filtering =
                                ice_vsi_ena_rx_vlan_filtering;
+                       /* all Rx traffic should be in the domain of the
+                        * assigned port VLAN, so prevent disabling Rx VLAN
+                        * filtering
+                        */
+                       vlan_ops->dis_rx_filtering = noop_vlan;
                } else {
+                       vlan_ops->dis_rx_filtering =
+                               ice_vsi_dis_rx_vlan_filtering;
                        if (!test_bit(ICE_FLAG_VF_VLAN_PRUNING, pf->flags))
                                vlan_ops->ena_rx_filtering = noop_vlan;
                        else