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=-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,URIBL_BLOCKED,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 1B6CFC4360F for ; Fri, 1 Mar 2019 18:05:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC56520842 for ; Fri, 1 Mar 2019 18:05:21 +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="rAFG8xg2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388687AbfCASFU (ORCPT ); Fri, 1 Mar 2019 13:05:20 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:44335 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388380AbfCASFR (ORCPT ); Fri, 1 Mar 2019 13:05:17 -0500 Received: by mail-qk1-f195.google.com with SMTP id r21so14781649qkl.11 for ; Fri, 01 Mar 2019 10:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=69IWf6aJfcYtmsOuD+reKgRqier1VRVLP5Sq/1cqOKo=; b=rAFG8xg2Ox/E9xRz0zlMVBKeYtqvAZXpuwppryuBzmOYDGMMSRkaDdNgS8bn2Zgrpy CrzMbh1MY3I2yhh1DUcNW9PEm+ODQqAaN3lsvSKGcidoYHGzSWH01IFZIfh8WiXfufF5 VSZF+xXlGZfejGVSOTwBGVESFVsMmx8EXkdTjgir0iFi3vhpHzjw+suPXnj1OL+G3vS/ WolhfGN9+3q36xydnzEK3G62xpnDUj2mQOEvBESqqSlqeK21MjSySzh3J2iV0QT8WO2G DtFLFKM3B8gG/QOMd2QzReJPJnw/MeFu2+Rp2x9tUpdR9TmIqpF/C+3XDszZQyWRvetS C1WA== 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:mime-version:content-transfer-encoding; bh=69IWf6aJfcYtmsOuD+reKgRqier1VRVLP5Sq/1cqOKo=; b=JxlQQ6r/qmGPjZOdlYvrKzJIs1nhaYR3aouPHmKBncLUN6ogYuoSBLNodfRSI1+J+r LSLGTnuAvTGwCw5yOEz5MOfgTOAj/1KZ0CvRZsqrtjdmP/v8sAi29OTV8wqQc+8Crql9 PQmpcR7wqT2mhizXLI9JYCe2t7DCcgswobU8x0YHlLBhqaw9V3N7kUTAXIQL2H6G24VC asJifyoITJqtFoBXwzxWogWth52+7g/nGKDCkiAZOsoSxJX418RMeV9sKfD6Tpze/0ds P4EZGNx3yhsho7YrHhJHw3q7mj+SXOT/9NpNfTmR8klqWINjPmUldkVBqOEP3735YLKb GCsg== X-Gm-Message-State: APjAAAV14zi1haTOjA8jRTgVMZoi1y4C94OA42XC5B8JUdGdcULYlwHv mfvAz2jmZmSQMtEApIqZbwQjFP0ZNgs= X-Google-Smtp-Source: APXvYqzbNxiklEJqdFOJ/jSvGvHfW3qQg52IUJx1e3BVH92yNb1dsklKlReBgxGlUcYYxBAAtZZxug== X-Received: by 2002:a05:620a:1679:: with SMTP id d25mr4915794qko.69.1551463516470; Fri, 01 Mar 2019 10:05:16 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id a13sm16785792qtb.6.2019.03.01.10.05.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 10:05:15 -0800 (PST) From: Jakub Kicinski To: jiri@resnulli.us, davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 7/7] nfp: expose PF peer netdevs Date: Fri, 1 Mar 2019 10:04:53 -0800 Message-Id: <20190301180453.17778-8-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190301180453.17778-1-jakub.kicinski@netronome.com> References: <20190301180453.17778-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Expose PF netdevs as devlink port's peers. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/abm/main.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.c | 1 + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 3 ++- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c index 4d4ff5844c47..8d7ff1200fd4 100644 --- a/drivers/net/ethernet/netronome/nfp/abm/main.c +++ b/drivers/net/ethernet/netronome/nfp/abm/main.c @@ -113,6 +113,7 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink, port->pf_id = alink->abm->pf_id; port->pf_split = app->pf->max_data_vnics > 1; port->pf_split_id = alink->id; + port->peer = alink->vnic->dp.netdev; port->vnic = alink->vnic->dp.ctrl_bar; } diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c index 408089133599..13aa21923bf7 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/main.c +++ b/drivers/net/ethernet/netronome/nfp/flower/main.c @@ -300,6 +300,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, if (repr_type == NFP_REPR_TYPE_PF) { port->pf_id = i; port->vnic = priv->nn->dp.ctrl_bar; + port->peer = priv->nn->dp.netdev; } else { port->pf_id = 0; port->vf_id = i; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 6ad2805f1efc..ced21a9951aa 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -377,7 +377,8 @@ int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) 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_type_eth_set_peer(&port->dl_port, port->netdev, + port->peer); devlink_port_attrs_pci_pf_set(&port->dl_port, port->pf_id, port->pf_split, port->pf_split_id); diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h index 09c55ca2371a..c75a25cc5cea 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h @@ -51,6 +51,7 @@ enum nfp_port_flags { * @eth_forced: for %NFP_PORT_PHYS_PORT port is forced UP or DOWN, don't change * @eth_port: for %NFP_PORT_PHYS_PORT translated ETH Table port entry * @eth_stats: for %NFP_PORT_PHYS_PORT MAC stats if available + * @peer: for %NFP_PORT_PF_PORT netdev of the actual vNIC, if reachable * @pf_id: for %NFP_PORT_PF_PORT, %NFP_PORT_VF_PORT ID of the PCI PF (0-3) * @vf_id: for %NFP_PORT_VF_PORT ID of the PCI VF within @pf_id * @pf_split: for %NFP_PORT_PF_PORT %true if PCI PF has more than one vNIC @@ -79,6 +80,7 @@ struct nfp_port { }; /* NFP_PORT_PF_PORT, NFP_PORT_VF_PORT */ struct { + struct net_device *peer; unsigned int pf_id; unsigned int vf_id; bool pf_split; -- 2.19.2