mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
net: expose devlink port over rtnetlink
Expose devlink port handle related to netdev over rtnetlink. Introduce a new nested IFLA attribute to carry the info. Call into devlink code to fill-up the nest with existing devlink attributes that are used over devlink netlink. Signed-off-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
77df1db80d
commit
dca56c3038
@@ -53,6 +53,7 @@
|
||||
#include <net/fib_rules.h>
|
||||
#include <net/rtnetlink.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/devlink.h>
|
||||
|
||||
#include "dev.h"
|
||||
|
||||
@@ -1038,6 +1039,16 @@ static size_t rtnl_proto_down_size(const struct net_device *dev)
|
||||
return size;
|
||||
}
|
||||
|
||||
static size_t rtnl_devlink_port_size(const struct net_device *dev)
|
||||
{
|
||||
size_t size = nla_total_size(0); /* nest IFLA_DEVLINK_PORT */
|
||||
|
||||
if (dev->devlink_port)
|
||||
size += devlink_nl_port_handle_size(dev->devlink_port);
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
static noinline size_t if_nlmsg_size(const struct net_device *dev,
|
||||
u32 ext_filter_mask)
|
||||
{
|
||||
@@ -1091,6 +1102,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
|
||||
+ nla_total_size(4) /* IFLA_MAX_MTU */
|
||||
+ rtnl_prop_list_size(dev)
|
||||
+ nla_total_size(MAX_ADDR_LEN) /* IFLA_PERM_ADDRESS */
|
||||
+ rtnl_devlink_port_size(dev)
|
||||
+ 0;
|
||||
}
|
||||
|
||||
@@ -1728,6 +1740,30 @@ nla_put_failure:
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
static int rtnl_fill_devlink_port(struct sk_buff *skb,
|
||||
const struct net_device *dev)
|
||||
{
|
||||
struct nlattr *devlink_port_nest;
|
||||
int ret;
|
||||
|
||||
devlink_port_nest = nla_nest_start(skb, IFLA_DEVLINK_PORT);
|
||||
if (!devlink_port_nest)
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (dev->devlink_port) {
|
||||
ret = devlink_nl_port_handle_fill(skb, dev->devlink_port);
|
||||
if (ret < 0)
|
||||
goto nest_cancel;
|
||||
}
|
||||
|
||||
nla_nest_end(skb, devlink_port_nest);
|
||||
return 0;
|
||||
|
||||
nest_cancel:
|
||||
nla_nest_cancel(skb, devlink_port_nest);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int rtnl_fill_ifinfo(struct sk_buff *skb,
|
||||
struct net_device *dev, struct net *src_net,
|
||||
int type, u32 pid, u32 seq, u32 change,
|
||||
@@ -1865,6 +1901,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
|
||||
dev->dev.parent->bus->name))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (rtnl_fill_devlink_port(skb, dev))
|
||||
goto nla_put_failure;
|
||||
|
||||
nlmsg_end(skb, nlh);
|
||||
return 0;
|
||||
|
||||
|
Reference in New Issue
Block a user