From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jakub.kicinski@netronome.com,
alex.aring@gmail.com, stefan@datenfreihafen.org,
jon.maloy@ericsson.com, ying.xue@windriver.com,
johannes.berg@intel.com, mkubecek@suse.cz, yuehaibing@huawei.com,
mlxsw@mellanox.com
Subject: [patch net-next 02/10] net: genetlink: introduce dump info struct to be available during dumpit op
Date: Sat, 5 Oct 2019 20:04:34 +0200 [thread overview]
Message-ID: <20191005180442.11788-3-jiri@resnulli.us> (raw)
In-Reply-To: <20191005180442.11788-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@mellanox.com>
Currently the cb->data is taken by ops during non-parallel dumping.
Introduce a new structure genl_dumpit_info and store the ops there.
Distribute the info to both non-parallel and parallel dumping. Also add
a helper genl_dumpit_info() to easily get the info structure in the
dumpit callback from cb.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
include/net/genetlink.h | 14 ++++++++++++
net/netlink/genetlink.c | 47 +++++++++++++++++++++++++++++++++--------
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 9292f1c588b7..fb838f4b0089 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -127,6 +127,20 @@ enum genl_validate_flags {
GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2),
};
+/**
+ * struct genl_info - info that is available during dumpit op call
+ * @ops: generic netlink ops - for internal genl code usage
+ */
+struct genl_dumpit_info {
+ const struct genl_ops *ops;
+};
+
+static inline const struct genl_dumpit_info *
+genl_dumpit_info(struct netlink_callback *cb)
+{
+ return cb->data;
+}
+
/**
* struct genl_ops - generic netlink operations
* @cmd: command identifier
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index b5fa98b1577d..c785080e9401 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -458,10 +458,19 @@ void *genlmsg_put(struct sk_buff *skb, u32 portid, u32 seq,
}
EXPORT_SYMBOL(genlmsg_put);
+static struct genl_dumpit_info *genl_dumpit_info_alloc(void)
+{
+ return kmalloc(sizeof(struct genl_dumpit_info), GFP_KERNEL);
+}
+
+static void genl_dumpit_info_free(const struct genl_dumpit_info *info)
+{
+ kfree(info);
+}
+
static int genl_lock_start(struct netlink_callback *cb)
{
- /* our ops are always const - netlink API doesn't propagate that */
- const struct genl_ops *ops = cb->data;
+ const struct genl_ops *ops = genl_dumpit_info(cb)->ops;
int rc = 0;
if (ops->start) {
@@ -474,8 +483,7 @@ static int genl_lock_start(struct netlink_callback *cb)
static int genl_lock_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
{
- /* our ops are always const - netlink API doesn't propagate that */
- const struct genl_ops *ops = cb->data;
+ const struct genl_ops *ops = genl_dumpit_info(cb)->ops;
int rc;
genl_lock();
@@ -486,8 +494,8 @@ static int genl_lock_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
static int genl_lock_done(struct netlink_callback *cb)
{
- /* our ops are always const - netlink API doesn't propagate that */
- const struct genl_ops *ops = cb->data;
+ const struct genl_dumpit_info *info = genl_dumpit_info(cb);
+ const struct genl_ops *ops = info->ops;
int rc = 0;
if (ops->done) {
@@ -495,6 +503,19 @@ static int genl_lock_done(struct netlink_callback *cb)
rc = ops->done(cb);
genl_unlock();
}
+ genl_dumpit_info_free(info);
+ return rc;
+}
+
+static int genl_parallel_done(struct netlink_callback *cb)
+{
+ const struct genl_dumpit_info *info = genl_dumpit_info(cb);
+ const struct genl_ops *ops = info->ops;
+ int rc = 0;
+
+ if (ops->done)
+ rc = ops->done(cb);
+ genl_dumpit_info_free(info);
return rc;
}
@@ -505,6 +526,7 @@ static int genl_family_rcv_msg_dumpit(const struct genl_family *family,
const struct genl_ops *ops,
int hdrlen, struct net *net)
{
+ struct genl_dumpit_info *info;
int err;
if (!ops->dumpit)
@@ -528,11 +550,17 @@ static int genl_family_rcv_msg_dumpit(const struct genl_family *family,
}
}
+ /* Allocate dumpit info. It is going to be freed by done() callback. */
+ info = genl_dumpit_info_alloc();
+ if (!info)
+ return -ENOMEM;
+
+ info->ops = ops;
+
if (!family->parallel_ops) {
struct netlink_dump_control c = {
.module = family->module,
- /* we have const, but the netlink API doesn't */
- .data = (void *)ops,
+ .data = info,
.start = genl_lock_start,
.dump = genl_lock_dumpit,
.done = genl_lock_done,
@@ -545,9 +573,10 @@ static int genl_family_rcv_msg_dumpit(const struct genl_family *family,
} else {
struct netlink_dump_control c = {
.module = family->module,
+ .data = info,
.start = ops->start,
.dump = ops->dumpit,
- .done = ops->done,
+ .done = genl_parallel_done,
};
err = __netlink_dump_start(net->genl_sock, skb, nlh, &c);
--
2.21.0
next prev parent reply other threads:[~2019-10-05 18:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-05 18:04 [patch net-next 00/10] net: genetlink: parse attrs for dumpit() callback Jiri Pirko
2019-10-05 18:04 ` [patch net-next 01/10] net: genetlink: push doit/dumpit code from genl_family_rcv_msg Jiri Pirko
2019-10-05 18:04 ` Jiri Pirko [this message]
2019-10-05 18:04 ` [patch net-next 03/10] net: genetlink: push attrbuf allocation and parsing to a separate function Jiri Pirko
2019-10-05 18:04 ` [patch net-next 04/10] net: genetlink: parse attrs and store in contect info struct during dumpit Jiri Pirko
2019-10-05 18:04 ` [patch net-next 05/10] net: ieee802154: have genetlink code to parse the attrs " Jiri Pirko
2019-10-05 18:04 ` [patch net-next 06/10] net: nfc: " Jiri Pirko
2019-10-05 18:04 ` [patch net-next 07/10] net: tipc: " Jiri Pirko
2021-04-15 21:24 ` Xin Long
2019-10-05 18:04 ` [patch net-next 08/10] net: tipc: allocate attrs locally instead of using genl_family_attrbuf in compat_dumpit() Jiri Pirko
2019-10-05 18:04 ` [patch net-next 09/10] net: genetlink: remove unused genl_family_attrbuf() Jiri Pirko
2019-10-05 18:04 ` [patch net-next 10/10] devlink: have genetlink code to parse the attrs during dumpit Jiri Pirko
2019-10-06 13:45 ` [patch net-next 00/10] net: genetlink: parse attrs for dumpit() callback David Miller
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=20191005180442.11788-3-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=johannes.berg@intel.com \
--cc=jon.maloy@ericsson.com \
--cc=mkubecek@suse.cz \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=stefan@datenfreihafen.org \
--cc=ying.xue@windriver.com \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).