Re: [nf-next PATCH v6 00/12] Dynamic hook interface binding part 2

[Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>]

Hi Phil,

This looks very good, I still have a few comments, related to three
patches:

== netfilter: nf_tables: Have a list of nf_hook_ops in nft_hook

1) There's a possible inconsistent use of list_for_each_entry{_safe}
   while calling nf_unregister_net_hook().

 static void nft_netdev_unregister_hooks(struct net *net,
                                        struct list_head *hook_list,
                                        bool release_netdev)
 {
+       struct nf_hook_ops *ops, *nextops;
        struct nft_hook *hook, *next;

        list_for_each_entry_safe(hook, next, hook_list, list) {
-               nf_unregister_net_hook(net, &hook->ops);
+               list_for_each_entry_safe(ops, nextops, &hook->ops_list, list) <--- HERE
+                       nf_unregister_net_hook(net, ops);

[...]

@@ -2923,8 +2962,10 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,
 err_hooks:
        if (nla[NFTA_CHAIN_HOOK]) {
                list_for_each_entry_safe(h, next, &hook.list, list) {
-                       if (unregister)
-                               nf_unregister_net_hook(ctx->net, &h->ops);
+                       if (unregister) {
+                               list_for_each_entry(ops, &h->ops_list, list)   <--- HERE
+                                       nf_unregister_net_hook(ctx->net, ops);

Which one should be adjusted? I think _safe can be removed?

Maybe add nf_unregister_net_hook_list() helper? It helps to avoid
future similar issues.

2) I wonder if nft_hook_find_ops()  will need a hashtable sooner or
   later. With the wildcard, the number of devices could be significantly
   large in this list lookup.

@@ -9611,9 +9666,12 @@ static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net,
 struct nf_hook_ops *nft_hook_find_ops(const struct nft_hook *hook,
                                      const struct net_device *dev)
 {
-       if (hook->ops.dev == dev)
-               return (struct nf_hook_ops *)&hook->ops;
+       struct nf_hook_ops *ops;

+       list_for_each_entry(ops, &hook->ops_list, list) {
+               if (ops->dev == dev)
+                       return ops;
+       }
        return NULL;
 }

3) Maybe move struct rcu_head at the end of struct nf_hook_ops?

 struct nf_hook_ops {
+       struct list_head        list;
+       struct rcu_head         rcu; <--- move it at the end of this struct?

   This is a control plane object, but still it is common to place
   this at the end. But not a deal breaker.

4) nft_netdev_event() is missing a break; I think it is an overlook?

diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c
index 783e4b5ef3e0..bac5aa8970a4 100644
--- a/net/netfilter/nft_chain_filter.c
+++ b/net/netfilter/nft_chain_filter.c
@@ -332,9 +332,8 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,
                if (!(basechain->chain.table->flags & NFT_TABLE_F_DORMANT))
                        nf_unregister_net_hook(dev_net(dev), ops);

-               list_del_rcu(&hook->list);
-               kfree_rcu(hook, rcu);
-               break;    <------------------------- this is gone!
+               list_del_rcu(&ops->list);
+               kfree_rcu(ops, rcu);
        }
 }

but I can still see break; in the flowtable event handler.

So nft_netdev_event() shows no break;
But nft_flowtable_event() still has a break;

== Support wildcard netdev hook specs

Nitpick: the err_ops_alloc: tag takes me to nft_netdev_hook_free(hook);
maybe better rename it to err_hook_free: ? Because currently
err_ops_alloc takes me to nft_netdev_hook_free(hook);

@@ -2323,7 +2323,7 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net *net,

        err = nla_strscpy(hook->ifname, attr, IFNAMSIZ);
        if (err < 0)
-               goto err_hook_dev;
+               goto err_ops_alloc;

but takes you to free the hook:

-err_hook_dev:
-       kfree(hook);
+err_ops_alloc:
+       nft_netdev_hook_free(hook);

== netfilter: nf_tables: Add "notications" <-- typo: "notifications"

I suggest you add a new NFNLGRP_NFT_DEV group for these notifications,
so NFNLGRP_NFTABLES is only used for control plane updates via
nfnetlink API. In this case, these events are triggered by rtnetlink
when a new device is registered and it matches the existing an
existing device if I understood the rationale.

Thanks.