Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 04007961 编写于 作者: J Jakub Kicinski 提交者： David S. Miller
浏览文件
操作

ethtool: netlink: convert commands to common SET 

Convert all SET commands where new common code is applicable.
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 99132b6e
隐藏空白更改
内联 并排
Showing with 508 addition and 725 deletion
net/ethtool/channels.c
浏览文件 @ 04007961
...@@ -86,18 +86,6 @@ static int channels_fill_reply(struct sk_buff *skb, ...@@ -86,18 +86,6 @@ static int channels_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_channels_request_ops = {
.request_cmd = ETHTOOL_MSG_CHANNELS_GET,
.reply_cmd = ETHTOOL_MSG_CHANNELS_GET_REPLY,
.hdr_attr = ETHTOOL_A_CHANNELS_HEADER,
.req_info_size = sizeof(struct channels_req_info),
.reply_data_size = sizeof(struct channels_reply_data),
.prepare_data = channels_prepare_data,
.reply_size = channels_reply_size,
.fill_reply = channels_fill_reply,
};
/* CHANNELS_SET */ /* CHANNELS_SET */
const struct nla_policy ethnl_channels_set_policy[] = { const struct nla_policy ethnl_channels_set_policy[] = {
...@@ -109,36 +97,28 @@ const struct nla_policy ethnl_channels_set_policy[] = { ...@@ -109,36 +97,28 @@ const struct nla_policy ethnl_channels_set_policy[] = {
[ETHTOOL_A_CHANNELS_COMBINED_COUNT] = { .type = NLA_U32 }, [ETHTOOL_A_CHANNELS_COMBINED_COUNT] = { .type = NLA_U32 },
}; };
int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_channels_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_channels && ops->set_channels ? 1 : -EOPNOTSUPP;
}
static int
ethnl_set_channels(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
unsigned int from_channel, old_total, i; unsigned int from_channel, old_total, i;
bool mod = false, mod_combined = false; bool mod = false, mod_combined = false;
struct net_device *dev = req_info->dev;
struct ethtool_channels channels = {}; struct ethtool_channels channels = {};
struct ethnl_req_info req_info = {};
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
u32 err_attr, max_rxfh_in_use; u32 err_attr, max_rxfh_in_use;
const struct ethtool_ops *ops;
struct net_device *dev;
u64 max_rxnfc_in_use; u64 max_rxnfc_in_use;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, dev->ethtool_ops->get_channels(dev, &channels);
tb[ETHTOOL_A_CHANNELS_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_channels || !ops->set_channels)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ops->get_channels(dev, &channels);
old_total = channels.combined_count + old_total = channels.combined_count +
max(channels.rx_count, channels.tx_count); max(channels.rx_count, channels.tx_count);
...@@ -151,9 +131,8 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) ...@@ -151,9 +131,8 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
ethnl_update_u32(&channels.combined_count, ethnl_update_u32(&channels.combined_count,
tb[ETHTOOL_A_CHANNELS_COMBINED_COUNT], &mod_combined); tb[ETHTOOL_A_CHANNELS_COMBINED_COUNT], &mod_combined);
mod |= mod_combined; mod |= mod_combined;
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
/* ensure new channel counts are within limits */ /* ensure new channel counts are within limits */
if (channels.rx_count > channels.max_rx) if (channels.rx_count > channels.max_rx)
...@@ -167,10 +146,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) ...@@ -167,10 +146,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
else else
err_attr = 0; err_attr = 0;
if (err_attr) { if (err_attr) {
ret = -EINVAL;
NL_SET_ERR_MSG_ATTR(info->extack, tb[err_attr], NL_SET_ERR_MSG_ATTR(info->extack, tb[err_attr],
"requested channel count exceeds maximum"); "requested channel count exceeds maximum");
goto out_ops; return -EINVAL;
} }
/* ensure there is at least one RX and one TX channel */ /* ensure there is at least one RX and one TX channel */
...@@ -183,10 +161,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) ...@@ -183,10 +161,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
if (err_attr) { if (err_attr) {
if (mod_combined) if (mod_combined)
err_attr = ETHTOOL_A_CHANNELS_COMBINED_COUNT; err_attr = ETHTOOL_A_CHANNELS_COMBINED_COUNT;
ret = -EINVAL;
NL_SET_ERR_MSG_ATTR(info->extack, tb[err_attr], NL_SET_ERR_MSG_ATTR(info->extack, tb[err_attr],
"requested channel counts would result in no RX or TX channel being configured"); "requested channel counts would result in no RX or TX channel being configured");
goto out_ops; return -EINVAL;
} }
/* ensure the new Rx count fits within the configured Rx flow /* ensure the new Rx count fits within the configured Rx flow
...@@ -198,14 +175,12 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) ...@@ -198,14 +175,12 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
ethtool_get_max_rxfh_channel(dev, &max_rxfh_in_use)) ethtool_get_max_rxfh_channel(dev, &max_rxfh_in_use))
max_rxfh_in_use = 0; max_rxfh_in_use = 0;
if (channels.combined_count + channels.rx_count <= max_rxfh_in_use) { if (channels.combined_count + channels.rx_count <= max_rxfh_in_use) {
ret = -EINVAL;
GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing indirection table settings"); GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing indirection table settings");
goto out_ops; return -EINVAL;
} }
if (channels.combined_count + channels.rx_count <= max_rxnfc_in_use) { if (channels.combined_count + channels.rx_count <= max_rxnfc_in_use) {
ret = -EINVAL;
GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing ntuple filter settings"); GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing ntuple filter settings");
goto out_ops; return -EINVAL;
} }
/* Disabling channels, query zero-copy AF_XDP sockets */ /* Disabling channels, query zero-copy AF_XDP sockets */
...@@ -213,21 +188,26 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) ...@@ -213,21 +188,26 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)
min(channels.rx_count, channels.tx_count); min(channels.rx_count, channels.tx_count);
for (i = from_channel; i < old_total; i++) for (i = from_channel; i < old_total; i++)
if (xsk_get_pool_from_qid(dev, i)) { if (xsk_get_pool_from_qid(dev, i)) {
ret = -EINVAL;
GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing zerocopy AF_XDP sockets"); GENL_SET_ERR_MSG(info, "requested channel counts are too low for existing zerocopy AF_XDP sockets");
goto out_ops; return -EINVAL;
} }
ret = dev->ethtool_ops->set_channels(dev, &channels); ret = dev->ethtool_ops->set_channels(dev, &channels);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops;
ethtool_notify(dev, ETHTOOL_MSG_CHANNELS_NTF, NULL);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_channels_request_ops = {
.request_cmd = ETHTOOL_MSG_CHANNELS_GET,
.reply_cmd = ETHTOOL_MSG_CHANNELS_GET_REPLY,
.hdr_attr = ETHTOOL_A_CHANNELS_HEADER,
.req_info_size = sizeof(struct channels_req_info),
.reply_data_size = sizeof(struct channels_reply_data),
.prepare_data = channels_prepare_data,
.reply_size = channels_reply_size,
.fill_reply = channels_fill_reply,
.set_validate = ethnl_set_channels_validate,
.set = ethnl_set_channels,
.set_ntf_cmd = ETHTOOL_MSG_CHANNELS_NTF,
};
net/ethtool/coalesce.c
浏览文件 @ 04007961
...@@ -195,18 +195,6 @@ static int coalesce_fill_reply(struct sk_buff *skb, ...@@ -195,18 +195,6 @@ static int coalesce_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_coalesce_request_ops = {
.request_cmd = ETHTOOL_MSG_COALESCE_GET,
.reply_cmd = ETHTOOL_MSG_COALESCE_GET_REPLY,
.hdr_attr = ETHTOOL_A_COALESCE_HEADER,
.req_info_size = sizeof(struct coalesce_req_info),
.reply_data_size = sizeof(struct coalesce_reply_data),
.prepare_data = coalesce_prepare_data,
.reply_size = coalesce_reply_size,
.fill_reply = coalesce_fill_reply,
};
/* COALESCE_SET */ /* COALESCE_SET */
const struct nla_policy ethnl_coalesce_set_policy[] = { const struct nla_policy ethnl_coalesce_set_policy[] = {
...@@ -241,49 +229,44 @@ const struct nla_policy ethnl_coalesce_set_policy[] = { ...@@ -241,49 +229,44 @@ const struct nla_policy ethnl_coalesce_set_policy[] = {
[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS] = { .type = NLA_U32 }, [ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS] = { .type = NLA_U32 },
}; };
int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_coalesce_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{ {
struct kernel_ethtool_coalesce kernel_coalesce = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
struct ethtool_coalesce coalesce = {};
struct ethnl_req_info req_info = {};
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
const struct ethtool_ops *ops;
struct net_device *dev;
u32 supported_params; u32 supported_params;
bool mod = false;
int ret;
u16 a; u16 a;
ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_COALESCE_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_coalesce || !ops->set_coalesce) if (!ops->get_coalesce || !ops->set_coalesce)
goto out_dev; return -EOPNOTSUPP;
/* make sure that only supported parameters are present */ /* make sure that only supported parameters are present */
supported_params = ops->supported_coalesce_params; supported_params = ops->supported_coalesce_params;
for (a = ETHTOOL_A_COALESCE_RX_USECS; a < __ETHTOOL_A_COALESCE_CNT; a++) for (a = ETHTOOL_A_COALESCE_RX_USECS; a < __ETHTOOL_A_COALESCE_CNT; a++)
if (tb[a] && !(supported_params & attr_to_mask(a))) { if (tb[a] && !(supported_params & attr_to_mask(a))) {
ret = -EINVAL;
NL_SET_ERR_MSG_ATTR(info->extack, tb[a], NL_SET_ERR_MSG_ATTR(info->extack, tb[a],
"cannot modify an unsupported parameter"); "cannot modify an unsupported parameter");
goto out_dev; return -EINVAL;
} }
rtnl_lock(); return 1;
ret = ethnl_ops_begin(dev); }
if (ret < 0)
goto out_rtnl; static int
ret = ops->get_coalesce(dev, &coalesce, &kernel_coalesce, ethnl_set_coalesce(struct ethnl_req_info *req_info, struct genl_info *info)
info->extack); {
struct kernel_ethtool_coalesce kernel_coalesce = {};
struct net_device *dev = req_info->dev;
struct ethtool_coalesce coalesce = {};
struct nlattr **tb = info->attrs;
bool mod = false;
int ret;
ret = dev->ethtool_ops->get_coalesce(dev, &coalesce, &kernel_coalesce,
info->extack);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
ethnl_update_u32(&coalesce.rx_coalesce_usecs, ethnl_update_u32(&coalesce.rx_coalesce_usecs,
tb[ETHTOOL_A_COALESCE_RX_USECS], &mod); tb[ETHTOOL_A_COALESCE_RX_USECS], &mod);
...@@ -339,21 +322,26 @@ int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) ...@@ -339,21 +322,26 @@ int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info)
tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES], &mod); tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES], &mod);
ethnl_update_u32(&kernel_coalesce.tx_aggr_time_usecs, ethnl_update_u32(&kernel_coalesce.tx_aggr_time_usecs,
tb[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS], &mod); tb[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS], &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
ret = dev->ethtool_ops->set_coalesce(dev, &coalesce, &kernel_coalesce, ret = dev->ethtool_ops->set_coalesce(dev, &coalesce, &kernel_coalesce,
info->extack); info->extack);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops;
ethtool_notify(dev, ETHTOOL_MSG_COALESCE_NTF, NULL);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_coalesce_request_ops = {
.request_cmd = ETHTOOL_MSG_COALESCE_GET,
.reply_cmd = ETHTOOL_MSG_COALESCE_GET_REPLY,
.hdr_attr = ETHTOOL_A_COALESCE_HEADER,
.req_info_size = sizeof(struct coalesce_req_info),
.reply_data_size = sizeof(struct coalesce_reply_data),
.prepare_data = coalesce_prepare_data,
.reply_size = coalesce_reply_size,
.fill_reply = coalesce_fill_reply,
.set_validate = ethnl_set_coalesce_validate,
.set = ethnl_set_coalesce,
.set_ntf_cmd = ETHTOOL_MSG_COALESCE_NTF,
};
net/ethtool/debug.c
浏览文件 @ 04007961
...@@ -63,18 +63,6 @@ static int debug_fill_reply(struct sk_buff *skb, ...@@ -63,18 +63,6 @@ static int debug_fill_reply(struct sk_buff *skb,
netif_msg_class_names, compact); 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 */ /* DEBUG_SET */
const struct nla_policy ethnl_debug_set_policy[] = { const struct nla_policy ethnl_debug_set_policy[] = {
...@@ -83,46 +71,47 @@ const struct nla_policy ethnl_debug_set_policy[] = { ...@@ -83,46 +71,47 @@ const struct nla_policy ethnl_debug_set_policy[] = {
[ETHTOOL_A_DEBUG_MSGMASK] = { .type = NLA_NESTED }, [ETHTOOL_A_DEBUG_MSGMASK] = { .type = NLA_NESTED },
}; };
int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_debug_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{ {
struct ethnl_req_info req_info = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_msglevel && ops->set_msglevel ? 1 : -EOPNOTSUPP;
}
static int
ethnl_set_debug(struct ethnl_req_info *req_info, struct genl_info *info)
{
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct net_device *dev;
bool mod = false; bool mod = false;
u32 msg_mask; u32 msg_mask;
int ret; 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); msg_mask = dev->ethtool_ops->get_msglevel(dev);
ret = ethnl_update_bitset32(&msg_mask, NETIF_MSG_CLASS_COUNT, ret = ethnl_update_bitset32(&msg_mask, NETIF_MSG_CLASS_COUNT,
tb[ETHTOOL_A_DEBUG_MSGMASK], tb[ETHTOOL_A_DEBUG_MSGMASK],
netif_msg_class_names, info->extack, &mod); netif_msg_class_names, info->extack, &mod);
if (ret < 0 || !mod) if (ret < 0 || !mod)
goto out_ops; return ret;
dev->ethtool_ops->set_msglevel(dev, msg_mask); dev->ethtool_ops->set_msglevel(dev, msg_mask);
ethtool_notify(dev, ETHTOOL_MSG_DEBUG_NTF, NULL); return 1;
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
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,
.set_validate = ethnl_set_debug_validate,
.set = ethnl_set_debug,
.set_ntf_cmd = ETHTOOL_MSG_DEBUG_NTF,
};
net/ethtool/eee.c
浏览文件 @ 04007961
...@@ -108,18 +108,6 @@ static int eee_fill_reply(struct sk_buff *skb, ...@@ -108,18 +108,6 @@ static int eee_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_eee_request_ops = {
.request_cmd = ETHTOOL_MSG_EEE_GET,
.reply_cmd = ETHTOOL_MSG_EEE_GET_REPLY,
.hdr_attr = ETHTOOL_A_EEE_HEADER,
.req_info_size = sizeof(struct eee_req_info),
.reply_data_size = sizeof(struct eee_reply_data),
.prepare_data = eee_prepare_data,
.reply_size = eee_reply_size,
.fill_reply = eee_fill_reply,
};
/* EEE_SET */ /* EEE_SET */
const struct nla_policy ethnl_eee_set_policy[] = { const struct nla_policy ethnl_eee_set_policy[] = {
...@@ -131,60 +119,56 @@ const struct nla_policy ethnl_eee_set_policy[] = { ...@@ -131,60 +119,56 @@ const struct nla_policy ethnl_eee_set_policy[] = {
[ETHTOOL_A_EEE_TX_LPI_TIMER] = { .type = NLA_U32 }, [ETHTOOL_A_EEE_TX_LPI_TIMER] = { .type = NLA_U32 },
}; };
int ethnl_set_eee(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_eee_validate(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct ethnl_req_info req_info = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_eee && ops->set_eee ? 1 : -EOPNOTSUPP;
}
static int
ethnl_set_eee(struct ethnl_req_info *req_info, struct genl_info *info)
{
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
const struct ethtool_ops *ops;
struct ethtool_eee eee = {}; struct ethtool_eee eee = {};
struct net_device *dev;
bool mod = false; bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, ret = dev->ethtool_ops->get_eee(dev, &eee);
tb[ETHTOOL_A_EEE_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0) if (ret < 0)
return ret; return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_eee || !ops->set_eee)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ret = ops->get_eee(dev, &eee);
if (ret < 0)
goto out_ops;
ret = ethnl_update_bitset32(&eee.advertised, EEE_MODES_COUNT, ret = ethnl_update_bitset32(&eee.advertised, EEE_MODES_COUNT,
tb[ETHTOOL_A_EEE_MODES_OURS], tb[ETHTOOL_A_EEE_MODES_OURS],
link_mode_names, info->extack, &mod); link_mode_names, info->extack, &mod);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
ethnl_update_bool32(&eee.eee_enabled, tb[ETHTOOL_A_EEE_ENABLED], &mod); ethnl_update_bool32(&eee.eee_enabled, tb[ETHTOOL_A_EEE_ENABLED], &mod);
ethnl_update_bool32(&eee.tx_lpi_enabled, ethnl_update_bool32(&eee.tx_lpi_enabled,
tb[ETHTOOL_A_EEE_TX_LPI_ENABLED], &mod); tb[ETHTOOL_A_EEE_TX_LPI_ENABLED], &mod);
ethnl_update_u32(&eee.tx_lpi_timer, tb[ETHTOOL_A_EEE_TX_LPI_TIMER], ethnl_update_u32(&eee.tx_lpi_timer, tb[ETHTOOL_A_EEE_TX_LPI_TIMER],
&mod); &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
ret = dev->ethtool_ops->set_eee(dev, &eee); ret = dev->ethtool_ops->set_eee(dev, &eee);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops;
ethtool_notify(dev, ETHTOOL_MSG_EEE_NTF, NULL);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_eee_request_ops = {
.request_cmd = ETHTOOL_MSG_EEE_GET,
.reply_cmd = ETHTOOL_MSG_EEE_GET_REPLY,
.hdr_attr = ETHTOOL_A_EEE_HEADER,
.req_info_size = sizeof(struct eee_req_info),
.reply_data_size = sizeof(struct eee_reply_data),
.prepare_data = eee_prepare_data,
.reply_size = eee_reply_size,
.fill_reply = eee_fill_reply,
.set_validate = ethnl_set_eee_validate,
.set = ethnl_set_eee,
.set_ntf_cmd = ETHTOOL_MSG_EEE_NTF,
};
net/ethtool/fec.c
浏览文件 @ 04007961
...@@ -217,18 +217,6 @@ static int fec_fill_reply(struct sk_buff *skb, ...@@ -217,18 +217,6 @@ static int fec_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_fec_request_ops = {
.request_cmd = ETHTOOL_MSG_FEC_GET,
.reply_cmd = ETHTOOL_MSG_FEC_GET_REPLY,
.hdr_attr = ETHTOOL_A_FEC_HEADER,
.req_info_size = sizeof(struct fec_req_info),
.reply_data_size = sizeof(struct fec_reply_data),
.prepare_data = fec_prepare_data,
.reply_size = fec_reply_size,
.fill_reply = fec_fill_reply,
};
/* FEC_SET */ /* FEC_SET */
const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1] = { const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1] = {
...@@ -237,36 +225,28 @@ const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1] = { ...@@ -237,36 +225,28 @@ const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1] = {
[ETHTOOL_A_FEC_AUTO] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_FEC_AUTO] = NLA_POLICY_MAX(NLA_U8, 1),
}; };
int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_fec_validate(struct ethnl_req_info *req_info, struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_fecparam && ops->set_fecparam ? 1 : -EOPNOTSUPP;
}
static int
ethnl_set_fec(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
__ETHTOOL_DECLARE_LINK_MODE_MASK(fec_link_modes) = {}; __ETHTOOL_DECLARE_LINK_MODE_MASK(fec_link_modes) = {};
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct ethtool_fecparam fec = {}; struct ethtool_fecparam fec = {};
const struct ethtool_ops *ops;
struct net_device *dev;
bool mod = false; bool mod = false;
u8 fec_auto; u8 fec_auto;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_FEC_HEADER], ret = dev->ethtool_ops->get_fecparam(dev, &fec);
genl_info_net(info), info->extack,
true);
if (ret < 0) if (ret < 0)
return ret; return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_fecparam || !ops->set_fecparam)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ret = ops->get_fecparam(dev, &fec);
if (ret < 0)
goto out_ops;
ethtool_fec_to_link_modes(fec.fec, fec_link_modes, &fec_auto); ethtool_fec_to_link_modes(fec.fec, fec_link_modes, &fec_auto);
...@@ -275,36 +255,39 @@ int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info) ...@@ -275,36 +255,39 @@ int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info)
tb[ETHTOOL_A_FEC_MODES], tb[ETHTOOL_A_FEC_MODES],
link_mode_names, info->extack, &mod); link_mode_names, info->extack, &mod);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
ethnl_update_u8(&fec_auto, tb[ETHTOOL_A_FEC_AUTO], &mod); ethnl_update_u8(&fec_auto, tb[ETHTOOL_A_FEC_AUTO], &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
ret = ethtool_link_modes_to_fecparam(&fec, fec_link_modes, fec_auto); ret = ethtool_link_modes_to_fecparam(&fec, fec_link_modes, fec_auto);
if (ret) { if (ret) {
NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_FEC_MODES], NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_FEC_MODES],
"invalid FEC modes requested"); "invalid FEC modes requested");
goto out_ops; return ret;
} }
if (!fec.fec) { if (!fec.fec) {
ret = -EINVAL;
NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_FEC_MODES], NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_FEC_MODES],
"no FEC modes set"); "no FEC modes set");
goto out_ops; return -EINVAL;
} }
ret = dev->ethtool_ops->set_fecparam(dev, &fec); ret = dev->ethtool_ops->set_fecparam(dev, &fec);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops;
ethtool_notify(dev, ETHTOOL_MSG_FEC_NTF, NULL);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_fec_request_ops = {
.request_cmd = ETHTOOL_MSG_FEC_GET,
.reply_cmd = ETHTOOL_MSG_FEC_GET_REPLY,
.hdr_attr = ETHTOOL_A_FEC_HEADER,
.req_info_size = sizeof(struct fec_req_info),
.reply_data_size = sizeof(struct fec_reply_data),
.prepare_data = fec_prepare_data,
.reply_size = fec_reply_size,
.fill_reply = fec_fill_reply,
.set_validate = ethnl_set_fec_validate,
.set = ethnl_set_fec,
.set_ntf_cmd = ETHTOOL_MSG_FEC_NTF,
};
net/ethtool/linkinfo.c
浏览文件 @ 04007961
...@@ -73,18 +73,6 @@ static int linkinfo_fill_reply(struct sk_buff *skb, ...@@ -73,18 +73,6 @@ static int linkinfo_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_linkinfo_request_ops = {
.request_cmd = ETHTOOL_MSG_LINKINFO_GET,
.reply_cmd = ETHTOOL_MSG_LINKINFO_GET_REPLY,
.hdr_attr = ETHTOOL_A_LINKINFO_HEADER,
.req_info_size = sizeof(struct linkinfo_req_info),
.reply_data_size = sizeof(struct linkinfo_reply_data),
.prepare_data = linkinfo_prepare_data,
.reply_size = linkinfo_reply_size,
.fill_reply = linkinfo_fill_reply,
};
/* LINKINFO_SET */ /* LINKINFO_SET */
const struct nla_policy ethnl_linkinfo_set_policy[] = { const struct nla_policy ethnl_linkinfo_set_policy[] = {
...@@ -95,37 +83,31 @@ const struct nla_policy ethnl_linkinfo_set_policy[] = { ...@@ -95,37 +83,31 @@ const struct nla_policy ethnl_linkinfo_set_policy[] = {
[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL] = { .type = NLA_U8 }, [ETHTOOL_A_LINKINFO_TP_MDIX_CTRL] = { .type = NLA_U8 },
}; };
int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_linkinfo_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
if (!ops->get_link_ksettings || !ops->set_link_ksettings)
return -EOPNOTSUPP;
return 1;
}
static int
ethnl_set_linkinfo(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct ethtool_link_ksettings ksettings = {}; struct ethtool_link_ksettings ksettings = {};
struct ethtool_link_settings *lsettings; struct ethtool_link_settings *lsettings;
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct net_device *dev;
bool mod = false; bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_LINKINFO_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ret = -EOPNOTSUPP;
if (!dev->ethtool_ops->get_link_ksettings ||
!dev->ethtool_ops->set_link_ksettings)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ret = __ethtool_get_link_ksettings(dev, &ksettings); ret = __ethtool_get_link_ksettings(dev, &ksettings);
if (ret < 0) { if (ret < 0) {
GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
goto out_ops; return ret;
} }
lsettings = &ksettings.base; lsettings = &ksettings.base;
...@@ -134,21 +116,30 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info) ...@@ -134,21 +116,30 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info)
&mod); &mod);
ethnl_update_u8(&lsettings->eth_tp_mdix_ctrl, ethnl_update_u8(&lsettings->eth_tp_mdix_ctrl,
tb[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL], &mod); tb[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL], &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
ret = dev->ethtool_ops->set_link_ksettings(dev, &ksettings); ret = dev->ethtool_ops->set_link_ksettings(dev, &ksettings);
if (ret < 0) if (ret < 0) {
GENL_SET_ERR_MSG(info, "link settings update failed"); GENL_SET_ERR_MSG(info, "link settings update failed");
else return ret;
ethtool_notify(dev, ETHTOOL_MSG_LINKINFO_NTF, NULL); }
out_ops: return 1;
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_linkinfo_request_ops = {
.request_cmd = ETHTOOL_MSG_LINKINFO_GET,
.reply_cmd = ETHTOOL_MSG_LINKINFO_GET_REPLY,
.hdr_attr = ETHTOOL_A_LINKINFO_HEADER,
.req_info_size = sizeof(struct linkinfo_req_info),
.reply_data_size = sizeof(struct linkinfo_reply_data),
.prepare_data = linkinfo_prepare_data,
.reply_size = linkinfo_reply_size,
.fill_reply = linkinfo_fill_reply,
.set_validate = ethnl_set_linkinfo_validate,
.set = ethnl_set_linkinfo,
.set_ntf_cmd = ETHTOOL_MSG_LINKINFO_NTF,
};
net/ethtool/linkmodes.c
浏览文件 @ 04007961
...@@ -151,18 +151,6 @@ static int linkmodes_fill_reply(struct sk_buff *skb, ...@@ -151,18 +151,6 @@ static int linkmodes_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_linkmodes_request_ops = {
.request_cmd = ETHTOOL_MSG_LINKMODES_GET,
.reply_cmd = ETHTOOL_MSG_LINKMODES_GET_REPLY,
.hdr_attr = ETHTOOL_A_LINKMODES_HEADER,
.req_info_size = sizeof(struct linkmodes_req_info),
.reply_data_size = sizeof(struct linkmodes_reply_data),
.prepare_data = linkmodes_prepare_data,
.reply_size = linkmodes_reply_size,
.fill_reply = linkmodes_fill_reply,
};
/* LINKMODES_SET */ /* LINKMODES_SET */
const struct nla_policy ethnl_linkmodes_set_policy[] = { const struct nla_policy ethnl_linkmodes_set_policy[] = {
...@@ -310,59 +298,64 @@ static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb, ...@@ -310,59 +298,64 @@ static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,
return 0; return 0;
} }
int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_linkmodes_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{ {
struct ethtool_link_ksettings ksettings = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
struct ethnl_req_info req_info = {};
struct nlattr **tb = info->attrs;
struct net_device *dev;
bool mod = false;
int ret; int ret;
ret = ethnl_check_linkmodes(info, tb); ret = ethnl_check_linkmodes(info, info->attrs);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ethnl_parse_header_dev_get(&req_info, if (!ops->get_link_ksettings || !ops->set_link_ksettings)
tb[ETHTOOL_A_LINKMODES_HEADER], return -EOPNOTSUPP;
genl_info_net(info), info->extack, return 1;
true); }
if (ret < 0)
return ret;
dev = req_info.dev;
ret = -EOPNOTSUPP;
if (!dev->ethtool_ops->get_link_ksettings ||
!dev->ethtool_ops->set_link_ksettings)
goto out_dev;
rtnl_lock(); static int
ret = ethnl_ops_begin(dev); ethnl_set_linkmodes(struct ethnl_req_info *req_info, struct genl_info *info)
if (ret < 0) {
goto out_rtnl; struct ethtool_link_ksettings ksettings = {};
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs;
bool mod = false;
int ret;
ret = __ethtool_get_link_ksettings(dev, &ksettings); ret = __ethtool_get_link_ksettings(dev, &ksettings);
if (ret < 0) { if (ret < 0) {
GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
goto out_ops; return ret;
} }
ret = ethnl_update_linkmodes(info, tb, &ksettings, &mod, dev); ret = ethnl_update_linkmodes(info, tb, &ksettings, &mod, dev);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
if (!mod)
return 0;
if (mod) { ret = dev->ethtool_ops->set_link_ksettings(dev, &ksettings);
ret = dev->ethtool_ops->set_link_ksettings(dev, &ksettings); if (ret < 0) {
if (ret < 0) GENL_SET_ERR_MSG(info, "link settings update failed");
GENL_SET_ERR_MSG(info, "link settings update failed"); return ret;
else
ethtool_notify(dev, ETHTOOL_MSG_LINKMODES_NTF, NULL);
} }
out_ops: return 1;
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_linkmodes_request_ops = {
.request_cmd = ETHTOOL_MSG_LINKMODES_GET,
.reply_cmd = ETHTOOL_MSG_LINKMODES_GET_REPLY,
.hdr_attr = ETHTOOL_A_LINKMODES_HEADER,
.req_info_size = sizeof(struct linkmodes_req_info),
.reply_data_size = sizeof(struct linkmodes_reply_data),
.prepare_data = linkmodes_prepare_data,
.reply_size = linkmodes_reply_size,
.fill_reply = linkmodes_fill_reply,
.set_validate = ethnl_set_linkmodes_validate,
.set = ethnl_set_linkmodes,
.set_ntf_cmd = ETHTOOL_MSG_LINKMODES_NTF,
};
net/ethtool/mm.c
浏览文件 @ 04007961
...@@ -146,18 +146,6 @@ static int mm_fill_reply(struct sk_buff *skb, ...@@ -146,18 +146,6 @@ static int mm_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_mm_request_ops = {
.request_cmd = ETHTOOL_MSG_MM_GET,
.reply_cmd = ETHTOOL_MSG_MM_GET_REPLY,
.hdr_attr = ETHTOOL_A_MM_HEADER,
.req_info_size = sizeof(struct mm_req_info),
.reply_data_size = sizeof(struct mm_reply_data),
.prepare_data = mm_prepare_data,
.reply_size = mm_reply_size,
.fill_reply = mm_fill_reply,
};
const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1] = { const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1] = {
[ETHTOOL_A_MM_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), [ETHTOOL_A_MM_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),
[ETHTOOL_A_MM_VERIFY_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_MM_VERIFY_ENABLED] = NLA_POLICY_MAX(NLA_U8, 1),
...@@ -184,40 +172,28 @@ static void mm_state_to_cfg(const struct ethtool_mm_state *state, ...@@ -184,40 +172,28 @@ static void mm_state_to_cfg(const struct ethtool_mm_state *state,
cfg->tx_min_frag_size = state->tx_min_frag_size; cfg->tx_min_frag_size = state->tx_min_frag_size;
} }
int ethnl_set_mm(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_mm_validate(struct ethnl_req_info *req_info, struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_mm && ops->set_mm ? 1 : -EOPNOTSUPP;
}
static int ethnl_set_mm(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct netlink_ext_ack *extack = info->extack; struct netlink_ext_ack *extack = info->extack;
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct ethtool_mm_state state = {}; struct ethtool_mm_state state = {};
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct ethtool_mm_cfg cfg = {}; struct ethtool_mm_cfg cfg = {};
const struct ethtool_ops *ops;
struct net_device *dev;
bool mod = false; bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_MM_HEADER], ret = dev->ethtool_ops->get_mm(dev, &state);
genl_info_net(info), extack, true);
if (ret) if (ret)
return ret; return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
if (!ops->get_mm || !ops->set_mm) {
ret = -EOPNOTSUPP;
goto out_dev_put;
}
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl_unlock;
ret = ops->get_mm(dev, &state);
if (ret)
goto out_complete;
mm_state_to_cfg(&state, &cfg); mm_state_to_cfg(&state, &cfg);
ethnl_update_bool(&cfg.verify_enabled, tb[ETHTOOL_A_MM_VERIFY_ENABLED], ethnl_update_bool(&cfg.verify_enabled, tb[ETHTOOL_A_MM_VERIFY_ENABLED],
...@@ -225,34 +201,38 @@ int ethnl_set_mm(struct sk_buff *skb, struct genl_info *info) ...@@ -225,34 +201,38 @@ int ethnl_set_mm(struct sk_buff *skb, struct genl_info *info)
ethnl_update_u32(&cfg.verify_time, tb[ETHTOOL_A_MM_VERIFY_TIME], &mod); ethnl_update_u32(&cfg.verify_time, tb[ETHTOOL_A_MM_VERIFY_TIME], &mod);
ethnl_update_bool(&cfg.tx_enabled, tb[ETHTOOL_A_MM_TX_ENABLED], &mod); ethnl_update_bool(&cfg.tx_enabled, tb[ETHTOOL_A_MM_TX_ENABLED], &mod);
ethnl_update_bool(&cfg.pmac_enabled, tb[ETHTOOL_A_MM_PMAC_ENABLED], ethnl_update_bool(&cfg.pmac_enabled, tb[ETHTOOL_A_MM_PMAC_ENABLED],
&mod); &mod);
ethnl_update_u32(&cfg.tx_min_frag_size, ethnl_update_u32(&cfg.tx_min_frag_size,
tb[ETHTOOL_A_MM_TX_MIN_FRAG_SIZE], &mod); tb[ETHTOOL_A_MM_TX_MIN_FRAG_SIZE], &mod);
if (!mod) if (!mod)
goto out_complete; return 0;
if (cfg.verify_time > state.max_verify_time) { if (cfg.verify_time > state.max_verify_time) {
NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MM_VERIFY_TIME], NL_SET_ERR_MSG_ATTR(extack, tb[ETHTOOL_A_MM_VERIFY_TIME],
"verifyTime exceeds device maximum"); "verifyTime exceeds device maximum");
ret = -ERANGE; return -ERANGE;
goto out_complete;
} }
ret = ops->set_mm(dev, &cfg, extack); ret = dev->ethtool_ops->set_mm(dev, &cfg, extack);
if (ret) return ret < 0 ? ret : 1;
goto out_complete; }
const struct ethnl_request_ops ethnl_mm_request_ops = {
.request_cmd = ETHTOOL_MSG_MM_GET,
.reply_cmd = ETHTOOL_MSG_MM_GET_REPLY,
.hdr_attr = ETHTOOL_A_MM_HEADER,
.req_info_size = sizeof(struct mm_req_info),
.reply_data_size = sizeof(struct mm_reply_data),
ethtool_notify(dev, ETHTOOL_MSG_MM_NTF, NULL); .prepare_data = mm_prepare_data,
.reply_size = mm_reply_size,
.fill_reply = mm_fill_reply,
out_complete: .set_validate = ethnl_set_mm_validate,
ethnl_ops_complete(dev); .set = ethnl_set_mm,
out_rtnl_unlock: .set_ntf_cmd = ETHTOOL_MSG_MM_NTF,
rtnl_unlock(); };
out_dev_put:
ethnl_parse_header_dev_put(&req_info);
return ret;
}
/* Returns whether a given device supports the MAC merge layer /* Returns whether a given device supports the MAC merge layer
* (has an eMAC and a pMAC). Must be called under rtnl_lock() and * (has an eMAC and a pMAC). Must be called under rtnl_lock() and
......
net/ethtool/module.c
浏览文件 @ 04007961
...@@ -91,18 +91,6 @@ static int module_fill_reply(struct sk_buff *skb, ...@@ -91,18 +91,6 @@ static int module_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_module_request_ops = {
.request_cmd = ETHTOOL_MSG_MODULE_GET,
.reply_cmd = ETHTOOL_MSG_MODULE_GET_REPLY,
.hdr_attr = ETHTOOL_A_MODULE_HEADER,
.req_info_size = sizeof(struct module_req_info),
.reply_data_size = sizeof(struct module_reply_data),
.prepare_data = module_prepare_data,
.reply_size = module_reply_size,
.fill_reply = module_fill_reply,
};
/* MODULE_SET */ /* MODULE_SET */
const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLICY + 1] = { const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLICY + 1] = {
...@@ -112,69 +100,62 @@ const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLI ...@@ -112,69 +100,62 @@ const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLI
ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO), ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO),
}; };
static int module_set_power_mode(struct net_device *dev, struct nlattr **tb, static int
bool *p_mod, struct netlink_ext_ack *extack) ethnl_set_module_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{ {
struct ethtool_module_power_mode_params power = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
struct ethtool_module_power_mode_params power_new; struct nlattr **tb = info->attrs;
const struct ethtool_ops *ops = dev->ethtool_ops;
int ret;
if (!tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY]) if (!tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY])
return 0; return 0;
if (!ops->get_module_power_mode || !ops->set_module_power_mode) { if (!ops->get_module_power_mode || !ops->set_module_power_mode) {
NL_SET_ERR_MSG_ATTR(extack, NL_SET_ERR_MSG_ATTR(info->extack,
tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY], tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY],
"Setting power mode policy is not supported by this device"); "Setting power mode policy is not supported by this device");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
power_new.policy = nla_get_u8(tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY]); return 1;
ret = ops->get_module_power_mode(dev, &power, extack);
if (ret < 0)
return ret;
if (power_new.policy == power.policy)
return 0;
*p_mod = true;
return ops->set_module_power_mode(dev, &power_new, extack);
} }
int ethnl_set_module(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_module(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct ethnl_req_info req_info = {}; struct ethtool_module_power_mode_params power = {};
struct ethtool_module_power_mode_params power_new;
const struct ethtool_ops *ops;
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct net_device *dev;
bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_MODULE_HEADER], ops = dev->ethtool_ops;
genl_info_net(info), info->extack,
true); power_new.policy = nla_get_u8(tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY]);
ret = ops->get_module_power_mode(dev, &power, info->extack);
if (ret < 0) if (ret < 0)
return ret; return ret;
dev = req_info.dev;
rtnl_lock(); if (power_new.policy == power.policy)
ret = ethnl_ops_begin(dev); return 0;
if (ret < 0)
goto out_rtnl;
ret = module_set_power_mode(dev, tb, &mod, info->extack); ret = ops->set_module_power_mode(dev, &power_new, info->extack);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops; }
if (!mod) const struct ethnl_request_ops ethnl_module_request_ops = {
goto out_ops; .request_cmd = ETHTOOL_MSG_MODULE_GET,
.reply_cmd = ETHTOOL_MSG_MODULE_GET_REPLY,
.hdr_attr = ETHTOOL_A_MODULE_HEADER,
.req_info_size = sizeof(struct module_req_info),
.reply_data_size = sizeof(struct module_reply_data),
ethtool_notify(dev, ETHTOOL_MSG_MODULE_NTF, NULL); .prepare_data = module_prepare_data,
.reply_size = module_reply_size,
.fill_reply = module_fill_reply,
out_ops: .set_validate = ethnl_set_module_validate,
ethnl_ops_complete(dev); .set = ethnl_set_module,
out_rtnl: .set_ntf_cmd = ETHTOOL_MSG_MODULE_NTF,
rtnl_unlock(); };
ethnl_parse_header_dev_put(&req_info);
return ret;
}
net/ethtool/netlink.c
浏览文件 @ 04007961
...@@ -269,29 +269,43 @@ static const struct ethnl_request_ops * ...@@ -269,29 +269,43 @@ static const struct ethnl_request_ops *
ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
[ETHTOOL_MSG_STRSET_GET] = &ethnl_strset_request_ops, [ETHTOOL_MSG_STRSET_GET] = &ethnl_strset_request_ops,
[ETHTOOL_MSG_LINKINFO_GET] = &ethnl_linkinfo_request_ops, [ETHTOOL_MSG_LINKINFO_GET] = &ethnl_linkinfo_request_ops,
[ETHTOOL_MSG_LINKINFO_SET] = &ethnl_linkinfo_request_ops,
[ETHTOOL_MSG_LINKMODES_GET] = &ethnl_linkmodes_request_ops, [ETHTOOL_MSG_LINKMODES_GET] = &ethnl_linkmodes_request_ops,
[ETHTOOL_MSG_LINKMODES_SET] = &ethnl_linkmodes_request_ops,
[ETHTOOL_MSG_LINKSTATE_GET] = &ethnl_linkstate_request_ops, [ETHTOOL_MSG_LINKSTATE_GET] = &ethnl_linkstate_request_ops,
[ETHTOOL_MSG_DEBUG_GET] = &ethnl_debug_request_ops, [ETHTOOL_MSG_DEBUG_GET] = &ethnl_debug_request_ops,
[ETHTOOL_MSG_DEBUG_SET] = &ethnl_debug_request_ops,
[ETHTOOL_MSG_WOL_GET] = &ethnl_wol_request_ops, [ETHTOOL_MSG_WOL_GET] = &ethnl_wol_request_ops,
[ETHTOOL_MSG_WOL_SET] = &ethnl_wol_request_ops,
[ETHTOOL_MSG_FEATURES_GET] = &ethnl_features_request_ops, [ETHTOOL_MSG_FEATURES_GET] = &ethnl_features_request_ops,
[ETHTOOL_MSG_PRIVFLAGS_GET] = &ethnl_privflags_request_ops, [ETHTOOL_MSG_PRIVFLAGS_GET] = &ethnl_privflags_request_ops,
[ETHTOOL_MSG_PRIVFLAGS_SET] = &ethnl_privflags_request_ops,
[ETHTOOL_MSG_RINGS_GET] = &ethnl_rings_request_ops, [ETHTOOL_MSG_RINGS_GET] = &ethnl_rings_request_ops,
[ETHTOOL_MSG_RINGS_SET] = &ethnl_rings_request_ops,
[ETHTOOL_MSG_CHANNELS_GET] = &ethnl_channels_request_ops, [ETHTOOL_MSG_CHANNELS_GET] = &ethnl_channels_request_ops,
[ETHTOOL_MSG_CHANNELS_SET] = &ethnl_channels_request_ops,
[ETHTOOL_MSG_COALESCE_GET] = &ethnl_coalesce_request_ops, [ETHTOOL_MSG_COALESCE_GET] = &ethnl_coalesce_request_ops,
[ETHTOOL_MSG_COALESCE_SET] = &ethnl_coalesce_request_ops,
[ETHTOOL_MSG_PAUSE_GET] = &ethnl_pause_request_ops, [ETHTOOL_MSG_PAUSE_GET] = &ethnl_pause_request_ops,
[ETHTOOL_MSG_PAUSE_SET] = &ethnl_pause_request_ops, [ETHTOOL_MSG_PAUSE_SET] = &ethnl_pause_request_ops,
[ETHTOOL_MSG_EEE_GET] = &ethnl_eee_request_ops, [ETHTOOL_MSG_EEE_GET] = &ethnl_eee_request_ops,
[ETHTOOL_MSG_EEE_SET] = &ethnl_eee_request_ops,
[ETHTOOL_MSG_FEC_GET] = &ethnl_fec_request_ops, [ETHTOOL_MSG_FEC_GET] = &ethnl_fec_request_ops,
[ETHTOOL_MSG_FEC_SET] = &ethnl_fec_request_ops,
[ETHTOOL_MSG_TSINFO_GET] = &ethnl_tsinfo_request_ops, [ETHTOOL_MSG_TSINFO_GET] = &ethnl_tsinfo_request_ops,
[ETHTOOL_MSG_MODULE_EEPROM_GET] = &ethnl_module_eeprom_request_ops, [ETHTOOL_MSG_MODULE_EEPROM_GET] = &ethnl_module_eeprom_request_ops,
[ETHTOOL_MSG_STATS_GET] = &ethnl_stats_request_ops, [ETHTOOL_MSG_STATS_GET] = &ethnl_stats_request_ops,
[ETHTOOL_MSG_PHC_VCLOCKS_GET] = &ethnl_phc_vclocks_request_ops, [ETHTOOL_MSG_PHC_VCLOCKS_GET] = &ethnl_phc_vclocks_request_ops,
[ETHTOOL_MSG_MODULE_GET] = &ethnl_module_request_ops, [ETHTOOL_MSG_MODULE_GET] = &ethnl_module_request_ops,
[ETHTOOL_MSG_MODULE_SET] = &ethnl_module_request_ops,
[ETHTOOL_MSG_PSE_GET] = &ethnl_pse_request_ops, [ETHTOOL_MSG_PSE_GET] = &ethnl_pse_request_ops,
[ETHTOOL_MSG_PSE_SET] = &ethnl_pse_request_ops,
[ETHTOOL_MSG_RSS_GET] = &ethnl_rss_request_ops, [ETHTOOL_MSG_RSS_GET] = &ethnl_rss_request_ops,
[ETHTOOL_MSG_PLCA_GET_CFG] = &ethnl_plca_cfg_request_ops, [ETHTOOL_MSG_PLCA_GET_CFG] = &ethnl_plca_cfg_request_ops,
[ETHTOOL_MSG_PLCA_SET_CFG] = &ethnl_plca_cfg_request_ops,
[ETHTOOL_MSG_PLCA_GET_STATUS] = &ethnl_plca_status_request_ops, [ETHTOOL_MSG_PLCA_GET_STATUS] = &ethnl_plca_status_request_ops,
[ETHTOOL_MSG_MM_GET] = &ethnl_mm_request_ops, [ETHTOOL_MSG_MM_GET] = &ethnl_mm_request_ops,
[ETHTOOL_MSG_MM_SET] = &ethnl_mm_request_ops,
}; };
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb) static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
...@@ -814,7 +828,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -814,7 +828,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_LINKINFO_SET, .cmd = ETHTOOL_MSG_LINKINFO_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_linkinfo, .doit = ethnl_default_set_doit,
.policy = ethnl_linkinfo_set_policy, .policy = ethnl_linkinfo_set_policy,
.maxattr = ARRAY_SIZE(ethnl_linkinfo_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_linkinfo_set_policy) - 1,
}, },
...@@ -830,7 +844,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -830,7 +844,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_LINKMODES_SET, .cmd = ETHTOOL_MSG_LINKMODES_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_linkmodes, .doit = ethnl_default_set_doit,
.policy = ethnl_linkmodes_set_policy, .policy = ethnl_linkmodes_set_policy,
.maxattr = ARRAY_SIZE(ethnl_linkmodes_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_linkmodes_set_policy) - 1,
}, },
...@@ -855,7 +869,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -855,7 +869,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_DEBUG_SET, .cmd = ETHTOOL_MSG_DEBUG_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_debug, .doit = ethnl_default_set_doit,
.policy = ethnl_debug_set_policy, .policy = ethnl_debug_set_policy,
.maxattr = ARRAY_SIZE(ethnl_debug_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_debug_set_policy) - 1,
}, },
...@@ -872,7 +886,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -872,7 +886,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_WOL_SET, .cmd = ETHTOOL_MSG_WOL_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_wol, .doit = ethnl_default_set_doit,
.policy = ethnl_wol_set_policy, .policy = ethnl_wol_set_policy,
.maxattr = ARRAY_SIZE(ethnl_wol_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_wol_set_policy) - 1,
}, },
...@@ -904,7 +918,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -904,7 +918,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_PRIVFLAGS_SET, .cmd = ETHTOOL_MSG_PRIVFLAGS_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_privflags, .doit = ethnl_default_set_doit,
.policy = ethnl_privflags_set_policy, .policy = ethnl_privflags_set_policy,
.maxattr = ARRAY_SIZE(ethnl_privflags_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_privflags_set_policy) - 1,
}, },
...@@ -920,7 +934,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -920,7 +934,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_RINGS_SET, .cmd = ETHTOOL_MSG_RINGS_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_rings, .doit = ethnl_default_set_doit,
.policy = ethnl_rings_set_policy, .policy = ethnl_rings_set_policy,
.maxattr = ARRAY_SIZE(ethnl_rings_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_rings_set_policy) - 1,
}, },
...@@ -936,7 +950,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -936,7 +950,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_CHANNELS_SET, .cmd = ETHTOOL_MSG_CHANNELS_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_channels, .doit = ethnl_default_set_doit,
.policy = ethnl_channels_set_policy, .policy = ethnl_channels_set_policy,
.maxattr = ARRAY_SIZE(ethnl_channels_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_channels_set_policy) - 1,
}, },
...@@ -952,7 +966,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -952,7 +966,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_COALESCE_SET, .cmd = ETHTOOL_MSG_COALESCE_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_coalesce, .doit = ethnl_default_set_doit,
.policy = ethnl_coalesce_set_policy, .policy = ethnl_coalesce_set_policy,
.maxattr = ARRAY_SIZE(ethnl_coalesce_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_coalesce_set_policy) - 1,
}, },
...@@ -984,7 +998,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -984,7 +998,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_EEE_SET, .cmd = ETHTOOL_MSG_EEE_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_eee, .doit = ethnl_default_set_doit,
.policy = ethnl_eee_set_policy, .policy = ethnl_eee_set_policy,
.maxattr = ARRAY_SIZE(ethnl_eee_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_eee_set_policy) - 1,
}, },
...@@ -1031,7 +1045,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -1031,7 +1045,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_FEC_SET, .cmd = ETHTOOL_MSG_FEC_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_fec, .doit = ethnl_default_set_doit,
.policy = ethnl_fec_set_policy, .policy = ethnl_fec_set_policy,
.maxattr = ARRAY_SIZE(ethnl_fec_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_fec_set_policy) - 1,
}, },
...@@ -1075,7 +1089,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -1075,7 +1089,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_MODULE_SET, .cmd = ETHTOOL_MSG_MODULE_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_module, .doit = ethnl_default_set_doit,
.policy = ethnl_module_set_policy, .policy = ethnl_module_set_policy,
.maxattr = ARRAY_SIZE(ethnl_module_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_module_set_policy) - 1,
}, },
...@@ -1091,7 +1105,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -1091,7 +1105,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_PSE_SET, .cmd = ETHTOOL_MSG_PSE_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_pse, .doit = ethnl_default_set_doit,
.policy = ethnl_pse_set_policy, .policy = ethnl_pse_set_policy,
.maxattr = ARRAY_SIZE(ethnl_pse_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_pse_set_policy) - 1,
}, },
...@@ -1113,7 +1127,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -1113,7 +1127,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_PLCA_SET_CFG, .cmd = ETHTOOL_MSG_PLCA_SET_CFG,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_plca_cfg, .doit = ethnl_default_set_doit,
.policy = ethnl_plca_set_cfg_policy, .policy = ethnl_plca_set_cfg_policy,
.maxattr = ARRAY_SIZE(ethnl_plca_set_cfg_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_plca_set_cfg_policy) - 1,
}, },
...@@ -1138,7 +1152,7 @@ static const struct genl_ops ethtool_genl_ops[] = { ...@@ -1138,7 +1152,7 @@ static const struct genl_ops ethtool_genl_ops[] = {
{ {
.cmd = ETHTOOL_MSG_MM_SET, .cmd = ETHTOOL_MSG_MM_SET,
.flags = GENL_UNS_ADMIN_PERM, .flags = GENL_UNS_ADMIN_PERM,
.doit = ethnl_set_mm, .doit = ethnl_default_set_doit,
.policy = ethnl_mm_set_policy, .policy = ethnl_mm_set_policy,
.maxattr = ARRAY_SIZE(ethnl_mm_set_policy) - 1, .maxattr = ARRAY_SIZE(ethnl_mm_set_policy) - 1,
}, },
......
net/ethtool/netlink.h
浏览文件 @ 04007961
...@@ -442,26 +442,12 @@ extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADE ...@@ -442,26 +442,12 @@ extern const struct nla_policy ethnl_plca_get_status_policy[ETHTOOL_A_PLCA_HEADE
extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1]; extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1];
extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1]; extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1];
int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_features(struct sk_buff *skb, struct genl_info *info); int ethnl_set_features(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_eee(struct sk_buff *skb, struct genl_info *info);
int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info); int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info);
int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info); int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info);
int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info); int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info);
int ethnl_tunnel_info_start(struct netlink_callback *cb); int ethnl_tunnel_info_start(struct netlink_callback *cb);
int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb); int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_module(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_pse(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_plca_cfg(struct sk_buff *skb, struct genl_info *info);
int ethnl_set_mm(struct sk_buff *skb, struct genl_info *info);
extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN]; extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN];
extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN]; extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN];
......
net/ethtool/plca.c
浏览文件 @ 04007961
...@@ -112,18 +112,6 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb, ...@@ -112,18 +112,6 @@ static int plca_get_cfg_fill_reply(struct sk_buff *skb,
return 0; return 0;
}; };
const struct ethnl_request_ops ethnl_plca_cfg_request_ops = {
.request_cmd = ETHTOOL_MSG_PLCA_GET_CFG,
.reply_cmd = ETHTOOL_MSG_PLCA_GET_CFG_REPLY,
.hdr_attr = ETHTOOL_A_PLCA_HEADER,
.req_info_size = sizeof(struct plca_req_info),
.reply_data_size = sizeof(struct plca_reply_data),
.prepare_data = plca_get_cfg_prepare_data,
.reply_size = plca_get_cfg_reply_size,
.fill_reply = plca_get_cfg_fill_reply,
};
// PLCA set configuration message ------------------------------------------- // // PLCA set configuration message ------------------------------------------- //
const struct nla_policy ethnl_plca_set_cfg_policy[] = { const struct nla_policy ethnl_plca_set_cfg_policy[] = {
...@@ -137,42 +125,23 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = { ...@@ -137,42 +125,23 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = {
[ETHTOOL_A_PLCA_BURST_TMR] = NLA_POLICY_MAX(NLA_U32, 255), [ETHTOOL_A_PLCA_BURST_TMR] = NLA_POLICY_MAX(NLA_U32, 255),
}; };
int ethnl_set_plca_cfg(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs;
const struct ethtool_phy_ops *ops; const struct ethtool_phy_ops *ops;
struct nlattr **tb = info->attrs;
struct phy_plca_cfg plca_cfg; struct phy_plca_cfg plca_cfg;
struct net_device *dev;
bool mod = false; bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_PLCA_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
rtnl_lock();
// check that the PHY device is available and connected // check that the PHY device is available and connected
if (!dev->phydev) { if (!dev->phydev)
ret = -EOPNOTSUPP; return -EOPNOTSUPP;
goto out_rtnl;
}
ops = ethtool_phy_ops; ops = ethtool_phy_ops;
if (!ops || !ops->set_plca_cfg) { if (!ops || !ops->set_plca_cfg)
ret = -EOPNOTSUPP; return -EOPNOTSUPP;
goto out_rtnl;
}
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
memset(&plca_cfg, 0xff, sizeof(plca_cfg)); memset(&plca_cfg, 0xff, sizeof(plca_cfg));
plca_update_sint(&plca_cfg.enabled, tb[ETHTOOL_A_PLCA_ENABLED], &mod); plca_update_sint(&plca_cfg.enabled, tb[ETHTOOL_A_PLCA_ENABLED], &mod);
...@@ -183,25 +152,27 @@ int ethnl_set_plca_cfg(struct sk_buff *skb, struct genl_info *info) ...@@ -183,25 +152,27 @@ int ethnl_set_plca_cfg(struct sk_buff *skb, struct genl_info *info)
&mod); &mod);
plca_update_sint(&plca_cfg.burst_tmr, tb[ETHTOOL_A_PLCA_BURST_TMR], plca_update_sint(&plca_cfg.burst_tmr, tb[ETHTOOL_A_PLCA_BURST_TMR],
&mod); &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack); ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops; }
ethtool_notify(dev, ETHTOOL_MSG_PLCA_NTF, NULL); const struct ethnl_request_ops ethnl_plca_cfg_request_ops = {
.request_cmd = ETHTOOL_MSG_PLCA_GET_CFG,
.reply_cmd = ETHTOOL_MSG_PLCA_GET_CFG_REPLY,
.hdr_attr = ETHTOOL_A_PLCA_HEADER,
.req_info_size = sizeof(struct plca_req_info),
.reply_data_size = sizeof(struct plca_reply_data),
out_ops: .prepare_data = plca_get_cfg_prepare_data,
ethnl_ops_complete(dev); .reply_size = plca_get_cfg_reply_size,
out_rtnl: .fill_reply = plca_get_cfg_fill_reply,
rtnl_unlock();
ethnl_parse_header_dev_put(&req_info);
return ret; .set = ethnl_set_plca,
} .set_ntf_cmd = ETHTOOL_MSG_PLCA_NTF,
};
// PLCA get status message -------------------------------------------------- // // PLCA get status message -------------------------------------------------- //
......
net/ethtool/privflags.c
浏览文件 @ 04007961
...@@ -118,19 +118,6 @@ static void privflags_cleanup_data(struct ethnl_reply_data *reply_data) ...@@ -118,19 +118,6 @@ static void privflags_cleanup_data(struct ethnl_reply_data *reply_data)
kfree(data->priv_flag_names); kfree(data->priv_flag_names);
} }
const struct ethnl_request_ops ethnl_privflags_request_ops = {
.request_cmd = ETHTOOL_MSG_PRIVFLAGS_GET,
.reply_cmd = ETHTOOL_MSG_PRIVFLAGS_GET_REPLY,
.hdr_attr = ETHTOOL_A_PRIVFLAGS_HEADER,
.req_info_size = sizeof(struct privflags_req_info),
.reply_data_size = sizeof(struct privflags_reply_data),
.prepare_data = privflags_prepare_data,
.reply_size = privflags_reply_size,
.fill_reply = privflags_fill_reply,
.cleanup_data = privflags_cleanup_data,
};
/* PRIVFLAGS_SET */ /* PRIVFLAGS_SET */
const struct nla_policy ethnl_privflags_set_policy[] = { const struct nla_policy ethnl_privflags_set_policy[] = {
...@@ -139,63 +126,70 @@ const struct nla_policy ethnl_privflags_set_policy[] = { ...@@ -139,63 +126,70 @@ const struct nla_policy ethnl_privflags_set_policy[] = {
[ETHTOOL_A_PRIVFLAGS_FLAGS] = { .type = NLA_NESTED }, [ETHTOOL_A_PRIVFLAGS_FLAGS] = { .type = NLA_NESTED },
}; };
int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_privflags_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
if (!info->attrs[ETHTOOL_A_PRIVFLAGS_FLAGS])
return -EINVAL;
if (!ops->get_priv_flags || !ops->set_priv_flags ||
!ops->get_sset_count || !ops->get_strings)
return -EOPNOTSUPP;
return 1;
}
static int
ethnl_set_privflags(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
const char (*names)[ETH_GSTRING_LEN] = NULL; const char (*names)[ETH_GSTRING_LEN] = NULL;
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
const struct ethtool_ops *ops;
struct net_device *dev;
unsigned int nflags; unsigned int nflags;
bool mod = false; bool mod = false;
bool compact; bool compact;
u32 flags; u32 flags;
int ret; int ret;
if (!tb[ETHTOOL_A_PRIVFLAGS_FLAGS])
return -EINVAL;
ret = ethnl_bitset_is_compact(tb[ETHTOOL_A_PRIVFLAGS_FLAGS], &compact); ret = ethnl_bitset_is_compact(tb[ETHTOOL_A_PRIVFLAGS_FLAGS], &compact);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_PRIVFLAGS_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_priv_flags || !ops->set_priv_flags ||
!ops->get_sset_count || !ops->get_strings)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ret = ethnl_get_priv_flags_info(dev, &nflags, compact ? NULL : &names); ret = ethnl_get_priv_flags_info(dev, &nflags, compact ? NULL : &names);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
flags = ops->get_priv_flags(dev); flags = dev->ethtool_ops->get_priv_flags(dev);
ret = ethnl_update_bitset32(&flags, nflags, ret = ethnl_update_bitset32(&flags, nflags,
tb[ETHTOOL_A_PRIVFLAGS_FLAGS], names, tb[ETHTOOL_A_PRIVFLAGS_FLAGS], names,
info->extack, &mod); info->extack, &mod);
if (ret < 0 || !mod) if (ret < 0 || !mod)
goto out_free; goto out_free;
ret = ops->set_priv_flags(dev, flags); ret = dev->ethtool_ops->set_priv_flags(dev, flags);
if (ret < 0) if (ret < 0)
goto out_free; goto out_free;
ethtool_notify(dev, ETHTOOL_MSG_PRIVFLAGS_NTF, NULL); ret = 1;
out_free: out_free:
kfree(names); kfree(names);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret; return ret;
} }
const struct ethnl_request_ops ethnl_privflags_request_ops = {
.request_cmd = ETHTOOL_MSG_PRIVFLAGS_GET,
.reply_cmd = ETHTOOL_MSG_PRIVFLAGS_GET_REPLY,
.hdr_attr = ETHTOOL_A_PRIVFLAGS_HEADER,
.req_info_size = sizeof(struct privflags_req_info),
.reply_data_size = sizeof(struct privflags_reply_data),
.prepare_data = privflags_prepare_data,
.reply_size = privflags_reply_size,
.fill_reply = privflags_fill_reply,
.cleanup_data = privflags_cleanup_data,
.set_validate = ethnl_set_privflags_validate,
.set = ethnl_set_privflags,
.set_ntf_cmd = ETHTOOL_MSG_PRIVFLAGS_NTF,
};
net/ethtool/pse-pd.c
浏览文件 @ 04007961
...@@ -106,18 +106,6 @@ static int pse_fill_reply(struct sk_buff *skb, ...@@ -106,18 +106,6 @@ static int pse_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_pse_request_ops = {
.request_cmd = ETHTOOL_MSG_PSE_GET,
.reply_cmd = ETHTOOL_MSG_PSE_GET_REPLY,
.hdr_attr = ETHTOOL_A_PSE_HEADER,
.req_info_size = sizeof(struct pse_req_info),
.reply_data_size = sizeof(struct pse_reply_data),
.prepare_data = pse_prepare_data,
.reply_size = pse_reply_size,
.fill_reply = pse_fill_reply,
};
/* PSE_SET */ /* PSE_SET */
const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = { const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {
...@@ -127,59 +115,50 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = { ...@@ -127,59 +115,50 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {
ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED), ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED),
}; };
static int pse_set_pse_config(struct net_device *dev, static int
struct netlink_ext_ack *extack, ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info)
struct nlattr **tb)
{ {
struct phy_device *phydev = dev->phydev; return !!info->attrs[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL];
struct pse_control_config config = {}; }
/* Optional attribute. Do not return error if not set. */ static int
if (!tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]) ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
return 0; {
struct net_device *dev = req_info->dev;
struct pse_control_config config = {};
struct nlattr **tb = info->attrs;
struct phy_device *phydev;
/* this values are already validated by the ethnl_pse_set_policy */ /* this values are already validated by the ethnl_pse_set_policy */
config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);
phydev = dev->phydev;
if (!phydev) { if (!phydev) {
NL_SET_ERR_MSG(extack, "No PHY is attached"); NL_SET_ERR_MSG(info->extack, "No PHY is attached");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (!phydev->psec) { if (!phydev->psec) {
NL_SET_ERR_MSG(extack, "No PSE is attached"); NL_SET_ERR_MSG(info->extack, "No PSE is attached");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
return pse_ethtool_set_config(phydev->psec, extack, &config); /* Return errno directly - PSE has no notification */
return pse_ethtool_set_config(phydev->psec, info->extack, &config);
} }
int ethnl_set_pse(struct sk_buff *skb, struct genl_info *info) const struct ethnl_request_ops ethnl_pse_request_ops = {
{ .request_cmd = ETHTOOL_MSG_PSE_GET,
struct ethnl_req_info req_info = {}; .reply_cmd = ETHTOOL_MSG_PSE_GET_REPLY,
struct nlattr **tb = info->attrs; .hdr_attr = ETHTOOL_A_PSE_HEADER,
struct net_device *dev; .req_info_size = sizeof(struct pse_req_info),
int ret; .reply_data_size = sizeof(struct pse_reply_data),
ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_PSE_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ret = pse_set_pse_config(dev, info->extack, tb);
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
ethnl_parse_header_dev_put(&req_info); .prepare_data = pse_prepare_data,
.reply_size = pse_reply_size,
.fill_reply = pse_fill_reply,
return ret; .set_validate = ethnl_set_pse_validate,
} .set = ethnl_set_pse,
/* PSE has no notification */
};
net/ethtool/rings.c
浏览文件 @ 04007961
...@@ -102,18 +102,6 @@ static int rings_fill_reply(struct sk_buff *skb, ...@@ -102,18 +102,6 @@ static int rings_fill_reply(struct sk_buff *skb,
return 0; return 0;
} }
const struct ethnl_request_ops ethnl_rings_request_ops = {
.request_cmd = ETHTOOL_MSG_RINGS_GET,
.reply_cmd = ETHTOOL_MSG_RINGS_GET_REPLY,
.hdr_attr = ETHTOOL_A_RINGS_HEADER,
.req_info_size = sizeof(struct rings_req_info),
.reply_data_size = sizeof(struct rings_reply_data),
.prepare_data = rings_prepare_data,
.reply_size = rings_reply_size,
.fill_reply = rings_fill_reply,
};
/* RINGS_SET */ /* RINGS_SET */
const struct nla_policy ethnl_rings_set_policy[] = { const struct nla_policy ethnl_rings_set_policy[] = {
...@@ -128,62 +116,53 @@ const struct nla_policy ethnl_rings_set_policy[] = { ...@@ -128,62 +116,53 @@ const struct nla_policy ethnl_rings_set_policy[] = {
[ETHTOOL_A_RINGS_TX_PUSH] = NLA_POLICY_MAX(NLA_U8, 1), [ETHTOOL_A_RINGS_TX_PUSH] = NLA_POLICY_MAX(NLA_U8, 1),
}; };
int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_rings_validate(struct ethnl_req_info *req_info,
struct genl_info *info)
{ {
struct kernel_ethtool_ringparam kernel_ringparam = {}; const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
struct ethtool_ringparam ringparam = {};
struct ethnl_req_info req_info = {};
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
const struct nlattr *err_attr;
const struct ethtool_ops *ops;
struct net_device *dev;
bool mod = false;
int ret;
ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_RINGS_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ops = dev->ethtool_ops;
ret = -EOPNOTSUPP;
if (!ops->get_ringparam || !ops->set_ringparam)
goto out_dev;
if (tb[ETHTOOL_A_RINGS_RX_BUF_LEN] && if (tb[ETHTOOL_A_RINGS_RX_BUF_LEN] &&
!(ops->supported_ring_params & ETHTOOL_RING_USE_RX_BUF_LEN)) { !(ops->supported_ring_params & ETHTOOL_RING_USE_RX_BUF_LEN)) {
ret = -EOPNOTSUPP;
NL_SET_ERR_MSG_ATTR(info->extack, NL_SET_ERR_MSG_ATTR(info->extack,
tb[ETHTOOL_A_RINGS_RX_BUF_LEN], tb[ETHTOOL_A_RINGS_RX_BUF_LEN],
"setting rx buf len not supported"); "setting rx buf len not supported");
goto out_dev; return -EOPNOTSUPP;
} }
if (tb[ETHTOOL_A_RINGS_CQE_SIZE] && if (tb[ETHTOOL_A_RINGS_CQE_SIZE] &&
!(ops->supported_ring_params & ETHTOOL_RING_USE_CQE_SIZE)) { !(ops->supported_ring_params & ETHTOOL_RING_USE_CQE_SIZE)) {
ret = -EOPNOTSUPP;
NL_SET_ERR_MSG_ATTR(info->extack, NL_SET_ERR_MSG_ATTR(info->extack,
tb[ETHTOOL_A_RINGS_CQE_SIZE], tb[ETHTOOL_A_RINGS_CQE_SIZE],
"setting cqe size not supported"); "setting cqe size not supported");
goto out_dev; return -EOPNOTSUPP;
} }
if (tb[ETHTOOL_A_RINGS_TX_PUSH] && if (tb[ETHTOOL_A_RINGS_TX_PUSH] &&
!(ops->supported_ring_params & ETHTOOL_RING_USE_TX_PUSH)) { !(ops->supported_ring_params & ETHTOOL_RING_USE_TX_PUSH)) {
ret = -EOPNOTSUPP;
NL_SET_ERR_MSG_ATTR(info->extack, NL_SET_ERR_MSG_ATTR(info->extack,
tb[ETHTOOL_A_RINGS_TX_PUSH], tb[ETHTOOL_A_RINGS_TX_PUSH],
"setting tx push not supported"); "setting tx push not supported");
goto out_dev; return -EOPNOTSUPP;
} }
rtnl_lock(); return ops->get_ringparam && ops->set_ringparam ? 1 : -EOPNOTSUPP;
ret = ethnl_ops_begin(dev); }
if (ret < 0)
goto out_rtnl; static int
ops->get_ringparam(dev, &ringparam, &kernel_ringparam, info->extack); ethnl_set_rings(struct ethnl_req_info *req_info, struct genl_info *info)
{
struct kernel_ethtool_ringparam kernel_ringparam = {};
struct ethtool_ringparam ringparam = {};
struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs;
const struct nlattr *err_attr;
bool mod = false;
int ret;
dev->ethtool_ops->get_ringparam(dev, &ringparam,
&kernel_ringparam, info->extack);
ethnl_update_u32(&ringparam.rx_pending, tb[ETHTOOL_A_RINGS_RX], &mod); ethnl_update_u32(&ringparam.rx_pending, tb[ETHTOOL_A_RINGS_RX], &mod);
ethnl_update_u32(&ringparam.rx_mini_pending, ethnl_update_u32(&ringparam.rx_mini_pending,
...@@ -197,9 +176,8 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info) ...@@ -197,9 +176,8 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info)
tb[ETHTOOL_A_RINGS_CQE_SIZE], &mod); tb[ETHTOOL_A_RINGS_CQE_SIZE], &mod);
ethnl_update_u8(&kernel_ringparam.tx_push, ethnl_update_u8(&kernel_ringparam.tx_push,
tb[ETHTOOL_A_RINGS_TX_PUSH], &mod); tb[ETHTOOL_A_RINGS_TX_PUSH], &mod);
ret = 0;
if (!mod) if (!mod)
goto out_ops; return 0;
/* ensure new ring parameters are within limits */ /* ensure new ring parameters are within limits */
if (ringparam.rx_pending > ringparam.rx_max_pending) if (ringparam.rx_pending > ringparam.rx_max_pending)
...@@ -213,23 +191,28 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info) ...@@ -213,23 +191,28 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info)
else else
err_attr = NULL; err_attr = NULL;
if (err_attr) { if (err_attr) {
ret = -EINVAL;
NL_SET_ERR_MSG_ATTR(info->extack, err_attr, NL_SET_ERR_MSG_ATTR(info->extack, err_attr,
"requested ring size exceeds maximum"); "requested ring size exceeds maximum");
goto out_ops; return -EINVAL;
} }
ret = dev->ethtool_ops->set_ringparam(dev, &ringparam, ret = dev->ethtool_ops->set_ringparam(dev, &ringparam,
&kernel_ringparam, info->extack); &kernel_ringparam, info->extack);
if (ret < 0) return ret < 0 ? ret : 1;
goto out_ops;
ethtool_notify(dev, ETHTOOL_MSG_RINGS_NTF, NULL);
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
const struct ethnl_request_ops ethnl_rings_request_ops = {
.request_cmd = ETHTOOL_MSG_RINGS_GET,
.reply_cmd = ETHTOOL_MSG_RINGS_GET_REPLY,
.hdr_attr = ETHTOOL_A_RINGS_HEADER,
.req_info_size = sizeof(struct rings_req_info),
.reply_data_size = sizeof(struct rings_reply_data),
.prepare_data = rings_prepare_data,
.reply_size = rings_reply_size,
.fill_reply = rings_fill_reply,
.set_validate = ethnl_set_rings_validate,
.set = ethnl_set_rings,
.set_ntf_cmd = ETHTOOL_MSG_RINGS_NTF,
};
net/ethtool/wol.c
浏览文件 @ 04007961
...@@ -82,18 +82,6 @@ static int wol_fill_reply(struct sk_buff *skb, ...@@ -82,18 +82,6 @@ static int wol_fill_reply(struct sk_buff *skb,
return 0; 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,
.req_info_size = sizeof(struct wol_req_info),
.reply_data_size = sizeof(struct wol_reply_data),
.prepare_data = wol_prepare_data,
.reply_size = wol_reply_size,
.fill_reply = wol_fill_reply,
};
/* WOL_SET */ /* WOL_SET */
const struct nla_policy ethnl_wol_set_policy[] = { const struct nla_policy ethnl_wol_set_policy[] = {
...@@ -104,67 +92,66 @@ const struct nla_policy ethnl_wol_set_policy[] = { ...@@ -104,67 +92,66 @@ const struct nla_policy ethnl_wol_set_policy[] = {
.len = SOPASS_MAX }, .len = SOPASS_MAX },
}; };
int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info) static int
ethnl_set_wol_validate(struct ethnl_req_info *req_info, struct genl_info *info)
{
const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
return ops->get_wol && ops->set_wol ? 1 : -EOPNOTSUPP;
}
static int
ethnl_set_wol(struct ethnl_req_info *req_info, struct genl_info *info)
{ {
struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
struct ethnl_req_info req_info = {}; struct net_device *dev = req_info->dev;
struct nlattr **tb = info->attrs; struct nlattr **tb = info->attrs;
struct net_device *dev;
bool mod = false; bool mod = false;
int ret; int ret;
ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_WOL_HEADER],
genl_info_net(info), info->extack,
true);
if (ret < 0)
return ret;
dev = req_info.dev;
ret = -EOPNOTSUPP;
if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)
goto out_dev;
rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
dev->ethtool_ops->get_wol(dev, &wol); dev->ethtool_ops->get_wol(dev, &wol);
ret = ethnl_update_bitset32(&wol.wolopts, WOL_MODE_COUNT, ret = ethnl_update_bitset32(&wol.wolopts, WOL_MODE_COUNT,
tb[ETHTOOL_A_WOL_MODES], wol_mode_names, tb[ETHTOOL_A_WOL_MODES], wol_mode_names,
info->extack, &mod); info->extack, &mod);
if (ret < 0) if (ret < 0)
goto out_ops; return ret;
if (wol.wolopts & ~wol.supported) { if (wol.wolopts & ~wol.supported) {
NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_WOL_MODES], NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_WOL_MODES],
"cannot enable unsupported WoL mode"); "cannot enable unsupported WoL mode");
ret = -EINVAL; return -EINVAL;
goto out_ops;
} }
if (tb[ETHTOOL_A_WOL_SOPASS]) { if (tb[ETHTOOL_A_WOL_SOPASS]) {
if (!(wol.supported & WAKE_MAGICSECURE)) { if (!(wol.supported & WAKE_MAGICSECURE)) {
NL_SET_ERR_MSG_ATTR(info->extack, NL_SET_ERR_MSG_ATTR(info->extack,
tb[ETHTOOL_A_WOL_SOPASS], tb[ETHTOOL_A_WOL_SOPASS],
"magicsecure not supported, cannot set password"); "magicsecure not supported, cannot set password");
ret = -EINVAL; return -EINVAL;
goto out_ops;
} }
ethnl_update_binary(wol.sopass, sizeof(wol.sopass), ethnl_update_binary(wol.sopass, sizeof(wol.sopass),
tb[ETHTOOL_A_WOL_SOPASS], &mod); tb[ETHTOOL_A_WOL_SOPASS], &mod);
} }
if (!mod) if (!mod)
goto out_ops; return 0;
ret = dev->ethtool_ops->set_wol(dev, &wol); ret = dev->ethtool_ops->set_wol(dev, &wol);
if (ret) if (ret)
goto out_ops; return ret;
dev->wol_enabled = !!wol.wolopts; dev->wol_enabled = !!wol.wolopts;
ethtool_notify(dev, ETHTOOL_MSG_WOL_NTF, NULL); return 1;
out_ops:
ethnl_ops_complete(dev);
out_rtnl:
rtnl_unlock();
out_dev:
ethnl_parse_header_dev_put(&req_info);
return ret;
} }
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,
.req_info_size = sizeof(struct wol_req_info),
.reply_data_size = sizeof(struct wol_reply_data),
.prepare_data = wol_prepare_data,
.reply_size = wol_reply_size,
.fill_reply = wol_fill_reply,
.set_validate = ethnl_set_wol_validate,
.set = ethnl_set_wol,
.set_ntf_cmd = ETHTOOL_MSG_WOL_NTF,
};
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或