From patchwork Wed Sep 9 04:50:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360325 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=raE5V3JP; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3N2xFNz9sTd for ; Wed, 9 Sep 2020 14:51:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726169AbgIIEvS (ORCPT ); Wed, 9 Sep 2020 00:51:18 -0400 Received: from mail-eopbgr30051.outbound.protection.outlook.com ([40.107.3.51]:57634 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725832AbgIIEvP (ORCPT ); Wed, 9 Sep 2020 00:51:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixzNi1KlqO494NHYi/xTSzsw+Wh85OiBWeS8g7XrtfBGpGToe4FFsVlvDqhbjTC66gLF7CClsosC0JbQ8sjg/ICQ2GM7hALb392IuV+eAHYbj7QAeCJ8vRu517knZfUhjfW+FBrWUqqRao2d8/NlhQUYzmPfbe1VPX9ioOPe6SiFI34kOFHxwwiOmfYNsSzah1QPMPAVakwktJ7tZpHMTAPftkY5RjYznsb7CAodbtcHl9QOLVWrQvrq3Zn6dLI0maCnbl8mfSzZK8Uidv2dA3K3Zqtfq+A2QPKp4PiytavTVRAUPnikRvzlCYz0s5b2RqF8Hk741zF3vt3mDaDn2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JSVIp5U1kSAv7+3GQEyfDd9ho/84r7x/HedE7a1jg8U=; b=bTMHLwmQgKA+ApJzB2IYAspgnxtDQ0LiYFOJJTmKwK2hT2ctS7YrKnVXQMhN76fhE6Nt519ZWYcJ/O8M8j+DnhYRwEnBAs4bpGj7FDLrDI91OBUaRuPH+4QJN/PlI+ETAHnYeuETSrLTwcAV7PhuA+KJ938EYa68XKa32jNzLpHAaJDa726ThzN/dMF+DKICxPDBDjurPPMghZE7pgVCk9QuSSv5fxOW5a9Hx12SrajXyWi5LxTyz9KxI05kXHPAu7Tk8jHW7GBJloaCB8+i1nalJAc2yJPdYHZB2DujzN/lCtOkv2jYIMS02cfkuX+HYBJ8FFiXIsvQfUMlTN/z6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JSVIp5U1kSAv7+3GQEyfDd9ho/84r7x/HedE7a1jg8U=; b=raE5V3JPwAxQEl/XZ/idY5XA7evK3/Wws4Cf6A+TWh0fLXVkIMrhPvucQ6opcK7sWsAIYTKYzV+Hdi+SHiUldqkxLa57xLiYH/YhA+oEQfskyZ/FVA/nYpPaAJE7m9AAcBEUx+qJNB0/j/LL4fTx6C8Vcu3oQui1nDOeAWV199I= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR0502MB3650.eurprd05.prod.outlook.com (2603:10a6:208:1c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16; Wed, 9 Sep 2020 04:51:06 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:06 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Roi Dayan Subject: [PATCH net-next v3 1/6] net/mlx5: E-switch, Read controller number from device Date: Wed, 9 Sep 2020 07:50:33 +0300 Message-Id: <20200909045038.63181-2-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:05 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cc192df9-c6c6-44a6-7101-08d8547bf61c X-MS-TrafficTypeDiagnostic: AM0PR0502MB3650: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:161; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uS3GDQldvtAqTOzf1kCcijD/4QHmJ5Pyu+4zm089CE7dLes7f4XO2C/2zk+2RZd+XuVkeD3TPmrKPQ59vOMHXR/WwtF9viLp2g0DUNfo+u4dpkDK/31FUiPN66UeOpi+So2Xse32TvFv/9aXWrbsxgkocZWi8pJEcU2IGGX4DPwopW89EW9AAVR6na/E5/hArmCvyno2QfziCbO28Ubo6L1gQxk3a6FLXuZb1Cau532jdWYo04r1uddry3YheQZI/ya34Lj/xXzw8G86aHcEO9AN0CUT5bNTICuJh+DB3sbBRA7R8ltfz1uv5QmYqazGT+jKMXlG088N8Z9W37xzbw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(366004)(396003)(346002)(136003)(39860400002)(8936002)(6506007)(186003)(16526019)(956004)(2616005)(26005)(6512007)(316002)(4326008)(54906003)(508600001)(6486002)(8676002)(5660300002)(36756003)(2906002)(52116002)(66946007)(83380400001)(1076003)(66476007)(66556008)(6666004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: k0cVFvGnGcxM0PUgoDS7nZysVv62EC+X3UzyV3RNcJQFChiM1PwdydQfKUJ6DJ93b0i06dgs3c0RLh07pegBS0ktr4+y+eoDQ5+HOVPMw5mNAPJGBtUGAfCVf69ittfqtXEjWy19f3ImG7FtgGChoEequEosNxsJC//31bn0bgbybWTKfoLcf1oFqCDQaxsrZApM1tGM4c8xPcPqEU7fPaYOZiXGcvGqGUURobtqVIk3M7Vd86yHQxXjmdjTJv8bE7II5jQzpPv737Qymb71XH3YxxEdgig2pUSsdKMK1T28Rhtdp9F+MK95daSNoSuY7vVuhL6/ie06qStzzG0UwsIjSKzRajZLOBQRBLH39XaFAz0Yk3Gm64lQWBNnlQ4nYaEbDQj0kKaA/atMczRO/+8dO7+/nVy0/fjcFncH3mgdTneB5lQI91hfKafPtFfyMpPnTlYdZd8XFwt9/1fMwZRvoTuj7uEKITx/vwMUWRurAUpex8AJ1kMk6ngX1mPhCIQA6W5HdBv3BCpNYubjZwzjvV4POO83C1j6Eknr6efPxC1AVPR+zAjK+oTyaH1my+EDfUiaD+ey/uFX/rJ/1lf0nU9oP5wSK1vGwS/4TE1h22U+Y5d55ciZ08jf83FR6/2+xniVpvGJ4vfyJ6bhKQ== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc192df9-c6c6-44a6-7101-08d8547bf61c X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:06.1723 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AIy7kALifEJ0meSks9/3Wad8rq53sSKi10n+0zvRmvsXrvS7MAYCiqbmjBJKoFryEotpvV5oBhlB+vnZrSx3LA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3650 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit ECPF supports one external host controller. Read controller number from the device. Signed-off-by: Parav Pandit Reviewed-by: Roi Dayan --- Changelog: v1->v2: - Removed controller number setting invocation as it is part of different API --- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + .../mellanox/mlx5/core/eswitch_offloads.c | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h index 867d8120b8a5..7455fbd21a0a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h @@ -217,6 +217,7 @@ struct mlx5_esw_offload { atomic64_t num_flows; enum devlink_eswitch_encap_mode encap; struct ida vport_metadata_ida; + unsigned int host_number; /* ECPF supports one external host */ }; /* E-Switch MC FDB table hash node */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index d2516922d867..b381cbca5852 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -2110,6 +2110,24 @@ int mlx5_esw_funcs_changed_handler(struct notifier_block *nb, unsigned long type return NOTIFY_OK; } +static int mlx5_esw_host_number_init(struct mlx5_eswitch *esw) +{ + const u32 *query_host_out; + + if (!mlx5_core_is_ecpf_esw_manager(esw->dev)) + return 0; + + query_host_out = mlx5_esw_query_functions(esw->dev); + if (IS_ERR(query_host_out)) + return PTR_ERR(query_host_out); + + /* Mark non local controller with non zero controller number. */ + esw->offloads.host_number = MLX5_GET(query_esw_functions_out, query_host_out, + host_params_context.host_number); + kvfree(query_host_out); + return 0; +} + int esw_offloads_enable(struct mlx5_eswitch *esw) { struct mlx5_vport *vport; @@ -2124,6 +2142,10 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) mutex_init(&esw->offloads.termtbl_mutex); mlx5_rdma_enable_roce(esw->dev); + err = mlx5_esw_host_number_init(esw); + if (err) + goto err_vport_metadata; + err = esw_set_passing_vport_metadata(esw, true); if (err) goto err_vport_metadata; From patchwork Wed Sep 9 04:50:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360326 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=LbW0CiBW; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3T1zGDz9sTS for ; Wed, 9 Sep 2020 14:51:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726605AbgIIEv2 (ORCPT ); Wed, 9 Sep 2020 00:51:28 -0400 Received: from mail-eopbgr30051.outbound.protection.outlook.com ([40.107.3.51]:57634 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725975AbgIIEvU (ORCPT ); Wed, 9 Sep 2020 00:51:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GFbvKyqS/G0os85iT+05vLz3b3NvJ37grra+077suXu6JNdxeHPyUQdBJqK8arn7srz4sSiFY/2WG0Or4iRrMBlA4rtt4WvsESpIBOmKima+rMmA5CY/UqHp2Z744KGKntLNHWPRMYx5vvUNs+o8kq1tb2sYneuGtfe+VHub8v2BNzTBeP8YrBPrb5aLwwF+2YyTKuQjGvgjeTdjJAeEba8Kl6iDCJO7TknoL/3IbANDh8BW1dGRFvG6Q+2Zuk7uKij6iB71ADSsbkS8MKukkZ/MizWBfKv2TG+uXO5pLujrLCTXWzvuD9ttEybR85ue9SNjD+ES6M9wzzm8hMuqPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F8s0CFFPlwqqltQ9x84JqJN9AgppuA3KaOR0DFpKyI4=; b=dEdWyh/JljnGJCyqiMga6aBl9tVb44BQGAWJKUP8AA+RCyvZLaBLD1SrH0RsD/DA3wTF19P0iBlAi/0lb0JDrObCz2bX19cqSWLvaUDP1hv2G0xJBsV4/LKO+Nx9GYZuT3PrcJkregtCIANmCQTNZODy1+wAT74LWgowViRgOp54446lnlSWKRNEx3V/serqG3juktVL27G4EkdW+h9igfmWNThNKunZL1o6WaK8yjelDEcidRQ5Sy1u6BsgywGM/gCgFhY2dgB+i7YY+FBDBHcDVNeSMrdL++54R10Y7cc62ihVT3POeDKfiu9XGmle1+CRXXbayafm8XWrk2gDhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F8s0CFFPlwqqltQ9x84JqJN9AgppuA3KaOR0DFpKyI4=; b=LbW0CiBWXoNyQPhuhQaR0Xtabfij+IqfH5qz3QhsdZCEO4uTfp8idTcMsS9u+6PaU9O6hkbKEQYfSoa/iqjKKOAfUYNojQPc0h1TwovBCu0a42wQoYWW2MlQqjrNdcn1kPoC8DF8mEgtEoUDUxPMw6fSvNkPK1CiHDir/RqEFqk= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR0502MB3650.eurprd05.prod.outlook.com (2603:10a6:208:1c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16; Wed, 9 Sep 2020 04:51:08 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:08 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko , Roi Dayan Subject: [PATCH net-next v3 2/6] devlink: Add comment block for missing port attributes Date: Wed, 9 Sep 2020 07:50:34 +0300 Message-Id: <20200909045038.63181-3-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:06 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c0a7f676-7812-474e-019e-08d8547bf705 X-MS-TrafficTypeDiagnostic: AM0PR0502MB3650: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YzN5eQtHnWqf0MKI9w23Anjc+KI0qT5PpH34CFfx2jv05UkwHwWrLrTem3pzYQc0usvuo+Pse8XFzSE0RmaRDTPGtSpL0z9FsXXj2OKesRT5Q7Wn5ztrB2wEnkKXNt1/61Q3X+VuOBD8Htlk/K8FPWF2BG8RidtFzLjEok1Bz9/mOeeYGVeK+H3V0nKljFOO7SZJDskPvtsJpMrleTas6ryroLOsSJtxtkjK+i3C+f2NPC5nEiUsjK1AJT6/W9aqySY5Rxd9CXrlI/bOFHmu8cKZxMftu/6jJ0YOtnCl+E0XzeW5lV1jhUxnC7ApKVzYJCvFrA9eLpXBeqfy1BjAaw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(366004)(396003)(346002)(136003)(39860400002)(4744005)(8936002)(6506007)(186003)(16526019)(956004)(2616005)(26005)(6512007)(316002)(4326008)(54906003)(508600001)(6486002)(8676002)(5660300002)(36756003)(2906002)(52116002)(66946007)(83380400001)(1076003)(66476007)(66556008)(6666004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 79InrsUEANB3OFUi0MtigLgLl/LELv/KXsk13+63TXeHX1rDJHnN8GCOwGZtYYGfbaavhyU8QWn1Rya5vv5TzeXNXLZPvtZFGONlNbzS91r3U/ErcDvY6WbfOXUiYbq1z6mZ+EJcFBMHqvnjHjGAK1v7/RbYxqgiQkB/0QqQMdo3h/mFabEBlWDE0G9cveiJeyaHHyYeIVcEs87dL+gV7vaf4zoMA4ZpnHFjAqm2Dluk0WyyvzqLQkUcBINxiqxEXstEIeHNL5zEfhjPW0Pn7R6d61nUEBsTMdsUJuIjgGunWrlrK4ZBRSVblwVUhNeUNNBYPy85+0KGXtWBVPCJxQBzurfMHa9odko0dH2cwSlayPoN2vs1U8t+jWkHIuoPjn62da9QOZrRwIzJg63ITFZy8OCwSlEpInB9i4oGWBQVVGMotgCjTw8X6p3xeZyFHLNZ6Fh5bv5UZNxXDRiGnhsCCYCAt7wcb/6hqFUN56ccWjT84kWlHNIUgQoYLrrlyfDuL+aeNB0YzkgMfOSRP/hTLaZ4MqrtK/7mnuizwQU94oah2xFnAXmUa3tEjTxAfpirKB3UWLEx8bzk6yG29X/XXIctFUyKmI7plUUNuOEORtYJsZIkuJe8RsGZsXJxVf9YSNziwQOj9K13kJrTKg== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0a7f676-7812-474e-019e-08d8547bf705 X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:07.9173 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: X1l1V5d2hjcUfQuTC5T2OzZx23a7M+FdpXbFh/7inEYbMdzD1hfwdFyV8/bP3SXmTOGrhSQEUK7AHXZ3LtPPPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3650 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit Add comment block for physical, PF and VF port attributes. Signed-off-by: Parav Pandit Reviewed-by: Jiri Pirko Reviewed-by: Roi Dayan --- include/net/devlink.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/net/devlink.h b/include/net/devlink.h index 8f3c8a443238..3c7ba3e1f490 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -73,6 +73,9 @@ struct devlink_port_pci_vf_attrs { * @splittable: indicates if the port can be split. * @lanes: maximum number of lanes the port supports. 0 value is not passed to netlink. * @switch_id: if the port is part of switch, this is buffer with ID, otherwise this is NULL + * @phys: physical port attributes + * @pci_pf: PCI PF port attributes + * @pci_vf: PCI VF port attributes */ struct devlink_port_attrs { u8 split:1, From patchwork Wed Sep 9 04:50:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360329 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=NfJta8vT; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3c0YgGz9sTX for ; Wed, 9 Sep 2020 14:51:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726801AbgIIEvi (ORCPT ); Wed, 9 Sep 2020 00:51:38 -0400 Received: from mail-eopbgr30051.outbound.protection.outlook.com ([40.107.3.51]:57634 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725948AbgIIEvZ (ORCPT ); Wed, 9 Sep 2020 00:51:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KgQy1wAloc6EXHF/VljAMvzZBJfxgzp2NzpzdKQWDIRq5L2fFFI4EuFGjQOcIrdFpn+kz5rNM5vkAX3Zjoxw6dvuGHMYLWna47qYalMINDHmvYGgdPS1It7fFdLfuOUElai3ZCvKs7ypwWb7tCUbi6wCXnbQOcl2euZzv6EcsLuAm1BFOuGCp6pL8Vy+ANy/sU5y287lzDY1/HwfdGtJHfNcDZ/hPKSG3RCuiCRSuqGBZ/dFiYPVpypCszdFLR0wP38gX3PcG2m07EHH50jfPhh9PbrNryxgA6VzstHlmroDhSo6GamrRCoxxELoeQx7k+QDn9H35yD69gbJuTi/gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AUT/27PDKkI0NfoeAfOR1z/6TCNH+IYwpmLalCWiyIo=; b=bYt0L7MlT0zoqkuhHfFAFrR9Wn3JWCRAMRcPkAfBfkyQbeu/JFnD2L03BCClMB9IHL69Eg7glIlULLo3AmkonLA3J7I7vaNqRd1aT4HFt5VzijRmZM7sO3eV97byN915XaqgAJ+ls8LdmlmTyqHhFx1rXSxg2rUbKaisL2rV36DXMB78BHC7jRRB85euA6oyExr/8es0JirVidlMmKi0pyuth+2FIqh5kQP0Jdk968LEeMULx8iCEYsKxRCmbslbRjUZ4nw/zoc7siqFcqJ7hVRwcb/k6pZxz9Iis4CIalmuLS8tK6YQdit39TCblxq8ad6YCn9uzU4bFaL5pvcbEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AUT/27PDKkI0NfoeAfOR1z/6TCNH+IYwpmLalCWiyIo=; b=NfJta8vTdp6/v51kdEDBXyVPAoHitvZdCiCczeSZbckU83TAScKmdWvc4+aeAd6k3SkK+2kHDCiR0ojmNoob2Cii8H41pfb6wAxADue/062aZMvJbWTWl8+vyZkhY47+naX9Z1vD4iChA78TC0dfYVUuB5Px2JJaExWNZjlMCbU= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR0502MB3650.eurprd05.prod.outlook.com (2603:10a6:208:1c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16; Wed, 9 Sep 2020 04:51:09 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:09 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko Subject: [PATCH net-next v3 3/6] devlink: Move structure comments outside of structure Date: Wed, 9 Sep 2020 07:50:35 +0300 Message-Id: <20200909045038.63181-4-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:08 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 30751a2c-cac2-4f17-56dc-08d8547bf819 X-MS-TrafficTypeDiagnostic: AM0PR0502MB3650: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GitN9uj4VUGviCrIx3lQoprCDibXchqaTHP9AeszwUf5gLugtqNdFJG/qKmYe1OGKRYku7QYKrAW43CsUjg0Gr/UT/dA2kt5KE4xpGC+FHNJ02f+eAVAFa8doSoq1Fr468O1IlzV9wKt44TQ1q/KNEW5AvnXzi+KmsmKXuH1+q3rfdASThxfqrtEeaDhLgCDvLS0ZwF/h0BKCeBRZb8Suwe7X785k3T8H1IWPj7nPLRs6v5lTQGZgHX68CSndHKOlh9F8ff587pBN4wxC1LHwKuSCQoIdRs5sAC7kOmMpktVRCuBH3nyg4n25dv+1kDTXRs11bYd5Po9mC6l42AbVg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(366004)(396003)(346002)(136003)(39860400002)(8936002)(6506007)(186003)(16526019)(956004)(2616005)(26005)(6512007)(316002)(4326008)(54906003)(508600001)(6486002)(8676002)(5660300002)(36756003)(2906002)(52116002)(66946007)(83380400001)(1076003)(66476007)(66556008)(6666004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: M9lcCodnqRBCgYY8WJ0eXwp88UlF5CHNxRkF2JQCuG2ir3aHJOGOh6dr09PMAf1NWg8UrMAUAGgGKfPgu2T3RtYAwIw4BR6bAgEE8l7LdGF+Z9/J3Nv7LqgEGQe4mNVUcHL5x18paHRdckm7N9Z3do7kEM15ZmZWVpqWH1D0xq7dWsEw6mjfMFA6w02P93UCdGJh6kZtxYn2bsUEwg5gVy8usxzAgkGVIhysdLa196yk56SRjqdYXgugs1zAA/tQBPsNKFcp5H0mhooOSb1732db/JVtAVPMXnLzr6EB/G7ooIKez5UyOZnrGIaPqU8cHL9rTIJd53CTZXqt4FoK3pUkPyz2Aoq01Pu4nLidgzMo8r2dO/DfYML5dnhCn25QPZIzELIg7v4tRxrrxGB7dCck+jRXru54uXfU0Y3vib6yUrVLju9l8mcc4wlCK4hfB3q5Wyyx9d2j5agBHl5IV5VhHrWPehHIM0bxCkb+evkP7S1HOqJmYs0iVHvnLGiyMnRDCYiqIgOWbDaeLpFJfLIMMD9GBNcbfYBuY+mmhBGgUA4Qo53VAXSpX2RTVZ+9ss2r+oBBhS9vCXQahbgJQBznKGr92FRWGUVSeHwDWVKn/tJYEpim+nKbu0j1nRyKLvx3raqjkqxB6aGm7ncHzg== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30751a2c-cac2-4f17-56dc-08d8547bf819 X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:09.6883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CCmYhJWxXIh32o3u7frwsLT+b2E7N9gP4tCQvgfZrc11/KzIjQasdxjimyGoN/oZ+SkHxFPRLU2eOHMYMqeW8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3650 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit To add more fields to the PCI PF and VF port attributes, follow standard structure comment format. Signed-off-by: Parav Pandit Reviewed-by: Jiri Pirko --- Changelog: v2->v3: - New patch --- include/net/devlink.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index 3c7ba3e1f490..efff9274d248 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -57,13 +57,22 @@ struct devlink_port_phys_attrs { u32 split_subport_number; /* If the port is split, this is the number of subport. */ }; +/** + * struct devlink_port_pci_pf_attrs - devlink port's PCI PF attributes + * @pf: Associated PCI PF number for this port. + */ struct devlink_port_pci_pf_attrs { - u16 pf; /* Associated PCI PF for this port. */ + u16 pf; }; +/** + * struct devlink_port_pci_vf_attrs - devlink port's PCI VF attributes + * @pf: Associated PCI PF number for this port. + * @vf: Associated PCI VF for of the PCI PF for this port. + */ struct devlink_port_pci_vf_attrs { - u16 pf; /* Associated PCI PF for this port. */ - u16 vf; /* Associated PCI VF for of the PCI PF for this port. */ + u16 pf; + u16 vf; }; /** From patchwork Wed Sep 9 04:50:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360324 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=MmWQLAXB; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3M5xlCz9sTX for ; Wed, 9 Sep 2020 14:51:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbgIIEvS (ORCPT ); Wed, 9 Sep 2020 00:51:18 -0400 Received: from mail-eopbgr150077.outbound.protection.outlook.com ([40.107.15.77]:49412 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725948AbgIIEvR (ORCPT ); Wed, 9 Sep 2020 00:51:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oN0ku2hU2ZNjyi3NDcSa0HB94Q18yd6XJ57RxLieRvMBlSBNrF1uTF4ujjFeVwulIiIaSV0+jnETD9ZM0fhCLy4aGo9db65zJGrV2KFnrqrH/UBPJWZMUAcAiiRynEPzgGOZJ8Vq7qY/aezPU98C6LTaYLhgHdYakQAvuebB42bqWG6S9kPLFh0ff3s7ufmevQEAEAitoNHV4dGlSl5cka9XzjiQUtduZCvN7Tmti2oAy9dv5r+6SIuhbUsm8+XCVA9V7cHM1dqlwdxy4dKQBbMQT0+SZVTY6p9b+dR7H8WoVnMQ+qVpvrzfn6WXmN8itgejj2tIeLHkCCPaLt9A+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U7gqZAl2HSpIB7nRQ94eh+jmaK9JClNcuBtRTmPhfa0=; b=gPG+PJdqvFpp8DzHO7e8l38YssbZeTGEbW7oNSLrV0t6a2gg/k1yVQxOFPhmtzoOWFmybCPpFhWntOi/y17PJU2irty30DHM3a2OzRku6hxp6QsnvjkIMJrtimDkd8xg4aR0tn5DOTEUcOzApvvNGGH9OUYYobeydQ9UJOOI/+Au1NezHOotKAYjgGUEAbWNJb+3RosjVeGTDUhYfELPegtlv5JBiCp80gRMpEruscmXD09utJpirpxfvZvFtEeExKhlHbOYau3pIAv1mwm16hQx3E0iKxAbvEpnvqVhenMl1PoRLI+eCDIbOTTmXT+L+6Cph28mfw3zc30WwwHLiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U7gqZAl2HSpIB7nRQ94eh+jmaK9JClNcuBtRTmPhfa0=; b=MmWQLAXBm5JlwR3pcRDr9Kw248rPrd3ElYJfp4TjpyCxaZBOXUNXZehLkyLvUIOBRvHyRLpQxrNeLJKO1XhL/YhBWLGSDm09ENzPtPAo5wDiqcppUXIm/IFHx1D51RgS59S50Jg7KvTsW9wWKOHZpL0GE0qJJujzr7vdrP25Lcg= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR05MB5907.eurprd05.prod.outlook.com (2603:10a6:208:12c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Wed, 9 Sep 2020 04:51:11 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:11 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko Subject: [PATCH net-next v3 4/6] devlink: Introduce external controller flag Date: Wed, 9 Sep 2020 07:50:36 +0300 Message-Id: <20200909045038.63181-5-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:10 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4972d121-ae1a-4c90-578a-08d8547bf90d X-MS-TrafficTypeDiagnostic: AM0PR05MB5907: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ChroVQ5BCJTi2DPspGc1ftZdK8plCpFrMnFIBMtAXhuzmaZ4HeqPDrGKX/TGc0TU3V+Ttpi70vsLv4KhlJ8IhcgcHR9Fj7ytR7KJjj21kKMnWy1t07jk7Fl8DSGT9w5mo9bgCivSl7vf3zNQAw0K8U5saGOMh/PTSkiTbE8Yy0pBwpCFlPtN0AO1bnxp3sNQjhQlXjP44BeSccU0IXX7heDkuVCI1SI0XMg2EJ4gHzvvIS4CvCoa51P9LqDVUfiTIZOFpn86o9ErpmbH9n6KQTcxCEeqSPpzVHd3txQbzh+7C2mRJ+p2hTpo02Y9l+zv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(366004)(396003)(1076003)(86362001)(16526019)(54906003)(52116002)(4326008)(2906002)(26005)(6506007)(186003)(2616005)(316002)(508600001)(956004)(6486002)(83380400001)(8676002)(66946007)(8936002)(66556008)(66476007)(6666004)(6512007)(5660300002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uGxK0JoJOjHD2XJWU+7n3n1z+KrjDIb6qk4hvflhnkom2xmrX4SO72hnwVDbywdO9y0cS3hzYoL4CEKbCNy9r6lYMJuurofyTGO5jWYEAjYbYhk+lADi9vJln3LL8OkpFINr0+dp6M49hObE452vRRRnzc2PailX331qd5KNGYSMxWoB2hSkBYZwEuSX/3F3e8cWrUNmNSon1YlDm2wYXFH7FjGyAfg/aOrAJdzhPfp5KyicLOAiPpvbiVIQEyyr8OWCNlIvmHR8EX+0A3mgUDcDGZ6mu3CUte/Iq4BYqaNW7OmKd3f5gk3ooremWyMIu7/0FDVRiZZ4TJ5gWBjas7C5y4CnSsfhJehizklIfkUr+6yjfvnDLTAt65QBe3FteRoUEiMFyDCxfndOWRmeNirdbiFRZFMsoQTFsjeKzp+TkR8cW6UqoaxFwNGry64DOY82uJHd9pQbLQIUi7998pd7+t3u01RwJUs8srilrEz7UWjRCl8Yl6bweOh51iki1mqYkuIAsDejCYkIJ2MtvzXNSirJRCRqE/EX8rgfdaZfXqHL8TA3gqi7F0PnpWetIU3DDVhRE5fdYHPuq8bA/9csl2nEHL6+ZeVnxMShOenEXHvJKdO5tEnLmNgafuMNbctmHm4xET1DezPXSojOgg== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4972d121-ae1a-4c90-578a-08d8547bf90d X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:11.4853 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zSAJdmOpZ4lg/iETqOcsIJpyRLUOMGWoxCEMk6k/bJ/VxBCfeB80oOesW0oBEtXaa4HXE87dBefo3Rz7qacCSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5907 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit A devlink eswitch port may represent PCI PF/VF ports of a controller. A controller either located on same system or it can be an external controller located in host where such NIC is plugged in. Add the ability for driver to specify if a port is for external controller. Use such flag in the mlx5_core driver. An example of an external controller having VF1 of PF0 belong to controller 1. $ devlink port show pci/0000:06:00.0/2 pci/0000:06:00.0/2: type eth netdev ens2f0pf0vf1 flavour pcivf pfnum 0 vfnum 1 external true splittable false function: hw_addr 00:00:00:00:00:00 $ devlink port show pci/0000:06:00.0/2 -jp { "port": { "pci/0000:06:00.0/2": { "type": "eth", "netdev": "ens2f0pf0vf1", "flavour": "pcivf", "pfnum": 0, "vfnum": 1, "external": true, "splittable": false, "function": { "hw_addr": "00:00:00:00:00:00" } } } } Signed-off-by: Parav Pandit Reviewed-by: Jiri Pirko --- Changelog: v1->v2: - Addressed comments from Jiri and Jakub - New patch - Split 'external' attribute from 'external controller number'. - Merged mlx5_core driver to avoid compiliation break --- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 ++++-- include/net/devlink.h | 8 ++++++-- include/uapi/linux/devlink.h | 1 + net/core/devlink.c | 12 ++++++++++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index e13e5d1b3eae..5b3599caa007 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -1215,11 +1215,13 @@ static int register_devlink_port(struct mlx5_core_dev *dev, struct devlink_port_attrs attrs = {}; struct netdev_phys_item_id ppid = {}; unsigned int dl_port_index = 0; + bool external; u16 pfnum; if (!is_devlink_port_supported(dev, rpriv)) return 0; + external = mlx5_core_is_ecpf_esw_manager(dev); mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid); dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, rep->vport); pfnum = PCI_FUNC(dev->pdev->devfn); @@ -1232,12 +1234,12 @@ static int register_devlink_port(struct mlx5_core_dev *dev, } else if (rep->vport == MLX5_VPORT_PF) { memcpy(rpriv->dl_port.attrs.switch_id.id, &ppid.id[0], ppid.id_len); rpriv->dl_port.attrs.switch_id.id_len = ppid.id_len; - devlink_port_attrs_pci_pf_set(&rpriv->dl_port, pfnum); + devlink_port_attrs_pci_pf_set(&rpriv->dl_port, pfnum, external); } else if (mlx5_eswitch_is_vf_vport(dev->priv.eswitch, rpriv->rep->vport)) { memcpy(rpriv->dl_port.attrs.switch_id.id, &ppid.id[0], ppid.id_len); rpriv->dl_port.attrs.switch_id.id_len = ppid.id_len; devlink_port_attrs_pci_vf_set(&rpriv->dl_port, - pfnum, rep->vport - 1); + pfnum, rep->vport - 1, external); } return devlink_port_register(devlink, &rpriv->dl_port, dl_port_index); } diff --git a/include/net/devlink.h b/include/net/devlink.h index efff9274d248..2dad8c9151f4 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -60,19 +60,23 @@ struct devlink_port_phys_attrs { /** * struct devlink_port_pci_pf_attrs - devlink port's PCI PF attributes * @pf: Associated PCI PF number for this port. + * @external: when set, indicates if a port is for an external controller */ struct devlink_port_pci_pf_attrs { u16 pf; + u8 external:1; }; /** * struct devlink_port_pci_vf_attrs - devlink port's PCI VF attributes * @pf: Associated PCI PF number for this port. * @vf: Associated PCI VF for of the PCI PF for this port. + * @external: when set, indicates if a port is for an external controller */ struct devlink_port_pci_vf_attrs { u16 pf; u16 vf; + u8 external:1; }; /** @@ -1215,9 +1219,9 @@ void devlink_port_type_ib_set(struct devlink_port *devlink_port, void devlink_port_type_clear(struct devlink_port *devlink_port); void devlink_port_attrs_set(struct devlink_port *devlink_port, struct devlink_port_attrs *devlink_port_attrs); -void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf); +void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf, bool external); void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, - u16 pf, u16 vf); + u16 pf, u16 vf, bool external); 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, diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index cfef4245ea5a..40823ed7e05a 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -458,6 +458,7 @@ enum devlink_attr { DEVLINK_ATTR_PORT_LANES, /* u32 */ DEVLINK_ATTR_PORT_SPLITTABLE, /* u8 */ + DEVLINK_ATTR_PORT_EXTERNAL, /* u8 */ /* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX, diff --git a/net/core/devlink.c b/net/core/devlink.c index 49e911c19881..6f5f85372721 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -526,6 +526,8 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg, if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs->pci_pf.pf)) return -EMSGSIZE; + if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_pf.external)) + return -EMSGSIZE; break; case DEVLINK_PORT_FLAVOUR_PCI_VF: if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, @@ -533,6 +535,8 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg, nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER, attrs->pci_vf.vf)) return -EMSGSIZE; + if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_vf.external)) + return -EMSGSIZE; break; case DEVLINK_PORT_FLAVOUR_PHYSICAL: case DEVLINK_PORT_FLAVOUR_CPU: @@ -7716,8 +7720,9 @@ EXPORT_SYMBOL_GPL(devlink_port_attrs_set); * * @devlink_port: devlink port * @pf: associated PF for the devlink port instance + * @external: indicates if the port is for an external controller */ -void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf) +void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf, bool external) { struct devlink_port_attrs *attrs = &devlink_port->attrs; int ret; @@ -7728,6 +7733,7 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf) return; attrs->pci_pf.pf = pf; + attrs->pci_pf.external = external; } EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_pf_set); @@ -7737,9 +7743,10 @@ EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_pf_set); * @devlink_port: devlink port * @pf: associated PF for the devlink port instance * @vf: associated VF of a PF for the devlink port instance + * @external: indicates if the port is for an external controller */ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, - u16 pf, u16 vf) + u16 pf, u16 vf, bool external) { struct devlink_port_attrs *attrs = &devlink_port->attrs; int ret; @@ -7750,6 +7757,7 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, return; attrs->pci_vf.pf = pf; attrs->pci_vf.vf = vf; + attrs->pci_vf.external = external; } EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_vf_set); From patchwork Wed Sep 9 04:50:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360327 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=OFKLupMj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3Y4LShz9sTS for ; Wed, 9 Sep 2020 14:51:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbgIIEvc (ORCPT ); Wed, 9 Sep 2020 00:51:32 -0400 Received: from mail-eopbgr150077.outbound.protection.outlook.com ([40.107.15.77]:49412 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726005AbgIIEvW (ORCPT ); Wed, 9 Sep 2020 00:51:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lncguCsaorgfeRzAchJEsuVnczEtlGzGy+orKiH/cUOXzwEiVfWXc/9zAGQzQA6DEo3G5w0bvquDy9S300OqnxunqKFHhnfEBIxfNVC7aXPU/cgNL7uHf8a/hAOFIc0PjwSTGqh5IdAmHo+hl/dNLru7WfGOXGx3hii3bzlPlDCeeXRvbq2JdND8KdQyXjsA3TQ3hINixOZdnQJyP73wsLALHRlLr9qfHBXX9eAIRbchVl+0nxIcjj7Vp+LSbltajze0PafdNeaJLAJntaJGwtGlXs4ipwAq2ivTtlsWWXhawaoifb7Ubs+NJHKZwqFyW3Uyfc/zp5R5HRQALBasrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=od49ByK3BEcy6fVYstMvbFT8wPw71CAH/zmzRA71juE=; b=S5rMJzyZAMg558rBiHACXJtn3BdPdlSu65rDYLIe7zZB27YDiSOCatRCaPj6DXZoAhiwR/5z23p3xTNqFYYyN3dG5BfjrM/pvGt/ihkXDZB/b2X5mFCKf9Ymu/d6xqjmh+BbMCF70IvFxEmabtI8z1IFdpGqkQYpOPdpf52MyQM2WrPtwGnmlvOuZ0Gw9ftxLuaDyYHQY0pr/Rn+0sRc+jEJ772kQigsP1vXHOyBXRaM2+lgrdzUFwO0FfYvgSQHh9NCEEZI1k7DqsUAqpM4qTgnU3qJ41Wuq2oUMCUa2E7d0/98KT4JjerjBNSss81nVFJB7HZaI3pu2PpvRY4RDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=od49ByK3BEcy6fVYstMvbFT8wPw71CAH/zmzRA71juE=; b=OFKLupMjD4t6z2QF45XuHKpcFRNhfIYK5/lvNxd+X/InQbIyzxvivoccbsO2G3TGhtINDmGaP0Y12TkPeXSo297ASp02gW5kVQi3miJISPqQD4US/zTvdJ8xTtCDjxW2CAn9ADscvUlhdG3uZsWZiYK4VPKmjF36N2uJJSL/4RU= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR05MB5907.eurprd05.prod.outlook.com (2603:10a6:208:12c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Wed, 9 Sep 2020 04:51:14 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:14 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko Subject: [PATCH net-next v3 5/6] devlink: Introduce controller number Date: Wed, 9 Sep 2020 07:50:37 +0300 Message-Id: <20200909045038.63181-6-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:12 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7b491952-6984-42fb-f00d-08d8547bfa40 X-MS-TrafficTypeDiagnostic: AM0PR05MB5907: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hW6TlLLi5Chj3vU0LZvflpyVS8I09fXlb3RBzaB2tYX5cbi+cFaYktwVjV95+F3GQX66WwQI/CyUMwygdiXcimxLxMmbiyr33EmwTweHl2PVj4NsJnfVrVKEmQDGY6n9cH/pibPjeG68sh60znAp/OOARV2MOxPNZqx0SvCZlkmIkjhy8K7HxCkSJdK6GyuK+Vq4/q1ahaeKzcy0j1zXD4SgokPkpv15sHRnca0rwAa/MD+FL2JtIaqgo9kJorrRMczByDdQ8C3XF+OYl5DGL+scALlo2uCYzzabbHu6rxM0054+41J5LVSs5S0X26oN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(366004)(396003)(1076003)(86362001)(16526019)(54906003)(52116002)(4326008)(2906002)(26005)(6506007)(186003)(2616005)(316002)(508600001)(956004)(6486002)(83380400001)(8676002)(66946007)(8936002)(66556008)(66476007)(6666004)(6512007)(5660300002)(36756003)(30864003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QPMoyvbGsYE/RHzNTnHa9ij8y8x1O+59oUAMqWakVtwaYzwHvTRTZlUju0Sqr+tq6eMG+Vext28GgojYbURI8rV7tqNLOtS29saXtfRhoRzca+5M2whoNDmURNlVGUjlbZ7VGwSuKDNsi8ksoWmOds20Lt4qPKckhFEYODXmJ3OSVy0CjPgMzr7oouLo95pyrOLXZ7/epybXwl7TofhieRUgEKlOm0Anh0vMB5q5ahHZp7OqboQ3QXPyNHGPdh4NB9NJ2ztxNghjIayPaV4BaD9DyqfaDJrOz33CZ6SXknUz13YxVKIbrusa9htbNfX0HxCVJ3UrnITL5SRo9XELbCEAKvOAVoTecW+bQrZ8F8OMv9lU+PVvEDnnNbXTVSoUOjqFK+XsVUEQlN4GDW0Cas6ppGFXsx4StGzFdVLlSlAvSp/UGWF/xlh3eUcarbxyUtuxCj457StWof5Sztt0vwQ3H03i8dCyQCI/sVebp/lBmtdtacVEzExU2PHbfY35d+iiRas3vGfWQkCpJOOf02yycDMaJ4o9W0FtZjmOSD1MCg/SdqcFwaQ+4YoedDX3LyzuDVf8z04tpxKGQ08TYabiWE/pYGa1h3Pw68pwJMGMKFmYHOEMC5ioa83uQ2I8oubcGz5PAfEQ0qHKi8w5sg== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b491952-6984-42fb-f00d-08d8547bfa40 X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:13.9519 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9xw7KdkqDiK3gvTGCwy4xP3TlYNXqhjwl3mbB7qcs+nGXvKHPPRSNcFqBxLms8ZBszEj4llCjUjLHnefwAjE5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5907 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit A devlink port may be for a controller consist of PCI device. A devlink instance holds ports of two types of controllers. (1) controller discovered on same system where eswitch resides This is the case where PCI PF/VF of a controller and devlink eswitch instance both are located on a single system. (2) controller located on external host system. This is the case where a controller is located in one system and its devlink eswitch ports are located in a different system. When a devlink eswitch instance serves the devlink ports of both controllers together, PCI PF/VF numbers may overlap. Due to this a unique phys_port_name cannot be constructed. For example in below such system controller-0 and controller-1, each has PCI PF pf0 whose eswitch ports can be present in controller-0. These results in phys_port_name as "pf0" for both. Similar problem exists for VFs and upcoming Sub functions. An example view of two controller systems: --------------------------------------------------------- | | | --------- --------- ------- ------- | ----------- | | vf(s) | | sf(s) | |vf(s)| |sf(s)| | | server | | ------- ----/---- ---/----- ------- ---/--- ---/--- | | pci rc |=== | pf0 |______/________/ | pf1 |___/_______/ | | connect | | ------- ------- | ----------- | | controller_num=1 (no eswitch) | ------|-------------------------------------------------- (internal wire) | --------------------------------------------------------- | devlink eswitch ports and reps | | ----------------------------------------------------- | | |ctrl-0 | ctrl-0 | ctrl-0 | ctrl-0 | ctrl-0 |ctrl-0 | | | |pf0 | pf0vfN | pf0sfN | pf1 | pf1vfN |pf1sfN | | | ----------------------------------------------------- | | |ctrl-1 | ctrl-1 | ctrl-1 | ctrl-1 | ctrl-1 |ctrl-1 | | | |pf1 | pf1vfN | pf1sfN | pf1 | pf1vfN |pf0sfN | | | ----------------------------------------------------- | | | | | | --------- --------- ------- ------- | | | vf(s) | | sf(s) | |vf(s)| |sf(s)| | | ------- ----/---- ---/----- ------- ---/--- ---/--- | | | pf0 |______/________/ | pf1 |___/_______/ | | ------- ------- | | | | local controller_num=0 (eswitch) | --------------------------------------------------------- An example devlink port for external controller with controller number = 1 for a VF 1 of PF 0: $ devlink port show pci/0000:06:00.0/2 pci/0000:06:00.0/2: type eth netdev ens2f0pf0vf1 flavour pcivf controller 1 pfnum 0 vfnum 1 external true splittable false function: hw_addr 00:00:00:00:00:00 $ devlink port show pci/0000:06:00.0/2 -jp { "port": { "pci/0000:06:00.0/2": { "type": "eth", "netdev": "ens2f0pf0vf1", "flavour": "pcivf", "controller": 1, "pfnum": 0, "vfnum": 1, "external": true, "splittable": false, "function": { "hw_addr": "00:00:00:00:00:00" } } } } Signed-off-by: Parav Pandit Reviewed-by: Jiri Pirko --- Changelog: v2->v3: - Updated diagram to get rid of controller 'A' and 'B' - Kept ports of single controller together in diagram - Updated diagram for pf1's VF and SF and its ports v1->v2: - Added text diagram of multiple controllers - Updated example for a VF - Addressed comments from Jiri and Jakub - Moved controller number attribute to PCI port flavours This enables to better, hirerchical view with controller and its PF, VF numbers - Split 'external' and 'controller number' attributes as two different attributes - Merged mlx5_core driver to avoid compiliation break --- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 9 ++++++-- include/net/devlink.h | 9 ++++++-- include/uapi/linux/devlink.h | 1 + net/core/devlink.c | 23 +++++++++++-------- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 5b3599caa007..135ee26881c9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -1210,11 +1210,13 @@ is_devlink_port_supported(const struct mlx5_core_dev *dev, static int register_devlink_port(struct mlx5_core_dev *dev, struct mlx5e_rep_priv *rpriv) { + struct mlx5_esw_offload *offloads = &dev->priv.eswitch->offloads; struct devlink *devlink = priv_to_devlink(dev); struct mlx5_eswitch_rep *rep = rpriv->rep; struct devlink_port_attrs attrs = {}; struct netdev_phys_item_id ppid = {}; unsigned int dl_port_index = 0; + u32 controller_num = 0; bool external; u16 pfnum; @@ -1222,6 +1224,8 @@ static int register_devlink_port(struct mlx5_core_dev *dev, return 0; external = mlx5_core_is_ecpf_esw_manager(dev); + if (external) + controller_num = offloads->host_number + 1; mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid); dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, rep->vport); pfnum = PCI_FUNC(dev->pdev->devfn); @@ -1234,11 +1238,12 @@ static int register_devlink_port(struct mlx5_core_dev *dev, } else if (rep->vport == MLX5_VPORT_PF) { memcpy(rpriv->dl_port.attrs.switch_id.id, &ppid.id[0], ppid.id_len); rpriv->dl_port.attrs.switch_id.id_len = ppid.id_len; - devlink_port_attrs_pci_pf_set(&rpriv->dl_port, pfnum, external); + devlink_port_attrs_pci_pf_set(&rpriv->dl_port, controller_num, + pfnum, external); } else if (mlx5_eswitch_is_vf_vport(dev->priv.eswitch, rpriv->rep->vport)) { memcpy(rpriv->dl_port.attrs.switch_id.id, &ppid.id[0], ppid.id_len); rpriv->dl_port.attrs.switch_id.id_len = ppid.id_len; - devlink_port_attrs_pci_vf_set(&rpriv->dl_port, + devlink_port_attrs_pci_vf_set(&rpriv->dl_port, controller_num, pfnum, rep->vport - 1, external); } return devlink_port_register(devlink, &rpriv->dl_port, dl_port_index); diff --git a/include/net/devlink.h b/include/net/devlink.h index 2dad8c9151f4..eaec0a8cc5ef 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -59,21 +59,25 @@ struct devlink_port_phys_attrs { /** * struct devlink_port_pci_pf_attrs - devlink port's PCI PF attributes + * @controller: Associated controller number * @pf: Associated PCI PF number for this port. * @external: when set, indicates if a port is for an external controller */ struct devlink_port_pci_pf_attrs { + u32 controller; u16 pf; u8 external:1; }; /** * struct devlink_port_pci_vf_attrs - devlink port's PCI VF attributes + * @controller: Associated controller number * @pf: Associated PCI PF number for this port. * @vf: Associated PCI VF for of the PCI PF for this port. * @external: when set, indicates if a port is for an external controller */ struct devlink_port_pci_vf_attrs { + u32 controller; u16 pf; u16 vf; u8 external:1; @@ -1219,8 +1223,9 @@ void devlink_port_type_ib_set(struct devlink_port *devlink_port, void devlink_port_type_clear(struct devlink_port *devlink_port); void devlink_port_attrs_set(struct devlink_port *devlink_port, struct devlink_port_attrs *devlink_port_attrs); -void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf, bool external); -void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, +void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 controller, + u16 pf, bool external); +void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller, u16 pf, u16 vf, bool external); int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, u32 size, u16 ingress_pools_count, diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 40823ed7e05a..40d35145c879 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -459,6 +459,7 @@ enum devlink_attr { DEVLINK_ATTR_PORT_SPLITTABLE, /* u8 */ DEVLINK_ATTR_PORT_EXTERNAL, /* u8 */ + DEVLINK_ATTR_PORT_CONTROLLER_NUMBER, /* u32 */ /* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX, diff --git a/net/core/devlink.c b/net/core/devlink.c index 6f5f85372721..9cf5b118253b 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -523,17 +523,18 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg, return -EMSGSIZE; switch (devlink_port->attrs.flavour) { case DEVLINK_PORT_FLAVOUR_PCI_PF: - if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, - attrs->pci_pf.pf)) + if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER, + attrs->pci_pf.controller) || + nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs->pci_pf.pf)) return -EMSGSIZE; if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_pf.external)) return -EMSGSIZE; break; case DEVLINK_PORT_FLAVOUR_PCI_VF: - if (nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, - attrs->pci_vf.pf) || - nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER, - attrs->pci_vf.vf)) + if (nla_put_u32(msg, DEVLINK_ATTR_PORT_CONTROLLER_NUMBER, + attrs->pci_vf.controller) || + nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_PF_NUMBER, attrs->pci_vf.pf) || + nla_put_u16(msg, DEVLINK_ATTR_PORT_PCI_VF_NUMBER, attrs->pci_vf.vf)) return -EMSGSIZE; if (nla_put_u8(msg, DEVLINK_ATTR_PORT_EXTERNAL, attrs->pci_vf.external)) return -EMSGSIZE; @@ -7719,10 +7720,12 @@ EXPORT_SYMBOL_GPL(devlink_port_attrs_set); * devlink_port_attrs_pci_pf_set - Set PCI PF port attributes * * @devlink_port: devlink port + * @controller: associated controller number for the devlink port instance * @pf: associated PF for the devlink port instance * @external: indicates if the port is for an external controller */ -void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf, bool external) +void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 controller, + u16 pf, bool external) { struct devlink_port_attrs *attrs = &devlink_port->attrs; int ret; @@ -7731,7 +7734,7 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u16 pf, bo DEVLINK_PORT_FLAVOUR_PCI_PF); if (ret) return; - + attrs->pci_pf.controller = controller; attrs->pci_pf.pf = pf; attrs->pci_pf.external = external; } @@ -7741,11 +7744,12 @@ EXPORT_SYMBOL_GPL(devlink_port_attrs_pci_pf_set); * devlink_port_attrs_pci_vf_set - Set PCI VF port attributes * * @devlink_port: devlink port + * @controller: associated controller number for the devlink port instance * @pf: associated PF for the devlink port instance * @vf: associated VF of a PF for the devlink port instance * @external: indicates if the port is for an external controller */ -void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, +void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller, u16 pf, u16 vf, bool external) { struct devlink_port_attrs *attrs = &devlink_port->attrs; @@ -7755,6 +7759,7 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, DEVLINK_PORT_FLAVOUR_PCI_VF); if (ret) return; + attrs->pci_vf.controller = controller; attrs->pci_vf.pf = pf; attrs->pci_vf.vf = vf; attrs->pci_vf.external = external; From patchwork Wed Sep 9 04:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1360328 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=UrbOfNcQ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmV3b2fz1z9sTS for ; Wed, 9 Sep 2020 14:51:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726726AbgIIEvg (ORCPT ); Wed, 9 Sep 2020 00:51:36 -0400 Received: from mail-eopbgr150077.outbound.protection.outlook.com ([40.107.15.77]:49412 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726555AbgIIEv3 (ORCPT ); Wed, 9 Sep 2020 00:51:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPDY+Nec/rUc62JcCnCYALyMDOOQ6moc1iuCznpdS5PPgXbVCg4OYxcCcG2zCqFNr2TKh2ynwT0CcXcgoYj8cvPxxDAioVdLvTyHoeNCYGUQlIwTdEvMEsB9/CDgXBHuWPy+Xlgo6Lq2abG93+6oIyviqM3KimJhjZFbpKZFphuP9woZMDz8W3vaDDxQb2QmmnYhb+755NQabPxc1QdsMEGk2u8/JeRHB9ROkKGpKN1pFJMpdVpa2OZ1prssnEVV7Qi/vxVBwkmeiEnDwfUeo3TZ/VqXxcqIvbw5AKJ51lH3eZYYUlk7VepjrFvY4NSD5KkztSJJoYNdqvN4vnHUGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VZfo7fw2oXyFycIP8mBNtK3m0omfP7EdL7Y5sj4CvVw=; b=hdgz/slnvpbNWvOfpBF88QLrb0TGL0UQAl+unKzCCqE1g8zo5JJM/SVswCr9fkTjgxeuAKMN+FnjF7Z4UlGxEKJYy07ZrEJOxjNNkPZlTQq4Qvom3mKC+imYNUfZ7u/Gkv5ayx7KW2l9iGDNtrcbk5iQG3N3WX7krPM1Dq7+c6Otm7lssSr1vm1aDeadnY66omAJNVaN2wnXQau6u7SY0Zhq+yKq1G41QoYvCWx9S+wrGl0b9TFuVdqAGDVGf3dRJuPcVxBwQAo4tQUg+6V9oDqjjIlfbp1zNOjjLTX2yWLrrOtuBiyXrBkHxclKhc3M0SXlwXN2es9dYeLgWkIe7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VZfo7fw2oXyFycIP8mBNtK3m0omfP7EdL7Y5sj4CvVw=; b=UrbOfNcQk8CojzJBATpZgCeNs0pwBg9ksYb9vYn4iPpGAJH+LpRooend8XOTXThgJoBgYXLEngsJPRJ60mImne7pAL3BLyZuhhSJ2dZMRB2SapHv4sbKrIL4gMKjNieBVTYNpz95gsQVeONHnMETdvXekeVO6HPpAf8B62wZVeI= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) by AM0PR05MB5907.eurprd05.prod.outlook.com (2603:10a6:208:12c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Wed, 9 Sep 2020 04:51:15 +0000 Received: from AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18]) by AM0PR05MB4866.eurprd05.prod.outlook.com ([fe80::349f:cbf4:ddcf:ce18%3]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 04:51:15 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko Subject: [PATCH net-next v3 6/6] devlink: Use controller while building phys_port_name Date: Wed, 9 Sep 2020 07:50:38 +0300 Message-Id: <20200909045038.63181-7-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200909045038.63181-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200909045038.63181-1-parav@mellanox.com> X-ClientProxiedBy: SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) To AM0PR05MB4866.eurprd05.prod.outlook.com (2603:10a6:208:c0::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sw-mtx-036.mtx.labs.mlnx (208.176.44.194) by SN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:805:f2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 04:51:14 +0000 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [208.176.44.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: bb84b04f-db69-4464-794a-08d8547bfb95 X-MS-TrafficTypeDiagnostic: AM0PR05MB5907: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xGfQqIH7b6j/YL8Jg/DxL8J6jlr7xnV1dIo53D+V9Zu89RrVSjbm9H8bBhcBm5pe9arpx4secwLR7g80Pq2tumSeFcaf4W2OO8CM0ROSxyTpWPDpW/Oid3jBuAYt+BfQ2xKIh587KRKKbJ7HD6tXOOj+QKh6DQ3m1WDv3MGSYhcIVhMy5kc3tQBhKBKy2pcUQCU4adjg50d8vPvTT4s1T71TCAkAz3eJ3p5DZCYXiN0TIjCdCTWitzF05gNiKZBdU0gU1chBQ3jhJzbCp8pxLD4QCuCTpyIB38Bv9XHtrdMzMHAL/gT1CCFNd9ARmEtlSVtn5DDAWOwBTDv9c01K7w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR05MB4866.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(366004)(396003)(1076003)(86362001)(16526019)(54906003)(52116002)(4326008)(2906002)(26005)(6506007)(186003)(2616005)(316002)(508600001)(956004)(6486002)(8676002)(66946007)(8936002)(66556008)(66476007)(6666004)(6512007)(5660300002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: DDQT+/76iVfnsdk9ZdZ2OfXPnvItQWSsqgCx5MrrP4O0uhuLDbPckGzvY2khO7f12KrfvGxTa3oCuT4GXnfCcWe4bE3cZ6OovBQRQ+lfE81uJXQR6wjpWTb8pwj1k9//YBbTJQznqvHYnhCLGSlTDONSX3ixz/MGah04QHkFuIRTkAMnb/8DOztV0YuJ5T9bvc90whxjhOgtPy5RgJ9B3sOP6I6IjmEPSLQaZojZFHUoEgGmoHdPg12ApLzdluf0aqoqf+09xEEHJqgO0KnSfxSXPh+4ESFCLGVd1ab1/0vLETdoYHPbTnkvpM69p1bQXEgE4GpcblxgLUOvoPTB4CCIiipsHwUH+fXi5XSp+SHpmKrZ1s5tr6RIaiACCRZKoE9D/Db19UhDISGJRJXucgZkFoF05ieJTTz3hZ+oGZP6M5LwM+13YfGbh4OTFYFBlFoeZYWjG0VrMDNpzkp4r9ng1gZ4xWdszamPYJ60SqW/ZqtrnHtXDNuQON8oPK8DzaqqX5ZwQ+gd5gNUqc3cdTAr2PpyRDE4lISoQrhji/dNug5OVZ3meS8hq/Yb9aeRQe37iajs38xDeV3JiMVBvnTI03YQ03lsIwxqnhkDaCNHBFmxTaPkiqi4gG8ALorWvn+0DDfCgnpjcvam5FXuOA== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb84b04f-db69-4464-794a-08d8547bfb95 X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 04:51:15.6170 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5WPaysfDvqwtTQ1LBlyQX1Vi134Oj7jWYZEvmLG+PLEqT79p4acnOru0e/KxNOKG33WGgwI+7Ke2PFRx6ipjDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5907 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Parav Pandit Now that controller number attribute is available, use it when building phsy_port_name for external controller ports. An example devlink port and representor netdev name consist of controller annotation for external controller with controller number = 1, for a VF 1 of PF 0: $ devlink port show pci/0000:06:00.0/2 pci/0000:06:00.0/2: type eth netdev ens2f0c1pf0vf1 flavour pcivf controller 1 pfnum 0 vfnum 1 external true splittable false function: hw_addr 00:00:00:00:00:00 $ devlink port show pci/0000:06:00.0/2 -jp { "port": { "pci/0000:06:00.0/2": { "type": "eth", "netdev": "ens2f0c1pf0vf1", "flavour": "pcivf", "controller": 1, "pfnum": 0, "vfnum": 1, "external": true, "splittable": false, "function": { "hw_addr": "00:00:00:00:00:00" } } } } Controller number annotation is skipped for non external controllers to maintain backward compatibility. Signed-off-by: Parav Pandit Reviewed-by: Jiri Pirko --- Changelog: v1->v2: - New patch --- net/core/devlink.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/core/devlink.c b/net/core/devlink.c index 9cf5b118253b..91c12612f2b7 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -7793,9 +7793,23 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, WARN_ON(1); return -EINVAL; case DEVLINK_PORT_FLAVOUR_PCI_PF: + if (attrs->pci_pf.external) { + n = snprintf(name, len, "c%u", attrs->pci_pf.controller); + if (n >= len) + return -EINVAL; + len -= n; + name += n; + } n = snprintf(name, len, "pf%u", attrs->pci_pf.pf); break; case DEVLINK_PORT_FLAVOUR_PCI_VF: + if (attrs->pci_vf.external) { + n = snprintf(name, len, "c%u", attrs->pci_vf.controller); + if (n >= len) + return -EINVAL; + len -= n; + name += n; + } n = snprintf(name, len, "pf%uvf%u", attrs->pci_vf.pf, attrs->pci_vf.vf); break;