From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2704FA0C53 for ; Wed, 3 Nov 2021 10:18:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0433540E5A; Wed, 3 Nov 2021 10:18:57 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2071.outbound.protection.outlook.com [40.107.93.71]) by mails.dpdk.org (Postfix) with ESMTP id 01FF240E5A for ; Wed, 3 Nov 2021 10:18:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SqtO8RNAVGewKdlgafKURb6MgWTwDuzBD6OF9ZPIy9tULuSusiSa0rPfKLVMNfpCwmaFv950P7zKEblfSb/bbO4e51nKIGVrr3kbSIaGbnY7Ddz1APafGIRtxTm/B09cKWyHS06OZwtt8YNKmTZASA+1wZCylxSo7VeH/lgnI2tcn3840lc8eOYl1wFKElnMMyvKE/EqLw2e+oaC9Aoj0Cd3guGNgRkeh80j3OZzYVQKg+Dik9NGF3OMdi+nRRwucQ/+mzabp4dau0UszIGnLiC10wxOa2ra4IT5JteAGD7C2wsuzkqq/dPRK8SFra6kncIkqLN4MixQ7gle5uia1Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lPQMZVN8T4YEgDtgc+8QU9NFT79amw4u1bpblxWN3tY=; b=JJHqzOXKoQp5y3Fq6kn5HUIAaFAVSm3r5GqufvdEE7Ga61VYw34fid174/rMCuwphp7NXr9Z/Tkq72fKVJxHRCASxea07POL5wpTA4sLrOlJjrgUuScdrHZ/i+F5DVJTX/xb9Rnqa7dyMsNatXk8uwh/CMwixXWz/ZYDPu1V9TMM5X5TaGynReO+BjMudE9/jPZaordbbuOYMHVS6gkK+mhjCkyemNBhM+beiYj1BGcsMpcRdujco2+jeh9W2ODOW9n0O0v/LjhM4kjtl0nAWR4ElIxOPg97zF29gAVGeudOFFGJ1EtCcdcM49Z7Rc/+b+FvcisZJHXCXro6BG9LEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lPQMZVN8T4YEgDtgc+8QU9NFT79amw4u1bpblxWN3tY=; b=Bl35xnZYZSynmTSjgbM4821q4iqmKZaptGz/VkU7A9QYtZ+/7hOOFX1jL+oLueGxLn9sV6eIpreNRGvwtgwKJM95CJw+l/ZqRQ3kSepJzx/yT9Mz+Kp7UCTitdd0qU5rzzp6Yt0AMmPVB01Y6P289CcG3yKyrxfhhMrKlfjyxGOscCzBKacvY0wzNDLm7YtuVRdAgIm0goutj0jSkHcADojpK4afZ6HWeQelcAfshk1ihshhZuu69j89fAO9smJMJqMTaccYkAoUqtJIpUQENvmxlfmKuN51453HomZsUAMmNvPUYPmf+UFSdv9nX/4ZQibzMLUwzJOUubM0i3tm9Q== Received: from MW4PR03CA0093.namprd03.prod.outlook.com (2603:10b6:303:b7::8) by CH2PR12MB4279.namprd12.prod.outlook.com (2603:10b6:610:af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Wed, 3 Nov 2021 09:18:54 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::5c) by MW4PR03CA0093.outlook.office365.com (2603:10b6:303:b7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 3 Nov 2021 09:18:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 3 Nov 2021 09:18:53 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 3 Nov 2021 09:18:51 +0000 From: Viacheslav Ovsiienko To: CC: , , Date: Wed, 3 Nov 2021 11:18:36 +0200 Message-ID: <20211103091836.27743-1-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211025103833.17917-1-viacheslavo@nvidia.com> References: <20211025103833.17917-1-viacheslavo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fce80ee-a12a-4eaf-0c2e-08d99eaaf4d4 X-MS-TrafficTypeDiagnostic: CH2PR12MB4279: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wXYap0J2jxch31SX0pVThFNNiA80NbIMI8GZEWhVYcKEmyLyyYHGIHb2x++hvamZ1s9VWZbi+JN41vQiEBxpdjAkg9yMqSqH9Hn7EVsPhaM/vA+sjwZbzEYtI/3gdz6uWWMEPs2O3ja2nSy7cFFkBiz1WvGwXDpibZCImY0uPoeNhLAq9IL3LGkYqV8rNVeXY1/y1OvFlttBBkAw9tc1ZXzCVWyp2dDU4kHs/wEQSViid9QJrBjAF1SFubZE5yva+XSmlHnCmAp0vx78VpVfWrSz4PDNSavhGkkBFoiU36rI3jfJU1NjrT/l+YurARORRjcMZxXiDnGAL+cM81JbkOEadSYLLJPMMezkznfblUSrkDHWM3hHsk0RpB8pt78F21qqx9JOIOaS1N49JrViVYoKy+ZZBuUvvt7jFcFcznYDF6habJ0CpmfjuKO1JwQtYO8Penxle8S9BVRhSpKjJN4TlWfE/eh/GVPj0RvwMzbNv+gjNcFPdoYFy+61qGno1tEFQc2/18IyiudtO841xjy4h0mz1lc0pmjBY/l9KI8oUbafN7MxQHzesgFH/Gdm8t+t5pRjZT6/A83TZkCmXmu9ij7Vi65nsAG6AgfGtcepk5GK0rqBhFbwcurNof8QL1K58ZreOr+hWTUc4z/Z3urTRWqWAyMtNBotz7ettUal/G9Nzu2Jf3HllFJ6MZpzFc7IdUG8Qj+KDoEJbxTHLw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(7636003)(6666004)(26005)(54906003)(8936002)(508600001)(356005)(36860700001)(55016002)(36756003)(316002)(4326008)(86362001)(47076005)(7696005)(107886003)(6286002)(16526019)(70206006)(2616005)(8676002)(82310400003)(70586007)(5660300002)(6916009)(83380400001)(2906002)(186003)(336012)(1076003)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 09:18:53.7702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8fce80ee-a12a-4eaf-0c2e-08d99eaaf4d4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4279 Subject: [dpdk-stable] [PATCH v2] common/mlx5: fix physical port name recognition X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Xueming Li [ upstream commit 59df97f1a832a0edfd7f77ffbe5149e553e860b5 ] While device probing mlx5 PMD get the physical port name and checks against the set of patterns. If there is no any pattern match, the driver assumes the port belongs to PF device, this behaviour provides compatibility with legacy kernel drivers (before and early SR-IOV support). The newer kernels added the PCI subfunction support and representor names with pattern like pf0sf1. This pattern was not recognized by PMD and the first found subfunction representor was considered as master device. This patch supports representor name parsing for SF, and SF representors are just ignored by PMD (as there is no support for SF in 20.11-LTS release). Signed-off-by: Xueming Li Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/mlx5_common_os.c | 32 +++++++++++++++------- drivers/common/mlx5/linux/mlx5_nl.c | 3 ++ drivers/common/mlx5/mlx5_common.h | 2 ++ drivers/net/mlx5/linux/mlx5_ethdev_os.c | 3 ++ 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 0edd78ea6d..5cf9576921 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -97,22 +97,34 @@ void mlx5_translate_port_name(const char *port_name_in, struct mlx5_switch_info *port_info_out) { - char pf_c1, pf_c2, vf_c1, vf_c2, eol; + char ctrl = 0, pf_c1, pf_c2, vf_c1, vf_c2, eol; char *end; int sc_items; - /* - * Check for port-name as a string of the form pf0vf0 - * (support kernel ver >= 5.0 or OFED ver >= 4.6). - */ + sc_items = sscanf(port_name_in, "%c%d", + &ctrl, &port_info_out->ctrl_num); + if (sc_items == 2 && ctrl == 'c') { + port_name_in++; /* 'c' */ + port_name_in += snprintf(NULL, 0, "%d", + port_info_out->ctrl_num); + } + /* Check for port-name as a string of the form pf0vf0 or pf0sf0 */ sc_items = sscanf(port_name_in, "%c%c%d%c%c%d%c", &pf_c1, &pf_c2, &port_info_out->pf_num, &vf_c1, &vf_c2, &port_info_out->port_name, &eol); - if (sc_items == 6 && - pf_c1 == 'p' && pf_c2 == 'f' && - vf_c1 == 'v' && vf_c2 == 'f') { - port_info_out->name_type = MLX5_PHYS_PORT_NAME_TYPE_PFVF; - return; + if (sc_items == 6 && pf_c1 == 'p' && pf_c2 == 'f') { + if (vf_c1 == 'v' && vf_c2 == 'f') { + /* Kernel ver >= 5.0 or OFED ver >= 4.6 */ + port_info_out->name_type = + MLX5_PHYS_PORT_NAME_TYPE_PFVF; + return; + } + if (vf_c1 == 's' && vf_c2 == 'f') { + /* Kernel ver >= 5.11 or OFED ver >= 5.1 */ + port_info_out->name_type = + MLX5_PHYS_PORT_NAME_TYPE_PFSF; + return; + } } /* * Check for port-name as a string of the form p0 diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c index 1f765dca07..145e354b2c 100644 --- a/drivers/common/mlx5/linux/mlx5_nl.c +++ b/drivers/common/mlx5/linux/mlx5_nl.c @@ -789,6 +789,7 @@ mlx5_nl_mac_addr_sync(int nlsk_fd, unsigned int iface_idx, int i; int ret; + memset(macs, 0, n * sizeof(macs[0])); ret = mlx5_nl_mac_addr_list(nlsk_fd, iface_idx, &macs, &macs_n); if (ret) return; @@ -1201,6 +1202,8 @@ mlx5_nl_check_switch_info(bool num_vf_set, case MLX5_PHYS_PORT_NAME_TYPE_PFHPF: /* Fallthrough */ case MLX5_PHYS_PORT_NAME_TYPE_PFVF: + /* Fallthrough */ + case MLX5_PHYS_PORT_NAME_TYPE_PFSF: /* New representors naming schema. */ switch_info->representor = 1; break; diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index a484b74b9c..4c75addd08 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -153,6 +153,7 @@ enum mlx5_nl_phys_port_name_type { MLX5_PHYS_PORT_NAME_TYPE_UPLINK, /* p0, kernel ver >= 5.0 */ MLX5_PHYS_PORT_NAME_TYPE_PFVF, /* pf0vf0, kernel ver >= 5.0 */ MLX5_PHYS_PORT_NAME_TYPE_PFHPF, /* pf0, kernel ver >= 5.7, HPF rep */ + MLX5_PHYS_PORT_NAME_TYPE_PFSF, /* pf0sf0, kernel ver >= 5.0 */ MLX5_PHYS_PORT_NAME_TYPE_UNKNOWN, /* Unrecognized. */ }; @@ -161,6 +162,7 @@ struct mlx5_switch_info { uint32_t master:1; /**< Master device. */ uint32_t representor:1; /**< Representor device. */ enum mlx5_nl_phys_port_name_type name_type; /** < Port name type. */ + int32_t ctrl_num; /**< Controller number (valid for c#pf#vf# format). */ int32_t pf_num; /**< PF number (valid for pfxvfx format only). */ int32_t port_name; /**< Representor port name. */ uint64_t switch_id; /**< Switch identifier. */ diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index f641cb936e..08b51b7dc8 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -1013,6 +1013,9 @@ mlx5_sysfs_check_switch_info(bool device_dir, /* New representors naming schema. */ switch_info->representor = 1; break; + default: + switch_info->master = device_dir; + break; } } -- 2.18.1