From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, jacob.e.keller@intel.com,
roopa@nvidia.com, mlxsw@nvidia.com
Subject: [patch net-next RFC 05/10] devlink: add port to line card relationship set
Date: Wed, 13 Jan 2021 13:12:17 +0100 [thread overview]
Message-ID: <20210113121222.733517-6-jiri@resnulli.us> (raw)
In-Reply-To: <20210113121222.733517-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@nvidia.com>
In order to properly inform user about relationship between port and
line card, introduce a driver API to set line card for a port. Use this
information to extend port devlink netlink message by line card index
and also include the line card index into phys_port_name and by that
into a netdevice name.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
include/net/devlink.h | 3 +++
net/core/devlink.c | 25 ++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index ec00cd94c626..cb911b6fdeda 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -137,6 +137,7 @@ struct devlink_port {
struct delayed_work type_warn_dw;
struct list_head reporter_list;
struct mutex reporters_lock; /* Protects reporter_list */
+ struct devlink_linecard *linecard;
};
struct devlink_linecard_ops;
@@ -1438,6 +1439,8 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 contro
u16 pf, bool external);
void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller,
u16 pf, u16 vf, bool external);
+void devlink_port_linecard_set(struct devlink_port *devlink_port,
+ struct devlink_linecard *linecard);
struct devlink_linecard *
devlink_linecard_create(struct devlink *devlink, unsigned int linecard_index,
const struct devlink_linecard_ops *ops, void *priv);
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 347976b88404..2faa30cc5cce 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -855,6 +855,10 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
goto nla_put_failure;
if (devlink_nl_port_function_attrs_put(msg, devlink_port, extack))
goto nla_put_failure;
+ if (devlink_port->linecard &&
+ nla_put_u32(msg, DEVLINK_ATTR_LINECARD_INDEX,
+ devlink_port->linecard->index))
+ goto nla_put_failure;
genlmsg_end(msg, hdr);
return 0;
@@ -8642,6 +8646,21 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 contro
}
EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_vf_set);
+/**
+ * devlink_port_linecard_set - Link port with a linecard
+ *
+ * @devlink_port: devlink port
+ * @devlink_linecard: devlink linecard
+ */
+void devlink_port_linecard_set(struct devlink_port *devlink_port,
+ struct devlink_linecard *linecard)
+{
+ if (WARN_ON(devlink_port->registered))
+ return;
+ devlink_port->linecard = linecard;
+}
+EXPORT_SYMBOL_GPL(devlink_port_linecard_set);
+
static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
char *name, size_t len)
{
@@ -8654,7 +8673,11 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
switch (attrs->flavour) {
case DEVLINK_PORT_FLAVOUR_PHYSICAL:
case DEVLINK_PORT_FLAVOUR_VIRTUAL:
- n = snprintf(name, len, "p%u", attrs->phys.port_number);
+ if (devlink_port->linecard)
+ n = snprintf(name, len, "l%u",
+ devlink_port->linecard->index);
+ n += snprintf(name + n, len - n, "p%u",
+ attrs->phys.port_number);
if (attrs->split)
n += snprintf(name + n, len - n, "s%u",
attrs->phys.split_subport_number);
--
2.26.2
next prev parent reply other threads:[~2021-01-13 12:13 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 12:12 [patch net-next RFC 00/10] introduce line card support for modular switch Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 01/10] devlink: add support to create line card and expose to user Jiri Pirko
2021-01-15 15:47 ` Ido Schimmel
2021-01-13 12:12 ` [patch net-next RFC 02/10] devlink: implement line card provisioning Jiri Pirko
2021-01-15 16:03 ` Ido Schimmel
2021-01-15 16:51 ` Jiri Pirko
2021-01-15 18:09 ` Ido Schimmel
2021-01-18 12:50 ` Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 03/10] devlink: implement line card active state Jiri Pirko
2021-01-15 16:06 ` Ido Schimmel
2021-01-15 16:52 ` Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 04/10] devlink: append split port number to the port name Jiri Pirko
2021-01-13 12:12 ` Jiri Pirko [this message]
2021-01-15 16:10 ` [patch net-next RFC 05/10] devlink: add port to line card relationship set Ido Schimmel
2021-01-15 16:53 ` Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 06/10] netdevsim: introduce line card support Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 07/10] netdevsim: allow port objects to be linked with line cards Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 08/10] netdevsim: create devlink line card object and implement provisioning Jiri Pirko
2021-01-15 16:30 ` Ido Schimmel
2021-01-15 16:54 ` Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 09/10] netdevsim: implement line card activation Jiri Pirko
2021-01-13 12:12 ` [patch net-next RFC 10/10] selftests: add netdevsim devlink lc test Jiri Pirko
2021-01-13 13:39 ` [patch iproute2/net-next RFC] devlink: add support for linecard show and provision Jiri Pirko
2021-01-14 2:07 ` [patch net-next RFC 00/10] introduce line card support for modular switch Andrew Lunn
2021-01-14 7:39 ` Jiri Pirko
2021-01-14 22:56 ` Jacob Keller
2021-01-15 14:19 ` Jiri Pirko
2021-01-19 11:56 ` Jiri Pirko
2021-01-19 14:51 ` Andrew Lunn
2021-01-20 8:36 ` Jiri Pirko
2021-01-20 13:56 ` Andrew Lunn
2021-01-20 23:41 ` Jakub Kicinski
2021-01-21 0:01 ` Andrew Lunn
2021-01-21 0:16 ` Jakub Kicinski
2021-01-21 15:34 ` Jiri Pirko
2021-01-21 15:32 ` Jiri Pirko
2021-01-21 16:38 ` David Ahern
2021-01-22 7:28 ` Jiri Pirko
2021-01-22 14:13 ` Andrew Lunn
2021-01-26 11:33 ` Jiri Pirko
2021-01-26 13:56 ` Andrew Lunn
2021-01-27 7:57 ` Jiri Pirko
2021-01-27 14:14 ` Andrew Lunn
2021-01-27 14:57 ` David Ahern
2021-01-28 8:14 ` Jiri Pirko
2021-01-28 14:17 ` Andrew Lunn
2021-01-29 7:20 ` Jiri Pirko
[not found] ` <YBQujIdnFtEhWqTF@lunn.ch>
2021-01-29 16:45 ` Vadim Pasternak
2021-01-29 17:31 ` Andrew Lunn
2021-01-30 14:19 ` Jiri Pirko
[not found] ` <251d1e12-1d61-0922-31f8-a8313f18f194@gmail.com>
2021-02-01 8:16 ` Jiri Pirko
2021-02-01 13:41 ` Andrew Lunn
2021-02-03 14:57 ` Jiri Pirko
2021-02-03 16:26 ` Andrew Lunn
2021-02-01 1:43 ` Andrew Lunn
2021-01-22 8:05 ` Jiri Pirko
2021-01-19 16:23 ` David Ahern
2021-01-20 8:37 ` Jiri Pirko
2021-01-14 2:27 ` Jakub Kicinski
2021-01-14 7:48 ` Jiri Pirko
2021-01-14 23:30 ` Jakub Kicinski
2021-01-15 14:39 ` Jiri Pirko
2021-01-15 19:26 ` Jakub Kicinski
2021-01-18 13:00 ` Jiri Pirko
2021-01-18 17:59 ` Jakub Kicinski
2021-01-19 11:51 ` Jiri Pirko
2021-01-18 22:55 ` David Ahern
2021-01-22 8:01 ` Jiri Pirko
2021-01-14 22:58 ` Jacob Keller
2021-01-14 23:20 ` Jakub Kicinski
2021-01-15 14:40 ` Jiri Pirko
2021-01-15 15:43 ` Ido Schimmel
2021-01-15 16:55 ` Jiri Pirko
2021-01-15 18:01 ` Ido Schimmel
2021-01-18 13:03 ` Jiri Pirko
2021-01-18 18:01 ` Edwin Peer
2021-01-18 22:57 ` David Ahern
2021-01-18 23:40 ` Edwin Peer
2021-01-19 2:39 ` David Ahern
2021-01-19 5:06 ` Edwin Peer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210113121222.733517-6-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=mlxsw@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).