* [PATCH nf-next v5 1/4] netfilter: nf_tables_offload: add __nft_offload_get_chain function
2019-09-09 6:22 [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
@ 2019-09-09 6:22 ` wenxu
2019-09-09 6:22 ` [PATCH nf-next v5 2/4] netfilter: nf_offload: refactor the nft_flow_offload_chain function wenxu
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: wenxu @ 2019-09-09 6:22 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: wenxu <wenxu@ucloud.cn>
Add __nft_offload_get_chain function. It make code more common
and can be used for others. __nft_offload_get_chain fix check
the offload flags.
The flow_block_ing_cmd() needs to call blocking functions while iterating
block_ing_cb_list, nft_indr_block_cb is in the cb_list. Also fix
nft_indr_block_cb in incorrect rcu case.
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v5: rebase to master
net/netfilter/nf_tables_offload.c | 52 +++++++++++++++++++++++++--------------
1 file changed, 34 insertions(+), 18 deletions(-)
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 8abf193..03ee823 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -354,33 +354,49 @@ 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 command)
+static struct nft_chain *__nft_offload_get_chain(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;
- list_for_each_entry_rcu(table, &net->nft.tables, list) {
+ list_for_each_entry(table, &net->nft.tables, list) {
if (table->family != NFPROTO_NETDEV)
continue;
- list_for_each_entry_rcu(chain, &table->chains, list) {
- if (nft_is_base_chain(chain)) {
- struct nft_base_chain *basechain;
-
- basechain = nft_base_chain(chain);
- if (!strncmp(basechain->dev_name, dev->name,
- IFNAMSIZ)) {
- nft_indr_block_ing_cmd(dev, basechain,
- cb, cb_priv,
- command);
- return;
- }
- }
+ list_for_each_entry(chain, &table->chains, list) {
+ if (!nft_is_base_chain(chain) ||
+ !(chain->flags & NFT_CHAIN_HW_OFFLOAD))
+ continue;
+
+ basechain = nft_base_chain(chain);
+ if (strncmp(basechain->dev_name, dev->name, IFNAMSIZ))
+ continue;
+
+ 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_get_chain(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);
}
static struct flow_indr_block_ing_entry block_ing_entry = {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH nf-next v5 2/4] netfilter: nf_offload: refactor the nft_flow_offload_chain function
2019-09-09 6:22 [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
2019-09-09 6:22 ` [PATCH nf-next v5 1/4] netfilter: nf_tables_offload: add __nft_offload_get_chain function wenxu
@ 2019-09-09 6:22 ` wenxu
2019-09-10 20:13 ` Pablo Neira Ayuso
2019-09-09 6:22 ` [PATCH nf-next v5 3/4] netfilter: nf_offload: refactor the nft_flow_offload_rule function wenxu
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: wenxu @ 2019-09-09 6:22 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: wenxu <wenxu@ucloud.cn>
Refactor nft_flow_offload_chain and make it more common
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v5: no change
net/netfilter/nf_tables_offload.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 03ee823..c49bd1a 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -279,10 +279,9 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,
#define FLOW_SETUP_BLOCK TC_SETUP_BLOCK
-static int nft_flow_offload_chain(struct nft_trans *trans,
+static int nft_flow_offload_chain(struct nft_chain *chain,
enum flow_block_command cmd)
{
- struct nft_chain *chain = trans->ctx.chain;
struct nft_base_chain *basechain;
struct net_device *dev;
@@ -294,16 +293,24 @@ static int nft_flow_offload_chain(struct nft_trans *trans,
if (!dev)
return -EOPNOTSUPP;
+ if (dev->netdev_ops->ndo_setup_tc)
+ return nft_block_offload_cmd(basechain, dev, cmd);
+ else
+ return nft_indr_block_offload_cmd(basechain, dev, cmd);
+}
+
+static int nft_flow_offload_chain_commit(struct nft_trans *trans,
+ enum flow_block_command cmd)
+{
+ struct nft_chain *chain = trans->ctx.chain;
+
/* Only default policy to accept is supported for now. */
if (cmd == FLOW_BLOCK_BIND &&
nft_trans_chain_policy(trans) != -1 &&
nft_trans_chain_policy(trans) != NF_ACCEPT)
return -EOPNOTSUPP;
- if (dev->netdev_ops->ndo_setup_tc)
- return nft_block_offload_cmd(basechain, dev, cmd);
- else
- return nft_indr_block_offload_cmd(basechain, dev, cmd);
+ return nft_flow_offload_chain(chain, cmd);
}
int nft_flow_rule_offload_commit(struct net *net)
@@ -320,13 +327,13 @@ int nft_flow_rule_offload_commit(struct net *net)
if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
continue;
- err = nft_flow_offload_chain(trans, FLOW_BLOCK_BIND);
+ err = nft_flow_offload_chain_commit(trans, FLOW_BLOCK_BIND);
break;
case NFT_MSG_DELCHAIN:
if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
continue;
- err = nft_flow_offload_chain(trans, FLOW_BLOCK_UNBIND);
+ err = nft_flow_offload_chain_commit(trans, FLOW_BLOCK_UNBIND);
break;
case NFT_MSG_NEWRULE:
if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH nf-next v5 3/4] netfilter: nf_offload: refactor the nft_flow_offload_rule function
2019-09-09 6:22 [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
2019-09-09 6:22 ` [PATCH nf-next v5 1/4] netfilter: nf_tables_offload: add __nft_offload_get_chain function wenxu
2019-09-09 6:22 ` [PATCH nf-next v5 2/4] netfilter: nf_offload: refactor the nft_flow_offload_chain function wenxu
@ 2019-09-09 6:22 ` wenxu
2019-09-10 20:11 ` Pablo Neira Ayuso
2019-09-09 6:22 ` [PATCH nf-next v5 4/4] netfilter: nf_offload: clean offload things when the device unregister wenxu
2019-09-10 20:02 ` [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: " Pablo Neira Ayuso
4 siblings, 1 reply; 10+ messages in thread
From: wenxu @ 2019-09-09 6:22 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: wenxu <wenxu@ucloud.cn>
Refactor nft_flow_offload_rule and make it more common
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v5: no change
net/netfilter/nf_tables_offload.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index c49bd1a..78b95e1 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -140,20 +140,20 @@ int nft_chain_offload_priority(struct nft_base_chain *basechain)
return 0;
}
-static int nft_flow_offload_rule(struct nft_trans *trans,
+static int nft_flow_offload_rule(struct nft_chain *chain,
+ struct nft_rule *rule,
+ struct nft_flow_rule *flow,
enum flow_cls_command command)
{
- struct nft_flow_rule *flow = nft_trans_flow_rule(trans);
- struct nft_rule *rule = nft_trans_rule(trans);
struct flow_cls_offload cls_flow = {};
struct nft_base_chain *basechain;
struct netlink_ext_ack extack;
__be16 proto = ETH_P_ALL;
- if (!nft_is_base_chain(trans->ctx.chain))
+ if (!nft_is_base_chain(chain))
return -EOPNOTSUPP;
- basechain = nft_base_chain(trans->ctx.chain);
+ basechain = nft_base_chain(chain);
if (flow)
proto = flow->proto;
@@ -168,6 +168,16 @@ static int nft_flow_offload_rule(struct nft_trans *trans,
return nft_setup_cb_call(basechain, TC_SETUP_CLSFLOWER, &cls_flow);
}
+static int nft_flow_offload_rule_commit(struct nft_trans *trans,
+ enum flow_cls_command command)
+{
+ struct nft_flow_rule *flow = nft_trans_flow_rule(trans);
+ struct nft_rule *rule = nft_trans_rule(trans);
+ struct nft_chain *chain = trans->ctx.chain;
+
+ return nft_flow_offload_rule(chain, rule, flow, command);
+}
+
static int nft_flow_offload_bind(struct flow_block_offload *bo,
struct nft_base_chain *basechain)
{
@@ -343,14 +353,14 @@ int nft_flow_rule_offload_commit(struct net *net)
!(trans->ctx.flags & NLM_F_APPEND))
return -EOPNOTSUPP;
- err = nft_flow_offload_rule(trans, FLOW_CLS_REPLACE);
+ err = nft_flow_offload_rule_commit(trans, FLOW_CLS_REPLACE);
nft_flow_rule_destroy(nft_trans_flow_rule(trans));
break;
case NFT_MSG_DELRULE:
if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
continue;
- err = nft_flow_offload_rule(trans, FLOW_CLS_DESTROY);
+ err = nft_flow_offload_rule_commit(trans, FLOW_CLS_DESTROY);
break;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH nf-next v5 4/4] netfilter: nf_offload: clean offload things when the device unregister
2019-09-09 6:22 [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
` (2 preceding siblings ...)
2019-09-09 6:22 ` [PATCH nf-next v5 3/4] netfilter: nf_offload: refactor the nft_flow_offload_rule function wenxu
@ 2019-09-09 6:22 ` wenxu
2019-09-10 20:02 ` [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: " Pablo Neira Ayuso
4 siblings, 0 replies; 10+ messages in thread
From: wenxu @ 2019-09-09 6:22 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: wenxu <wenxu@ucloud.cn>
When the net_device unregister, the netdevice_notifier will release
the related netdev basedchain and rules in this chains. So it is also
need to clean the offload things before the chain is destroy.
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v5: no change
include/net/netfilter/nf_tables_offload.h | 2 +-
net/netfilter/nf_tables_api.c | 9 +++++--
net/netfilter/nf_tables_offload.c | 43 ++++++++++++++++++++++++++++++-
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/include/net/netfilter/nf_tables_offload.h b/include/net/netfilter/nf_tables_offload.h
index 6de896e..824b95b 100644
--- a/include/net/netfilter/nf_tables_offload.h
+++ b/include/net/netfilter/nf_tables_offload.h
@@ -76,7 +76,7 @@ struct nft_flow_rule {
int nft_chain_offload_priority(struct nft_base_chain *basechain);
-void nft_offload_init(void);
+int nft_offload_init(void);
void nft_offload_exit(void);
#endif
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index efd0c97..049f035 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7694,15 +7694,20 @@ static int __init nf_tables_module_init(void)
if (err < 0)
goto err4;
+ err = nft_offload_init();
+ if (err < 0)
+ goto err5;
+
/* must be last */
err = nfnetlink_subsys_register(&nf_tables_subsys);
if (err < 0)
- goto err5;
+ goto err6;
nft_chain_route_init();
- nft_offload_init();
return err;
+err6:
+ nft_offload_exit();
err5:
rhltable_destroy(&nft_objname_ht);
err4:
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 78b95e1..35a5301 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -416,17 +416,58 @@ static void nft_indr_block_cb(struct net_device *dev,
mutex_unlock(&net->nft.commit_mutex);
}
+static void nft_offload_chain_clean(struct nft_chain *chain)
+{
+ struct nft_rule *rule;
+
+ list_for_each_entry(rule, &chain->rules, list) {
+ nft_flow_offload_rule(chain, rule,
+ NULL, FLOW_CLS_DESTROY);
+ }
+
+ nft_flow_offload_chain(chain, FLOW_BLOCK_UNBIND);
+}
+
+static int nft_offload_netdev_event(struct notifier_block *this,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+ struct net *net = dev_net(dev);
+ struct nft_chain *chain;
+
+ mutex_lock(&net->nft.commit_mutex);
+ chain = __nft_offload_get_chain(dev);
+ if (chain)
+ nft_offload_chain_clean(chain);
+ mutex_unlock(&net->nft.commit_mutex);
+
+ return NOTIFY_DONE;
+}
+
static struct flow_indr_block_ing_entry block_ing_entry = {
.cb = nft_indr_block_cb,
.list = LIST_HEAD_INIT(block_ing_entry.list),
};
-void nft_offload_init(void)
+static struct notifier_block nft_offload_netdev_notifier = {
+ .notifier_call = nft_offload_netdev_event,
+};
+
+int nft_offload_init(void)
{
+ int err;
+
+ err = register_netdevice_notifier(&nft_offload_netdev_notifier);
+ if (err < 0)
+ return err;
+
flow_indr_add_block_ing_cb(&block_ing_entry);
+
+ return 0;
}
void nft_offload_exit(void)
{
flow_indr_del_block_ing_cb(&block_ing_entry);
+ unregister_netdevice_notifier(&nft_offload_netdev_notifier);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister
2019-09-09 6:22 [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister wenxu
` (3 preceding siblings ...)
2019-09-09 6:22 ` [PATCH nf-next v5 4/4] netfilter: nf_offload: clean offload things when the device unregister wenxu
@ 2019-09-10 20:02 ` Pablo Neira Ayuso
2019-09-10 20:34 ` Pablo Neira Ayuso
4 siblings, 1 reply; 10+ messages in thread
From: Pablo Neira Ayuso @ 2019-09-10 20:02 UTC (permalink / raw)
To: wenxu; +Cc: netfilter-devel
On Mon, Sep 09, 2019 at 02:22:02PM +0800, wenxu@ucloud.cn wrote:
> From: wenxu <wenxu@ucloud.cn>
>
> This series clean the offload things for both chain and rules when the
> related device unregister
>
> This version just rebase the master and make __nft_offload_get_chain
> fixes mutex and offload flag problem
applied.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister
2019-09-10 20:02 ` [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: " Pablo Neira Ayuso
@ 2019-09-10 20:34 ` Pablo Neira Ayuso
2019-09-11 0:02 ` wenxu
0 siblings, 1 reply; 10+ messages in thread
From: Pablo Neira Ayuso @ 2019-09-10 20:34 UTC (permalink / raw)
To: wenxu; +Cc: netfilter-devel
On Tue, Sep 10, 2019 at 10:02:06PM +0200, Pablo Neira Ayuso wrote:
> On Mon, Sep 09, 2019 at 02:22:02PM +0800, wenxu@ucloud.cn wrote:
> > From: wenxu <wenxu@ucloud.cn>
> >
> > This series clean the offload things for both chain and rules when the
> > related device unregister
> >
> > This version just rebase the master and make __nft_offload_get_chain
> > fixes mutex and offload flag problem
>
> applied.
Sorry, I have to keep this back, compilation breaks if I remove patch
3/4 and 4/4. It would be good not to add new code that goes over the
80-chars per column boundary.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH nf-next v5 0/4] netfilter: nf_tables_offload: clean offload things when the device unregister
2019-09-10 20:34 ` Pablo Neira Ayuso
@ 2019-09-11 0:02 ` wenxu
0 siblings, 0 replies; 10+ messages in thread
From: wenxu @ 2019-09-11 0:02 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
在 2019/9/11 4:34, Pablo Neira Ayuso 写道:
> On Tue, Sep 10, 2019 at 10:02:06PM +0200, Pablo Neira Ayuso wrote:
>> On Mon, Sep 09, 2019 at 02:22:02PM +0800, wenxu@ucloud.cn wrote:
>>> From: wenxu <wenxu@ucloud.cn>
>>>
>>> This series clean the offload things for both chain and rules when the
>>> related device unregister
>>>
>>> This version just rebase the master and make __nft_offload_get_chain
>>> fixes mutex and offload flag problem
>> applied.
> Sorry, I have to keep this back, compilation breaks if I remove patch
> 3/4 and 4/4. It would be good not to add new code that goes over the
> 80-chars per column boundary.
The orignal nft_flow_offload_rule and nft_flow_offload_chain used struct nft_ctx, but
in the device event notify there is no nft_ctx. that's why I need the 2/4 and 3/4 patches.
Any suggestion?
>
^ permalink raw reply [flat|nested] 10+ messages in thread