net: hsr: Disable promiscuous mode in offload mode

[ Upstream commit e748d0fd66abc4b1c136022e4e053004fce2b792 ]

When port-to-port forwarding for interfaces in HSR node is enabled,
disable promiscuous mode since L2 frame forward happens at the
offloaded hardware.

Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230614114710.31400-1-r-gunasekaran@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 8884c6939913 ("hsr: use rtnl lock when iterating over ports")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 6e434af189bc0fa83f7f24b339c0387704606c6f..511407df49151d004e3b47e59e8bf22cab798716 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -529,6 +529,11 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
        if (res)
                goto err_add_master;
 
+       /* HSR forwarding offload supported in lower device? */
+       if ((slave[0]->features & NETIF_F_HW_HSR_FWD) &&
+           (slave[1]->features & NETIF_F_HW_HSR_FWD))
+               hsr->fwd_offloaded = true;
+
        res = register_netdevice(hsr_dev);
        if (res)
                goto err_unregister;

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index 58a5a8b3891ffd3f5beedff105740dc1bbdcf826..044e0b456fcfb270f9c4888c3006d2f1ee04fb25 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -202,6 +202,7 @@ struct hsr_priv {
        u8 net_id;              /* for PRP, it occupies most significant 3 bits
                                 * of lan_id
                                 */
+       bool fwd_offloaded;     /* Forwarding offloaded to HW */
        unsigned char           sup_multicast_addr[ETH_ALEN] __aligned(sizeof(u16));
                                /* Align to u16 boundary to avoid unaligned access
                                 * in ether_addr_equal

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 0e6daee488b4f1c521d5fd5c7925d23f54a602f8..52302a054613363cb3cc2ed99bc06956269448ff 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -137,9 +137,14 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
        struct hsr_port *master;
        int res;
 
-       res = dev_set_promiscuity(dev, 1);
-       if (res)
-               return res;
+       /* Don't use promiscuous mode for offload since L2 frame forward
+        * happens at the offloaded hardware.
+        */
+       if (!port->hsr->fwd_offloaded) {
+               res = dev_set_promiscuity(dev, 1);
+               if (res)
+                       return res;
+       }
 
        master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
        hsr_dev = master->dev;
@@ -158,7 +163,9 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
 fail_rx_handler:
        netdev_upper_dev_unlink(dev, hsr_dev);
 fail_upper_dev_link:
-       dev_set_promiscuity(dev, -1);
+       if (!port->hsr->fwd_offloaded)
+               dev_set_promiscuity(dev, -1);
+
        return res;
 }