From patchwork Wed Aug 14 10:16:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wenxu X-Patchwork-Id: 1146921 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 (mailfrom) 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 467lqp2R30z9sML for ; Wed, 14 Aug 2019 20:16:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727296AbfHNKQx (ORCPT ); Wed, 14 Aug 2019 06:16:53 -0400 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:55460 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbfHNKQw (ORCPT ); Wed, 14 Aug 2019 06:16:52 -0400 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id C60F541B98; Wed, 14 Aug 2019 18:16:49 +0800 (CST) From: wenxu@ucloud.cn To: pablo@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next v4 04/12] netfilter: nft_payload: add nft_set_payload offload support Date: Wed, 14 Aug 2019 18:16:40 +0800 Message-Id: <1565777808-28735-5-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565777808-28735-1-git-send-email-wenxu@ucloud.cn> References: <1565777808-28735-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVkpVSklCQkJCTE5NQ0pIS05ZV1koWU FJQjdXWS1ZQUlXWQkOFx4IWUFZNTQpNjo3JCkuNz5ZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NRg6Cxw6Gjg0OTkiAjEKCCsL AhIKFBxVSlVKTk1OTExMQ0tCQ0JCVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUhPTkg3Bg++ X-HM-Tid: 0a6c8fa1519e2086kuqyc60f541b98 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: wenxu currently payload set only support ll header nft --debug=netlink add rule netdev firewall aclout ip daddr 10.0.1.7 @ll,0,48 set 0x00002e9ca06e2596 @ll,48,48 set 0xfaffffffffff fwd to eth0 Signed-off-by: wenxu --- v4: no change net/netfilter/nft_payload.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index 22a80eb..980e4a1 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -562,12 +562,68 @@ static int nft_payload_set_dump(struct sk_buff *skb, const struct nft_expr *expr return -1; } +static int nft_payload_set_offload(struct nft_offload_ctx *ctx, + struct nft_flow_rule *flow, + const struct nft_expr *expr) +{ + const struct nft_payload_set *priv = nft_expr_priv(expr); + struct nft_offload_reg *reg = &ctx->regs[priv->sreg]; + const struct nft_data *data = ®->data; + struct flow_action_entry *entry; + u32 len = priv->len; + u32 offset, last; + int n_actions, i; + + if (priv->base != NFT_PAYLOAD_LL_HEADER || len > 16) + return -EOPNOTSUPP; + + offset = priv->offset; + n_actions = len >> 2; + last = len & 0x3; + + for (i = 0; i < n_actions; i++) { + entry = &flow->rule->action.entries[ctx->num_actions++]; + + entry->id = FLOW_ACTION_MANGLE; + entry->mangle.htype = FLOW_ACT_MANGLE_HDR_TYPE_ETH; + entry->mangle.mask = 0; + entry->mangle.val = data->data[i]; + entry->mangle.offset = offset; + offset = offset + 4; + } + + if (last) { + entry = &flow->rule->action.entries[ctx->num_actions++]; + + entry->id = FLOW_ACTION_MANGLE; + entry->mangle.htype = FLOW_ACT_MANGLE_HDR_TYPE_ETH; + entry->mangle.mask = ~((1 << (last * 8)) - 1); + entry->mangle.val = data->data[i]; + entry->mangle.offset = offset; + } + + return 0; +} + +static int nft_payload_set_offload_actions(const struct nft_expr *expr) +{ + const struct nft_payload_set *priv = nft_expr_priv(expr); + u32 len = priv->len; + + if (priv->base != NFT_PAYLOAD_LL_HEADER || len > 16) + return 0; + + return (len >> 2) + !!(len & 3); +} + static const struct nft_expr_ops nft_payload_set_ops = { .type = &nft_payload_type, .size = NFT_EXPR_SIZE(sizeof(struct nft_payload_set)), .eval = nft_payload_set_eval, .init = nft_payload_set_init, .dump = nft_payload_set_dump, + .offload = nft_payload_set_offload, + .offload_actions = nft_payload_set_offload_actions, }; static const struct nft_expr_ops *