From nobody Mon Feb 9 10:32:46 2026 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=1660928264; cv=none; d=zohomail.com; s=zohoarc; b=U/k0teAv8VQt9bh+/oTRZDGkAzWRzurpr+u5Wj81YvfrHEb0mEHEPzZE/uYTMJ5UIXpnI6gxMHAMCWAybiB3yfewlG36Hugl6pptq2HiXqQCwQBa2kT7yvcK3dnCedoNTUJyH/9aQSGYI9uSdnskZqf5zHcz4pLGRH9rCwEgjfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660928264; 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=8ZrDFQPvA2ha/NNE0Gf5lA5+keNhWYZOdGwM1beFqHQ=; b=hAPV5IrQ5PW5xOCdIrQf4iSuD43Cw4NHvlVt1sh+DJYGUQYrvg+WiK3KPg9O8ElCQXpZO/NoaF1gy02AqWU9IZyoozcvfnXMs9FQgYTgo3CMAzpzpi1GbMjjt/3I9NnuAOpVJ1utMVHeNOm5ZNJAbksMSj3W1H98hrdIjIlOcyA= 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 1660928264506178.0671448426301; Fri, 19 Aug 2022 09:57:44 -0700 (PDT) Received: from localhost ([::1]:39406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP5JW-0001FP-Iv for importer@patchew.org; Fri, 19 Aug 2022 12:57:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5GJ-0006dE-HK for qemu-devel@nongnu.org; Fri, 19 Aug 2022 12:54:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:43732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5GD-0000Zx-I3 for qemu-devel@nongnu.org; Fri, 19 Aug 2022 12:54:22 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-393-3piho8MkOMqMDZOz2zQLfg-1; Fri, 19 Aug 2022 12:54:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CAA4D3C025B2 for ; Fri, 19 Aug 2022 16:54:11 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86C442026D4C; Fri, 19 Aug 2022 16:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660928053; 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=8ZrDFQPvA2ha/NNE0Gf5lA5+keNhWYZOdGwM1beFqHQ=; b=DLb42c7hocgUrh1gIyoNZJLM4QPTArqk3umDSNbHggaLgt74Qb9QtMn45ehyqoiSbO8/SC DFJTVGxLVmJaKS6mQTA0mASyGwRq5a6QUTA9N5mta3W0pQMNBzTBbHuqHEByTAqCEfCyTd jkc/GMpmz8ZnuIOdVenwO015BkWGzJw= X-MC-Unique: 3piho8MkOMqMDZOz2zQLfg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Lei Yang , Jason Wang , Laurent Vivier , Cindy Lu , Peter Xu , "Michael S. Tsirkin" Subject: [PATCH 7/7] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring Date: Fri, 19 Aug 2022 18:53:57 +0200 Message-Id: <20220819165357.3591965-8-eperezma@redhat.com> In-Reply-To: <20220819165357.3591965-1-eperezma@redhat.com> References: <20220819165357.3591965-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=eperezma@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: 1660928265986100002 Reduce code duplication. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 07d00f5284..45d6e86b45 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -884,10 +884,12 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *d= ev, /** * Unmap a SVQ area in the device */ -static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, - const DMAMap *needle) +static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, hwaddr addr) { - const DMAMap *result =3D vhost_iova_tree_find_iova(v->iova_tree, needl= e); + const DMAMap needle =3D { + .translated_addr =3D addr, + }; + const DMAMap *result =3D vhost_iova_tree_find_iova(v->iova_tree, &need= le); hwaddr size; int r; =20 @@ -908,17 +910,14 @@ static void vhost_vdpa_svq_unmap_ring(struct vhost_vd= pa *v, static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, const VhostShadowVirtqueue *svq) { - DMAMap needle =3D {}; struct vhost_vdpa *v =3D dev->opaque; struct vhost_vring_addr svq_addr; =20 vhost_svq_get_vring_addr(svq, &svq_addr); =20 - needle.translated_addr =3D svq_addr.desc_user_addr; - vhost_vdpa_svq_unmap_ring(v, &needle); + vhost_vdpa_svq_unmap_ring(v, svq_addr.desc_user_addr); =20 - needle.translated_addr =3D svq_addr.used_user_addr; - vhost_vdpa_svq_unmap_ring(v, &needle); + vhost_vdpa_svq_unmap_ring(v, svq_addr.used_user_addr); } =20 /** @@ -996,7 +995,7 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *= dev, ok =3D vhost_vdpa_svq_map_ring(v, &device_region, errp); if (unlikely(!ok)) { error_prepend(errp, "Cannot create vq device region: "); - vhost_vdpa_svq_unmap_ring(v, &driver_region); + vhost_vdpa_svq_unmap_ring(v, driver_region.translated_addr); } addr->used_user_addr =3D device_region.iova; =20 --=20 2.31.1