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 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 D4ADBC43381 for ; Fri, 1 Mar 2019 16:25:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A23BF2083D for ; Fri, 1 Mar 2019 16:25:41 +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="RvcEisqt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389073AbfCAQZk (ORCPT ); Fri, 1 Mar 2019 11:25:40 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:47054 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388450AbfCAQZk (ORCPT ); Fri, 1 Mar 2019 11:25:40 -0500 Received: by mail-qk1-f194.google.com with SMTP id i5so14592514qkd.13 for ; Fri, 01 Mar 2019 08:25:39 -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=JvL/uXhClw4krbEWzaver3x6XjQSUgdAOehleYf9Z8Q=; b=RvcEisqtgR9/85bZMLRZHGtvudBhiIbzLat8kB/5vd40bVdHU5GajveLK/APnHLr2k 9xg98v4F4p4IUUh5dLWpnYf/c89XZ++RG7l90mBkb48T6NzqHI40SmmT7rr6AcYHnbJl NfaYIJLXfocvwbivhnYkNztp40F7eTpvY2TmNFu358wikX3NjisdSyLVh8YwzGNZPBJx YIFkDN5HcbUZG2MdMysPncsygnogs02s8+bQ2Y3xucmoBvesf7ECLmbP2BpA2ktvVJeh 8dj9QA4n4SMkMr5ajmmyvbiJQSXFne8Wsk9PqUkxuWStVfppHpQWzHI7Cf2OHOMbR6gv 7ydA== 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=JvL/uXhClw4krbEWzaver3x6XjQSUgdAOehleYf9Z8Q=; b=DE7lLMI0yidhC+SyIEgz3DlY2/BUEXJLa7gG3ZNaHZ6OBHqONyKIANlTCBI66SXzDA 32MuK/xxMLkqSqdu3rfU0+MEoimF1O8FTRY3yXn63dANmH9JmNWPjByU+oIVXX4Qyx3Q /qr5AXKZijdJGANlvVaYSQXwtuP9rbIS1ScT3nu3YOHrCoIwS5zCGFhJoUTI+gerxVCK oKoEIVk5RHh9ceeeZXrX6lyQ8esMz6i1VPP638327W8TRCd650HD+bITOhiIE7m8E3/e mNavY8EMXlYg813hWOUI4lGddAifYAQubTN8UqqFNWHSUX8c2r+H30zoTu78TlGnIbeT rtig== X-Gm-Message-State: APjAAAV7uPqQFLMuP3EWziQlTavspeT/Lk+er5rHAXnf5sXmxZaWnPyc wTQ6M3SWuer7EA0gjXBgrSE/6Q== X-Google-Smtp-Source: APXvYqzAtKi//Q8ptr4S16qeRsumVUafabnhyXKFgMF8hPYYm5lJhZZpY8XodBtPB4jFhWlr2BmlMg== X-Received: by 2002:a37:9f4c:: with SMTP id i73mr4327394qke.154.1551457538741; Fri, 01 Mar 2019 08:25:38 -0800 (PST) Received: from cakuba.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id u18sm9382014qka.25.2019.03.01.08.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:25:38 -0800 (PST) Date: Fri, 1 Mar 2019 08:25:29 -0800 From: Jakub Kicinski To: Jiri Pirko Cc: netdev@vger.kernel.org, davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: Re: [patch net-next 5/5] net: devlink: remove unused devlink_port_get_phys_port_name() function Message-ID: <20190301082529.6d7aee20@cakuba.netronome.com> In-Reply-To: <20190301081402.6074-6-jiri@resnulli.us> References: <20190301081402.6074-1-jiri@resnulli.us> <20190301081402.6074-6-jiri@resnulli.us> 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 Fri, 1 Mar 2019 09:14:02 +0100, Jiri Pirko wrote: > From: Jiri Pirko > > Now it is unused, remove it. > > Signed-off-by: Jiri Pirko Oh, you nuke this completely, that's going to conflict hard with my series :) (Provided the locking is okay) I think it'd be good if we flipped the logic in dev_get_phys_port_name(). Always try devlink: @@ -7872,7 +7873,7 @@ int dev_get_phys_port_name(struct net_device *dev, const struct net_device_ops *ops = dev->netdev_ops; + if (!devlink_compat_phys_port_name_get(dev, name, len)) + return 0; if (!ops->ndo_get_phys_port_name) return -EOPNOTSUPP; return ops->ndo_get_phys_port_name(dev, name, len); } NFP is using a single set of NDOs for PFs and VFs (which don't have devlink ports), so either it'd be good if I could call the devlink helper for real ports, or we need the above. > diff --git a/include/net/devlink.h b/include/net/devlink.h > index ae2cd34da99e..227c453cc20e 100644 > --- a/include/net/devlink.h > +++ b/include/net/devlink.h > @@ -578,8 +578,6 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port, > enum devlink_port_flavour flavour, > u32 port_number, bool split, > u32 split_subport_number); > -int devlink_port_get_phys_port_name(struct devlink_port *devlink_port, > - char *name, size_t 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, > @@ -794,13 +792,6 @@ static inline void devlink_port_attrs_set(struct devlink_port *devlink_port, > { > } > > -static inline int > -devlink_port_get_phys_port_name(struct devlink_port *devlink_port, > - char *name, size_t len) > -{ > - return -EOPNOTSUPP; > -} > - > static inline int devlink_sb_register(struct devlink *devlink, > unsigned int sb_index, u32 size, > u16 ingress_pools_count, > diff --git a/net/core/devlink.c b/net/core/devlink.c > index 4fd45d4a4818..d90a745d8258 100644 > --- a/net/core/devlink.c > +++ b/net/core/devlink.c > @@ -5451,13 +5451,6 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, > return 0; > } > > -int devlink_port_get_phys_port_name(struct devlink_port *devlink_port, > - char *name, size_t len) > -{ > - return __devlink_port_phys_port_name_get(devlink_port, name, len); > -} > -EXPORT_SYMBOL_GPL(devlink_port_get_phys_port_name); > - > 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,