From patchwork Sat Nov 16 07:49:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wenxu X-Patchwork-Id: 1196069 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ucloud.cn Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47FS6P1sYYz9sP6 for ; Sat, 16 Nov 2019 18:49:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727343AbfKPHta (ORCPT ); Sat, 16 Nov 2019 02:49:30 -0500 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:57408 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726034AbfKPHt3 (ORCPT ); Sat, 16 Nov 2019 02:49:29 -0500 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id B914A41631; Sat, 16 Nov 2019 15:49:24 +0800 (CST) From: wenxu@ucloud.cn To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next v2 4/4] netfilter: nft_tunnel: add nft_tunnel_get_offload support Date: Sat, 16 Nov 2019 15:49:24 +0800 Message-Id: <1573890564-16500-5-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1573890564-16500-1-git-send-email-wenxu@ucloud.cn> References: <1573890564-16500-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVkpVSkhOS0tLSktCTUxJTk5ZV1koWU FJQjdXWS1ZQUlXWQkOFx4IWUFZNTQpNjo3JCkuNz5ZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Ogw6STo4TjgzEwpMDwMMPz8* EShPCzJVSlVKTkxIQ0JLTk1PQ05JVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUhCSEg3Bg++ X-HM-Tid: 0a6e7330229d2086kuqyb914a41631 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: wenxu Add tunnel meta match offload. Currently support for NFT_TUNNEL_ID NFT_TUNNEL_IPV4_SRC/DST and NFT_TUNNEL_IPV6_SRC/DST Signed-off-by: wenxu --- v2: no change 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 ea7d1d7..58ac20c 100644 --- a/include/net/netfilter/nf_tables_offload.h +++ b/include/net/netfilter/nf_tables_offload.h @@ -46,6 +46,11 @@ struct nft_flow_key { struct flow_dissector_key_vlan vlan; struct flow_dissector_key_eth_addrs eth_addrs; struct flow_dissector_key_meta meta; + 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 943a704..5ff543b 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c @@ -11,6 +11,7 @@ #include #include #include +#include struct nft_tunnel { enum nft_tunnel_keys key:8; @@ -194,6 +195,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_IPV4_SRC: + NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4, + src, sizeof(__u32), reg); + break; + case NFT_TUNNEL_IPV4_DST: + NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, enc_ipv4, + dst, sizeof(__u32), reg); + break; + case NFT_TUNNEL_IPV6_SRC: + NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, enc_ipv6, + src, sizeof(struct in6_addr), reg); + break; + case NFT_TUNNEL_IPV6_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, @@ -201,6 +241,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 = {