net: hsr: Disable promiscuous mode in offload mode

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>

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 5a236aae2366f4d0ddb623f29f2c6ea98552690c..306f942c3b28af226435c34ff1c68b7eb31d77e0 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -531,6 +531,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 5584c80a5c795eab3397da435e6c5947c0ffa030..6851e33df7d14607034807c64ebe3a0b860af7f1 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -208,6 +208,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 b70e6bbf6021f5dcc50ced0d8811aa0280680376..e5742f2a2d522a432092216a596fe7a4ef91f1da 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -131,9 +131,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;
@@ -152,7 +157,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;
 }