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=-13.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 159E1C43381 for ; Sat, 23 Mar 2019 22:58:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDF482183E for ; Sat, 23 Mar 2019 22:58:35 +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="SQVWx54h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727706AbfCWW6e (ORCPT ); Sat, 23 Mar 2019 18:58:34 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46129 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbfCWW6e (ORCPT ); Sat, 23 Mar 2019 18:58:34 -0400 Received: by mail-wr1-f68.google.com with SMTP id o1so6076003wrs.13 for ; Sat, 23 Mar 2019 15:58:32 -0700 (PDT) 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=3H8CC7Cntrm6cVtPh3Er/rZTtadNgtcx5s4d3j74/24=; b=SQVWx54hTV/DuOinU8HvNPZEWgpepJuj7ZvQPGbULNIRdvVwr6NlPbcb22kfbMMpKs UGX2rslEy7m89/EuFla1MurQOmFlGuaHoFJgbtT5CJ5EnAcgGl+d1hlY58ECV9gylgNt 3hC+TgxX8TNllUh0/lixWN7OGV0P97MyVPQTvIzQFPeX0wJj306yg9wlde761YU/TgSc vaKARkK+SpnPl77oPzlcI33fpVam9+9UixaPbmFcp84XI3LKMGT+4+Xj9W1J7PingGqI uBFf3PoTyw1bufBmieZD1Andwi8RYDdbhFngBvk0z5O2MentjoziEPLHttOHddae/nNL hN9A== 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=3H8CC7Cntrm6cVtPh3Er/rZTtadNgtcx5s4d3j74/24=; b=WmxRz22XNg5LRDDgDtLwwmPqAby5tHMcF3+5jPeluOxI/q7t+BHfpcuHWFoxS/QG9t g8iiPOyWyI9s6YgFawxEUnq8J5eMIhdBqwXha3ikOPCHGHztYYO4k0Y/OegzkxGm7sn7 7kqwncZpI/Kecpi9AIQjQzj2SWjbtCLPIR+TNS03MBmbbdd4NuFUFValYCs1CGdZ6yk3 ggTjKCGlqmqz5fcb1c7MV77LCSy/nj0nsnS/6jzg2XPvd7AZvLZ8I8F5e7+P6rtTcbZZ QkiLQx7Abv/ZzfxZyltCA4QIbEe3kZtN4nS6yykNQVwEsQHwq7FnLeAJOCNG4kN9b6/j MWSg== X-Gm-Message-State: APjAAAV1he44w6ilpjitH/TImuVlepUnIrHxyq4T7MPxlIYOPgxtqOVw iWjH8IXYYJ0NQmiMj6e/hFSbWA== X-Google-Smtp-Source: APXvYqyTdlrs9ijSnNIT4HRnbXcl4ibjv21PgZLAcSKBxAIqzfuMFINKMggHOWBaZ1gkevDR9vvmcw== X-Received: by 2002:adf:dd49:: with SMTP id u9mr10278950wrm.316.1553381911929; Sat, 23 Mar 2019 15:58:31 -0700 (PDT) Received: from localhost (ip-94-113-125-71.net.upcbroadband.cz. [94.113.125.71]) by smtp.gmail.com with ESMTPSA id b16sm10502202wrq.41.2019.03.23.15.58.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 15:58:31 -0700 (PDT) Date: Sat, 23 Mar 2019 23:47:50 +0100 From: Jiri Pirko To: Jakub Kicinski Cc: netdev@vger.kernel.org, davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: Re: [patch net-next v2 11/15] nfp: move devlink port type set after netdev registration Message-ID: <20190323224750.GC2327@nanopsycho> References: <20190322165636.1725-1-jiri@resnulli.us> <20190322165636.1725-12-jiri@resnulli.us> <20190323133102.60fceb6e@cakuba.netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190323133102.60fceb6e@cakuba.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 Sat, Mar 23, 2019 at 09:31:02PM CET, jakub.kicinski@netronome.com wrote: >On Fri, 22 Mar 2019 17:56:32 +0100, Jiri Pirko wrote: >> From: Jiri Pirko >> >> Similar to other driver, move the port type set after netdev registration >> is done. Along with that, clear the type before unregistration. >> >> Signed-off-by: Jiri Pirko >> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c >> index e9eca99cf493..cb59a18ec6a6 100644 >> --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c >> +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c >> @@ -362,7 +362,6 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) >> if (ret) >> return ret; >> >> - 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); >> @@ -377,6 +376,16 @@ void nfp_devlink_port_unregister(struct nfp_port *port) >> devlink_port_unregister(&port->dl_port); >> } >> >> +void nfp_devlink_port_type_eth_set(struct nfp_port *port) >> +{ >> + devlink_port_type_eth_set(&port->dl_port, port->netdev); >> +} >> + >> +void nfp_devlink_port_type_clear(struct nfp_port *port) >> +{ >> + devlink_port_type_clear(&port->dl_port); >> +} >> + >> struct devlink *nfp_devlink_get_devlink(struct net_device *netdev) >> { >> struct nfp_app *app; >> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> index 08f5fdbd8e41..e29744f2af02 100644 >> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> @@ -169,6 +169,8 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) >> if (err) >> goto err_devlink_port_clean; >> } >> + if (nn->port) >> + nfp_devlink_port_type_eth_set(nn->port); >> >> return 0; >> >> @@ -218,6 +220,8 @@ nfp_net_pf_alloc_vnics(struct nfp_pf *pf, void __iomem *ctrl_bar, >> >> static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) >> { >> + if (nn->port) >> + nfp_devlink_port_type_clear(nn->port); >> if (nfp_net_is_data_vnic(nn)) >> nfp_app_vnic_clean(pf->app, nn); > >Sorry for not noticing right away, I thought you just split my patch in >two, but it seems you reordered the app_vnic_init/clean calls with the I did the patch from scratch. >type setting. I'd rather those calls happened on fully initialized >netdev (and port), could you perhaps just take this patch into the I don't get it, you are commenting cleanup part. On init, the type set happens on fully initialized devlink_port and netdev. >series: > >https://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux.git/commit/?h=devlink-pci-ports&id=1debfdef5aef369412e72f370d11120d309a6a74 > >> if (nn->port)