ethtool: provide WoL settings with WOL_GET request
Implement WOL_GET request to get wake-on-lan settings for a device, traditionally available via ETHTOOL_GWOL ioctl request. As part of the implementation, provide symbolic names for wake-on-line modes as ETH_SS_WOL_MODES string set. Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
0bda7af39d
commit
51ea22b04e
@@ -5,4 +5,4 @@ obj-y += ioctl.o common.o
|
||||
obj-$(CONFIG_ETHTOOL_NETLINK) += ethtool_nl.o
|
||||
|
||||
ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o \
|
||||
linkstate.o debug.o
|
||||
linkstate.o debug.o wol.o
|
||||
|
@@ -190,6 +190,18 @@ const char netif_msg_class_names[][ETH_GSTRING_LEN] = {
|
||||
};
|
||||
static_assert(ARRAY_SIZE(netif_msg_class_names) == NETIF_MSG_CLASS_COUNT);
|
||||
|
||||
const char wol_mode_names[][ETH_GSTRING_LEN] = {
|
||||
[const_ilog2(WAKE_PHY)] = "phy",
|
||||
[const_ilog2(WAKE_UCAST)] = "ucast",
|
||||
[const_ilog2(WAKE_MCAST)] = "mcast",
|
||||
[const_ilog2(WAKE_BCAST)] = "bcast",
|
||||
[const_ilog2(WAKE_ARP)] = "arp",
|
||||
[const_ilog2(WAKE_MAGIC)] = "magic",
|
||||
[const_ilog2(WAKE_MAGICSECURE)] = "magicsecure",
|
||||
[const_ilog2(WAKE_FILTER)] = "filter",
|
||||
};
|
||||
static_assert(ARRAY_SIZE(wol_mode_names) == WOL_MODE_COUNT);
|
||||
|
||||
/* return false if legacy contained non-0 deprecated fields
|
||||
* maxtxpkt/maxrxpkt. rest of ksettings always updated
|
||||
*/
|
||||
|
@@ -20,6 +20,7 @@ extern const char
|
||||
phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN];
|
||||
extern const char link_mode_names[][ETH_GSTRING_LEN];
|
||||
extern const char netif_msg_class_names[][ETH_GSTRING_LEN];
|
||||
extern const char wol_mode_names[][ETH_GSTRING_LEN];
|
||||
|
||||
int __ethtool_get_link(struct net_device *dev);
|
||||
|
||||
|
@@ -214,6 +214,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
|
||||
[ETHTOOL_MSG_LINKMODES_GET] = ðnl_linkmodes_request_ops,
|
||||
[ETHTOOL_MSG_LINKSTATE_GET] = ðnl_linkstate_request_ops,
|
||||
[ETHTOOL_MSG_DEBUG_GET] = ðnl_debug_request_ops,
|
||||
[ETHTOOL_MSG_WOL_GET] = ðnl_wol_request_ops,
|
||||
};
|
||||
|
||||
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
|
||||
@@ -679,6 +680,14 @@ static const struct genl_ops ethtool_genl_ops[] = {
|
||||
.flags = GENL_UNS_ADMIN_PERM,
|
||||
.doit = ethnl_set_debug,
|
||||
},
|
||||
{
|
||||
.cmd = ETHTOOL_MSG_WOL_GET,
|
||||
.flags = GENL_UNS_ADMIN_PERM,
|
||||
.doit = ethnl_default_doit,
|
||||
.start = ethnl_default_start,
|
||||
.dumpit = ethnl_default_dumpit,
|
||||
.done = ethnl_default_done,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
|
||||
|
@@ -335,6 +335,7 @@ extern const struct ethnl_request_ops ethnl_linkinfo_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_linkmodes_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_linkstate_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_debug_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_wol_request_ops;
|
||||
|
||||
int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info);
|
||||
int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info);
|
||||
|
@@ -55,6 +55,11 @@ static const struct strset_info info_template[] = {
|
||||
.count = NETIF_MSG_CLASS_COUNT,
|
||||
.strings = netif_msg_class_names,
|
||||
},
|
||||
[ETH_SS_WOL_MODES] = {
|
||||
.per_dev = false,
|
||||
.count = WOL_MODE_COUNT,
|
||||
.strings = wol_mode_names,
|
||||
},
|
||||
};
|
||||
|
||||
struct strset_req_info {
|
||||
|
99
net/ethtool/wol.c
Normal file
99
net/ethtool/wol.c
Normal file
@@ -0,0 +1,99 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
#include "netlink.h"
|
||||
#include "common.h"
|
||||
#include "bitset.h"
|
||||
|
||||
struct wol_req_info {
|
||||
struct ethnl_req_info base;
|
||||
};
|
||||
|
||||
struct wol_reply_data {
|
||||
struct ethnl_reply_data base;
|
||||
struct ethtool_wolinfo wol;
|
||||
bool show_sopass;
|
||||
};
|
||||
|
||||
#define WOL_REPDATA(__reply_base) \
|
||||
container_of(__reply_base, struct wol_reply_data, base)
|
||||
|
||||
static const struct nla_policy
|
||||
wol_get_policy[ETHTOOL_A_WOL_MAX + 1] = {
|
||||
[ETHTOOL_A_WOL_UNSPEC] = { .type = NLA_REJECT },
|
||||
[ETHTOOL_A_WOL_HEADER] = { .type = NLA_NESTED },
|
||||
[ETHTOOL_A_WOL_MODES] = { .type = NLA_REJECT },
|
||||
[ETHTOOL_A_WOL_SOPASS] = { .type = NLA_REJECT },
|
||||
};
|
||||
|
||||
static int wol_prepare_data(const struct ethnl_req_info *req_base,
|
||||
struct ethnl_reply_data *reply_base,
|
||||
struct genl_info *info)
|
||||
{
|
||||
struct wol_reply_data *data = WOL_REPDATA(reply_base);
|
||||
struct net_device *dev = reply_base->dev;
|
||||
int ret;
|
||||
|
||||
if (!dev->ethtool_ops->get_wol)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = ethnl_ops_begin(dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
dev->ethtool_ops->get_wol(dev, &data->wol);
|
||||
ethnl_ops_complete(dev);
|
||||
data->show_sopass = data->wol.supported & WAKE_MAGICSECURE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wol_reply_size(const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
||||
const struct wol_reply_data *data = WOL_REPDATA(reply_base);
|
||||
int len;
|
||||
|
||||
len = ethnl_bitset32_size(&data->wol.wolopts, &data->wol.supported,
|
||||
WOL_MODE_COUNT, wol_mode_names, compact);
|
||||
if (len < 0)
|
||||
return len;
|
||||
if (data->show_sopass)
|
||||
len += nla_total_size(sizeof(data->wol.sopass));
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static int wol_fill_reply(struct sk_buff *skb,
|
||||
const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
||||
const struct wol_reply_data *data = WOL_REPDATA(reply_base);
|
||||
int ret;
|
||||
|
||||
ret = ethnl_put_bitset32(skb, ETHTOOL_A_WOL_MODES, &data->wol.wolopts,
|
||||
&data->wol.supported, WOL_MODE_COUNT,
|
||||
wol_mode_names, compact);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
if (data->show_sopass &&
|
||||
nla_put(skb, ETHTOOL_A_WOL_SOPASS, sizeof(data->wol.sopass),
|
||||
data->wol.sopass))
|
||||
return -EMSGSIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const struct ethnl_request_ops ethnl_wol_request_ops = {
|
||||
.request_cmd = ETHTOOL_MSG_WOL_GET,
|
||||
.reply_cmd = ETHTOOL_MSG_WOL_GET_REPLY,
|
||||
.hdr_attr = ETHTOOL_A_WOL_HEADER,
|
||||
.max_attr = ETHTOOL_A_WOL_MAX,
|
||||
.req_info_size = sizeof(struct wol_req_info),
|
||||
.reply_data_size = sizeof(struct wol_reply_data),
|
||||
.request_policy = wol_get_policy,
|
||||
|
||||
.prepare_data = wol_prepare_data,
|
||||
.reply_size = wol_reply_size,
|
||||
.fill_reply = wol_fill_reply,
|
||||
};
|
Reference in New Issue
Block a user