From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAAB1C43381 for ; Tue, 26 Feb 2019 18:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6FA78217F5 for ; Tue, 26 Feb 2019 18:25:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="N+SeQkG5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729174AbfBZSY7 (ORCPT ); Tue, 26 Feb 2019 13:24:59 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:35539 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729067AbfBZSY6 (ORCPT ); Tue, 26 Feb 2019 13:24:58 -0500 Received: by mail-qt1-f196.google.com with SMTP id p48so16078824qtk.2 for ; Tue, 26 Feb 2019 10:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xLafgvIktMUqrZmcuPObSZmMC/vkX80Uc/mOova5Ed4=; b=N+SeQkG5wiDchkt01i6UKC6YV7Dwd7AfVpGdnxwTQADn/qiaEvCvXSNpp5kdlRw1QE E4EPA2UMpyXPoAMYMmuQmMS8JXqGQcKf9wH/6kqygBV9fEeKCMQNU4Y1G8S5/OBam5Yq j+6hQruKoxaELF5W2N4bjWLDeAcIXrVGRvxnUPqcKAm2C5QBhg1QCgsyNFgvh5uWRW/Q vizoV6CRTfy13db3z5fc9+GL+BIWC+XSvJ5PqI75zn8Qm8AL0Uf3krjC174eaV81SWQO BHifYtgHNHEgF9RIE+IBd7a5ndHGFN4ZD5hI1C2b57a2tLvKEwmLmWOPMEp6HnwXhh4q hvwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xLafgvIktMUqrZmcuPObSZmMC/vkX80Uc/mOova5Ed4=; b=sf3lKmRG++t4bK6dkuPHz2+FAeUtOsc5Oy8OrvVTrd8XeFYglKxrV2Ovf3ElXLXcNU U0jJYqPk1SzYqxCXwoTaSXRZllzn1zHf7CbS8w+TlqYgRFoR4y2pHAqitERdA4xfInae /nKu0LzZ6jr+hopHpJRmkgvP78HPJGQIMgXyGeBqIasck2QJTBTCGL9M+cvZggPs2prv pyGXhjXyHhABhIwkJngg1vm6Fkq2OExxGubzCrKpMTbqN9xJ47yOHIe8QG7GY9BZYvP4 9+zoj0XtZvUj4GFAOYJyuasFOSwvHXDvBKY69OYJYU9VTP2Geb76JUTF1ALc1PB4+sTm eRAA== X-Gm-Message-State: AHQUAuY8Fb2sUvEIZdB160/0SihrTS9ux4dvtcxHmXde7UIhOK/nZM3K 7p/4NcC/MYB6/O2TpHknXPFc2rLzzc8= X-Google-Smtp-Source: AHgI3IYVjribNPc3vayEuMUABKF7kadqcNCMGAVr3YMkm887DRi5ZuNIaP8zGdytdqxFeOMxaCnBLw== X-Received: by 2002:a0c:d963:: with SMTP id t32mr18883801qvj.231.1551205496419; Tue, 26 Feb 2019 10:24:56 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id u31sm9733892qth.15.2019.02.26.10.24.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 10:24:55 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next 6/8] devlink: introduce port's peer netdevs Date: Tue, 26 Feb 2019 10:24:34 -0800 Message-Id: <20190226182436.23811-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226182436.23811-1-jakub.kicinski@netronome.com> References: <20190226182436.23811-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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