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 8F40546A63 for ; Thu, 26 Jun 2025 14:06:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A738402A3; Thu, 26 Jun 2025 14:06:51 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) by mails.dpdk.org (Postfix) with ESMTP id 704DE400D6 for ; Thu, 26 Jun 2025 14:06:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dJOwRVHmqElBSEvtoSs+pveijqdTxM92zlc/lEkzC7ZXtarWFUKVmYsjV4y77HCm+9yr7WcL7GaYyIaZtg0IuCk8oWCPDnwyWsFKyqTwEknIWgoy+z1wE6NUtPTrNr3/T7GZqm9bYWPkOugIuBV/EmK1fX8cK9pismc1xSwWbvYGWfyvo2y+PFla1A0vSEzP863OcYvZEc5B2JGp2IRxm/5ptV/Y6QIIy5JJ7n2qlgaOnxmtY71pXUZaiZA2gJsAT8YlveirgXzpqp7PEqDT4H8ObSzP34/RuMRlfAylOxB+8aOj0rlqqvtaXgiU7Uq8AH0ohTDbuRri9312ty7LXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=OZ3Ap/Q4jXJatzdxBq6B2uUrmsal5j0zitSjKc5mugE=; b=R8rE2uGYyMsTPukjJXO8X9x1j66XqVprPMIMU9S6oKq09kLfCNfJQk/Q4k38TStsjopC0VtuFC4rJ3iP9WqVhOjz64g5IIdonhzrXMPCYWTrJD6GCKv8/gmaAB7v58YzIl3Czx0wyVDfcsVHXvh98S8aW8G3iBlsvEQXYyiu5kaYOqNm5tRRt7KPRQNGpDgLrT93dy0t+habTacP3ZvbNOozq0JtCNha4ReHlgb/Z26eQK43KaoYFC0w0CsVC0rCk0PCsVZR0JdMYtwVa+gx2Oyt/76pP8G0tvaKWg2lt0NGZxKGxm4oeW/B7nF5bD9vF0nFCGxH3PN8XX3T6O8aOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=OZ3Ap/Q4jXJatzdxBq6B2uUrmsal5j0zitSjKc5mugE=; b=N42rlcwNGmnzV5OCxcwIkYETfiQ8O2m75c5YGMOqK5ZE+5EkrZvWhQJ612kJYJkr8EnLuICiKjbA8RjydfmctDP0MInpqZatw1CvdfPntEnAHrieuCEJ4tvi/2Gcf/xiU3FzfJsGz3dp486Tu1dKFrKo02aI8gR38F9ndQfgfEnI0VLN9LzaX5hPljSYulgSmi+0mifT5cW9/ky92XKgaIlB+vh+g2azz/R3ktQdv99siRqvrz2YwKsw0z5GcEqX9gJvL1bDmHPusC1vR0rRzs6yz7H+utbgm6DqwePWtnOnm4pTjPfzJLdk9bBJbYr9bIrZ9nOdI1DC2Ilrb6SIOQ== Received: from MW4PR03CA0100.namprd03.prod.outlook.com (2603:10b6:303:b7::15) by CY8PR12MB7217.namprd12.prod.outlook.com (2603:10b6:930:5b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.21; Thu, 26 Jun 2025 12:06:47 +0000 Received: from SJ5PEPF000001D1.namprd05.prod.outlook.com (2603:10b6:303:b7:cafe::4d) by MW4PR03CA0100.outlook.office365.com (2603:10b6:303:b7::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8857.31 via Frontend Transport; Thu, 26 Jun 2025 12:06:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ5PEPF000001D1.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:06:47 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:06:31 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 26 Jun 2025 05:06:29 -0700 From: Xueming Li To: Long Li CC: Xueming Li , dpdk stable Subject: patch 'net/mana: check vendor ID when probing RDMA device' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:11 +0800 Message-ID: <20250626120145.27369-52-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D1:EE_|CY8PR12MB7217:EE_ X-MS-Office365-Filtering-Correlation-Id: 3399de11-19ca-4d47-0d51-08ddb4a9ecd7 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VF0q99cr9hcqCpaSa31vvExIxQoOgG2SJxok6A5nvXk9uMxRvNI8AjjT0jLn?= =?us-ascii?Q?ZljXqM0bZioFOBU/IMv/B0nduQ7wp4f8lvhNLFBnz+cYaYrPQ7K+3Q5hB8gR?= =?us-ascii?Q?1qSMETit0SjS8KiXN/zIyVdM9PYCngXuTK5eFXiBinG2Ybroqk4Zgo5j5pis?= =?us-ascii?Q?2Nat8eMilli7fvlq6gf5EV+VngnUkKKkOwb1I32/Lf4AgxRyMvgt++obm3Lc?= =?us-ascii?Q?8ymieYW4JUXjUfLXBMygI0Fj441AasXwj34l0mOr66n3xsQuutP2mzIdMayc?= =?us-ascii?Q?a8NotsqRtb8k/heIRO7ewehNEJ9Usk4enDZBao2KT+muRmRAhP04ygtvkLzn?= =?us-ascii?Q?gHXsD3S5gdNVardBSbz7q+D72wP7FbEu5roirse4A2c+znWYzZ+oI7Bjsbcm?= =?us-ascii?Q?S+7jTw73TSecZjLqYlYXtHxkIya8WtqUltYOyssZ7Y3RU6Oqvgvs476wAlA0?= =?us-ascii?Q?7d7J4FSIiPnmb/tdfWMCAf+JAprzdJYEBrDK3PHfoJmOPtQJKFrz6EAPUzVp?= =?us-ascii?Q?evG77DyYTfE9Ra1y9rqy3P0XThyfzHPW1LiqzUGLYCX7VoFFiExwGmrZtcGA?= =?us-ascii?Q?RXqy3blUyLQes+aSUN6NlNOMciOtgbn5chewJxmIQFsjNx13iV3JPB1fGN/R?= =?us-ascii?Q?6PlbIPnfbmC5HOkdSdBvPWQoTBETtIZNeiw//+OT5xicI9AES1qaAMzHiLnD?= =?us-ascii?Q?5JIYn2PPtMNipE+J+Nv+ANGfcPdrqfcTNhuPC2l9qyBzKjSQu/Pewd53+JXV?= =?us-ascii?Q?jxIRBCNBw4Gourc4JwsuRmshLklxKcSP1TWs3nP1Gf+UkYiw5/PVgzDlkgpD?= =?us-ascii?Q?iaSmWyDAvaGXqZ+xaPGOQNXZsWoJaoeeiiN5szRBmdMxN2YYtPhydTzwd+S1?= =?us-ascii?Q?mKrxejWJkof2vbHxKoB/Q/5zvrPaU+NwtEkxr/7LN/v2NE0NBkyGfsSfxJIr?= =?us-ascii?Q?U7a+6YX78Jas+1CxJJiX07TXwuDleZotLbkqybrh8Na8gnfXaB5eIYWAIe7f?= =?us-ascii?Q?yNBn/NfHDk2GZaH2LfqJGu89hHv8l/rZYjdP8jVezQKGghA45yXsG6nabZAK?= =?us-ascii?Q?lbiojKhyCsnXqRuOg7GV0FmHXMXquh4w3aTAKR+yxMLCpzc0yryXGWMLVYV9?= =?us-ascii?Q?9zDZ1NB2A/VSglrz1nKpsodfdt/T4L6ECRtHFOL1ff/Omb/EhaXtRv97cQgA?= =?us-ascii?Q?hBdpNWcQ09X6Tzn2OllDvqzZb0X8F+bQa6QcpFxtacSKd7mhP1PE5cb6gPtB?= =?us-ascii?Q?63rOXtic9pY7jPzcwlXmk6LLvzB8CxWmQEOmSG+iu/HcBIoWjsabWiHpETlG?= =?us-ascii?Q?Szx8rEo2f2uVZsKJPfPmw+XMOSlsXv8uzXQJ78svoyjKgqFD23OMaUk3+HSI?= =?us-ascii?Q?Qvt7Gs+EsUT7zOwJK/RMdYtiaN0+PT9c4QfEBTvJmkmDsrSrk/buhUCTgZUb?= =?us-ascii?Q?IG9YMbY+zJiQ52fwaccJL/kXcZu/hHQmsZAv1mfHM0oIPnk22VtO/wF5X3Ak?= =?us-ascii?Q?39yqu3L/fjJ5T2fBgJPOlmTlKSeCdLGD4uXeG327x22LRSxZgLLSnNRy/w?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:06:47.2063 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3399de11-19ca-4d47-0d51-08ddb4a9ecd7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7217 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 Hi, FYI, your patch has been queued to stable release 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2e2c96c0385d790636c1adee23c938ac5ad01200 Thanks. Xueming Li --- >From 2e2c96c0385d790636c1adee23c938ac5ad01200 Mon Sep 17 00:00:00 2001 From: Long Li Date: Mon, 12 May 2025 14:52:02 -0700 Subject: [PATCH] net/mana: check vendor ID when probing RDMA device Cc: Xueming Li [ upstream commit be4ed96378811e572860cac558bff54b5c361992 ] The RDMA kernel driver may expose two MANA RDMA devices, for RC and RAW QP types. The purpose is to support fast service mode at SOC. Depending on kernel version, the probe may fail if DPDK picks up the wrong device. Add check for vendor_part_id and RAW QP capability when probing the MANA device. This check is compatible with all kernel versions. Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment") Signed-off-by: Long Li --- drivers/net/mana/mana.c | 14 ++++++++++++++ drivers/net/mana/mana.h | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c index c0ff132fe1..ea164bc259 100644 --- a/drivers/net/mana/mana.c +++ b/drivers/net/mana/mana.c @@ -1486,6 +1486,20 @@ mana_pci_probe_mac(struct rte_pci_device *pci_dev, continue; } + if (dev_attr.orig_attr.vendor_part_id) { + if (dev_attr.orig_attr.vendor_part_id != + GDMA_DEVICE_MANA) { + DRV_LOG(INFO, "Skip device vendor part id %x", + dev_attr.orig_attr.vendor_part_id); + continue; + } + if (!dev_attr.raw_packet_caps) { + DRV_LOG(INFO, + "Skip device without RAW support"); + continue; + } + } + for (port = 1; port <= dev_attr.orig_attr.phys_port_cnt; port++) { struct rte_ether_addr addr; diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h index 7931a443a4..31b949ef33 100644 --- a/drivers/net/mana/mana.h +++ b/drivers/net/mana/mana.h @@ -12,6 +12,10 @@ struct mana_shared_data { RTE_ATOMIC(uint32_t) secondary_cnt; }; +/* vendor_part_id returned from ibv_query_device */ +#define GDMA_DEVICE_MANA 2 +#define GDMA_DEVICE_MANA_IB 3 + #define MANA_MAX_MTU 9000 #define MIN_RX_BUF_SIZE 1024 #define MANA_MAX_MAC_ADDR 1 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.798058343 +0800 +++ 0051-net-mana-check-vendor-ID-when-probing-RDMA-device.patch 2025-06-26 19:59:17.414418043 +0800 @@ -1 +1 @@ -From be4ed96378811e572860cac558bff54b5c361992 Mon Sep 17 00:00:00 2001 +From 2e2c96c0385d790636c1adee23c938ac5ad01200 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit be4ed96378811e572860cac558bff54b5c361992 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 2934da29f7..c42a987a30 100644 +index c0ff132fe1..ea164bc259 100644 @@ -26 +28 @@ -@@ -1490,6 +1490,20 @@ mana_pci_probe_mac(struct rte_pci_device *pci_dev, +@@ -1486,6 +1486,20 @@ mana_pci_probe_mac(struct rte_pci_device *pci_dev, @@ -48 +50 @@ -index 855d98911b..6309cae76b 100644 +index 7931a443a4..31b949ef33 100644