i40e: Set defport behavior for the Main VSI when in promiscuous mode

This fixes bugs where the port is not receiving multicast or VLAN tagged
packets when in promiscuous mode. This can occur when a SW bridge is
created on top of the device.

This also fixes issues where the promiscuous behavior setting was not
being preserved across a reset caused by features being enabled or
disabled.

We are using defport instead of doing a true promiscuous mode because we do
not need to receive the SRIOV or VMDq VSI directed traffic which would suck
up bandwidth and is really not intended for the SW bridge.

In addition, with defport we get VLAN promiscuous behavior which is not
possible from the VSI level promiscuous setting.

Change-ID: Ie21985eac32d5af1c02e9d71c6430a90d5bab40f
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 05df21c16c79053564141e30abdaad9a900b6c60..e7462793d48d416bf33d826edd470e3f0cf247cc 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -372,6 +372,7 @@ struct i40e_pf {
 #ifdef CONFIG_DEBUG_FS
        struct dentry *i40e_dbg_pf;
 #endif /* CONFIG_DEBUG_FS */
+       bool cur_promisc;
 
        u16 instance; /* A unique number per i40e_pf instance in the system */
 

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index a97f193382d79e573ba7a275caf5be097969b1f0..851c1a159be8a1566d8a792c52bf4e83ea6877d7 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1937,15 +1937,35 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
                cur_promisc = (!!(vsi->current_netdev_flags & IFF_PROMISC) ||
                               test_bit(__I40E_FILTER_OVERFLOW_PROMISC,
                                        &vsi->state));
-               ret = i40e_aq_set_vsi_unicast_promiscuous(&vsi->back->hw,
+               if (vsi->type == I40E_VSI_MAIN && pf->lan_veb != I40E_NO_VEB) {
+                       /* set defport ON for Main VSI instead of true promisc
+                        * this way we will get all unicast/multicast and VLAN
+                        * promisc behavior but will not get VF or VMDq traffic
+                        * replicated on the Main VSI.
+                        */
+                       if (pf->cur_promisc != cur_promisc) {
+                               pf->cur_promisc = cur_promisc;
+                               i40e_do_reset_safe(pf,
+                                               BIT(__I40E_PF_RESET_REQUESTED));
+                       }
+               } else {
+                       ret = i40e_aq_set_vsi_unicast_promiscuous(
+                                                         &vsi->back->hw,
                                                          vsi->seid,
                                                          cur_promisc, NULL);
-               if (ret)
-                       dev_info(&pf->pdev->dev,
-                                "set uni promisc failed, err %s, aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
-                                i40e_aq_str(&pf->hw,
-                                            pf->hw.aq.asq_last_status));
+                       if (ret)
+                               dev_info(&pf->pdev->dev,
+                                        "set unicast promisc failed, err %d, aq_err %d\n",
+                                        ret, pf->hw.aq.asq_last_status);
+                       ret = i40e_aq_set_vsi_multicast_promiscuous(
+                                                         &vsi->back->hw,
+                                                         vsi->seid,
+                                                         cur_promisc, NULL);
+                       if (ret)
+                               dev_info(&pf->pdev->dev,
+                                        "set multicast promisc failed, err %d, aq_err %d\n",
+                                        ret, pf->hw.aq.asq_last_status);
+               }
                ret = i40e_aq_set_vsi_broadcast(&vsi->back->hw,
                                                vsi->seid,
                                                cur_promisc, NULL);
@@ -4001,6 +4021,7 @@ static void i40e_vsi_close(struct i40e_vsi *vsi)
        i40e_vsi_free_irq(vsi);
        i40e_vsi_free_tx_resources(vsi);
        i40e_vsi_free_rx_resources(vsi);
+       vsi->current_netdev_flags = 0;
 }
 
 /**
@@ -9312,7 +9333,7 @@ void i40e_veb_release(struct i40e_veb *veb)
 static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
 {
        struct i40e_pf *pf = veb->pf;
-       bool is_default = false;
+       bool is_default = veb->pf->cur_promisc;
        bool is_cloud = false;
        int ret;