From patchwork Tue Sep 8 14:42: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: 1359863 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=WvT/lvy9; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmBxM3wTYz9sRK for ; Wed, 9 Sep 2020 03:30:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731739AbgIHRaN (ORCPT ); Tue, 8 Sep 2020 13:30:13 -0400 Received: from mail-eopbgr80048.outbound.protection.outlook.com ([40.107.8.48]:49369 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731598AbgIHQQD (ORCPT ); Tue, 8 Sep 2020 12:16:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HC5lyTmL9lE+SSMppLoR3LMGqm3bIjCHXacd6kafFAGELbIC6e/ge2o+QY3WZ3zl8DZjOfnBZMiPW0PuRP1PjOyxUvtj+hi3JG9F2j7lENzN2zy59va1DZhkIfEOfbGdRa3xIJSYKV+sJ+81DOcmdju8CQ9jMmWLzTDgqMZIO88WZARXgZ3VgNm5OzgMKaQYHQTFUPlmS3F+alMGcw4AZmnBjj5VwH9PyvhLfQSiN4q8ccR1gFINO/524rl5Dm41INfWM5E8DoGBPytrvcWPrufvbRmuw3/HDyAMZBSVRwy53DTtPVYqYmLuWu45mxFXKae9ZsnJffmljrJWZWLPfQ== 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=HrxzzzFuMDZDSx5YCuSWXi+PHFQCLRxIkVHckD7/DJYgC8E/7dphrCv2bJguOTU5fSavdBLy38BI9WxeodBdqjX47UZC2FfcfyUrhSQ0WYhf6b5OuIpBMiyseqtuEtvUy7bDa+p9JxM0IY642P8HSihTMPL3FWwneBegqyy10w6MENe4kUGe7xrdAwoAouPYQaJ2KnWTMPPCyON3UcOQpHhj2/+dzOsDpDf1MQokbRwC3gduHKp8HnYoA/rFHMuhAyIN2SFuT9EYKSA/+olzTRFEgI0x1l1pGqZgU4v6n66XDWU3544315bzI2AzdmnEx4JWYhMXzwB4ksnnvAOKNQ== 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=WvT/lvy9f6YVa6UQ6tMIfWEgVX9f1WveNcGMGPeor/Nvlo5dGkfgw8ChSyVFoezxF2ktFNFjNXvhKVzrxj/nlEe5MXsFx95iseqXeM29jaCWeI/egTtPoCplLvbS0P+SdpxgW00VIXqIYVeb8Rm/oM50vHw4NDzYAXbXeKBXL64= 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 AM0PR05MB4353.eurprd05.prod.outlook.com (2603:10a6:208:67::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Tue, 8 Sep 2020 14:43:10 +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.3348.019; Tue, 8 Sep 2020 14:43:10 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Roi Dayan Subject: [PATCH net-next v2 1/6] net/mlx5: E-switch, Read controller number from device Date: Tue, 8 Sep 2020 17:42:36 +0300 Message-Id: <20200908144241.21673-2-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200908144241.21673-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200908144241.21673-1-parav@mellanox.com> X-ClientProxiedBy: SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) 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 SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Tue, 8 Sep 2020 14:43: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: 822a48b5-2d6b-46ef-2c24-08d854058192 X-MS-TrafficTypeDiagnostic: AM0PR05MB4353: 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: UCP5cql0prpdd+DOhPcL7cbgg7ENIifPoL6jQHFxc5Vr3YAs6PfHs5DGhuyG3Vaj9KBJVNdpBc3+t1mOwL5J/2LTXmDjQVLBgGJGUWbpGS44LFScSartyAnY2LQgDhUtHrcmz6NWISAjo3yPw5ohm3jjZYZu8qjLfKMjB6xTSytbmzKMukupVKEol70f8EAPerWHLxSHDdTgX1cFvJWjLsL9yCT1H+I2lsbLFOuI9ZV5r43sMiAEi2CmHGJ5zWX7fC7G450Fqk6KDmxVcwidT8Jxr6zVnrb/eqPqkgT9ImN1CSqSbkTEEFm9PlVvz0ja2MD9OY4Ut+XqLxe040gZeQ== 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)(366004)(6486002)(6666004)(498600001)(26005)(1076003)(6512007)(6506007)(86362001)(4326008)(52116002)(54906003)(5660300002)(2906002)(36756003)(66946007)(8676002)(83380400001)(66556008)(66476007)(956004)(16526019)(8936002)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: UczzYlzoke+wYj0qArL5oerz4383Pxs1jgZhmkQ7EOSOwH7CYXXGTLPKRosRt4juib+h+yQOJ9Zcgr+XPfPEAqHuOsJRGigpnVZfoXfOI44KLy52mSKDwu0MgAoiZvGfmGAEH+RyxVuKeo6aLFE0iyFnBHWJkfW+L21uNeU24ZOh+2XIjjXdkaxBbyMk29kMoOhk28IbzDPtvyCrFTxJsH34OnxV5RfYzYbjhXLDu6BvTvcNooLX9WYPY7gMPk5tZCuvcActCDhsx7fd9tVzjwcnHRjQoMua8RSJMaFcvKUntXqu+ijJR/DFqVS9JPxWG4hKDejnjf27vYRIfOqKzGoj7SVR6EV6fJNLiiie+86uOqk9ufoVov5FkccZubhV1rtVnBFsX1dVGgInTSPUcRobfkLSx7FX3tLUN4tRLilxUb66Hth6Zqwu2EweJEtvs9aMk5NcC6vVcs9A+bXa2P8CMURFtHRa3JikauoHq5ZYD/2UzsjsU0ZJDE2emuIhMfUbPGmLWMOYtLsBOPDXFOAIm96c/ZNPOne7TNoMxq+gA7MxsJ3ZEF3GKl9OrypRyb7nczn1jJj58CpHMVbadzN5GQI4GpnaLtHXh7YfuxBxKQlOoo130nc4RyRlimgEK+FL7d3TtnD77xzzAYnXKA== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 822a48b5-2d6b-46ef-2c24-08d854058192 X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 14:43:10.0234 (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: aZe552WMrhP4aJWnaDyPypgXIB5ugZCsGvS+pei5BJhz0qjTi8uhSuswvATqWpZkqcU3jl3YVX14zS8VUK51rA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4353 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 Tue Sep 8 14:42: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: 1360023 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=ChdbUr+u; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BmGTf17PKz9sTK for ; Wed, 9 Sep 2020 06:09:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730930AbgIHUJw (ORCPT ); Tue, 8 Sep 2020 16:09:52 -0400 Received: from mail-eopbgr00056.outbound.protection.outlook.com ([40.107.0.56]:58754 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729773AbgIHPSh (ORCPT ); Tue, 8 Sep 2020 11:18:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d0juIjn2cJqFWMg/LCWBEgD92C+2917SgVj4FPp2DlxnHKkDLL+TsFfYKJDNRl+YJHtiJMNtI8ctB2FLX2S/+rSR2xGuegW65bMIzXtaUA0geTVAZK2berwe36UemoYcrPY4l9MoJqgMN7RoAag6b/RVT7Q/9dflYj+W3wue8wcpUKAtj7y2GGsJLC9a4dN/Oq9opiu42eqwR1W1gklgFSmpXhecZby2NeZML9Xb7+oJELu6v0CXbkk6NhzM3JsZFzFZ7ROPte+JuNGI3XIvLqnCeAhEyeFCMd84g6KcmKTze0qY5AO/IGTMjYl8t8717vrsvapkXjCqTcI2p2zjeQ== 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=IQmgvYthuUWRJHiw0hPe+wnfyLDtkjHxCviY8UHMxcOW9J6L88PMYoj8mKhVYSBJbRH5SBcIdow+vBxTMNfireytM7GO+YnH1XICsiWq26Y+bIZnxYP3eetqrRqjpNKO9ebg+8PCzE6ipstVV8WO8VG+KtQuF2w8wu/N5MCaQGnCIdpdQ+0RRWpMeElc4GpkB9oDO8TmdQMXOuzXPXHkvONOTnXZIU0HATt/qLLwVSAUw2CuspmhZbteKxBn8Z8H24jZpClze7K1IkNPOgc6M7UneqmGnXAFaanD7lNHY1vRf/QuC3TfNLoG/oZrD4gB97bkFJ9Vsh8LMKCsnxCzZA== 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=ChdbUr+uET7K1xVAirmF1JU13/lX9tsbeCGUl/yq/JRW5iYvQAvAw1vK5tegAdlxXpwMco2cSJTZaLF9lfxZUss7/mg6qLdbriydLTzkoG/mzt529ok6RSORywVS+rTz5iMIykxMshzqcrA+X6JpvdeT6rtuuCBC3LTn6GaZzf4= 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 AM8PR05MB7331.eurprd05.prod.outlook.com (2603:10a6:20b:1dd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Tue, 8 Sep 2020 14:43:12 +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.3348.019; Tue, 8 Sep 2020 14:43:12 +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 v2 2/6] devlink: Add comment block for missing port attributes Date: Tue, 8 Sep 2020 17:42:37 +0300 Message-Id: <20200908144241.21673-3-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200908144241.21673-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200908144241.21673-1-parav@mellanox.com> X-ClientProxiedBy: SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) 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 SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Tue, 8 Sep 2020 14:43: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: ff3bcb94-74c9-4f2d-96f9-08d85405829c X-MS-TrafficTypeDiagnostic: AM8PR05MB7331: 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: 7zfwq7vuyxGrTAWP9jcR1loDAk+hDhT5n5XqkxonGxRLGUv0+avSwB8CtqwoaBXybHLyWBBm1YAMwiiu9q2+vdo6OM9/3ErD2/vWS2Ry8trZHFpT4u2610JB5++T/txDNFq3IU9ioJUao/YvRHtMW8f4wAUybrvJvasiPe22un8qdbgGoDSr7U7bSjIiDPTMIw/ByG1fykpT6AVyoamBOlkuWZAPTonupZ1mglH7I6JbxgipPSTHG1W/c5W/x0CLYiPQp5MSOOfoTJL7twedLiVR3qiZuWCuMZV/T9Lk4tCTNnDIN2HcvO7Q6FMrjultkF6bRiNbQ2unEK3aZWU2cQ== 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)(366004)(6512007)(4744005)(8676002)(5660300002)(66476007)(66946007)(66556008)(2906002)(36756003)(2616005)(956004)(54906003)(186003)(8936002)(86362001)(498600001)(16526019)(6506007)(83380400001)(26005)(6486002)(1076003)(52116002)(6666004)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: DScrlyBOgtqC/liliy+osvP8Ayv0Cv9LtkVUPed6nvDvv4ZUJ7WcYjGfmX2fEfT4M0+7WTJttTD9nR/X15BS0XNnHqS4unATMsYwmgWVm9cyaf2KZCVKy/Pm2cAvtaGiY1sOdgfcY3po3Naz6JRROZf6h8jK0/HzOTfaBJ9JHHRCYPxsaIao7HS//cxXqUH4vTqdq6vTjIb+JE1q6378SZ9w+t0AADWSHKI8/t7EVTanMqZ175RhyPhSbZFx0tIrNoQLdw8k4taPw3sZVcJHoU0YXydakmqLwinXogEWE/9JOp9d+V1KRpXtAsNLbBqj1+N3Hol4+sNZCkfmmgJP+Wenmf9VBMhBpohJmyNNZNPOuae4DV78R7f3ChVFeBm1Vqb/d5vaMoiRW74XtajJTbPFuH0ocoktRV63/AY9OYSMfc88jVWBp3Xu1IH/PWVr9Vu4aC/SJn6YOQo7/9Zd60TL3mmGrq8eJgT4uAPCIRwNcOL1dcnwU3qbNc/KAcB+PzNqNyVlFKEc651iW8to8LcXN9a+JXMAkeUlLG5eIPGf/lem5+gcZDITLPi40G5wdHEhi7du5qEVxabJu0DWsuZuPz68vgGqvzW9u6dAzMPcLG4assbr3CHG3K1BOurwj1FW6fB7DCFurJtffXbdxQ== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff3bcb94-74c9-4f2d-96f9-08d85405829c X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 14:43:11.8723 (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: FWql6RLs2TvQMFCS48cguHwD5yde/0MuJIG4WfJ3SaLZPjuo36CkOb+2s2Zj/uf8i+HkylN8RcdsCXdnwuVjBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7331 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 Tue Sep 8 14:42: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: 1359783 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=Tk6WCo51; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bm7n05m5Nz9sSJ for ; Wed, 9 Sep 2020 01:07:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729779AbgIHPHp (ORCPT ); Tue, 8 Sep 2020 11:07:45 -0400 Received: from mail-eopbgr130087.outbound.protection.outlook.com ([40.107.13.87]:37001 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730232AbgIHPEW (ORCPT ); Tue, 8 Sep 2020 11:04:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ntVbhHG721DYafag0iExAVtCGNaQPl9s85DSkL4GCtewQtbQ4SDA/WTNvn/sBE6lrWzYW/U7RU4mf4Pal69prjQjony7PVv0NamxTI5KPjPajHu0GA1VXhIhD1nhzd56YG5n8PVSgcezQWQZf0ts1SOyrQMG4MFS/4eoCQWJXA6LFXPj1gpwSQ4EzaSLIaI/7z0z92Vgv+QxkW+WlLPcJrxTUsceb8hOQkUUzMkh7yzNY9wC13LpVm5s4xlzcTzCoAMRuFRfzO2bDEpBeJFxl8wLPgeI0DT1jovaivUJlwYTxPmFiV2W0gvA1zrcWcTP4y3+rQ24yaWlW3nN/jdItw== 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=TMCojpgZpe5/jovRcEkclbhcEXLtAGTND6fXQM1GuCoV3H+x0DafCo5MSTC5ETxdXFag/JJxK3uvUn15eOcjHFzNT/P5rMTa+dfSniU1d52x7JKZm2y1ZG4ZIIq+DYL1DRkc4JbLeYTfNieDo9OvY5YEjWuqJVjRetwgwXH4xevwEOnHgQSZUezPcWmKuwJfzn/yrBr7hGInECDQG7QJMQIS5tVxB2oTQgwUw74ANgU1XozKDb5Jruv2pz2XmMMQhzomfqoKPR2xWv6dWKOoGnjhAf4zERA6EiMGkOavkPJyLf9MoSP2vRx3OJNamVMouVr1n0OYKfRdAARqYxogJA== 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=Tk6WCo51sDAJcb6IipB2Pd1pyx0+qDb/d1SuFd9TImp9A2ZFcKa4IUa2thymtNyHZI05/4YaaIMhgRgQcdgy4G0tpMjXNKcfWwo1CkKTWiCGpL104ewvSyFYxKPKFWX9tNKPl3eRh70NB4/9f2ewq2EPGIf1hiK/21klIL/Gar4= 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 AM0PR05MB4353.eurprd05.prod.outlook.com (2603:10a6:208:67::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Tue, 8 Sep 2020 14:43: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.3348.019; Tue, 8 Sep 2020 14:43: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 v2 3/6] devlink: Move structure comments outside of structure Date: Tue, 8 Sep 2020 17:42:38 +0300 Message-Id: <20200908144241.21673-4-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200908144241.21673-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200908144241.21673-1-parav@mellanox.com> X-ClientProxiedBy: SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) 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 SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Tue, 8 Sep 2020 14:43:13 +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: 43ec1440-5ed2-497b-e285-08d85405846b X-MS-TrafficTypeDiagnostic: AM0PR05MB4353: 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: zwxv5jDyxvOKKYyPWz2IxsWXu0xKubg5LerFOAHQiacFThsnI/bsElhGAeuaa4L966jWPBhYC/4m48msTF6T/vKkmXjOqn2CvAChjRLgAVvkXqr8Heugn4bRGgtDbAbpVU1AEpHVkWUum/8AVTsCg0INRzNahaZVdQcnaO/AC6cxTTdIK7OgIEf80GxiIlHlDfrAkNuVwD2A2cFg7wrAb70omeT039/OqfJ/z3uVK89fAnVtJaZEvLZyNjR/zaCtaTXt/1sCvFEk1MWKsYKsLjkVtVfVNDVm1JCjtoqo3r5iRrmLVi/gwsARE+9Lwaljl7L+/alQvlHtOxnQ+fSpCw== 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)(366004)(6486002)(6666004)(498600001)(26005)(1076003)(6512007)(6506007)(86362001)(4326008)(52116002)(54906003)(5660300002)(2906002)(36756003)(66946007)(8676002)(83380400001)(66556008)(66476007)(956004)(16526019)(8936002)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ph02zm1EGiV9zrKElISDfXzZAz9I9mFYtqZJ2i4CrVjRLghjOM+0Gjo0sen7xlwFVP3GJ1quQyIdR+x2XeBkru56ehFDXrjUJlMQ20uLUl9gB33KsJ6IQNwuisUs91H3n0XBtHGqXJy8K1P8PecNkRovt6reZ8d0JkIiuyWdKbIEkx17BovPX1CxGjiPAs9ypFNxND4uUF2iyaJfSfo9Zj0gsPeOqtBve0IxMTJ0Amh8BHVuyPd3Y2+gN3oS2ct9QohxEam/nJ5q8kXM7wUl3LsBxkb/Wt45icDE73hxmBSNVc9rs5ga8GhFUtTEnppnGTIwKdJykF029SJTyGV8DLj+d94NXZJkjCjGFdL+b4aUQ+FWjhdiSQE1X+jsiPnH5VOCWYD9ZzwG71sBXAHmUa5mFovxJ+YeHJ15KSgEldpcgNDKNAoo6g1awgC+/zjXlx0am4uc7XCLeKRGUa5nurdnOeg5tKP/ETd9rx+C3kuvfctYoJHR+BolBc8Vq89+SYva4A6TZg7zwnPG1BWF/NoC8Q2QnsLqacKd+VkXYpemN8OwliyvvH5bPjtW1lzT8VcD0BWZzQih18pKBGxEHjTy9CeOHf8SS3kwyyG2d7332meapvYcKVvclcLIaDpFKDd5g7gAR4A0QW2ShK/20g== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43ec1440-5ed2-497b-e285-08d85405846b X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 14:43:15.0465 (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: +PMLO4gB+T6eHNpPXS2z+4GFl6+JUGY50CLgvQjmzhtBAhCx9LbfdLZobU1NYcGQcx9FxYFFMJv3VTJw5u+GLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4353 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 Tue Sep 8 14:42:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 1359784 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=dgc/VnBU; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bm7n96tJtz9sSP for ; Wed, 9 Sep 2020 01:07:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729988AbgIHPHH (ORCPT ); Tue, 8 Sep 2020 11:07:07 -0400 Received: from mail-eopbgr80057.outbound.protection.outlook.com ([40.107.8.57]:47842 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729655AbgIHPEX (ORCPT ); Tue, 8 Sep 2020 11:04:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mR+2cP3aPRlWXmc2mNBu+NS6EnGfj0YCW8rCNpvAsOPeHFM20fAMUc9cYfd3TWms0ZRAZYwIMwvb6TlMPiDryA4VQ+z8wdtNeSbIepqt4WNJ0Tp32RCKmDJkzSfaXD8pFmPubRFH4tcQNzhxd4PqEQs7FDUBhYPSUjydDU0mTPGVJabNCC/TgAYGI7zTP2za4mekzujg/rwUkREMZaIja1LcUq5Zf7xAAICYR7L14yWBsNOSHXTc8IAg+Ao5no3POQya5gh3ZKlEmrH30R/bBG1zkg91n4hZL4r4+oLWYYs8gp4lSLybwQAJOUmT0XRRESYYvnRXHBNmljbiwkD6ew== 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=qpVjFbR98z1LVEi0xBlZRiuK0jIO11oda11lCjhEGbI=; b=RE1r8beJu9eqCFblSBXdO3Hmm3j8xIVePV3g2pHp4oePhhUsEfGmK8hIj4YW94R2yZvzW44UzO0btAfH51BItc681+EZgQOB+b1i8My39P3DzhP5KsrOrKQK9dKNNoQqU3pn8QXNoUKG2AQY1OJUZLWcDmNwGkaOatKphwAsmFV99teMLzm0FixD+sZrVqGiswFpWn3Ndq66v91iKs5gPDunn8n+GF7CwC18Gh3IqHhliHA8Qr99gWaaCJ2VURQ8a4jdavEAimACJhcfp5qc6Ky7u8zdK/yoFEQAXhybRvAc6wkN2gqic15jy+/9AQEOyvjo0ciLyExo9JHWMi0X9Q== 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=qpVjFbR98z1LVEi0xBlZRiuK0jIO11oda11lCjhEGbI=; b=dgc/VnBUPyH2O6B4COZ873u9er7KjjgTxmlHChjFwiqm9BjI3LpZIDKMwIdRvTeRSR5FBx3kCVsC72nUUS7R2O90KyJ+gadlk/oj4lJRIDeNgZTbnzcda1z4DcEEvmbGlqn4VNdF03F40Uc7IypgBLyG4MvvrdRwgwZsPjHK6nM= 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 AM8PR05MB7331.eurprd05.prod.outlook.com (2603:10a6:20b:1dd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Tue, 8 Sep 2020 14:43:19 +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.3348.019; Tue, 8 Sep 2020 14:43:18 +0000 From: Parav Pandit To: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Parav Pandit , Jiri Pirko Subject: [PATCH net-next v2 5/6] devlink: Introduce controller number Date: Tue, 8 Sep 2020 17:42:40 +0300 Message-Id: <20200908144241.21673-6-parav@mellanox.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200908144241.21673-1-parav@mellanox.com> References: <20200825135839.106796-1-parav@mellanox.com> <20200908144241.21673-1-parav@mellanox.com> X-ClientProxiedBy: SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) 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 SA9PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:6e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Tue, 8 Sep 2020 14:43:17 +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: 2dcfaf8a-672d-4898-9ea8-08d85405867a X-MS-TrafficTypeDiagnostic: AM8PR05MB7331: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hoRRuAzb6xI42x7uHF4yaFwEri73GkaGyXU9St6vVP4Qy7TKAnXPVQ899VYeLk7Q9nSsZfPii5BKNw1pnVcTV0KT8CpB+rwMUQxfhYLNqAAaUGExjdyRwfjlWJ2k+AGcU1UOqEo//MGgZ8Z3rD42OEFVFDtM2j+cG0MJPBad8hYxMryVnglGWkK+GYzw11SLND5isbpiU4Sfy4TvPQQeInStcNYXRECdSn8G6N/QuUWvzM4iHbbc3KVQquexBEBUNy7f+dhyIcUWzNbeXyD1fGsGOoOeDwSPM1LA1Re72SYdrLiq9aRy0bjK+GOs+vAl 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)(366004)(6512007)(8676002)(5660300002)(66476007)(66946007)(66556008)(30864003)(2906002)(36756003)(2616005)(956004)(54906003)(186003)(8936002)(86362001)(498600001)(16526019)(6506007)(83380400001)(26005)(6486002)(1076003)(52116002)(6666004)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /TIZTZgsbrTAuAc5X7L8St58FRRrxF9fePHLTFHgtlNWA+qZTevw3ewtfLbC0QgwFiN7dHvQB5ryZCUDriNkk88e5dquPXqGqdndGMSlwtuxqmXnaFSRY1dadkm9/L5R4do6sAhZ1daNaW+b8NB2HaJp26PywYUFdKQI6Ne3QSY5w51QRdaN6GNoD0f4+y9uFRM2WS56zxsyzZ85piFmCICebjYo5pSWD5IC9jXrF/KM3BAxYJEMGENhVLRs+eWP8JOxnm22U6wXVMd5t4UAzOghQHO57he+n4VLPnm+MpzNeswbmeCzUT/fCwtdp8GHKoee+FGhH59PDz3EqObreakSQt3yzn1qJttMWMScUntX4JlZ928dTc7L7wvZzkMahPOck+Qg1tNBkU9bPF2ikMruRDwLxe7sUboOe1TUD7glkrKn/Oe/kxUmjGnC6HGHZ5HjMpKQ3JAylTGo1tdu4/75JieDZAAeURO2luXt1a4m+eNwRTsWlwPlTkjuyrwylb62IbQnidRIdJVjfMGLGSwijZ5cM3xSAXOCvy47FxfMNADF0IULisYBnkULXwxfpTinm1MwImhO46Z6p1VJvjDv49HJxKIdgyprA9jsDGS8wYC37409ivLuf+Z8S5HMl5esV5Us3/fzREPsmPJV3A== X-MS-Exchange-Transport-Forked: True X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dcfaf8a-672d-4898-9ea8-08d85405867a X-MS-Exchange-CrossTenant-AuthSource: AM0PR05MB4866.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 14:43:18.7323 (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: VptlJbKqR4RbQhLAYSX8tw3OFIqI+oSDSJVzO0jHoHtfIdOufDq4AsnPF9ElLzM+f6FJW0gWCWLzlvIGVURtTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7331 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-A and controller-B, each has PCI PF pf0 whose eswitch ports are present in controller-A. 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) | | | server | | ------- ----/---- ---/----- ------- | | pci rc |=====| pf0 |______/________/ | pf1 | | | connection| | ------- ------- | ------------- | | controller-B (no eswitch) (controller num=1)| ------|---------------------------------------------- (internal wire) | ----------------------------------------------------- | devlink eswitch ports and reps | | --------------------------------------------- | | |ctrl-A | ctrl-B | ctrl-A | ctrl-B | ctrl-B | | | |pf0 | pf0 | pf0vfN | pf0vfN | pf0sfN | | | --------------------------------------------- | | | | --------- | | | sf(s) | | | ------- ---/----- ------- | | | pf0 |_____/ | pf1 | | | ------- ------- | | | | local controller-A (eswitch) (controller num=0) | ----------------------------------------------------- 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: 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;