[PATCH v7 net-next 13/14] bridge: Introduce DEV_PATH_BR_VLAN_KEEP_HW for bridge-fastpath

[Eric Woudstra]

This patch introduces DEV_PATH_BR_VLAN_KEEP_HW. It is needed in the
bridge fastpath for switchdevs supporting SWITCHDEV_OBJ_ID_PORT_VLAN.

It is similar to DEV_PATH_BR_VLAN_TAG, with the correcponding bit in
ingress_vlans set.

In the forward fastpath it is not needed.

Acked-by: Nikolay Aleksandrov <ra...@blackwall.org>
Signed-off-by: Eric Woudstra <ericwo...@gmail.com>
---
 include/linux/netdevice.h        |  1 +
 net/bridge/br_device.c           |  4 ++++
 net/bridge/br_vlan.c             | 18 +++++++++++-------
 net/netfilter/nft_flow_offload.c |  3 +++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 695445927598..9ac7142ee493 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -869,6 +869,7 @@ struct net_device_path {
                                DEV_PATH_BR_VLAN_TAG,
                                DEV_PATH_BR_VLAN_UNTAG,
                                DEV_PATH_BR_VLAN_UNTAG_HW,
+                               DEV_PATH_BR_VLAN_KEEP_HW,
                        }               vlan_mode;
                        u16             vlan_id;
                        __be16          vlan_proto;
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index c7646afc8b96..112fd8556217 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -430,6 +430,10 @@ static int br_fill_forward_path(struct net_device_path_ctx 
*ctx,
        case DEV_PATH_BR_VLAN_UNTAG:
                ctx->num_vlans--;
                break;
+       case DEV_PATH_BR_VLAN_KEEP_HW:
+               if (!src)
+                       path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;
+               break;
        case DEV_PATH_BR_VLAN_KEEP:
                break;
        }
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index aea94d401a30..114d47d5f90f 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -1494,13 +1494,17 @@ int br_vlan_fill_forward_path_mode(struct net_bridge 
*br,
        if (!(v->flags & BRIDGE_VLAN_INFO_UNTAGGED))
                return 0;
 
-       if (path->bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG)
-               path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;
-       else if (v->priv_flags & BR_VLFLAG_TAGGING_BY_SWITCHDEV)
-               path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG_HW;
-       else
-               path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG;
-
+       if (path->bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG) {
+               if (v->priv_flags & BR_VLFLAG_TAGGING_BY_SWITCHDEV)
+                       path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP_HW;
+               else
+                       path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;
+       } else {
+               if (v->priv_flags & BR_VLFLAG_TAGGING_BY_SWITCHDEV)
+                       path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG_HW;
+               else
+                       path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG;
+       }
        return 0;
 }
 
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index c95fad495460..c0c310c569cd 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -148,6 +148,9 @@ static void nft_dev_path_info(const struct 
net_device_path_stack *stack,
                        case DEV_PATH_BR_VLAN_UNTAG_HW:
                                info->ingress_vlans |= BIT(info->num_encaps - 
1);
                                break;
+                       case DEV_PATH_BR_VLAN_KEEP_HW:
+                               info->ingress_vlans |= BIT(info->num_encaps);
+                               fallthrough;
                        case DEV_PATH_BR_VLAN_TAG:
                                info->encap[info->num_encaps].id = 
path->bridge.vlan_id;
                                info->encap[info->num_encaps].proto = 
path->bridge.vlan_proto;
-- 
2.47.1