{"id":2224330,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2224330/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260417093942.373885-4-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260417093942.373885-4-pablo@netfilter.org>","list_archive_url":null,"date":"2026-04-17T09:39:42","name":"[nf,v6,4/4] netfilter: nf_tables: add hook transactions for device deletions","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"8ac8998981d9a8e6394d4bb38cbf255017c1703f","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260417093942.373885-4-pablo@netfilter.org/mbox/","series":[{"id":500296,"url":"http://patchwork.ozlabs.org/api/1.2/series/500296/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=500296","date":"2026-04-17T09:39:41","name":"[nf,v6,1/4] netfilter: nf_tables: use list_del_rcu for netlink hooks","version":6,"mbox":"http://patchwork.ozlabs.org/series/500296/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224330/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224330/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n <netfilter-devel+bounces-11996-incoming=patchwork.ozlabs.org@vger.kernel.org>","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=netfilter.org header.i=@netfilter.org\n header.a=rsa-sha256 header.s=2025 header.b=vsKXLI32;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11996-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=\"vsKXLI32\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=217.70.190.124","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=netfilter.org"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fxqvX0Qzdz1yDF\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 17 Apr 2026 19:53:28 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 9B4F131E61E3\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 17 Apr 2026 09:40:42 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 09A0B3B4EB1;\n\tFri, 17 Apr 2026 09:39:56 +0000 (UTC)","from mail.netfilter.org (mail.netfilter.org [217.70.190.124])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id A18E73B777B;\n\tFri, 17 Apr 2026 09:39:53 +0000 (UTC)","from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id 3DEC96017D;\n\tFri, 17 Apr 2026 11:39:51 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776418795; cv=none;\n b=SdLLQmAzwgieyS1gkrFVYYtwK/1ad7vgAJESxjh3DmL89pgFZHX1VOF3R6l+UcIAmRfF0pIqiGRFzUx6At24wRXRnCr6vKu5heQEREEZL6FlNE18MBadg9HSg28RUjMJN7nk/wWlZjcP0on424QhCQN8KFEimYdNvWg7RNu6mro=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776418795; c=relaxed/simple;\n\tbh=yQq1s9JMLELSWMim2fbGzsDBDSQe+F13MEht4hnVLmk=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=GAfC73lhlEq4baCkq8M6tnS+a2psqFCLOe9Nddr7OSgJzymyMiYccc+CqEfAu3g0GRUHWS4nsgEyWOXsblkmuuo7CFe/yJK9nUscG0Ng/qp8teHeC/TJ0/SjgEuc9WLPz2nVEdh9jpikABTh5qTFiv+wjnNWqUwe4gECZTsKQ6g=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org;\n spf=pass smtp.mailfrom=netfilter.org;\n dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=vsKXLI32; arc=none smtp.client-ip=217.70.190.124","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org;\n\ts=2025; t=1776418791;\n\tbh=YgMALUF1To0Oe/rCAPb2Nuey5Ao9W/hbrXA5JSEWUV8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=vsKXLI32jQrZZ9Hyju51SzSgiI1NzN52ER7o5FwFEKtmMckjjvD3lYIUtHI4fxw43\n\t g/HQRRpNwWvwmO9/aq7VxJx81u5gTW0tQi2bTTNqVvW16tgoQrmg7sUeuQH4O/Gbt8\n\t x33bs9tH8DtTvYFS2QZNkX4fpHA+33F00I2bGDpPCYox7NSb1Tlia1elw/IalD7k1s\n\t je9Hk2A7VQXxkzvdq28+4JiyIyiPvaJyOaarbmGjfi/sqyRLia5M9SHdMDx0QWC+s3\n\t Q/qfc6FoIt5n3+Zlo1c9jOVmrNuYYXTCwCaph5t9352cO1exzHCgQcPzMYavFsRtKq\n\t RzIuh//5hLGNA==","From":"Pablo Neira Ayuso <pablo@netfilter.org>","To":"netfilter-devel@vger.kernel.org","Cc":"netdev@vger.kernel.org,\n\tfw@strlen.de","Subject":"[PATCH nf,v6 4/4] netfilter: nf_tables: add hook transactions for\n device deletions","Date":"Fri, 17 Apr 2026 11:39:42 +0200","Message-ID":"<20260417093942.373885-4-pablo@netfilter.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260417093942.373885-1-pablo@netfilter.org>","References":"<20260417093942.373885-1-pablo@netfilter.org>","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"<netfilter-devel.vger.kernel.org>","List-Subscribe":"<mailto:netfilter-devel+subscribe@vger.kernel.org>","List-Unsubscribe":"<mailto:netfilter-devel+unsubscribe@vger.kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"Restore the flag that indicates that the hook is going away, ie.\nNFT_HOOK_REMOVE, but add a new transaction object to track deletion\nof hooks without altering the basechain/flowtable hook_list during\nthe preparation phase.\n\nThe existing approach that moves the hook from the basechain/flowtable\nhook_list to transaction hook_list breaks netlink dump path readers\nof this RCU-protected list.\n\nIt should be possible use an array for nft_trans_hook to store the\ndeleted hooks to compact the representation but I am not expecting\nmany hook object, specially now that wildcard support for devices\nis in place.\n\nNote that the nft_trans_chain_hooks() list contains a list of struct\nnft_trans_hook objects for DELCHAIN and DELFLOWTABLE commands, while\nthis list stores struct nft_hook objects for NEWCHAIN and NEWFLOWTABLE.\nNote that new commands can be updated to use nft_trans_hook for\nconsistency.\n\nThis patch also adapts the event notification path to deal with the list\nof hook transactions.\n\nFixes: 7d937b107108 (\"netfilter: nf_tables: support for deleting devices in an existing netdev chain\")\nFixes: b6d9014a3335 (\"netfilter: nf_tables: delete flowtable hooks via transaction list\")\nReported-by: Xiang Mei <xmei5@asu.edu>\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\nv6: just a rebase on top of net-next, net is still behind.\n\n include/net/netfilter/nf_tables.h |  13 ++\n net/netfilter/nf_tables_api.c     | 251 +++++++++++++++++++++++-------\n 2 files changed, 212 insertions(+), 52 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h\nindex 2c0173d9309c..cff7b773e972 100644\n--- a/include/net/netfilter/nf_tables.h\n+++ b/include/net/netfilter/nf_tables.h\n@@ -1204,12 +1204,15 @@ struct nft_stats {\n \tstruct u64_stats_sync\tsyncp;\n };\n \n+#define NFT_HOOK_REMOVE\t(1 << 0)\n+\n struct nft_hook {\n \tstruct list_head\tlist;\n \tstruct list_head\tops_list;\n \tstruct rcu_head\t\trcu;\n \tchar\t\t\tifname[IFNAMSIZ];\n \tu8\t\t\tifnamelen;\n+\tu8\t\t\tflags;\n };\n \n struct nf_hook_ops *nft_hook_find_ops(const struct nft_hook *hook,\n@@ -1664,6 +1667,16 @@ struct nft_trans {\n \tu8\t\t\t\tput_net:1;\n };\n \n+/**\n+ * struct nft_trans_hook - nf_tables hook update in transaction\n+ * @list: used internally\n+ * @hook: struct nft_hook with the device hook\n+ */\n+struct nft_trans_hook {\n+\tstruct list_head\t\tlist;\n+\tstruct nft_hook\t\t\t*hook;\n+};\n+\n /**\n  * struct nft_trans_binding - nf_tables object with binding support in transaction\n  * @nft_trans:    base structure, MUST be first member\ndiff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex ae10116af923..d04768641ffb 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -380,6 +380,29 @@ static void nft_netdev_hook_unlink_free_rcu(struct nft_hook *hook)\n \tnft_netdev_hook_free_rcu(hook);\n }\n \n+static void nft_trans_hook_destroy(struct nft_trans_hook *trans_hook)\n+{\n+\tlist_del(&trans_hook->list);\n+\tkfree(trans_hook);\n+}\n+\n+static void nft_netdev_unregister_trans_hook(struct net *net,\n+\t\t\t\t\t     struct list_head *hook_list)\n+{\n+\tstruct nft_trans_hook *trans_hook, *next;\n+\tstruct nf_hook_ops *ops;\n+\tstruct nft_hook *hook;\n+\n+\tlist_for_each_entry_safe(trans_hook, next, hook_list, list) {\n+\t\thook = trans_hook->hook;\n+\t\tlist_for_each_entry(ops, &hook->ops_list, list)\n+\t\t\tnf_unregister_net_hook(net, ops);\n+\n+\t\tnft_netdev_hook_unlink_free_rcu(hook);\n+\t\tnft_trans_hook_destroy(trans_hook);\n+\t}\n+}\n+\n static void nft_netdev_unregister_hooks(struct net *net,\n \t\t\t\t\tstruct list_head *hook_list,\n \t\t\t\t\tbool release_netdev)\n@@ -1946,13 +1969,59 @@ static int nft_nla_put_hook_dev(struct sk_buff *skb, struct nft_hook *hook)\n \treturn nla_put_string(skb, attr, hook->ifname);\n }\n \n+struct nft_hook_dump_ctx {\n+\tstruct nft_hook *first;\n+\tint n;\n+};\n+\n+static int nft_dump_basechain_hook_one(struct sk_buff *skb,\n+\t\t\t\t       struct nft_hook *hook,\n+\t\t\t\t       struct nft_hook_dump_ctx *dump_ctx)\n+{\n+\tif (!dump_ctx->first)\n+\t\tdump_ctx->first = hook;\n+\n+\tif (nft_nla_put_hook_dev(skb, hook))\n+\t\treturn -1;\n+\n+\tdump_ctx->n++;\n+\n+\treturn 0;\n+}\n+\n+static int nft_dump_basechain_hook_list(struct sk_buff *skb,\n+\t\t\t\t\tconst struct list_head *hook_list,\n+\t\t\t\t\tstruct nft_hook_dump_ctx *dump_ctx)\n+{\n+\tstruct nft_hook *hook;\n+\n+\tlist_for_each_entry_rcu(hook, hook_list, list,\n+\t\t\t\tlockdep_commit_lock_is_held(net))\n+\t\tnft_dump_basechain_hook_one(skb, hook, dump_ctx);\n+\n+\treturn 0;\n+}\n+\n+static int nft_dump_basechain_trans_hook_list(struct sk_buff *skb,\n+\t\t\t\t\t      const struct list_head *trans_hook_list,\n+\t\t\t\t\t      struct nft_hook_dump_ctx *dump_ctx)\n+{\n+\tstruct nft_trans_hook *trans_hook;\n+\n+\tlist_for_each_entry(trans_hook, trans_hook_list, list)\n+\t\tnft_dump_basechain_hook_one(skb, trans_hook->hook, dump_ctx);\n+\n+\treturn 0;\n+}\n+\n static int nft_dump_basechain_hook(struct sk_buff *skb,\n \t\t\t\t   const struct net *net, int family,\n \t\t\t\t   const struct nft_base_chain *basechain,\n-\t\t\t\t   const struct list_head *hook_list)\n+\t\t\t\t   const struct list_head *hook_list,\n+\t\t\t\t   const struct list_head *trans_hook_list)\n {\n \tconst struct nf_hook_ops *ops = &basechain->ops;\n-\tstruct nft_hook *hook, *first = NULL;\n+\tstruct nft_hook_dump_ctx dump_hook_ctx = {};\n \tstruct nlattr *nest, *nest_devs;\n \tint n = 0;\n \n@@ -1969,23 +2038,23 @@ static int nft_dump_basechain_hook(struct sk_buff *skb,\n \t\tif (!nest_devs)\n \t\t\tgoto nla_put_failure;\n \n-\t\tif (!hook_list)\n+\t\tif (!hook_list && !trans_hook_list)\n \t\t\thook_list = &basechain->hook_list;\n \n-\t\tlist_for_each_entry_rcu(hook, hook_list, list,\n-\t\t\t\t\tlockdep_commit_lock_is_held(net)) {\n-\t\t\tif (!first)\n-\t\t\t\tfirst = hook;\n-\n-\t\t\tif (nft_nla_put_hook_dev(skb, hook))\n-\t\t\t\tgoto nla_put_failure;\n-\t\t\tn++;\n+\t\tif (hook_list &&\n+\t\t    nft_dump_basechain_hook_list(skb, hook_list, &dump_hook_ctx)) {\n+\t\t\tgoto nla_put_failure;\n+\t\t} else if (trans_hook_list &&\n+\t\t\t   nft_dump_basechain_trans_hook_list(skb, trans_hook_list,\n+\t\t\t\t\t\t\t      &dump_hook_ctx)) {\n+\t\t\tgoto nla_put_failure;\n \t\t}\n+\n \t\tnla_nest_end(skb, nest_devs);\n \n \t\tif (n == 1 &&\n-\t\t    !hook_is_prefix(first) &&\n-\t\t    nla_put_string(skb, NFTA_HOOK_DEV, first->ifname))\n+\t\t    !hook_is_prefix(dump_hook_ctx.first) &&\n+\t\t    nla_put_string(skb, NFTA_HOOK_DEV, dump_hook_ctx.first->ifname))\n \t\t\tgoto nla_put_failure;\n \t}\n \tnla_nest_end(skb, nest);\n@@ -1999,7 +2068,8 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,\n \t\t\t\t     u32 portid, u32 seq, int event, u32 flags,\n \t\t\t\t     int family, const struct nft_table *table,\n \t\t\t\t     const struct nft_chain *chain,\n-\t\t\t\t     const struct list_head *hook_list)\n+\t\t\t\t     const struct list_head *hook_list,\n+\t\t\t\t     const struct list_head *trans_hook_list)\n {\n \tstruct nlmsghdr *nlh;\n \n@@ -2015,7 +2085,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,\n \t\t\t NFTA_CHAIN_PAD))\n \t\tgoto nla_put_failure;\n \n-\tif (!hook_list &&\n+\tif (!hook_list && !trans_hook_list &&\n \t    (event == NFT_MSG_DELCHAIN ||\n \t     event == NFT_MSG_DESTROYCHAIN)) {\n \t\tnlmsg_end(skb, nlh);\n@@ -2026,7 +2096,8 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,\n \t\tconst struct nft_base_chain *basechain = nft_base_chain(chain);\n \t\tstruct nft_stats __percpu *stats;\n \n-\t\tif (nft_dump_basechain_hook(skb, net, family, basechain, hook_list))\n+\t\tif (nft_dump_basechain_hook(skb, net, family, basechain,\n+\t\t\t\t\t    hook_list, trans_hook_list))\n \t\t\tgoto nla_put_failure;\n \n \t\tif (nla_put_be32(skb, NFTA_CHAIN_POLICY,\n@@ -2062,7 +2133,8 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,\n }\n \n static void nf_tables_chain_notify(const struct nft_ctx *ctx, int event,\n-\t\t\t\t   const struct list_head *hook_list)\n+\t\t\t\t   const struct list_head *hook_list,\n+\t\t\t\t   const struct list_head *trans_hook_list)\n {\n \tstruct nftables_pernet *nft_net;\n \tstruct sk_buff *skb;\n@@ -2082,7 +2154,7 @@ static void nf_tables_chain_notify(const struct nft_ctx *ctx, int event,\n \n \terr = nf_tables_fill_chain_info(skb, ctx->net, ctx->portid, ctx->seq,\n \t\t\t\t\tevent, flags, ctx->family, ctx->table,\n-\t\t\t\t\tctx->chain, hook_list);\n+\t\t\t\t\tctx->chain, hook_list, trans_hook_list);\n \tif (err < 0) {\n \t\tkfree_skb(skb);\n \t\tgoto err;\n@@ -2128,7 +2200,7 @@ static int nf_tables_dump_chains(struct sk_buff *skb,\n \t\t\t\t\t\t      NFT_MSG_NEWCHAIN,\n \t\t\t\t\t\t      NLM_F_MULTI,\n \t\t\t\t\t\t      table->family, table,\n-\t\t\t\t\t\t      chain, NULL) < 0)\n+\t\t\t\t\t\t      chain, NULL, NULL) < 0)\n \t\t\t\tgoto done;\n \n \t\t\tnl_dump_check_consistent(cb, nlmsg_hdr(skb));\n@@ -2182,7 +2254,7 @@ static int nf_tables_getchain(struct sk_buff *skb, const struct nfnl_info *info,\n \n \terr = nf_tables_fill_chain_info(skb2, net, NETLINK_CB(skb).portid,\n \t\t\t\t\tinfo->nlh->nlmsg_seq, NFT_MSG_NEWCHAIN,\n-\t\t\t\t\t0, family, table, chain, NULL);\n+\t\t\t\t\t0, family, table, chain, NULL, NULL);\n \tif (err < 0)\n \t\tgoto err_fill_chain_info;\n \n@@ -2345,8 +2417,12 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,\n \n \tlist_for_each_entry(hook, hook_list, list) {\n \t\tif (!strncmp(hook->ifname, this->ifname,\n-\t\t\t     min(hook->ifnamelen, this->ifnamelen)))\n+\t\t\t     min(hook->ifnamelen, this->ifnamelen))) {\n+\t\t\tif (hook->flags & NFT_HOOK_REMOVE)\n+\t\t\t\tcontinue;\n+\n \t\t\treturn hook;\n+\t\t}\n \t}\n \n \treturn NULL;\n@@ -3105,6 +3181,32 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info,\n \treturn nf_tables_addchain(&ctx, family, policy, flags, extack);\n }\n \n+static int nft_trans_delhook(struct nft_hook *hook,\n+\t\t\t     struct list_head *del_list)\n+{\n+\tstruct nft_trans_hook *trans_hook;\n+\n+\ttrans_hook = kmalloc_obj(*trans_hook, GFP_KERNEL);\n+\tif (!trans_hook)\n+\t\treturn -ENOMEM;\n+\n+\ttrans_hook->hook = hook;\n+\tlist_add_tail(&trans_hook->list, del_list);\n+\thook->flags |= NFT_HOOK_REMOVE;\n+\n+\treturn 0;\n+}\n+\n+static void nft_trans_delhook_abort(struct list_head *del_list)\n+{\n+\tstruct nft_trans_hook *trans_hook, *next;\n+\n+\tlist_for_each_entry_safe(trans_hook, next, del_list, list) {\n+\t\ttrans_hook->hook->flags &= ~NFT_HOOK_REMOVE;\n+\t\tnft_trans_hook_destroy(trans_hook);\n+\t}\n+}\n+\n static int nft_delchain_hook(struct nft_ctx *ctx,\n \t\t\t     struct nft_base_chain *basechain,\n \t\t\t     struct netlink_ext_ack *extack)\n@@ -3131,7 +3233,10 @@ static int nft_delchain_hook(struct nft_ctx *ctx,\n \t\t\terr = -ENOENT;\n \t\t\tgoto err_chain_del_hook;\n \t\t}\n-\t\tlist_move(&hook->list, &chain_del_list);\n+\t\tif (nft_trans_delhook(hook, &chain_del_list) < 0) {\n+\t\t\terr = -ENOMEM;\n+\t\t\tgoto err_chain_del_hook;\n+\t\t}\n \t}\n \n \ttrans = nft_trans_alloc_chain(ctx, NFT_MSG_DELCHAIN);\n@@ -3151,7 +3256,7 @@ static int nft_delchain_hook(struct nft_ctx *ctx,\n \treturn 0;\n \n err_chain_del_hook:\n-\tlist_splice(&chain_del_list, &basechain->hook_list);\n+\tnft_trans_delhook_abort(&chain_del_list);\n \tnft_chain_release_hook(&chain_hook);\n \n \treturn err;\n@@ -8933,6 +9038,14 @@ static int nft_register_flowtable_net_hooks(struct net *net,\n \treturn err;\n }\n \n+static void nft_trans_delhook_commit(struct list_head *hook_list)\n+{\n+\tstruct nft_trans_hook *trans_hook, *next;\n+\n+\tlist_for_each_entry_safe(trans_hook, next, hook_list, list)\n+\t\tnft_trans_hook_destroy(trans_hook);\n+}\n+\n static void nft_hooks_destroy(struct list_head *hook_list)\n {\n \tstruct nft_hook *hook, *next;\n@@ -8941,6 +9054,24 @@ static void nft_hooks_destroy(struct list_head *hook_list)\n \t\tnft_netdev_hook_unlink_free_rcu(hook);\n }\n \n+static void nft_flowtable_unregister_trans_hook(struct net *net,\n+\t\t\t\t\t\tstruct nft_flowtable *flowtable,\n+\t\t\t\t\t\tstruct list_head *hook_list)\n+{\n+\tstruct nft_trans_hook *trans_hook, *next;\n+\tstruct nf_hook_ops *ops;\n+\tstruct nft_hook *hook;\n+\n+\tlist_for_each_entry_safe(trans_hook, next, hook_list, list) {\n+\t\thook = trans_hook->hook;\n+\t\tlist_for_each_entry(ops, &hook->ops_list, list)\n+\t\t\tnft_unregister_flowtable_ops(net, flowtable, ops);\n+\n+\t\tnft_netdev_hook_unlink_free_rcu(hook);\n+\t\tnft_trans_hook_destroy(trans_hook);\n+\t}\n+}\n+\n static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,\n \t\t\t\tstruct nft_flowtable *flowtable,\n \t\t\t\tstruct netlink_ext_ack *extack)\n@@ -9199,7 +9330,10 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx,\n \t\t\terr = -ENOENT;\n \t\t\tgoto err_flowtable_del_hook;\n \t\t}\n-\t\tlist_move(&hook->list, &flowtable_del_list);\n+\t\tif (nft_trans_delhook(hook, &flowtable_del_list) < 0) {\n+\t\t\terr = -ENOMEM;\n+\t\t\tgoto err_flowtable_del_hook;\n+\t\t}\n \t}\n \n \ttrans = nft_trans_alloc(ctx, NFT_MSG_DELFLOWTABLE,\n@@ -9220,7 +9354,7 @@ static int nft_delflowtable_hook(struct nft_ctx *ctx,\n \treturn 0;\n \n err_flowtable_del_hook:\n-\tlist_splice(&flowtable_del_list, &flowtable->hook_list);\n+\tnft_trans_delhook_abort(&flowtable_del_list);\n \tnft_flowtable_hook_release(&flowtable_hook);\n \n \treturn err;\n@@ -9285,8 +9419,10 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,\n \t\t\t\t\t u32 portid, u32 seq, int event,\n \t\t\t\t\t u32 flags, int family,\n \t\t\t\t\t struct nft_flowtable *flowtable,\n-\t\t\t\t\t struct list_head *hook_list)\n+\t\t\t\t\t struct list_head *hook_list,\n+\t\t\t\t\t struct list_head *trans_hook_list)\n {\n+\tstruct nft_trans_hook *trans_hook;\n \tstruct nlattr *nest, *nest_devs;\n \tstruct nft_hook *hook;\n \tstruct nlmsghdr *nlh;\n@@ -9303,7 +9439,7 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,\n \t\t\t NFTA_FLOWTABLE_PAD))\n \t\tgoto nla_put_failure;\n \n-\tif (!hook_list &&\n+\tif (!hook_list && !trans_hook_list &&\n \t    (event == NFT_MSG_DELFLOWTABLE ||\n \t     event == NFT_MSG_DESTROYFLOWTABLE)) {\n \t\tnlmsg_end(skb, nlh);\n@@ -9325,13 +9461,20 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,\n \tif (!nest_devs)\n \t\tgoto nla_put_failure;\n \n-\tif (!hook_list)\n+\tif (!hook_list && !trans_hook_list)\n \t\thook_list = &flowtable->hook_list;\n \n-\tlist_for_each_entry_rcu(hook, hook_list, list,\n-\t\t\t\tlockdep_commit_lock_is_held(net)) {\n-\t\tif (nft_nla_put_hook_dev(skb, hook))\n-\t\t\tgoto nla_put_failure;\n+\tif (hook_list) {\n+\t\tlist_for_each_entry_rcu(hook, hook_list, list,\n+\t\t\t\t\tlockdep_commit_lock_is_held(net)) {\n+\t\t\tif (nft_nla_put_hook_dev(skb, hook))\n+\t\t\t\tgoto nla_put_failure;\n+\t\t}\n+\t} else if (trans_hook_list) {\n+\t\tlist_for_each_entry(trans_hook, trans_hook_list, list) {\n+\t\t\tif (nft_nla_put_hook_dev(skb, trans_hook->hook))\n+\t\t\t\tgoto nla_put_failure;\n+\t\t}\n \t}\n \tnla_nest_end(skb, nest_devs);\n \tnla_nest_end(skb, nest);\n@@ -9385,7 +9528,7 @@ static int nf_tables_dump_flowtable(struct sk_buff *skb,\n \t\t\t\t\t\t\t  NFT_MSG_NEWFLOWTABLE,\n \t\t\t\t\t\t\t  NLM_F_MULTI | NLM_F_APPEND,\n \t\t\t\t\t\t\t  table->family,\n-\t\t\t\t\t\t\t  flowtable, NULL) < 0)\n+\t\t\t\t\t\t\t  flowtable, NULL, NULL) < 0)\n \t\t\t\tgoto done;\n \n \t\t\tnl_dump_check_consistent(cb, nlmsg_hdr(skb));\n@@ -9485,7 +9628,7 @@ static int nf_tables_getflowtable(struct sk_buff *skb,\n \terr = nf_tables_fill_flowtable_info(skb2, net, NETLINK_CB(skb).portid,\n \t\t\t\t\t    info->nlh->nlmsg_seq,\n \t\t\t\t\t    NFT_MSG_NEWFLOWTABLE, 0, family,\n-\t\t\t\t\t    flowtable, NULL);\n+\t\t\t\t\t    flowtable, NULL, NULL);\n \tif (err < 0)\n \t\tgoto err_fill_flowtable_info;\n \n@@ -9498,7 +9641,9 @@ static int nf_tables_getflowtable(struct sk_buff *skb,\n \n static void nf_tables_flowtable_notify(struct nft_ctx *ctx,\n \t\t\t\t       struct nft_flowtable *flowtable,\n-\t\t\t\t       struct list_head *hook_list, int event)\n+\t\t\t\t       struct list_head *hook_list,\n+\t\t\t\t       struct list_head *trans_hook_list,\n+\t\t\t\t       int event)\n {\n \tstruct nftables_pernet *nft_net = nft_pernet(ctx->net);\n \tstruct sk_buff *skb;\n@@ -9518,7 +9663,8 @@ static void nf_tables_flowtable_notify(struct nft_ctx *ctx,\n \n \terr = nf_tables_fill_flowtable_info(skb, ctx->net, ctx->portid,\n \t\t\t\t\t    ctx->seq, event, flags,\n-\t\t\t\t\t    ctx->family, flowtable, hook_list);\n+\t\t\t\t\t    ctx->family, flowtable,\n+\t\t\t\t\t    hook_list, trans_hook_list);\n \tif (err < 0) {\n \t\tkfree_skb(skb);\n \t\tgoto err;\n@@ -10053,7 +10199,7 @@ static void nft_commit_release(struct nft_trans *trans)\n \tcase NFT_MSG_DELCHAIN:\n \tcase NFT_MSG_DESTROYCHAIN:\n \t\tif (nft_trans_chain_update(trans))\n-\t\t\tnft_hooks_destroy(&nft_trans_chain_hooks(trans));\n+\t\t\tnft_trans_delhook_commit(&nft_trans_chain_hooks(trans));\n \t\telse\n \t\t\tnf_tables_chain_destroy(nft_trans_chain(trans));\n \t\tbreak;\n@@ -10076,7 +10222,7 @@ static void nft_commit_release(struct nft_trans *trans)\n \tcase NFT_MSG_DELFLOWTABLE:\n \tcase NFT_MSG_DESTROYFLOWTABLE:\n \t\tif (nft_trans_flowtable_update(trans))\n-\t\t\tnft_hooks_destroy(&nft_trans_flowtable_hooks(trans));\n+\t\t\tnft_trans_delhook_commit(&nft_trans_flowtable_hooks(trans));\n \t\telse\n \t\t\tnf_tables_flowtable_destroy(nft_trans_flowtable(trans));\n \t\tbreak;\n@@ -10837,31 +10983,30 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)\n \t\t\tif (nft_trans_chain_update(trans)) {\n \t\t\t\tnft_chain_commit_update(nft_trans_container_chain(trans));\n \t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_NEWCHAIN,\n-\t\t\t\t\t\t       &nft_trans_chain_hooks(trans));\n+\t\t\t\t\t\t       &nft_trans_chain_hooks(trans), NULL);\n \t\t\t\tlist_splice_rcu(&nft_trans_chain_hooks(trans),\n \t\t\t\t\t\t&nft_trans_basechain(trans)->hook_list);\n \t\t\t\t/* trans destroyed after rcu grace period */\n \t\t\t} else {\n \t\t\t\tnft_chain_commit_drop_policy(nft_trans_container_chain(trans));\n \t\t\t\tnft_clear(net, nft_trans_chain(trans));\n-\t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_NEWCHAIN, NULL);\n+\t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_NEWCHAIN, NULL, NULL);\n \t\t\t\tnft_trans_destroy(trans);\n \t\t\t}\n \t\t\tbreak;\n \t\tcase NFT_MSG_DELCHAIN:\n \t\tcase NFT_MSG_DESTROYCHAIN:\n \t\t\tif (nft_trans_chain_update(trans)) {\n-\t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_DELCHAIN,\n+\t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_DELCHAIN, NULL,\n \t\t\t\t\t\t       &nft_trans_chain_hooks(trans));\n \t\t\t\tif (!(table->flags & NFT_TABLE_F_DORMANT)) {\n-\t\t\t\t\tnft_netdev_unregister_hooks(net,\n-\t\t\t\t\t\t\t\t    &nft_trans_chain_hooks(trans),\n-\t\t\t\t\t\t\t\t    true);\n+\t\t\t\t\tnft_netdev_unregister_trans_hook(net,\n+\t\t\t\t\t\t\t\t\t &nft_trans_chain_hooks(trans));\n \t\t\t\t}\n \t\t\t} else {\n \t\t\t\tnft_chain_del(nft_trans_chain(trans));\n \t\t\t\tnf_tables_chain_notify(&ctx, NFT_MSG_DELCHAIN,\n-\t\t\t\t\t\t       NULL);\n+\t\t\t\t\t\t       NULL, NULL);\n \t\t\t\tnf_tables_unregister_hook(ctx.net, ctx.table,\n \t\t\t\t\t\t\t  nft_trans_chain(trans));\n \t\t\t}\n@@ -10967,6 +11112,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)\n \t\t\t\tnf_tables_flowtable_notify(&ctx,\n \t\t\t\t\t\t\t   nft_trans_flowtable(trans),\n \t\t\t\t\t\t\t   &nft_trans_flowtable_hooks(trans),\n+\t\t\t\t\t\t\t   NULL,\n \t\t\t\t\t\t\t   NFT_MSG_NEWFLOWTABLE);\n \t\t\t\tlist_splice_rcu(&nft_trans_flowtable_hooks(trans),\n \t\t\t\t\t\t&nft_trans_flowtable(trans)->hook_list);\n@@ -10975,6 +11121,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)\n \t\t\t\tnf_tables_flowtable_notify(&ctx,\n \t\t\t\t\t\t\t   nft_trans_flowtable(trans),\n \t\t\t\t\t\t\t   NULL,\n+\t\t\t\t\t\t\t   NULL,\n \t\t\t\t\t\t\t   NFT_MSG_NEWFLOWTABLE);\n \t\t\t}\n \t\t\tnft_trans_destroy(trans);\n@@ -10984,16 +11131,18 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)\n \t\t\tif (nft_trans_flowtable_update(trans)) {\n \t\t\t\tnf_tables_flowtable_notify(&ctx,\n \t\t\t\t\t\t\t   nft_trans_flowtable(trans),\n+\t\t\t\t\t\t\t   NULL,\n \t\t\t\t\t\t\t   &nft_trans_flowtable_hooks(trans),\n \t\t\t\t\t\t\t   trans->msg_type);\n-\t\t\t\tnft_unregister_flowtable_net_hooks(net,\n-\t\t\t\t\t\t\t\t   nft_trans_flowtable(trans),\n-\t\t\t\t\t\t\t\t   &nft_trans_flowtable_hooks(trans));\n+\t\t\t\tnft_flowtable_unregister_trans_hook(net,\n+\t\t\t\t\t\t\t\t    nft_trans_flowtable(trans),\n+\t\t\t\t\t\t\t\t    &nft_trans_flowtable_hooks(trans));\n \t\t\t} else {\n \t\t\t\tlist_del_rcu(&nft_trans_flowtable(trans)->list);\n \t\t\t\tnf_tables_flowtable_notify(&ctx,\n \t\t\t\t\t\t\t   nft_trans_flowtable(trans),\n \t\t\t\t\t\t\t   NULL,\n+\t\t\t\t\t\t\t   NULL,\n \t\t\t\t\t\t\t   trans->msg_type);\n \t\t\t\tnft_unregister_flowtable_net_hooks(net,\n \t\t\t\t\t\tnft_trans_flowtable(trans),\n@@ -11157,8 +11306,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)\n \t\tcase NFT_MSG_DELCHAIN:\n \t\tcase NFT_MSG_DESTROYCHAIN:\n \t\t\tif (nft_trans_chain_update(trans)) {\n-\t\t\t\tlist_splice(&nft_trans_chain_hooks(trans),\n-\t\t\t\t\t    &nft_trans_basechain(trans)->hook_list);\n+\t\t\t\tnft_trans_delhook_abort(&nft_trans_chain_hooks(trans));\n \t\t\t} else {\n \t\t\t\tnft_use_inc_restore(&table->use);\n \t\t\t\tnft_clear(trans->net, nft_trans_chain(trans));\n@@ -11272,8 +11420,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)\n \t\tcase NFT_MSG_DELFLOWTABLE:\n \t\tcase NFT_MSG_DESTROYFLOWTABLE:\n \t\t\tif (nft_trans_flowtable_update(trans)) {\n-\t\t\t\tlist_splice(&nft_trans_flowtable_hooks(trans),\n-\t\t\t\t\t    &nft_trans_flowtable(trans)->hook_list);\n+\t\t\t\tnft_trans_delhook_abort(&nft_trans_flowtable_hooks(trans));\n \t\t\t} else {\n \t\t\t\tnft_use_inc_restore(&table->use);\n \t\t\t\tnft_clear(trans->net, nft_trans_flowtable(trans));\n","prefixes":["nf","v6","4/4"]}