From nobody Thu May 16 09:44:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658825653; cv=none; d=zohomail.com; s=zohoarc; b=nHg6xSXVYhiC87Piw0uiaq9zsRV4jeHaiQ1nxH3DZKm2PiSEUY4OeCgPr1NY2yXiU3bj+fKM85Nb5xwy7AJCCD6+z/TpDnGpc5INfm2BOOabku59oSP0+7GmMSgJMUuInsZT8B8Rc6nc88YOu6IIccY1cnpkPnHuYnCXg1FSes8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658825653; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l8aSav+29oJzxnp6tOaz2V0cLdh7Tr2uiOGMFX0cq84=; b=Z+RT4w1kfUnh1ke5jdrziWv7SZRSH41aiGrVo1jZl+fiO8cm6tHwfkrKbjwzBCGKFGYgXJqlIwzYseg6OnNjTsNj/OaMVVswm9aFxyBQ4x4osdGnKsYFHy3/1ygosiHFCEA5Vjc4m+plUcasFB8U+e9sVMkoMDgLo5+AglsW51E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658825653015576.0546721482359; Tue, 26 Jul 2022 01:54:13 -0700 (PDT) Received: from localhost ([::1]:38578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGGKR-0001EY-T1 for importer@patchew.org; Tue, 26 Jul 2022 04:54:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHU-0007Ie-88 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHQ-0000ux-Ij for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:05 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-178-lkymBlu9NhmFYIXa74so4g-1; Tue, 26 Jul 2022 04:51:02 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42466801755; Tue, 26 Jul 2022 08:51:02 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-201.pek2.redhat.com [10.72.12.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DB46492CA2; Tue, 26 Jul 2022 08:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658825463; 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=l8aSav+29oJzxnp6tOaz2V0cLdh7Tr2uiOGMFX0cq84=; b=JqD3Rgdun/J6rhYC5FMl/gE6ZWGzxUD75gwniJ58Z/wF4kdSeCAPzYxgTa0rTPnPH3hu8O eUdyPs7ntWt9MrC49eCF+e2u7BfmbC31YE6tZFWyvjsXAfsGp2YEY4+MTCJCZPa32AKrSu sma6xHgmXlva0sjvyRn4kVJPFK0Hq9E= X-MC-Unique: lkymBlu9NhmFYIXa74so4g-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Ake Koomsin , Jason Wang Subject: [PULL 1/3] e1000e: Fix possible interrupt loss when using MSI Date: Tue, 26 Jul 2022 16:50:53 +0800 Message-Id: <20220726085055.17239-2-jasowang@redhat.com> In-Reply-To: <20220726085055.17239-1-jasowang@redhat.com> References: <20220726085055.17239-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658825654372100001 Content-Type: text/plain; charset="utf-8" From: Ake Koomsin Commit "e1000e: Prevent MSI/MSI-X storms" introduced msi_causes_pending to prevent interrupt storms problem. It was tested with MSI-X. In case of MSI, the guest can rely solely on interrupts to clear ICR. Upon clearing all pending interrupts, msi_causes_pending gets cleared. However, when e1000e_itr_should_postpone() in e1000e_send_msi() returns true, MSI never gets fired by e1000e_intrmgr_on_throttling_timer() because msi_causes_pending is still set. This results in interrupt loss. To prevent this, we need to clear msi_causes_pending when MSI is going to get fired by the throttling timer. The guest can then receive interrupts eventually. Signed-off-by: Ake Koomsin Signed-off-by: Jason Wang --- hw/net/e1000e_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 2c51089..208e3e0 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -159,6 +159,8 @@ e1000e_intrmgr_on_throttling_timer(void *opaque) =20 if (msi_enabled(timer->core->owner)) { trace_e1000e_irq_msi_notify_postponed(); + /* Clear msi_causes_pending to fire MSI eventually */ + timer->core->msi_causes_pending =3D 0; e1000e_set_interrupt_cause(timer->core, 0); } else { trace_e1000e_irq_legacy_notify_postponed(); --=20 2.7.4 From nobody Thu May 16 09:44:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658825812; cv=none; d=zohomail.com; s=zohoarc; b=XsXtWryIuKia6By3pqltT9BCRAcjiRCrB47TxC7JZROFqv3biKWYyjXf7mhd67eWzx4FBljzpKBtXLFAHY9om+LzOOO8QloigeSMKyPm9R7gVnt1+k25LiBSiAR7s+9cvU7of5r6pD4FR1JlYd60mOWW8BuOYZSredYdKmx15qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658825812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wPBU5VFGQvjjlhsAJQEvDheuBYa6yuwCIyxePdi56hA=; b=No9i3hG2Bq71AWFzbaXOY5Tr6lvhvRrwP7dhJ/n/99raT10QSdM3/7yqFTX8Bc+d2u6SqfEfVnKZ1/erm04sunB91iTbg0zSDC5wtjJQtyD7z9NvrfbF/26SZsw9BQ9MxOjGDO2pd+pQwYmY5PIu9B6S30bqDrQkc82sKGWbSwQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658825812676232.6097739650702; Tue, 26 Jul 2022 01:56:52 -0700 (PDT) Received: from localhost ([::1]:41764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGGN1-0003UQ-Gk for importer@patchew.org; Tue, 26 Jul 2022 04:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHZ-0007Ku-3Y for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHW-0000vR-QD for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:12 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-316-CJwduvR9P9O1Q0brOLP4_Q-1; Tue, 26 Jul 2022 04:51:05 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1EBF3811E80; Tue, 26 Jul 2022 08:51:05 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-201.pek2.redhat.com [10.72.12.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA2BD492CA2; Tue, 26 Jul 2022 08:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658825470; 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=wPBU5VFGQvjjlhsAJQEvDheuBYa6yuwCIyxePdi56hA=; b=Ck8g8rd/CV6s4f6lGsXya/5l3nFLvsVf0GWOwUfzNIYxq1+i42NJ6F1+vBrh4lP0aqvE0C zzDocC1xSd8iPqcSfYbAd6NJ2CKO46i0CfAP5r8MPNoi257wN+AvY/kk4WufAbkUwGdkba w/m27wRmUd2ETIZb7BDKonqTUGu8sXE= X-MC-Unique: CJwduvR9P9O1Q0brOLP4_Q-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Jason Wang Subject: [PULL 2/3] vhost: Get vring base from vq, not svq Date: Tue, 26 Jul 2022 16:50:54 +0800 Message-Id: <20220726085055.17239-3-jasowang@redhat.com> In-Reply-To: <20220726085055.17239-1-jasowang@redhat.com> References: <20220726085055.17239-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658825813059100001 From: Eugenio P=C3=A9rez The SVQ vring used idx usually match with the guest visible one, as long as all the guest buffers (GPA) maps to exactly one buffer within qemu's VA. However, as we can see in virtqueue_map_desc, a single guest buffer could map to many buffers in SVQ vring. Also, its also a mistake to rewind them at the source of migration. Since VirtQueue is able to migrate the inflight descriptors, its responsability of the destination to perform the rewind just in case it cannot report the inflight descriptors to the device. This makes easier to migrate between backends or to recover them in vhost devices that support set in flight descriptors. Fixes: 6d0b22266633 ("vdpa: Adapt vhost_vdpa_get_vring_base to SVQ") Signed-off-by: Eugenio P=C3=A9rez Signed-off-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 291cd19..bce64f4 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1179,7 +1179,18 @@ static int vhost_vdpa_set_vring_base(struct vhost_de= v *dev, struct vhost_vring_state *ring) { struct vhost_vdpa *v =3D dev->opaque; + VirtQueue *vq =3D virtio_get_queue(dev->vdev, ring->index); =20 + /* + * vhost-vdpa devices does not support in-flight requests. Set all of = them + * as available. + * + * TODO: This is ok for networking, but other kinds of devices might + * have problems with these retransmissions. + */ + while (virtqueue_rewind(vq, 1)) { + continue; + } if (v->shadow_vqs_enabled) { /* * Device vring base was set at device start. SVQ base is handled = by @@ -1195,21 +1206,10 @@ static int vhost_vdpa_get_vring_base(struct vhost_d= ev *dev, struct vhost_vring_state *ring) { struct vhost_vdpa *v =3D dev->opaque; - int vdpa_idx =3D ring->index - dev->vq_index; int ret; =20 if (v->shadow_vqs_enabled) { - VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, vdp= a_idx); - - /* - * Setting base as last used idx, so destination will see as avail= able - * all the entries that the device did not use, including the in-f= light - * processing ones. - * - * TODO: This is ok for networking, but other kinds of devices mig= ht - * have problems with these retransmissions. - */ - ring->num =3D svq->last_used_idx; + ring->num =3D virtio_queue_get_last_avail_idx(dev->vdev, ring->ind= ex); return 0; } =20 --=20 2.7.4 From nobody Thu May 16 09:44:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658825860; cv=none; d=zohomail.com; s=zohoarc; b=hAMma2d7utPqiCaUh1mUYY3yiw43TADiWm6rOsvgpfUcTNtVqpvHSWQwvtWdIhVJWNbdlgnS0FxsU1rSzq2LPRD/p+uwhaaFiGuvVgvJCVgqC2u92Cpid+FbVc6AdN/hNlD5W8zgspyw3Yg+9LmDK0MltM6eQymUFqpIii1lKwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658825860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bwF+3AqHIKREkP09rCefxZAy405jzgNGdbpbJGxpBd0=; b=ez74LAYUJRowa9tScjTUclyObxbwCEzvV9JqU2TVUTyVCGxXnX2fP2i8aQJe3Avf8d1CPsEm8ZdI1mNYmYWKy2LYbg9wTKeOb5pEJVfIa0BWNYNN7m0GFIW0WFhry/6//KYO8LhulDOXCBdmgxerluBKXUK2ui6ab+1zHzUv/tI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658825860005344.6144355692825; Tue, 26 Jul 2022 01:57:40 -0700 (PDT) Received: from localhost ([::1]:42692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGGNm-00047t-TQ for importer@patchew.org; Tue, 26 Jul 2022 04:57:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHb-0007NU-S0 for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGGHY-0000ve-Qd for qemu-devel@nongnu.org; Tue, 26 Jul 2022 04:51:15 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-191-Q7k3upM-MEGQCJdUDiPmWw-1; Tue, 26 Jul 2022 04:51:08 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2FAFA811E75; Tue, 26 Jul 2022 08:51:08 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-201.pek2.redhat.com [10.72.12.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7CAE492CA2; Tue, 26 Jul 2022 08:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658825471; 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=bwF+3AqHIKREkP09rCefxZAy405jzgNGdbpbJGxpBd0=; b=Cc0umOg7LKpuPTcVSQASwUYowiWPpGc8qp98dDBqO1xikZNaN8qNnzCOsdH5Je4JaHpNPw FnlaqWKscWYc36iymPV+bwLRZGLBgcTuAtERduQE2lvtZMcdX6V7RZmKhLiWEw8x8OMafE 417LXmfWUhuBnU2EYuO1vvSngoIfPMg= X-MC-Unique: Q7k3upM-MEGQCJdUDiPmWw-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Lei Yang , Jason Wang Subject: [PULL 3/3] vdpa: Fix memory listener deletions of iova tree Date: Tue, 26 Jul 2022 16:50:55 +0800 Message-Id: <20220726085055.17239-4-jasowang@redhat.com> In-Reply-To: <20220726085055.17239-1-jasowang@redhat.com> References: <20220726085055.17239-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658825861130100001 From: Eugenio P=C3=A9rez vhost_vdpa_listener_region_del is always deleting the first iova entry of the tree, since it's using the needle iova instead of the result's one. This was detected using a vga virtual device in the VM using vdpa SVQ. It makes some extra memory adding and deleting, so the wrong one was mapped / unmapped. This was undetected before since all the memory was mappend and unmapped totally without that device, but other conditions could trigger it too: * mem_region was with .iova =3D 0, .translated_addr =3D (correct GPA). * iova_tree_find_iova returned right result, but does not update mem_region. * iova_tree_remove always removed region with .iova =3D 0. Right iova were sent to the device. * Next map will fill the first region with .iova =3D 0, causing a mapping with the same iova and device complains, if the next action is a map. * Next unmap will cause to try to unmap again iova =3D 0, causing the device to complain that no region was mapped at iova =3D 0. Fixes: 34e3c94edaef ("vdpa: Add custom IOTLB translations to SVQ") Reported-by: Lei Yang Signed-off-by: Eugenio P=C3=A9rez Signed-off-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index bce64f4..3ff9ce3 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -290,7 +290,7 @@ static void vhost_vdpa_listener_region_del(MemoryListen= er *listener, =20 result =3D vhost_iova_tree_find_iova(v->iova_tree, &mem_region); iova =3D result->iova; - vhost_iova_tree_remove(v->iova_tree, &mem_region); + vhost_iova_tree_remove(v->iova_tree, result); } vhost_vdpa_iotlb_batch_begin_once(v); ret =3D vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); --=20 2.7.4