From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6354BC11D24 for ; Mon, 24 Feb 2020 05:29:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 379EE20661 for ; Mon, 24 Feb 2020 05:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbgBXF3a (ORCPT ); Mon, 24 Feb 2020 00:29:30 -0500 Received: from m9785.mail.qiye.163.com ([220.181.97.85]:43311 "EHLO m9785.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726538AbgBXF33 (ORCPT ); Mon, 24 Feb 2020 00:29:29 -0500 Received: from localhost.localdomain (unknown [123.59.132.129]) by m9785.mail.qiye.163.com (Hmail) with ESMTPA id C4BEA5C18A9; Mon, 24 Feb 2020 13:22:55 +0800 (CST) From: wenxu@ucloud.cn To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH nf-next v5 1/4] netfilter: flowtable: add nf_flow_table_block_offload_init() Date: Mon, 24 Feb 2020 13:22:52 +0800 Message-Id: <1582521775-25176-2-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582521775-25176-1-git-send-email-wenxu@ucloud.cn> References: <1582521775-25176-1-git-send-email-wenxu@ucloud.cn> X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVklVSkJMS0tLSU1OSklKT01ZV1koWU FJQjdXWS1ZQUlXWQkOFx4IWUFZNTQpNjo3JCkuNz5ZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6OU06HTo6Kjg3MCw1EBkJHUw9 KToaCQ1VSlVKTkNJTklKTExOQ01DVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpJSFVO QlVKSElVSklCWVdZCAFZQUlNTUs3Bg++ X-HM-Tid: 0a7075a5f6c72087kuqyc4bea5c18a9 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: wenxu Add nf_flow_table_block_offload_init prepare for the indr block offload patch Signed-off-by: wenxu --- v5: rebase to the upstream net/netfilter/nf_flow_table_offload.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c index 482a728..ffeffbe 100644 --- a/net/netfilter/nf_flow_table_offload.c +++ b/net/netfilter/nf_flow_table_offload.c @@ -833,6 +833,21 @@ static int nf_flow_table_block_setup(struct nf_flowtable *flowtable, return err; } +static void nf_flow_table_block_offload_init(struct flow_block_offload *bo, + struct net *net, + enum flow_block_command cmd, + struct nf_flowtable *flowtable, + struct netlink_ext_ack *extack) +{ + memset(bo, 0, sizeof(*bo)); + bo->net = net; + bo->block = &flowtable->flow_block; + bo->command = cmd; + bo->binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS; + bo->extack = extack; + INIT_LIST_HEAD(&bo->cb_list); +} + static int nf_flow_table_offload_cmd(struct flow_block_offload *bo, struct nf_flowtable *flowtable, struct net_device *dev, @@ -844,14 +859,8 @@ static int nf_flow_table_offload_cmd(struct flow_block_offload *bo, if (!dev->netdev_ops->ndo_setup_tc) return -EOPNOTSUPP; - memset(bo, 0, sizeof(*bo)); - bo->net = dev_net(dev); - bo->block = &flowtable->flow_block; - bo->command = cmd; - bo->binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS; - bo->extack = extack; - INIT_LIST_HEAD(&bo->cb_list); - + nf_flow_table_block_offload_init(bo, dev_net(dev), cmd, flowtable, + extack); err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_FT, bo); if (err < 0) return err; -- 1.8.3.1