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=-8.5 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,USER_AGENT_MUTT 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 D9B2EC43381 for ; Sat, 2 Mar 2019 08:53:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B9AE20838 for ; Sat, 2 Mar 2019 08:53:44 +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="xPUyBPKX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726190AbfCBIxn (ORCPT ); Sat, 2 Mar 2019 03:53:43 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40227 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725902AbfCBIxm (ORCPT ); Sat, 2 Mar 2019 03:53:42 -0500 Received: by mail-wr1-f65.google.com with SMTP id q1so275260wrp.7 for ; Sat, 02 Mar 2019 00:53:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=D9HxXcbC4yjnnRKbVPduFGz1YcyXIWRCDWT693InT8U=; b=xPUyBPKXNFRVNzc/0VjeAAMVB+nOg0pp0w91u+rFIgUsMWdNFkACQD/BSXtewXiqH4 v8UF4PQ7uy0GXqZVgn3vNUzcmk6DFU4vKTEMfMdysE2Y0kxyiWxkbgjbHdR98V+KXXLc ouhR2Uxw1Tp3PJTlGb91eiXDae+5JvYs5FDAJt8GJ/dkFbgkpRlhbCRP9P2/Y971J7ci 3UiO0WMmju6WhpS0SVu8YG96i5eAp6XaJJoZ5V3lu5pu0HYgMKJLYRMCOgn+BSQye+DU /XXhqFQIxOpgTptydH4oFGBVdkyiRXPnt4Y41zLicRjme+Ie0f6O9AMJYmAq41j+BSc5 DuMA== 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:references :mime-version:content-disposition:in-reply-to:user-agent; bh=D9HxXcbC4yjnnRKbVPduFGz1YcyXIWRCDWT693InT8U=; b=UbGxURMLa05fW/OwzOcgKPSPDo+4LxnsEZTcZpD5QgZ4pCyIh5WagUtXJw7p1E5HN2 ytMwmXVasF7qsBMemXIJ5jjb3rrJ3dbTInFehUzlxUR1Voqb1sEOSm4o0cksKycJHeDq E8CACjInGQch5qAI1N7tqewvS1XsD1D/woZWmAeuS7ZZYyBWTkQHnvsYZzKc+GIGJ8Ko Kle9A4nt7wZ4aYJL1/ScmCs9RFZzYj8X8cqXVb0R9FVC3AOg5vMxFzqLxmFvsOWBAgSN /H6dlFJFv7HBIj8ucYyDlLWggHiv4B1ESrHwDKNMRCP7VNGUe7BfS7eRti7cbGJxq0F8 x22A== X-Gm-Message-State: APjAAAVf5pW4317gVUrqBCjngsl01dM25RGCHhhbiiRQHIXjosampXLb xLNDEbIWkUFTnwAqggY5KTSFwQGq0taxMg== X-Google-Smtp-Source: APXvYqw9Why2nByurN/AaBVr9ZsUH1j7NY6kakUiDdQ8SV7tnXH7QOhgbZ09PpKc/OdoMWEd9Dn5cA== X-Received: by 2002:a5d:6112:: with SMTP id v18mr6027144wrt.207.1551516820381; Sat, 02 Mar 2019 00:53:40 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id o18sm1144299wrg.40.2019.03.02.00.53.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2019 00:53:39 -0800 (PST) Date: Sat, 2 Mar 2019 09:43:47 +0100 From: Jiri Pirko To: Jakub Kicinski 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: <20190302084347.GP2314@nanopsycho> References: <20190301180453.17778-1-jakub.kicinski@netronome.com> <20190301180453.17778-4-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190301180453.17778-4-jakub.kicinski@netronome.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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? >+ 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? >+ 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. >+ 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: >-- >2.19.2 >