34ac17ecbf
It seems I missed that most ethnl_parse_header_dev_get() callers
declare an on-stack struct ethnl_req_info, and that they simply call
dev_put(req_info.dev) when about to return.
Add ethnl_parse_header_dev_put() helper to properly untrack
reference taken by ethnl_parse_header_dev_get().
Fixes: e4b8954074 ("netlink: add net device refcount tracker to struct ethnl_req_info")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
129 lines
3.3 KiB
C
129 lines
3.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
#include "netlink.h"
|
|
#include "common.h"
|
|
#include "bitset.h"
|
|
|
|
struct debug_req_info {
|
|
struct ethnl_req_info base;
|
|
};
|
|
|
|
struct debug_reply_data {
|
|
struct ethnl_reply_data base;
|
|
u32 msg_mask;
|
|
};
|
|
|
|
#define DEBUG_REPDATA(__reply_base) \
|
|
container_of(__reply_base, struct debug_reply_data, base)
|
|
|
|
const struct nla_policy ethnl_debug_get_policy[] = {
|
|
[ETHTOOL_A_DEBUG_HEADER] =
|
|
NLA_POLICY_NESTED(ethnl_header_policy),
|
|
};
|
|
|
|
static int debug_prepare_data(const struct ethnl_req_info *req_base,
|
|
struct ethnl_reply_data *reply_base,
|
|
struct genl_info *info)
|
|
{
|
|
struct debug_reply_data *data = DEBUG_REPDATA(reply_base);
|
|
struct net_device *dev = reply_base->dev;
|
|
int ret;
|
|
|
|
if (!dev->ethtool_ops->get_msglevel)
|
|
return -EOPNOTSUPP;
|
|
|
|
ret = ethnl_ops_begin(dev);
|
|
if (ret < 0)
|
|
return ret;
|
|
data->msg_mask = dev->ethtool_ops->get_msglevel(dev);
|
|
ethnl_ops_complete(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int debug_reply_size(const struct ethnl_req_info *req_base,
|
|
const struct ethnl_reply_data *reply_base)
|
|
{
|
|
const struct debug_reply_data *data = DEBUG_REPDATA(reply_base);
|
|
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
|
|
|
return ethnl_bitset32_size(&data->msg_mask, NULL, NETIF_MSG_CLASS_COUNT,
|
|
netif_msg_class_names, compact);
|
|
}
|
|
|
|
static int debug_fill_reply(struct sk_buff *skb,
|
|
const struct ethnl_req_info *req_base,
|
|
const struct ethnl_reply_data *reply_base)
|
|
{
|
|
const struct debug_reply_data *data = DEBUG_REPDATA(reply_base);
|
|
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
|
|
|
return ethnl_put_bitset32(skb, ETHTOOL_A_DEBUG_MSGMASK, &data->msg_mask,
|
|
NULL, NETIF_MSG_CLASS_COUNT,
|
|
netif_msg_class_names, compact);
|
|
}
|
|
|
|
const struct ethnl_request_ops ethnl_debug_request_ops = {
|
|
.request_cmd = ETHTOOL_MSG_DEBUG_GET,
|
|
.reply_cmd = ETHTOOL_MSG_DEBUG_GET_REPLY,
|
|
.hdr_attr = ETHTOOL_A_DEBUG_HEADER,
|
|
.req_info_size = sizeof(struct debug_req_info),
|
|
.reply_data_size = sizeof(struct debug_reply_data),
|
|
|
|
.prepare_data = debug_prepare_data,
|
|
.reply_size = debug_reply_size,
|
|
.fill_reply = debug_fill_reply,
|
|
};
|
|
|
|
/* DEBUG_SET */
|
|
|
|
const struct nla_policy ethnl_debug_set_policy[] = {
|
|
[ETHTOOL_A_DEBUG_HEADER] =
|
|
NLA_POLICY_NESTED(ethnl_header_policy),
|
|
[ETHTOOL_A_DEBUG_MSGMASK] = { .type = NLA_NESTED },
|
|
};
|
|
|
|
int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info)
|
|
{
|
|
struct ethnl_req_info req_info = {};
|
|
struct nlattr **tb = info->attrs;
|
|
struct net_device *dev;
|
|
bool mod = false;
|
|
u32 msg_mask;
|
|
int ret;
|
|
|
|
ret = ethnl_parse_header_dev_get(&req_info,
|
|
tb[ETHTOOL_A_DEBUG_HEADER],
|
|
genl_info_net(info), info->extack,
|
|
true);
|
|
if (ret < 0)
|
|
return ret;
|
|
dev = req_info.dev;
|
|
ret = -EOPNOTSUPP;
|
|
if (!dev->ethtool_ops->get_msglevel || !dev->ethtool_ops->set_msglevel)
|
|
goto out_dev;
|
|
|
|
rtnl_lock();
|
|
ret = ethnl_ops_begin(dev);
|
|
if (ret < 0)
|
|
goto out_rtnl;
|
|
|
|
msg_mask = dev->ethtool_ops->get_msglevel(dev);
|
|
ret = ethnl_update_bitset32(&msg_mask, NETIF_MSG_CLASS_COUNT,
|
|
tb[ETHTOOL_A_DEBUG_MSGMASK],
|
|
netif_msg_class_names, info->extack, &mod);
|
|
if (ret < 0 || !mod)
|
|
goto out_ops;
|
|
|
|
dev->ethtool_ops->set_msglevel(dev, msg_mask);
|
|
ethtool_notify(dev, ETHTOOL_MSG_DEBUG_NTF, NULL);
|
|
|
|
out_ops:
|
|
ethnl_ops_complete(dev);
|
|
out_rtnl:
|
|
rtnl_unlock();
|
|
out_dev:
|
|
ethnl_parse_header_dev_put(&req_info);
|
|
return ret;
|
|
}
|