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 C043B46211 for ; Thu, 13 Feb 2025 11:00:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BC90742ECF; Thu, 13 Feb 2025 11:00:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id F3BDF42ED0 for ; Thu, 13 Feb 2025 11:00:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M4EEW2f5txNqg/3P7sHmy8dsLTP49/7pNfohaiftV28=; b=Jw6GXyILgloCB7K0MmCn64MIXGbFPcWWZp/OPxazn87T47M2gqbrUz+1oMVQYsHWOMmeGB 7J5lLf3fYGGsvJjQW5KV/afxFIvySTIL3KaNACQuBoadhYQnmdHsOzR0xUHD4YtukBV3hD G31KrLaPVVmf/xj+lvbeh8TA+7LV4Q4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-189-nPRuJCMhPlizXzQl-tstvQ-1; Thu, 13 Feb 2025 04:59:58 -0500 X-MC-Unique: nPRuJCMhPlizXzQl-tstvQ-1 X-Mimecast-MFC-AGG-ID: nPRuJCMhPlizXzQl-tstvQ_1739440797 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 169C71800570; Thu, 13 Feb 2025 09:59:57 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0557D1800872; Thu, 13 Feb 2025 09:59:54 +0000 (UTC) From: Kevin Traynor 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 24.11.2 Date: Thu, 13 Feb 2025 09:57:32 +0000 Message-ID: <20250213095933.362078-5-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yADCTbUZPbcecjviaZyY_VlXaAGR5LoUNIxLiThDRXY_1739440797 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/821f370cbf4f3031197c8980dec2827fe03b811b Thanks. Kevin --- >From 821f370cbf4f3031197c8980dec2827fe03b811b 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 [ 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 d29d15494c..05a7e5902f 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -845,12 +845,4 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) int ret = 0; - VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); - - if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) { - VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u queue pairs", - VHOST_MAX_QUEUE_PAIRS); - return -1; - } - pthread_mutex_lock(&vhost_user.mutex); vsocket = find_vhost_user_socket(path); @@ -873,4 +865,13 @@ rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs) } + VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u", max_queue_pairs); + + if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) { + VHOST_CONFIG_LOG(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; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:35.181348861 +0000 +++ 0005-vhost-fix-log-when-setting-max-queue-num.patch 2025-02-12 17:29:34.125944587 +0000 @@ -1 +1 @@ -From 274292190d1384b028552adc601dda4b197f2417 Mon Sep 17 00:00:00 2001 +From 821f370cbf4f3031197c8980dec2827fe03b811b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 274292190d1384b028552adc601dda4b197f2417 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org