| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230828061657.300667-5-jiri@resnulli.us>
Date: Mon, 28 Aug 2023 08:16:46 +0200
From: Jiri Pirko <jiri@...nulli.us>
To: netdev@...r.kernel.org
Cc: kuba@...nel.org,
pabeni@...hat.com,
davem@...emloft.net,
edumazet@...gle.com,
moshe@...dia.com
Subject: [patch net-next v2 04/15] devlink: move and rename devlink_dpipe_send_and_alloc_skb() helper
From: Jiri Pirko <jiri@...dia.com>
Since both dpipe and resource code is using this helper, in preparation
for code split to separate files, move
devlink_dpipe_send_and_alloc_skb() helper into netlink.c. Rename it on
the way.
Signed-off-by: Jiri Pirko <jiri@...dia.com>
---
net/devlink/devl_internal.h | 2 ++
net/devlink/leftover.c | 34 +++++++++-------------------------
net/devlink/netlink.c | 15 +++++++++++++++
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index e1a6b7a763b8..66c94957e96c 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -150,6 +150,8 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
return 0;
}
+int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);
+
/* Notify */
void devlink_notify(struct devlink *devlink, enum devlink_command cmd);
void devlink_ports_notify_register(struct devlink *devlink);
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 795bfdd41103..1bcd4192099e 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1277,22 +1277,6 @@ static int devlink_dpipe_table_put(struct sk_buff *skb,
return -EMSGSIZE;
}
-static int devlink_dpipe_send_and_alloc_skb(struct sk_buff **pskb,
- struct genl_info *info)
-{
- int err;
-
- if (*pskb) {
- err = genlmsg_reply(*pskb, info);
- if (err)
- return err;
- }
- *pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);
- if (!*pskb)
- return -ENOMEM;
- return 0;
-}
-
static int devlink_dpipe_tables_fill(struct genl_info *info,
enum devlink_command cmd, int flags,
struct list_head *dpipe_tables,
@@ -1311,7 +1295,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info,
table = list_first_entry(dpipe_tables,
struct devlink_dpipe_table, list);
start_again:
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
@@ -1358,7 +1342,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info,
nlh = nlmsg_put(skb, info->snd_portid, info->snd_seq,
NLMSG_DONE, 0, flags | NLM_F_MULTI);
if (!nlh) {
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
goto send_done;
@@ -1551,8 +1535,8 @@ int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx)
struct devlink *devlink;
int err;
- err = devlink_dpipe_send_and_alloc_skb(&dump_ctx->skb,
- dump_ctx->info);
+ err = devlink_nl_msg_reply_and_new(&dump_ctx->skb,
+ dump_ctx->info);
if (err)
return err;
@@ -1638,7 +1622,7 @@ static int devlink_dpipe_entries_fill(struct genl_info *info,
nlh = nlmsg_put(dump_ctx.skb, info->snd_portid, info->snd_seq,
NLMSG_DONE, 0, flags | NLM_F_MULTI);
if (!nlh) {
- err = devlink_dpipe_send_and_alloc_skb(&dump_ctx.skb, info);
+ err = devlink_nl_msg_reply_and_new(&dump_ctx.skb, info);
if (err)
return err;
goto send_done;
@@ -1746,7 +1730,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info,
i = 0;
start_again:
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
@@ -1782,7 +1766,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info,
nlh = nlmsg_put(skb, info->snd_portid, info->snd_seq,
NLMSG_DONE, 0, flags | NLM_F_MULTI);
if (!nlh) {
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
goto send_done;
@@ -2047,7 +2031,7 @@ static int devlink_resource_fill(struct genl_info *info,
resource = list_first_entry(&devlink->resource_list,
struct devlink_resource, list);
start_again:
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
@@ -2086,7 +2070,7 @@ static int devlink_resource_fill(struct genl_info *info,
nlh = nlmsg_put(skb, info->snd_portid, info->snd_seq,
NLMSG_DONE, 0, flags | NLM_F_MULTI);
if (!nlh) {
- err = devlink_dpipe_send_and_alloc_skb(&skb, info);
+ err = devlink_nl_msg_reply_and_new(&skb, info);
if (err)
return err;
goto send_done;
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 72a5005a64cd..5f57afd31dea 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -82,6 +82,21 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
[DEVLINK_ATTR_REGION_DIRECT] = { .type = NLA_FLAG },
};
+int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info)
+{
+ int err;
+
+ if (*msg) {
+ err = genlmsg_reply(*msg, info);
+ if (err)
+ return err;
+ }
+ *msg = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!*msg)
+ return -ENOMEM;
+ return 0;
+}
+
struct devlink *
devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs)
{
--
2.41.0
Powered by blists - more mailing lists