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 5D2A6C43381 for ; Fri, 1 Mar 2019 16:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2084D20857 for ; Fri, 1 Mar 2019 16:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Do7s9yEq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388989AbfCAQGE (ORCPT ); Fri, 1 Mar 2019 11:06:04 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35645 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727952AbfCAQFt (ORCPT ); Fri, 1 Mar 2019 11:05:49 -0500 Received: by mail-wr1-f68.google.com with SMTP id t18so26458111wrx.2 for ; Fri, 01 Mar 2019 08:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0eR5mFECi0PYpUnQ4MG7/d7iomhYlB4JDH57biesPRY=; b=Do7s9yEqS9XUhE9XPSq55DbnUQJ0Nrjj9UK16/1B/EroUD7UaaxEK4nA+ED3FLcFnb G8ul6QDAAXaRGI2T6T9XjIbgCfGmvLH1NBF3AJnAbhTtrcJPogQOLmU9t6Ee0KceVIBB EnUv6UwnJtFmUHTynqmAbVse1bPMglzE4A//WxTCAU2TkI6IotwrBt+/gA5KT93Mc7w1 0C40PtENR6KlgxGARd8/jj0qos+8ha0rJNn4dmj06wvDIkG7ZCY/9mW5r95ZUHJut9Yn 87+K/B6vmat2scgeuVGmvAcy4BUIJzxtDC5a93p2EpPxKp8aN60GOLvNJGpsjJSWtrOx JJnQ== 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; bh=0eR5mFECi0PYpUnQ4MG7/d7iomhYlB4JDH57biesPRY=; b=MdhhaaEBSuOf2mEKlKSVqIKlsv3BkFNttDekbJ/Jy5YikqkdK25ad+Qc2ZnulxWOwV QOcireCAB1uJt4iv3WzXlJ1XcL9lvMG3+A5pFku7mKcXvrD1c/S2LAkbtYTnC7y6JnZI sV60pKOf4Ksvn7EUtsZQrziVPKw6QSwxsYrc6HVHFsHW9LB1R4eEALZuBfvO8nJUC+pP J4T4Wq15GVQRDXnZXwkZfqGHeIV7kCjGbSVReXglvxn21AY1ImNJaVieNhQoDmVqGtCz VMZl7NASbmOcNX773GNrPErMySi15QWvmArdSSC4JLVxb5ZC3ViinoGFIQGo2b3lpEVn Lu1g== X-Gm-Message-State: APjAAAUCl+zfspKX0XAJ878wbEHZXxeCnEg6PNko8LCeFN3UMg5mVvgE C6LH4VeX0fgwvpX6L2+1q9Tfsfg+FWvtLA== X-Google-Smtp-Source: APXvYqz88CQYA2LIhrMiT74ya++Kv5f4QktgzRTCUF8ttDvH8ZK4PKGEr7Be0ojm9V48Srk3V+an3g== X-Received: by 2002:adf:e3cb:: with SMTP id k11mr4087463wrm.263.1551456346096; Fri, 01 Mar 2019 08:05:46 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id e23sm5285303wme.15.2019.03.01.08.05.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:45 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next RFC 2/8] net: devlink: extend port attrs for switch ID Date: Fri, 1 Mar 2019 17:05:36 +0100 Message-Id: <20190301160542.6474-3-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301160542.6474-1-jiri@resnulli.us> References: <20190301160542.6474-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Extend devlink_port_attrs_set() to pass switch ID for ports which are part of switch and store it in port attrs. For other ports, this is NULL. During dump to userspace only valid switch ID is filled up. Note that this allows the driver to group devlink ports into one or more switches according to the actual topology. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 ++- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 2 +- include/net/devlink.h | 12 +++++++--- include/uapi/linux/devlink.h | 2 ++ net/core/devlink.c | 29 +++++++++++++++++++----- net/dsa/dsa2.c | 6 ++--- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index d10108e44438..a2fecfdec2a1 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1756,7 +1756,8 @@ void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port, mlxsw_core_port->port_driver_priv = port_driver_priv; devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, - port_number, split, split_port_subnumber); + port_number, split, split_port_subnumber, + NULL, 0); devlink_port_type_eth_set(devlink_port, dev); } EXPORT_SYMBOL(mlxsw_core_port_eth_set); diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index f24a7fc11b9f..b042dd9b2200 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -365,7 +365,7 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) devlink_port_type_eth_set(&port->dl_port, port->netdev); devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, eth_port.label_port, eth_port.is_split, - eth_port.label_subport); + eth_port.label_subport, NULL, 0); devlink = priv_to_devlink(app->pf); diff --git a/include/net/devlink.h b/include/net/devlink.h index 084a8762f3e9..1eebbb832cb3 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -41,10 +41,12 @@ struct devlink { struct devlink_port_attrs { u8 set:1, - split:1; + split:1, + switch_port:1; enum devlink_port_flavour flavour; u32 port_number; /* same value as "split group" */ u32 split_subport_number; + struct netdev_phys_item_id switch_id; }; struct devlink_port { @@ -577,7 +579,9 @@ void devlink_port_type_clear(struct devlink_port *devlink_port); void devlink_port_attrs_set(struct devlink_port *devlink_port, enum devlink_port_flavour flavour, u32 port_number, bool split, - u32 split_subport_number); + u32 split_subport_number, + const unsigned char *switch_id, + unsigned char switch_id_len); 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, @@ -788,7 +792,9 @@ static inline void devlink_port_type_clear(struct devlink_port *devlink_port) static inline void devlink_port_attrs_set(struct devlink_port *devlink_port, enum devlink_port_flavour flavour, u32 port_number, bool split, - u32 split_subport_number) + u32 split_subport_number, + const unsigned char *switch_id, + unsigned char switch_id_len) { } diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 5bb4ea67d84f..daabe7baaf4c 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -332,6 +332,8 @@ enum devlink_attr { DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME, /* string */ DEVLINK_ATTR_FLASH_UPDATE_COMPONENT, /* string */ + DEVLINK_ATTR_PORT_SWITCH_ID, /* binary */ + /* 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 d90a745d8258..1a011431694a 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -518,12 +518,15 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg, return -EMSGSIZE; if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER, attrs->port_number)) return -EMSGSIZE; - if (!attrs->split) - return 0; - if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP, attrs->port_number)) + if (attrs->split && + (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_GROUP, + attrs->port_number) || + nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER, + attrs->split_subport_number))) return -EMSGSIZE; - if (nla_put_u32(msg, DEVLINK_ATTR_PORT_SPLIT_SUBPORT_NUMBER, - attrs->split_subport_number)) + if (attrs->switch_port && + nla_put(msg, DEVLINK_ATTR_PORT_SWITCH_ID, + attrs->switch_id.id_len, attrs->switch_id.id)) return -EMSGSIZE; return 0; } @@ -5402,11 +5405,16 @@ EXPORT_SYMBOL_GPL(devlink_port_type_clear); * @split: indicates if this is split port * @split_subport_number: if the port is split, this is the number * of subport. + * @switch_id: if the port is part of switch, this is buffer with ID, + * otwerwise this is NULL + * @switch_id_len: length of the switch_id buffer */ void devlink_port_attrs_set(struct devlink_port *devlink_port, enum devlink_port_flavour flavour, u32 port_number, bool split, - u32 split_subport_number) + u32 split_subport_number, + const unsigned char *switch_id, + unsigned char switch_id_len) { struct devlink_port_attrs *attrs = &devlink_port->attrs; @@ -5415,6 +5423,15 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port, attrs->port_number = port_number; attrs->split = split; attrs->split_subport_number = split_subport_number; + if (switch_id) { + attrs->switch_port = true; + if (WARN_ON(switch_id_len > MAX_PHYS_ITEM_ID_LEN)) + switch_id_len = MAX_PHYS_ITEM_ID_LEN; + memcpy(attrs->switch_id.id, switch_id, switch_id_len); + attrs->switch_id.id_len = switch_id_len; + } else { + attrs->switch_port = false; + } devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW); } EXPORT_SYMBOL_GPL(devlink_port_attrs_set); diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 8c431e0f3627..9df9cb55ce9d 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -278,7 +278,7 @@ static int dsa_port_setup(struct dsa_port *dp) */ devlink_port_attrs_set(&dp->devlink_port, DEVLINK_PORT_FLAVOUR_CPU, - dp->index, false, 0); + dp->index, false, 0, NULL, 0); err = dsa_port_link_register_of(dp); if (err) { dev_err(ds->dev, "failed to setup link for port %d.%d\n", @@ -293,7 +293,7 @@ static int dsa_port_setup(struct dsa_port *dp) */ devlink_port_attrs_set(&dp->devlink_port, DEVLINK_PORT_FLAVOUR_DSA, - dp->index, false, 0); + dp->index, false, 0, NULL, 0); err = dsa_port_link_register_of(dp); if (err) { dev_err(ds->dev, "failed to setup link for port %d.%d\n", @@ -304,7 +304,7 @@ static int dsa_port_setup(struct dsa_port *dp) case DSA_PORT_TYPE_USER: devlink_port_attrs_set(&dp->devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, - dp->index, false, 0); + dp->index, false, 0, NULL, 0); err = dsa_slave_create(dp); if (err) dev_err(ds->dev, "failed to create slave for port %d.%d\n", -- 2.14.5