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 893C546211 for ; Thu, 13 Feb 2025 10:59:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 817B040287; Thu, 13 Feb 2025 10:59:57 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id A538342EC3 for ; Thu, 13 Feb 2025 10:59:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440796; 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=/GQvCpXtMlWa2f3POrDkz/BDr4C38aJ6W6fQRSX+pyw=; b=PfnGJkyWWVdW3tMPv2KIPxhIyT7LOQv1jZU+mjIdKmS/DygD7IvsvgC3M+Gopp66EX+tco hK+MTyXvtMKbD0bYA0nbSnbGS3bjNbn9HYhGaxkQHzln/rCH+1Q6sk+CTnBYYrFtuPGNDV qzXct0a+1v8IuNCItKL6aTHAAsc1UEY= Received: from mx-prod-mc-06.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-542-HdEqy5lRNXu85RZqm1CNaw-1; Thu, 13 Feb 2025 04:59:52 -0500 X-MC-Unique: HdEqy5lRNXu85RZqm1CNaw-1 X-Mimecast-MFC-AGG-ID: HdEqy5lRNXu85RZqm1CNaw 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 116611800268; Thu, 13 Feb 2025 09:59:52 +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 1985D1800570; Thu, 13 Feb 2025 09:59:49 +0000 (UTC) From: Kevin Traynor To: Jianping Zhao Cc: Maxime Coquelin , dpdk stable Subject: patch 'vhost: clear ring addresses when getting vring base' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:30 +0000 Message-ID: <20250213095933.362078-3-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: pUy2juZimNx9RTZWnL8Ods4_tPe1DR2iVAkJ4lO1lug_1739440792 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/f57032f4378a07608aa907883fd9a762ade4b962 Thanks. Kevin --- >From f57032f4378a07608aa907883fd9a762ade4b962 Mon Sep 17 00:00:00 2001 From: Jianping Zhao Date: Wed, 27 Nov 2024 10:03:49 +0800 Subject: [PATCH] vhost: clear ring addresses when getting vring base [ upstream commit 1846fe767f00a9d0dade333e7838f81e6721b694 ] Clear ring addresses during vring base retrieval to handle guest reboot scenarios correctly. This is particularly important for vdpa-blk devices where the following issue occurs: When a guest OS with vdpa-blk device reboots, during UEFI stage, only one vring is actually used and configured. However, QEMU still sends enable messages for all configured queues. The remaining queues retain their addresses from before reboot, which reference invalid memory mappings in the rebooted guest. The issue manifests in vq_is_ready(): static bool vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq) { /* Only checks pointer validity, not address freshness */ rings_ok = vq->desc && vq->avail && vq->used; ... } vq_is_ready() incorrectly considers these queues as ready because it only checks if desc/avail/used pointers are non-NULL, but cannot detect that these addresses are stale from the previous boot. Clear the ring addresses in vhost_user_get_vring_base() to force the guest driver to reconfigure them before use. This ensures that vq_is_ready() will return false for queues with stale addresses until they are properly reconfigured by the guest driver. Fixes: 3ea7052f4b1b ("vhost: postpone rings addresses translation") Signed-off-by: Jianping Zhao Reviewed-by: Maxime Coquelin --- .mailmap | 1 + lib/vhost/vhost_user.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 818798273f..1a1744df4d 100644 --- a/.mailmap +++ b/.mailmap @@ -674,4 +674,5 @@ Jianfeng Tan Jiang Yu Jiangu Zhao +Jianping Zhao Jianwei Ma Jianwei Mei diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 6d92ad904e..52d8078d7c 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2278,4 +2278,5 @@ vhost_user_get_vring_base(struct virtio_net **pdev, rte_rwlock_write_lock(&vq->access_lock); vring_invalidate(dev, vq); + memset(&vq->ring_addrs, 0, sizeof(struct vhost_vring_addr)); rte_rwlock_write_unlock(&vq->access_lock); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:34.969644619 +0000 +++ 0003-vhost-clear-ring-addresses-when-getting-vring-base.patch 2025-02-12 17:29:34.118944545 +0000 @@ -1 +1 @@ -From 1846fe767f00a9d0dade333e7838f81e6721b694 Mon Sep 17 00:00:00 2001 +From f57032f4378a07608aa907883fd9a762ade4b962 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1846fe767f00a9d0dade333e7838f81e6721b694 ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org @@ -46 +47 @@ -index b90ff0444c..cc1ffe1ad9 100644 +index 818798273f..1a1744df4d 100644 @@ -49 +50 @@ -@@ -675,4 +675,5 @@ Jianfeng Tan +@@ -674,4 +674,5 @@ Jianfeng Tan