netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: wenxu@ucloud.cn
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH nf-next v3 3/4] netfilter: nf_tables_offload: add nft_offload_netdev_iterate function
Date: Thu,  5 Sep 2019 12:00:18 +0800	[thread overview]
Message-ID: <1567656019-6881-4-git-send-email-wenxu@ucloud.cn> (raw)
In-Reply-To: <1567656019-6881-1-git-send-email-wenxu@ucloud.cn>

From: wenxu <wenxu@ucloud.cn>

Add nft_offload_netdev_iterate function. It make code more common
and can be used for others.

Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v3: new patch

 net/netfilter/nf_tables_offload.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 9657001..e5977cf 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -365,16 +365,13 @@ int nft_flow_rule_offload_commit(struct net *net)
 	return err;
 }
 
-static void nft_indr_block_cb(struct net_device *dev,
-			      flow_indr_block_bind_cb_t *cb, void *cb_priv,
-			      enum flow_block_command cmd)
+static struct nft_chain *nft_offload_netdev_iterate(struct net_device *dev)
 {
 	struct nft_base_chain *basechain;
 	struct net *net = dev_net(dev);
-	const struct nft_table *table;
-	const struct nft_chain *chain;
+	struct nft_chain *chain;
+	struct nft_table *table;
 
-	mutex_lock(&net->nft.commit_mutex);
 	list_for_each_entry(table, &net->nft.tables, list) {
 		if (table->family != NFPROTO_NETDEV)
 			continue;
@@ -388,11 +385,28 @@ static void nft_indr_block_cb(struct net_device *dev,
 			if (strncmp(basechain->dev_name, dev->name, IFNAMSIZ))
 				continue;
 
-			nft_indr_block_ing_cmd(dev, basechain, cb, cb_priv, cmd);
-			mutex_unlock(&net->nft.commit_mutex);
-			return;
+			return chain;
 		}
 	}
+
+	return NULL;
+}
+
+static void nft_indr_block_cb(struct net_device *dev,
+			      flow_indr_block_bind_cb_t *cb, void *cb_priv,
+			      enum flow_block_command cmd)
+{
+	struct net *net = dev_net(dev);
+	struct nft_chain *chain;
+
+	mutex_lock(&net->nft.commit_mutex);
+	chain = nft_offload_netdev_iterate(dev);
+	if (chain) {
+		struct nft_base_chain *basechain;
+
+		basechain = nft_base_chain(chain);
+		nft_indr_block_ing_cmd(dev, basechain, cb, cb_priv, cmd);
+	}
 	mutex_unlock(&net->nft.commit_mutex);
 }
 
-- 
1.8.3.1


  parent reply	other threads:[~2019-09-05  4:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-05  4:00 [PATCH nf-next v3 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
2019-09-05  4:00 ` [PATCH nf-next v3 1/4] netfilter: nf_tables_offload: refactor the nft_flow_offload_chain function wenxu
2019-09-05  4:00 ` [PATCH nf-next v3 2/4] netfilter: nf_tables_offload: refactor the nft_flow_offload_rule function wenxu
2019-09-05  4:00 ` wenxu [this message]
2019-09-06  0:34   ` [PATCH nf-next v3 3/4] netfilter: nf_tables_offload: add nft_offload_netdev_iterate function Pablo Neira Ayuso
2019-09-06  3:25     ` wenxu
2019-09-05  4:00 ` [PATCH nf-next v3 4/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
2019-09-06  0:27 ` [PATCH nf-next v3 0/4] " Pablo Neira Ayuso
2019-09-06  3:09   ` wenxu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1567656019-6881-4-git-send-email-wenxu@ucloud.cn \
    --to=wenxu@ucloud.cn \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).