@@ -578,21 +578,34 @@ static int ethnl_default_dumpit(struct sk_buff *skb,
int ret = 0;
rcu_read_lock();
- for_each_netdev_dump(net, dev, ctx->pos_ifindex) {
- dev_hold(dev);
+ if (ctx->req_info->dev) {
+ dev = ctx->req_info->dev;
rcu_read_unlock();
-
- ret = ethnl_default_dump_one(skb, dev, ctx, genl_info_dump(cb));
-
+ /* Filtered DUMP request targeted to a single netdev. We already
+ * hold a ref to the netdev from ->start()
+ */
+ ret = ethnl_default_dump_one_dev(skb, dev, ctx,
+ genl_info_dump(cb));
rcu_read_lock();
- dev_put(dev);
-
- if (ret < 0 && ret != -EOPNOTSUPP) {
- if (likely(skb->len))
- ret = skb->len;
- break;
+ netdev_put(ctx->req_info->dev, &ctx->req_info->dev_tracker);
+ } else {
+ for_each_netdev_dump(net, dev, ctx->pos_ifindex) {
+ dev_hold(dev);
+ rcu_read_unlock();
+
+ ret = ethnl_default_dump_one(skb, dev, ctx,
+ genl_info_dump(cb));
+
+ rcu_read_lock();
+ dev_put(dev);
+
+ if (ret < 0 && ret != -EOPNOTSUPP) {
+ if (likely(skb->len))
+ ret = skb->len;
+ break;
+ }
+ ret = 0;
}
- ret = 0;
}
rcu_read_unlock();
@@ -626,10 +639,10 @@ static int ethnl_default_start(struct netlink_callback *cb)
}
ret = ethnl_default_parse(req_info, &info->info, ops, false);
- if (req_info->dev) {
- /* We ignore device specification in dump requests but as the
- * same parser as for non-dump (doit) requests is used, it
- * would take reference to the device if it finds one
+ if (req_info->dev && !ops->allow_pernetdev_dump) {
+ /* We ignore device specification in unfiltered dump requests
+ * but as the same parser as for non-dump (doit) requests is
+ * used, it would take reference to the device if it finds one
*/
netdev_put(req_info->dev, &req_info->dev_tracker);
req_info->dev = NULL;
@@ -388,6 +388,7 @@ struct ethnl_request_ops {
unsigned int req_info_size;
unsigned int reply_data_size;
bool allow_nodev_do;
+ bool allow_pernetdev_dump;
u8 set_ntf_cmd;
int (*parse_request)(struct ethnl_req_info *req_info,
We have a number of netlink commands in the ethnl family that may have multiple objects to dump even for a single net_device, including : - PLCA, PSE-PD, phy: one message per PHY device - tsinfo: one message per timestamp source (netdev + phys) - rss: One per RSS context To get this behaviour, these netlink commands need to roll a custom ->dumpit(). To prepare making per-netdev DUMP more generic in ethnl, introduce a member in the ethnl ops to indicate if a given command may allow pernetdev DUMPs (also referred to as filtered DUMPs). Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> --- net/ethtool/netlink.c | 45 ++++++++++++++++++++++++++++--------------- net/ethtool/netlink.h | 1 + 2 files changed, 30 insertions(+), 16 deletions(-)