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 4CF3BC43381 for ; Fri, 1 Mar 2019 16:05:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AC2D2084F for ; Fri, 1 Mar 2019 16:05:51 +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="RYC4fiRp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388940AbfCAQFt (ORCPT ); Fri, 1 Mar 2019 11:05:49 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38843 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388923AbfCAQFt (ORCPT ); Fri, 1 Mar 2019 11:05:49 -0500 Received: by mail-wr1-f68.google.com with SMTP id g12so14382578wrm.5 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=uyKc6UD32db6gaMLYKU1LNc6JW6eqw7twRmYpPvJpss=; b=RYC4fiRp6UBpf93Of7qHkyWmmKgtNpAt4sdcGiBH7ZQPhU5KjkC9H/NxIhhsvlbIqo kr/m4VQpy6zJ2KlNHyyHPYEvjkjElRuinfEo8s8eroOyznJprmv4vTBv4biGyxkkc/0M M/i3ASDLywKfGCBmkcbeUQNGwrTbIfhmh4Hllp1EwUujjNEOI93eJ0FvXi8nQn/lfu6j GPivz9Ypt3+bLd2R34r784AG62TRv8ZTTFRb1793hws65zJ58ECBFTPu4G8ryrDrQN+e LCTgbIJQL3RDBqqny0QgEx9H9iGN0eeElwCjCWxWCjLR/mfabQobi6JrCuIaBoDKI8xJ HZGA== 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=uyKc6UD32db6gaMLYKU1LNc6JW6eqw7twRmYpPvJpss=; b=S0BjRrLEeDFsIS+3oI0dv+fR2X5ant9wOrZc+1lbmLKKHugqUJ9DrABVJg8B2jWlmL 9FxgIH2Ib4vOVNHKmDjaOzk7rVJmDjyVEuvI5U61Ut8H1/IPSVMNXbwFxhkNoFfkafOa Tq+ucJa9rcAimGbrDj9NfnFHBsAnLIGeehPNPYA7XAi4BbshrTqn0hVjpZSvtn2vOGfq KTZwc90BKLU0I9nbUHji8WQbXZGB3fiO/gqiJjt0kf94HavZ1+NNmnD6kI+q1soTKDSc WJOf4X7ggISoh4lTpr71bLd4U2DsFFzkpuLl2VLV+PIJYexiNLJUSBlblvlMjCRU2xnm kKSw== X-Gm-Message-State: APjAAAWRx2GCnXPJjd0yzYDxTxdJUttoIwIcGa3D8B0Ft4wosBjlOUFg N0w54z69b17sVC4Tu+DaFagPTL5+JZofaA== X-Google-Smtp-Source: APXvYqzX5/q1hUpa3/jO+TScdIYRaeUJzYBanxDC11H4KeFrEzjC/KMEJ1FzVYjnAtC+MDp2226MBw== X-Received: by 2002:adf:eb85:: with SMTP id t5mr4020003wrn.168.1551456347093; Fri, 01 Mar 2019 08:05:47 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id 12sm20750145wme.25.2019.03.01.08.05.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:46 -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 3/8] net: devlink: introduce devlink_compat_switch_id_get() helper Date: Fri, 1 Mar 2019 17:05:37 +0100 Message-Id: <20190301160542.6474-4-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 Introduce devlink_compat_switch_id_get() helper which fills up switch_id according to passed netdev pointer. Call it directly from dev_get_port_parent_id() as a fallback when ndo_get_port_parent_id is not defined for given netdev. Signed-off-by: Jiri Pirko --- include/net/devlink.h | 9 +++++++++ net/core/dev.c | 8 ++++++-- net/core/devlink.c | 25 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index 1eebbb832cb3..34c78485b050 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -733,6 +733,8 @@ void devlink_compat_running_version(struct net_device *dev, int devlink_compat_flash_update(struct net_device *dev, const char *file_name); int devlink_compat_phys_port_name_get(struct net_device *dev, char *name, size_t len); +int devlink_compat_switch_id_get(struct net_device *dev, + struct netdev_phys_item_id *ppid); #else @@ -1230,6 +1232,13 @@ devlink_compat_phys_port_name_get(struct net_device *dev, { return -EOPNOTSUPP; } + +static inline int +int devlink_compat_switch_id_get(struct net_device *dev, + struct netdev_phys_item_id *ppid) +{ + return -EOPNOTSUPP; +} #endif #endif /* _NET_DEVLINK_H_ */ diff --git a/net/core/dev.c b/net/core/dev.c index a614b26b0842..7401b45738f2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7894,14 +7894,18 @@ int dev_get_port_parent_id(struct net_device *dev, struct netdev_phys_item_id first = { }; struct net_device *lower_dev; struct list_head *iter; - int err = -EOPNOTSUPP; + int err; if (ops->ndo_get_port_parent_id) return ops->ndo_get_port_parent_id(dev, ppid); - if (!recurse) + err = devlink_compat_switch_id_get(dev, ppid); + if (!err || err != -EOPNOTSUPP) return err; + if (!recurse) + return -EOPNOTSUPP; + netdev_for_each_lower_dev(dev, lower_dev, iter) { err = dev_get_port_parent_id(lower_dev, ppid, recurse); if (err) diff --git a/net/core/devlink.c b/net/core/devlink.c index 1a011431694a..0964ee319af5 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6505,6 +6505,31 @@ int devlink_compat_phys_port_name_get(struct net_device *dev, return err; } +int devlink_compat_switch_id_get(struct net_device *dev, + struct netdev_phys_item_id *ppid) +{ + struct devlink_port *devlink_port; + struct devlink_port_attrs *attrs; + int err = -EOPNOTSUPP; + + mutex_lock(&devlink_mutex); + devlink_port = netdev_to_devlink_port(dev); + if (!devlink_port) + goto unlock_list; + + mutex_lock(&devlink_port->devlink->lock); + attrs = &devlink_port->attrs; + if (attrs->switch_port) { + memcpy(ppid, &attrs->switch_id, sizeof(*ppid)); + err = 0; + } + mutex_unlock(&devlink_port->devlink->lock); +unlock_list: + mutex_unlock(&devlink_mutex); + + return err; +} + static int __init devlink_init(void) { return genl_register_family(&devlink_nl_family); -- 2.14.5