devlink: Introduce PCI VF port flavour and port attribute

In an eswitch, PCI VF may have port which is normally represented using
a representor netdevice.
To have better visibility of eswitch port, its association with VF,
and its representor netdevice, introduce a PCI VF port flavour.

When devlink port flavour is PCI VF, fill up PCI VF attributes of
the port.

Extend port name creation using PCI PF and VF number scheme on best
effort basis, so that vendor drivers can skip defining their own scheme.

$ devlink port show
pci/0000:05:00.0/0: type eth netdev eth0 flavour pcipf pfnum 0
pci/0000:05:00.0/1: type eth netdev eth1 flavour pcivf pfnum 0 vfnum 0
pci/0000:05:00.0/2: type eth netdev eth2 flavour pcivf pfnum 0 vfnum 1

Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 97cef896e4d06fc102c97e052ef4f081a44bf8a6..bc36f942a7d533e66d39394a91df3e62606517bb 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -50,6 +50,11 @@ struct devlink_port_pci_pf_attrs {
        u16 pf; /* Associated PCI PF for this port. */
 };
 
+struct devlink_port_pci_vf_attrs {
+       u16 pf; /* Associated PCI PF for this port. */
+       u16 vf; /* Associated PCI VF for of the PCI PF for this port. */
+};
+
 struct devlink_port_attrs {
        u8 set:1,
           split:1,
@@ -59,6 +64,7 @@ struct devlink_port_attrs {
        union {
                struct devlink_port_phys_attrs phys;
                struct devlink_port_pci_pf_attrs pci_pf;
+               struct devlink_port_pci_vf_attrs pci_vf;
        };
 };
 
@@ -607,6 +613,10 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port,
 void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port,
                                   const unsigned char *switch_id,
                                   unsigned char switch_id_len, u16 pf);
+void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port,
+                                  const unsigned char *switch_id,
+                                  unsigned char switch_id_len,
+                                  u16 pf, u16 vf);
 int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
                        u32 size, u16 ingress_pools_count,
                        u16 egress_pools_count, u16 ingress_tc_count,

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index f7323884c3fe1e50e1a50ba0605989d3a15db390..ffc99325652778b1c071efa3974f838875bfe909 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -173,6 +173,10 @@ enum devlink_port_flavour {
                                      * the PCI PF. It is an internal
                                      * port that faces the PCI PF.
                                      */
+       DEVLINK_PORT_FLAVOUR_PCI_VF, /* Represents eswitch port
+                                     * for the PCI VF. It is an internal
+                                     * port that faces the PCI VF.
+                                     */
 };
 
 enum devlink_param_cmode {
@@ -342,6 +346,8 @@ enum devlink_attr {
        DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL, /* u64 */
 
        DEVLINK_ATTR_PORT_PCI_PF_NUMBER,        /* u16 */
+       DEVLINK_ATTR_PORT_PCI_VF_NUMBER,        /* u16 */
+
        /* 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 d362652a5cc7dffb7483c20e295ae9b8891101ac..4f40aeace9022672b86662176e55fd61de7430d1 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -519,6 +519,12 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
                if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
                                attrs->pci_pf.pf))
                        return -EMSGSIZE;
+       } else if (devlink_port->attrs.flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) {
+               if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER,
+                               attrs->pci_vf.pf) ||
+                   nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER,
+                               attrs->pci_vf.vf))
+                       return -EMSGSIZE;
        }
        if (devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_PHYSICAL &&
            devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_CPU &&
@@ -5832,6 +5838,34 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port,
 }
 EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_pf_set);
 
+/**
+ *     devlink_port_attrs_pci_vf_set - Set PCI VF port attributes
+ *
+ *     @devlink_port: devlink port
+ *     @pf: associated PF for the devlink port instance
+ *     @vf: associated VF of a PF for the devlink port instance
+ *     @switch_id: if the port is part of switch, this is buffer with ID,
+ *                 otherwise this is NULL
+ *     @switch_id_len: length of the switch_id buffer
+ */
+void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port,
+                                  const unsigned char *switch_id,
+                                  unsigned char switch_id_len,
+                                  u16 pf, u16 vf)
+{
+       struct devlink_port_attrs *attrs = &devlink_port->attrs;
+       int ret;
+
+       ret = __devlink_port_attrs_set(devlink_port,
+                                      DEVLINK_PORT_FLAVOUR_PCI_VF,
+                                      switch_id, switch_id_len);
+       if (ret)
+               return;
+       attrs->pci_vf.pf = pf;
+       attrs->pci_vf.vf = vf;
+}
+EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_vf_set);
+
 static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
                                             char *name, size_t len)
 {
@@ -5860,6 +5894,10 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
        case DEVLINK_PORT_FLAVOUR_PCI_PF:
                n = snprintf(name, len, "pf%u", attrs->pci_pf.pf);
                break;
+       case DEVLINK_PORT_FLAVOUR_PCI_VF:
+               n = snprintf(name, len, "pf%uvf%u",
+                            attrs->pci_vf.pf, attrs->pci_vf.vf);
+               break;
        }
 
        if (n >= len)