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=-7.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,URIBL_BLOCKED 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 CF503C43381 for ; Sat, 2 Mar 2019 19:07:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CAF62086D for ; Sat, 2 Mar 2019 19:07:31 +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="l4fvJCN4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726991AbfCBTHa (ORCPT ); Sat, 2 Mar 2019 14:07:30 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:46823 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726529AbfCBTH3 (ORCPT ); Sat, 2 Mar 2019 14:07:29 -0500 Received: by mail-pf1-f196.google.com with SMTP id g6so514001pfh.13 for ; Sat, 02 Mar 2019 11:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=6YveV84XTD64ffggOpS45eF8M49R/zZnpu79WbgLgyE=; b=l4fvJCN4G3qQl/ZmxBz6HcurmXmn8YaPoHazZ7Yq4XozmpCuc5KCuOqNVkcLKEIf6u GFcKuWjuUeZ0VCBjTb35aMAbkHC+4T4kUHTz8mTfjZckDWYoBzDFyQRYJcuuJdFKuJ18 c/l4cKA7t3MtpYFgvZlE8Va1tM4QTi4bJ2nsSQrsZ2KKxeuLsHykMlRA9dD6fMW+ArqE s6bZz3iRIfOuQClBsUpLwlydTOXEtu7tcztxEQDP5ZUomXNNsCxyPM2D8tVgnTrn9T0Y HtJplnWVA9V5OTFwGmj76qp2jf08OkBcNPtOvxh9DPgpoYqgI6o5o21WpzEDZowXX3je sgyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=6YveV84XTD64ffggOpS45eF8M49R/zZnpu79WbgLgyE=; b=tUq5y/J/YXHfspXpjcs2UKgjj0WWRuUq5G6VadjDOZQuF7iVfyHIq+CRAsgBQzcwoT 4Y1uMkE/AFED4V9pdLzmGZfAoPnkUWbWVApAgKl90WD+vdPSG7C3Xf2+ak1bDrJC9SKY o5hr3MLvb7h/t1ylYKiRbzgjT5o+5rCNM+UQfwLA0qaTQC+gUpTgUejQZxg3mSnYRfyL d4YJCMkVGeVMd0z9qC3NLb05HHbVLkYXahM2KzoWJnYOa1RxwoyoSZc32Vxr2NuPE1Eo gg0kT6w4BSwDFSwM36UEhg32lsiWoERCKzfafrDj54eth/JI8QVGOXgbJPWJQG1Uja5g iXZg== X-Gm-Message-State: APjAAAVz7yCzE/ybV2KFkP7lADMYUGMJ6J15YXh3kk3VT/oV3AZYjBdi ETZKTurJCf5SHDB9IFdb6IesMYQS+Zo= X-Google-Smtp-Source: APXvYqySlmo+Pn8tkYg0arTvaMglEzfe+MGoUZ+GFwZGyd6kn8ovZQrQUvBmSHJ2CTws70JBuENdTA== X-Received: by 2002:a63:a11:: with SMTP id 17mr10995604pgk.310.1551553648397; Sat, 02 Mar 2019 11:07:28 -0800 (PST) Received: from cakuba.netronome.com ([2601:646:8e00:1b7a::2]) by smtp.gmail.com with ESMTPSA id k75sm5217020pfj.46.2019.03.02.11.07.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2019 11:07:28 -0800 (PST) Date: Sat, 2 Mar 2019 11:07:24 -0800 From: Jakub Kicinski To: Jiri Pirko Cc: davem@davemloft.net, netdev@vger.kernel.org, oss-drivers@netronome.com Subject: Re: [PATCH net-next v2 3/7] nfp: register devlink ports of all reprs Message-ID: <20190302110724.75d1bdf5@cakuba.netronome.com> In-Reply-To: <20190302084347.GP2314@nanopsycho> References: <20190301180453.17778-1-jakub.kicinski@netronome.com> <20190301180453.17778-4-jakub.kicinski@netronome.com> <20190302084347.GP2314@nanopsycho> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, 2 Mar 2019 09:43:47 +0100, Jiri Pirko wrote: > Fri, Mar 01, 2019 at 07:04:49PM CET, jakub.kicinski@netronome.com wrote: > >Register all representors as devlink ports. > > > >The port_index is slightly tricky to figure out, we use a bit of > >arbitrary math to create unique IDs for PCI ports. > > > >Signed-off-by: Jakub Kicinski > >--- > > .../net/ethernet/netronome/nfp/nfp_devlink.c | 40 ++++++++++++++++++- > > .../net/ethernet/netronome/nfp/nfp_net_repr.c | 16 +++++++- > > 2 files changed, 53 insertions(+), 3 deletions(-) > > > >diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > >index 9af3cb1f2f17..bf7fd9614152 100644 > >--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > >+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > >@@ -350,7 +350,8 @@ const struct devlink_ops nfp_devlink_ops = { > > .flash_update = nfp_devlink_flash_update, > > }; > > > >-int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) > >+static int > >+nfp_devlink_port_init_phys(struct devlink *devlink, struct nfp_port *port) > > { > > struct nfp_eth_table_port eth_port; > > int ret; > >@@ -368,6 +369,27 @@ int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) > > return 0; > > } > > > >+int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) > >+{ > >+ struct devlink *devlink = priv_to_devlink(app->pf); > >+ > >+ switch (port->type) { > >+ case NFP_PORT_PHYS_PORT: > >+ return nfp_devlink_port_init_phys(devlink, port); > >+ case NFP_PORT_PF_PORT: > >+ devlink_port_type_eth_set(&port->dl_port, port->netdev); > >+ devlink_port_attrs_pci_pf_set(&port->dl_port, port->pf_id); > >+ return 0; > >+ case NFP_PORT_VF_PORT: > >+ devlink_port_type_eth_set(&port->dl_port, port->netdev); > >+ devlink_port_attrs_pci_vf_set(&port->dl_port, port->pf_id, > >+ port->vf_id); > > What is the reason to expose vf/pf id for switch port? Isn't it rather > an attribute of a peer? Naw, its an attribute of the port. I leave the ASIC via PF n or VF m of PF n. Whatever is on the other side is isolated from the topology of the ASIC. Is the physical port ID an attribute of the other end of the cable? > >+ return 0; > >+ default: > >+ return -EINVAL; > >+ } > >+} > >+ > > void nfp_devlink_port_clean(struct nfp_port *port) > > { > > } > >@@ -376,7 +398,21 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) > > { > > struct devlink *devlink = priv_to_devlink(app->pf); > > > >- return devlink_port_register(devlink, &port->dl_port, port->eth_id); > >+ switch (port->type) { > >+ case NFP_PORT_PHYS_PORT: > >+ return devlink_port_register(devlink, &port->dl_port, > >+ port->eth_id); > >+ case NFP_PORT_PF_PORT: > >+ return devlink_port_register(devlink, &port->dl_port, > >+ (port->pf_id + 1) * 10000 + > >+ port->pf_split_id * 1000); > > Wait. What this 10000/1000 magic about? port_index has to be unique, I need some unique number here, as I stated both in the commit message and the cover letter, this is arbitrary. I can put the datapath port identifier in there but its (a) meaningless, (b) a bitfield, so it will look like 8972367083. And it may change depending on the FW load, so its not stable either. > >+ case NFP_PORT_VF_PORT: > >+ return devlink_port_register(devlink, &port->dl_port, > >+ (port->pf_id + 1) * 10000 + > >+ port->vf_id + 1); > >+ default: > >+ return -EINVAL; > >+ } > > } > > > > void nfp_devlink_port_unregister(struct nfp_port *port) > >diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > >index d2c803bb4e56..869d22760a6e 100644 > >--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > >+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > >@@ -292,7 +292,9 @@ nfp_repr_transfer_features(struct net_device *netdev, struct net_device *lower) > > > > static void nfp_repr_clean(struct nfp_repr *repr) > > { > >+ nfp_devlink_port_unregister(repr->port); > > unregister_netdev(repr->netdev); > >+ nfp_devlink_port_clean(repr->port); > > nfp_app_repr_clean(repr->app, repr->netdev); > > dst_release((struct dst_entry *)repr->dst); > > nfp_port_free(repr->port); > >@@ -395,12 +397,24 @@ int nfp_repr_init(struct nfp_app *app, struct net_device *netdev, > > if (err) > > goto err_clean; > > > >- err = register_netdev(netdev); > >+ err = nfp_devlink_port_init(app, repr->port); > > if (err) > > goto err_repr_clean; > > > >+ err = register_netdev(netdev); > >+ if (err) > >+ goto err_port_clean; > >+ > >+ err = nfp_devlink_port_register(app, repr->port); > > Don't you want to take my patch ("nfp: register devlink port before > netdev") to change order of register_netdev and devlink_port_register, > include it to this patchset before this patch and change the order in > this patch too? I think it would be clearer to do it from the beginning. This way both netdev and devlink_port can get registered fully initialized. Otherwise we'd get two notifications. Are we trying to establish some ordering rules to get around the rtnl locking? :) > >+ if (err) > >+ goto err_unreg_netdev; > >+ > > return 0; > > > >+err_unreg_netdev: > >+ unregister_netdev(repr->netdev); > >+err_port_clean: > >+ nfp_devlink_port_clean(repr->port); > > err_repr_clean: > > nfp_app_repr_clean(app, netdev); > > err_clean: