From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, edumazet@google•com, pabeni@redhat•com,
jiri@resnulli•us, jacob.e.keller@intel•com, leon@kernel•org,
Jakub Kicinski <kuba@kernel•org>,
pablo@netfilter•org, kadlec@netfilter•org, fw@strlen•de,
johannes@sipsolutions•net, ecree.xilinx@gmail•com,
netfilter-devel@vger•kernel.org, coreteam@netfilter•org
Subject: [RFC net-next 05/15] netlink: add macro for checking dump ctx size
Date: Wed, 14 Dec 2022 18:01:45 -0800 [thread overview]
Message-ID: <20221215020155.1619839-6-kuba@kernel.org> (raw)
In-Reply-To: <20221215020155.1619839-1-kuba@kernel.org>
We encourage casting struct netlink_callback::ctx to a local
struct (in a comment above the field). Provide a convenience
macro for checking if the local struct fits into the ctx.
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
CC: pablo@netfilter•org
CC: kadlec@netfilter•org
CC: fw@strlen•de
CC: johannes@sipsolutions•net
CC: ecree.xilinx@gmail•com
CC: netfilter-devel@vger•kernel.org
CC: coreteam@netfilter•org
---
include/linux/netlink.h | 4 ++++
net/netfilter/nf_conntrack_netlink.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index d81bde5a5844..38f6334f408c 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -263,6 +263,10 @@ struct netlink_callback {
};
};
+#define NL_ASSET_DUMP_CTX_FITS(type_name) \
+ BUILD_BUG_ON(sizeof(type_name) > \
+ sizeof_field(struct netlink_callback, ctx))
+
struct netlink_notify {
struct net *net;
u32 portid;
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 1286ae7d4609..90672e293e57 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -3866,7 +3866,7 @@ static int __init ctnetlink_init(void)
{
int ret;
- BUILD_BUG_ON(sizeof(struct ctnetlink_list_dump_ctx) > sizeof_field(struct netlink_callback, ctx));
+ NL_ASSET_DUMP_CTX_FITS(struct ctnetlink_list_dump_ctx);
ret = nfnetlink_subsys_register(&ctnl_subsys);
if (ret < 0) {
--
2.38.1
next prev parent reply other threads:[~2022-12-15 2:02 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 2:01 [RFC net-next 00/15] devlink: code split and structured instance walk Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 01/15] devlink: move code to a dedicated directory Jakub Kicinski
2022-12-15 9:51 ` Jiri Pirko
2022-12-15 18:44 ` Jacob Keller
2022-12-15 19:13 ` Jakub Kicinski
2022-12-15 19:09 ` Jakub Kicinski
2022-12-15 19:29 ` Jacob Keller
2022-12-15 19:48 ` Jakub Kicinski
2022-12-16 9:09 ` Jiri Pirko
2022-12-16 9:10 ` Jiri Pirko
2022-12-16 18:32 ` Jakub Kicinski
2022-12-16 23:26 ` Jacob Keller
2022-12-15 2:01 ` [RFC net-next 02/15] devlink: split out core code Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 03/15] devlink: split out netlink code Jakub Kicinski
2022-12-15 18:45 ` Jacob Keller
2022-12-15 19:14 ` Jakub Kicinski
2022-12-15 19:35 ` Jacob Keller
2022-12-15 2:01 ` [RFC net-next 04/15] devlink: protect devlink dump by the instance lock Jakub Kicinski
2022-12-15 8:42 ` Jiri Pirko
2022-12-15 19:17 ` Jakub Kicinski
2022-12-15 2:01 ` Jakub Kicinski [this message]
2022-12-15 2:01 ` [RFC net-next 06/15] devlink: use an explicit structure for dump context Jakub Kicinski
2022-12-15 9:52 ` Jiri Pirko
2022-12-15 18:50 ` Jacob Keller
2022-12-15 19:18 ` Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 07/15] devlink: remove start variables from dumps Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 08/15] devlink: drop the filter argument from devlinks_xa_find_get Jakub Kicinski
2022-12-15 18:52 ` Jacob Keller
2022-12-15 2:01 ` [RFC net-next 09/15] devlink: health: combine loops in dump Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 10/15] devlink: restart dump based on devlink instance ids (simple) Jakub Kicinski
2022-12-15 18:59 ` Jacob Keller
2022-12-15 2:01 ` [RFC net-next 11/15] devlink: restart dump based on devlink instance ids (nested) Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 12/15] devlink: restart dump based on devlink instance ids (function) Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 13/15] devlink: uniformly take the devlink instance lock in the dump loop Jakub Kicinski
2022-12-15 2:01 ` [RFC net-next 14/15] devlink: add by-instance dump infra Jakub Kicinski
2022-12-15 9:11 ` Jiri Pirko
2022-12-15 19:24 ` Jacob Keller
2022-12-15 19:47 ` Jakub Kicinski
2022-12-16 9:23 ` Jiri Pirko
2022-12-15 19:03 ` Jacob Keller
2022-12-15 2:01 ` [RFC net-next 15/15] devlink: convert remaining dumps to the by-instance scheme Jakub Kicinski
2022-12-15 19:39 ` [RFC net-next 00/15] devlink: code split and structured instance walk Jacob Keller
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=20221215020155.1619839-6-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=coreteam@netfilter$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=ecree.xilinx@gmail$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=jacob.e.keller@intel$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kadlec@netfilter$(echo .)org \
--cc=leon@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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