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 86C464625C for ; Tue, 18 Feb 2025 13:36:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C8C2402E1; Tue, 18 Feb 2025 13:36:20 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) by mails.dpdk.org (Postfix) with ESMTP id 9C91E402A0 for ; Tue, 18 Feb 2025 13:36:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q/HRxGsW80n1kjj2lJ63wpASSmT06MV/RsF7o1fbSgS2ze4Lp3V+HVYVQZXgvFUxFbQ8ptEFrx9vvBsFL2fuxfW0485UckxR1ibTIGez6lxrVIm/dP9/o7iJ7Pd8yahNSsLBLaIYjf7Ot57PYn+OWDbq6lyBcNjvIxcsgAjKgGzmw6l2egjlJ5VSV4NqMHwN57yrUTclMn9WP+gofnrkEgqhgTrcHLUjS+3/Jxz/jWhBgjEh31gbiJIi/g5MG6UPlpaEAy4BfGQqh29oANFs7Sgl2OueufyRVqbrv9beTivWhoab+2VgvNfyCpLLh/u7BB48NVa0k03GnNNMg8TmRg== 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=mSnyRwZp4noUyjLZNCJvTk4LhVgI7qF7C+1i3TF5Hts=; b=czNGYTwWxdTJkR+EVkh92TZH1P+YShydO8M596h/c45TxXKuJeOtdL4vIV7btwj6IGWhYNvNZdGkd/lofmCelai24+++H3EqArgPsmIL7UpaV+xRW+mH9kcE+olS4YIo1cxdMxdq4X4PpQf1b4vLdmGYy7EqKdM/rNqXnQiefvEzorpof7uyR8e4UdlqApubg9Xey4sog2wNKXnEC+nN4SDe5ADGFGXxrFTHYcjbFnLE13DB9fecyqZp63Owc3kPM8PpYku5tCIgljKYUsVxLrHYUu0jjMdsWL5pDKid0mFstP1YecT+X47fLsWm2S2dIhwOe/HL/nqKhgC1IpSr3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.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=mSnyRwZp4noUyjLZNCJvTk4LhVgI7qF7C+1i3TF5Hts=; b=e4nw/SlC5hcpl6H/nMfXbAkvASexXA/4k7MDbWPS4zwi8Cgr+ONR2G7v+QGtMd1D1UcLizspUPoHfc7EczQlI4zSJkmtvckkx7jObh6kHUXxthEzSrq9BxKDraAM5p4EhKYRNaHeBxcDgQrr9uMNINMOzJAGys46jIgWGFzcIMVvjYS9SmDDUOXdeLdFHBNf2UM1cj/V2qmR3WI4cg0pQrU4Gp5/tSdCfSv7rTal36wp09j5iA/WX+mYSqUDb7ErTSPg9+Qj3gDLVbdBojsZ7mZcr1VSgSkoHhwfxHLUWZ7pKTM2CbiIvIMhPKAm+Gs+V0V871q0/DQSCzbMEMCJeg== Received: from BYAPR08CA0067.namprd08.prod.outlook.com (2603:10b6:a03:117::44) by CH3PR12MB7523.namprd12.prod.outlook.com (2603:10b6:610:148::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:36:14 +0000 Received: from MWH0EPF000989E7.namprd02.prod.outlook.com (2603:10b6:a03:117:cafe::7a) by BYAPR08CA0067.outlook.office365.com (2603:10b6:a03:117::44) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:36:14 +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 MWH0EPF000989E7.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:36:13 +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; Tue, 18 Feb 2025 04:36:00 -0800 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; Tue, 18 Feb 2025 04:35:57 -0800 From: Xueming Li To: Maxime Coquelin CC: , Ilya Maximets , Chenbo Xia , Kevin Traynor , dpdk stable Subject: patch 'vhost: fix log when setting max queue num' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:33:59 +0800 Message-ID: <20250218123523.36836-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: MWH0EPF000989E7:EE_|CH3PR12MB7523:EE_ X-MS-Office365-Filtering-Correlation-Id: 95bb952e-5b7b-4adf-7544-08dd5018d50b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YW971/2UPwjzq52tZNIXhGyE1Qoqcrit/hPersiH5kgDDLx43P40zFnUkbTg?= =?us-ascii?Q?rHPAYkNglqrt3pVmKcao29dXHCd5cehv/XieZg+51fh7De1Ss8pN0VxujIPJ?= =?us-ascii?Q?Az82ZPxRub9j3kn9JBUHhF4YdeNfllwcPFaP+HUqhDF4kO+XpmLAB4Ew7nCF?= =?us-ascii?Q?Uc99cbz9v2uQvvk538TbMaWLu4HSfwR67MuXiz9sW2SusFsnNCCVv0P6R7Jw?= =?us-ascii?Q?ovXOwHsax70n+vnv6ki8W65izOG46ai9FE97/N5WK14HRDCYIJPTi/z9kdgY?= =?us-ascii?Q?Djw6/heKUm4S1VdU4uQ6HK2HhdSt4RZzQh4cnQ+PRIbcqZIsLjos0wUvVTn4?= =?us-ascii?Q?w++ipXSYBcCMIqN9J7rMaZ43r5uA9Z8phljZQ21pBpVaOS5ZePVRghgJh8qj?= =?us-ascii?Q?wf/k6XMvZjuuhtjnlmLePoAG6zFrXYeOpHnmUgltJzRBFHddEKS2HhCVagyC?= =?us-ascii?Q?spMjvih7B4uUxCEA7Q0/I7xp3s9IeZXYdwJPpSY9Y26c+LPgRhe9RP2Dwmxn?= =?us-ascii?Q?VpPwl8Vll3DXC7rd56iSlg249ya5PXyAhtDpcKkYaGCyevBAVQb8TAOKHpim?= =?us-ascii?Q?59BocWw3JAnW/lUknKec4afyxt4tdZodcra9o4/gjM5C8DOKyLMI4azXz7OK?= =?us-ascii?Q?xnkz1UycoTqfxQlylhJRXzE0WGotg6sb+yLstQgZCUsuB9KMPj2S5MSzrmGb?= =?us-ascii?Q?O3Nuk4OnsNDoHRNBX8me1HzKxccQbNig0uIDQQ0xv+HUxakCCZHR8LsIrZfE?= =?us-ascii?Q?u3ct+Wp7iJEQZbpdR1ClgsxrFD/uU4qMff3GKjAxraw7e8Wp+pqfu13+Mo9y?= =?us-ascii?Q?LRDbhm6bSmkv9VG3pnxyfUYpHcHuKVK/UmCEnmIzW4QC6ILCmAyffyq6/O6a?= =?us-ascii?Q?9lq18sPolXYay6aPOOBtsVqmAPH5czkD76nAOxwsnbJfMbaaCXVZz6bpVPR7?= =?us-ascii?Q?LBgHfvdA+nCHjOlqHF0Bg7Ah7kPeXE4NYc4YzsMEklPIFUhj1Owxahl7veo1?= =?us-ascii?Q?TuQW8CbUVN/Jr+nzS8OOxFZc1E0AgGi5uqf1GKHG0ALHL5LrgAyVdfrQ7kv2?= =?us-ascii?Q?GHrfylgMtrR0B4TZINuJHDgW3rQ+h1YQo7W5eNLHkkBoIsFDZF6D/N9drtnd?= =?us-ascii?Q?2KblpAGOEIUxlTB3fDw0bXBRmab4sw7SH/ujAMx2MO9R+0iRqtB/72fU/as4?= =?us-ascii?Q?YrVmolmsYG6Cvu4LbxwkAWfBdCJemX7Xm3WIbkwZHQahdtYAoubRdPwKtLcz?= =?us-ascii?Q?TYVgN6kGQaN/LQmzCUNxTog/IVoX1hm9mWj3lYjWIEUqUUlPkSowTWZn16xl?= =?us-ascii?Q?EAi8O62r8TqDAPLiWHQGjtxSjKrd+IaNybx6MHulQO6gurjrbQR9rWkTmV0G?= =?us-ascii?Q?NDjRMOU1Mwcs4wnrHMACHWG54lDrZsA3KKiQk4MnNeSKKfyk4Wk4IegplgMX?= =?us-ascii?Q?qbyyl4a4QhzEbd0g4T0Jojp55DuF+BI1nlzlaHOWjAZGGu8+tG7QKUzxsS/H?= =?us-ascii?Q?BRcfStow50wosyY=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)(36860700013)(376014)(1800799024)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:36:13.9901 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95bb952e-5b7b-4adf-7544-08dd5018d50b 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: MWH0EPF000989E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7523 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=e099c1e17e8dda291975db45ef6298a6c87e84cc Thanks. Xueming Li --- >From e099c1e17e8dda291975db45ef6298a6c87e84cc Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 9 Jan 2025 15:31:30 +0100 Subject: [PATCH] vhost: fix log when setting max queue num Cc: Xueming Li [ upstream commit 274292190d1384b028552adc601dda4b197f2417 ] rte_vhost_driver_set_max_queue_num API returns early when called for a Vhost-user device, as this API is intended to limit the maximum number of queue pairs supported by VDUSE devices. However, a log mentioning the maximum number of queue pairs is being set is emitted unconditionally, which may confuse the end user. This patch moves this log after the backend type is checked, so that it is only called with VDUSE backends. The check on the requested value is also moved at the same place. Fixes: e1808999d36b ("vhost: restrict set max queue pair API to VDUSE") Signed-off-by: Maxime Coquelin Reviewed-by: Ilya Maximets Reviewed-by: Chenbo Xia Acked-by: Kevin Traynor --- lib/vhost/socket.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index ffb8518e74..6cf76eb7ae 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -849,14 +849,6 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) struct vhost_user_socket *vsocket; int ret = 0; - VHOST_LOG_CONFIG(path, INFO, "Setting max queue pairs to %u\n", max_queue_pairs); - - if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) { - VHOST_LOG_CONFIG(path, ERR, "Library only supports up to %u queue pairs\n", - VHOST_MAX_QUEUE_PAIRS); - return -1; - } - pthread_mutex_lock(&vhost_user.mutex); vsocket = find_vhost_user_socket(path); if (!vsocket) { @@ -876,6 +868,15 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) goto unlock_exit; } + VHOST_LOG_CONFIG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); + + if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) { + VHOST_LOG_CONFIG(path, ERR, "Library only supports up to %u queue pairs", + VHOST_MAX_QUEUE_PAIRS); + ret = -1; + goto unlock_exit; + } + vsocket->max_queue_pairs = max_queue_pairs; unlock_exit: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:00.901479401 +0800 +++ 0004-vhost-fix-log-when-setting-max-queue-num.patch 2025-02-18 19:39:00.398244087 +0800 @@ -1 +1 @@ -From 274292190d1384b028552adc601dda4b197f2417 Mon Sep 17 00:00:00 2001 +From e099c1e17e8dda291975db45ef6298a6c87e84cc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 274292190d1384b028552adc601dda4b197f2417 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index d29d15494c..05a7e5902f 100644 +index ffb8518e74..6cf76eb7ae 100644 @@ -33 +35 @@ -@@ -844,14 +844,6 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) +@@ -849,14 +849,6 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) @@ -37 +39 @@ -- VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); +- VHOST_LOG_CONFIG(path, INFO, "Setting max queue pairs to %u\n", max_queue_pairs); @@ -40 +42 @@ -- VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u queue pairs", +- VHOST_LOG_CONFIG(path, ERR, "Library only supports up to %u queue pairs\n", @@ -48 +50 @@ -@@ -872,6 +864,15 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) +@@ -876,6 +868,15 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) @@ -52 +54 @@ -+ VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); ++ VHOST_LOG_CONFIG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); @@ -55 +57 @@ -+ VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u queue pairs", ++ VHOST_LOG_CONFIG(path, ERR, "Library only supports up to %u queue pairs",