Devlink ports represent ports of a switch device (or SR-IOV
NIC which has an embedded switch). In case of SR-IOV when
PCIe PFs are exposed the PFs which are directly connected
to the local machine may also spawn PF netdev (much like
VFs have a port/"repr" and an actual VF netdev).
Allow devlink to expose such linking. There is currently no
way to find out which netdev corresponds to which PF.
Example:
$ devlink port
pci/0000:82:00.0/0: type eth netdev p4p1 flavour physical
pci/0000:82:00.0/10000: type eth netdev eth1 flavour pci_pf pf 0 peer_netdev
enp130s0
pci/0000:82:00.0/10001: type eth netdev eth0 flavour pci_vf pf 0 vf 0
pci/0000:82:00.0/10002: type eth netdev eth2 flavour pci_vf pf 0 vf 1
Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com>
---
include/net/devlink.h | 11 ++++++++
include/uapi/linux/devlink.h | 3 +++
net/core/devlink.c | 51 +++++++++++++++++++++++++++++-------
3 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 13e0a479c546..15912cca5d16 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -68,6 +68,7 @@ struct devlink_port {
enum devlink_port_type type;
enum devlink_port_type desired_type;
void *type_dev;
+ void *type_peer;
struct devlink_port_attrs attrs;
};
@@ -573,6 +574,9 @@ int devlink_port_register(struct devlink *devlink,
void devlink_port_unregister(struct devlink_port *devlink_port);
void devlink_port_type_eth_set(struct devlink_port *devlink_port,
struct net_device *netdev);
+void devlink_port_type_eth_set_peer(struct devlink_port *devlink_port,
+ struct net_device *netdev,
+ struct net_device *peer);
void devlink_port_type_ib_set(struct devlink_port *devlink_port,
struct ib_device *ibdev);
void devlink_port_type_clear(struct devlink_port *devlink_port);
@@ -782,6 +786,13 @@ static inline void devlink_port_type_eth_set(struct
devlink_port *devlink_port,
{
}
+static inline void
+devlink_port_type_eth_set_peer(struct devlink_port *devlink_port,
+ struct net_device *netdev,
+ struct net_device *peer)
+{
+}
+
static inline void devlink_port_type_ib_set(struct devlink_port *devlink_port,
struct ib_device *ibdev)
{
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 417ae8233cce..9ce4718f8b8b 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -338,6 +338,9 @@ enum devlink_attr {
DEVLINK_ATTR_PORT_PCI_VF_NUMBER, /* u32 */
DEVLINK_ATTR_PORT_PCI_SUBPORT, /* u32 */
+ DEVLINK_ATTR_PORT_PEER_NETDEV_IFINDEX, /* u32 */
+ DEVLINK_ATTR_PORT_PEER_NETDEV_NAME, /* string */
+
/* add new attributes above here, update the policy in devlink.c */
__DEVLINK_ATTR_MAX,
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 6cdf7e87d7fc..b514be300839 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -552,6 +552,17 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
}
}
+static int devlink_nl_port_put_netdev(struct sk_buff *msg,
+ int attr_ifindex, int attr_name,
+ struct net_device *netdev)
+{
+ if (netdev &&
+ (nla_put_u32(msg, attr_ifindex, netdev->ifindex) ||
+ nla_put_string(msg, attr_name, netdev->name)))
+ return -EMSGSIZE;
+ return 0;
+}
+
static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
struct devlink_port *devlink_port,
enum devlink_command cmd, u32 portid,
@@ -574,13 +585,16 @@ static int devlink_nl_port_fill(struct sk_buff *msg,
struct devlink *devlink,
devlink_port->desired_type))
goto nla_put_failure;
if (devlink_port->type == DEVLINK_PORT_TYPE_ETH) {
- struct net_device *netdev = devlink_port->type_dev;
+ if (devlink_nl_port_put_netdev(msg,
+ DEVLINK_ATTR_PORT_NETDEV_IFINDEX,
+ DEVLINK_ATTR_PORT_NETDEV_NAME,
+ devlink_port->type_dev))
+ goto nla_put_failure;
- if (netdev &&
- (nla_put_u32(msg, DEVLINK_ATTR_PORT_NETDEV_IFINDEX,
- netdev->ifindex) ||
- nla_put_string(msg, DEVLINK_ATTR_PORT_NETDEV_NAME,
- netdev->name)))
+ if (devlink_nl_port_put_netdev(msg,
+
DEVLINK_ATTR_PORT_PEER_NETDEV_IFINDEX,
+
DEVLINK_ATTR_PORT_PEER_NETDEV_NAME,
+ devlink_port->type_peer))
goto nla_put_failure;
}
if (devlink_port->type == DEVLINK_PORT_TYPE_IB) {
@@ -5369,10 +5383,11 @@ EXPORT_SYMBOL_GPL(devlink_port_unregister);
static void __devlink_port_type_set(struct devlink_port *devlink_port,
enum devlink_port_type type,
- void *type_dev)
+ void *type_dev, void *type_peer)
{
devlink_port->type = type;
devlink_port->type_dev = type_dev;
+ devlink_port->type_peer = type_peer;
devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);
}
@@ -5386,10 +5401,26 @@ void devlink_port_type_eth_set(struct devlink_port
*devlink_port,
struct net_device *netdev)
{
return __devlink_port_type_set(devlink_port,
- DEVLINK_PORT_TYPE_ETH, netdev);
+ DEVLINK_PORT_TYPE_ETH, netdev, NULL);
}
EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);
+/**
+ * devlink_port_type_eth_set_peer - Set port type to Ethernet with peer
+ *
+ * @devlink_port: devlink port
+ * @netdev: related netdevice
+ * @peer: for PCIe ports the non-port netdev (actual VF or PF)
+ */
+void devlink_port_type_eth_set_peer(struct devlink_port *devlink_port,
+ struct net_device *netdev,
+ struct net_device *peer)
+{
+ return __devlink_port_type_set(devlink_port,
+ DEVLINK_PORT_TYPE_ETH, netdev, peer);
+}
+EXPORT_SYMBOL_GPL(devlink_port_type_eth_set_peer);
+
/**
* devlink_port_type_ib_set - Set port type to InfiniBand
*
@@ -5400,7 +5431,7 @@ void devlink_port_type_ib_set(struct devlink_port
*devlink_port,
struct ib_device *ibdev)
{
return __devlink_port_type_set(devlink_port,
- DEVLINK_PORT_TYPE_IB, ibdev);
+ DEVLINK_PORT_TYPE_IB, ibdev, NULL);
}
EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);
@@ -5412,7 +5443,7 @@ EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);
void devlink_port_type_clear(struct devlink_port *devlink_port)
{
return __devlink_port_type_set(devlink_port,
- DEVLINK_PORT_TYPE_NOTSET, NULL);
+ DEVLINK_PORT_TYPE_NOTSET, NULL, NULL);
}
EXPORT_SYMBOL_GPL(devlink_port_type_clear);
--
2.19.2
