From: wenxu <we...@ucloud.cn>

Add tunnel meta match offload. Currently support for NFT_TUNNEL_ID
NFT_TUNNEL_IP(6)_SRC/DST

Signed-off-by: wenxu <we...@ucloud.cn>
---
v4: add IP6_SRC/DST offload

 include/net/netfilter/nf_tables_offload.h |  5 ++++
 net/netfilter/nft_tunnel.c                | 41 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/include/net/netfilter/nf_tables_offload.h 
b/include/net/netfilter/nf_tables_offload.h
index ff032fb..b20c651 100644
--- a/include/net/netfilter/nf_tables_offload.h
+++ b/include/net/netfilter/nf_tables_offload.h
@@ -45,6 +45,11 @@ struct nft_flow_key {
        struct flow_dissector_key_ip                    ip;
        struct flow_dissector_key_vlan                  vlan;
        struct flow_dissector_key_eth_addrs             eth_addrs;
+       struct flow_dissector_key_keyid         enc_key_id;
+       union {
+               struct flow_dissector_key_ipv4_addrs    enc_ipv4;
+               struct flow_dissector_key_ipv6_addrs    enc_ipv6;
+       };
 } __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. 
*/
 
 struct nft_flow_match {
diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index 58b6083..018ec27 100644
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -11,6 +11,7 @@
 #include <net/ip_tunnels.h>
 #include <net/vxlan.h>
 #include <net/erspan.h>
+#include <net/netfilter/nf_tables_offload.h>
 
 struct nft_tunnel {
        enum nft_tunnel_keys    key:8;
@@ -177,6 +178,45 @@ static int nft_tunnel_get_dump(struct sk_buff *skb,
        return -1;
 }
 
+static int nft_tunnel_get_offload(struct nft_offload_ctx *ctx,
+                                 struct nft_flow_rule *flow,
+                                 const struct nft_expr *expr)
+{
+       const struct nft_tunnel *priv = nft_expr_priv(expr);
+       struct nft_offload_reg *reg = &ctx->regs[priv->dreg];
+
+       if (priv->mode == NFT_TUNNEL_MODE_TX)
+               return -EOPNOTSUPP;
+
+       switch (priv->key) {
+       case NFT_TUNNEL_ID:
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_KEYID, enc_key_id, 
keyid,
+                                 sizeof(__u32), reg);
+               break;
+       case NFT_TUNNEL_IP_SRC:
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4, 
src,
+                                 sizeof(__u32), reg);
+               break;
+       case NFT_TUNNEL_IP_DST:
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4, 
dst,
+                                 sizeof(__u32), reg);
+               break;
+       case NFT_TUNNEL_IP6_SRC:
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, enc_ipv6, 
src,
+                                 sizeof(struct in6_addr), reg);
+               break;
+       case NFT_TUNNEL_IP6_DST:
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, enc_ipv6, 
dst,
+                                 sizeof(struct in6_addr), reg);
+               break;
+       case NFT_TUNNEL_PATH:
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
 static struct nft_expr_type nft_tunnel_type;
 static const struct nft_expr_ops nft_tunnel_get_ops = {
        .type           = &nft_tunnel_type,
@@ -184,6 +224,7 @@ static int nft_tunnel_get_dump(struct sk_buff *skb,
        .eval           = nft_tunnel_get_eval,
        .init           = nft_tunnel_get_init,
        .dump           = nft_tunnel_get_dump,
+       .offload        = nft_tunnel_get_offload,
 };
 
 static struct nft_expr_type nft_tunnel_type __read_mostly = {
-- 
1.8.3.1

Reply via email to