netfilter: flowtable: add vlan pop action offload support

This patch adds vlan pop action offload in the flowtable offload.

Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index dc1d6b4..b87f8c3 100644 (file)
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -619,6 +619,7 @@ nf_flow_rule_route_common(struct net *net, const struct flow_offload *flow,
                          struct nf_flow_rule *flow_rule)
 {
        const struct flow_offload_tuple *other_tuple;
+       const struct flow_offload_tuple *tuple;
        int i;
 
        flow_offload_decap_tunnel(flow, dir, flow_rule);
@@ -628,6 +629,20 @@ nf_flow_rule_route_common(struct net *net, const struct flow_offload *flow,
            flow_offload_eth_dst(net, flow, dir, flow_rule) < 0)
                return -1;
 
+       tuple = &flow->tuplehash[dir].tuple;
+
+       for (i = 0; i < tuple->encap_num; i++) {
+               struct flow_action_entry *entry;
+
+               if (tuple->in_vlan_ingress & BIT(i))
+                       continue;
+
+               if (tuple->encap[i].proto == htons(ETH_P_8021Q)) {
+                       entry = flow_action_entry_next(flow_rule);
+                       entry->id = FLOW_ACTION_VLAN_POP;
+               }
+       }
+
        other_tuple = &flow->tuplehash[!dir].tuple;
 
        for (i = 0; i < other_tuple->encap_num; i++) {