From nobody Wed Nov 27 00:36:31 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=1703159757; cv=none; d=zohomail.com; s=zohoarc; b=nVOSHfqOutd9MGqZNxCBrpirf6tAapgkWNkCW2C3StUPssnIwNDomK+xm8QhAexuFISe8mtVE9rz3PZhYGOGnGRolkgCGPvkOhLhn6SuUMceKid/lUPsQ4F3By0EUdinl8EszHg3tymTJKjWo8sKyx0oLZTgatD2KIsM9vWejVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703159757; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wEqxCxIU4wEiF1ZxDcemsg37cDOuCjoWmO0/s/NRmkQ=; b=G7KS3ooGuMQe4/35opHDhO66PVcuw0KzF/wG7VNPoQBZ68+AtW4cb3PUyTEE9xacBbgVHTJLHJKG3kiX0q05wHpKYAB7KDdlmMRnEkvUi0CSlae6MM7gF9JzM3qL8ZoOOzem3KKgSUnvUrG0BaSomV5pTvyFppyIex2lVMIh8H0= 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 1703159757840194.9661695896766; Thu, 21 Dec 2023 03:55:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGHch-0008DD-A9; Thu, 21 Dec 2023 06:53:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGHcb-0008BO-HI for qemu-devel@nongnu.org; Thu, 21 Dec 2023 06:53:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGHcY-0007x9-HT for qemu-devel@nongnu.org; Thu, 21 Dec 2023 06:53:47 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-3sHyjAZyPUSCOUY97mZLxw-1; Thu, 21 Dec 2023 06:53:42 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03443185A780; Thu, 21 Dec 2023 11:53:42 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4130E40C6EB9; Thu, 21 Dec 2023 11:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703159625; 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=wEqxCxIU4wEiF1ZxDcemsg37cDOuCjoWmO0/s/NRmkQ=; b=XHsovZ73CeagAFAra6X0dUAgjzKP3wKjSjvXptFxS/L2gohY/VlhrT/kvb18WtrUBYeXJX uKrU3Kr654LsKa36/jve7IY6Nw5ac4mOs46YV48JLqm7pcmHyDaOBIAlOGO82f9p+tlcCH 8EeQJN/hNWLGbtqMkVDowMrrigMo9W4= X-MC-Unique: 3sHyjAZyPUSCOUY97mZLxw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Parav Pandit , Dragos Tatulea , Lei Yang , Jason Wang , si-wei.liu@oracle.com, Zhu Lingshan , Stefano Garzarella , "Michael S. Tsirkin" , Laurent Vivier Subject: [PATCH v3 09/14] vdpa: remove msg type of vhost_vdpa Date: Thu, 21 Dec 2023 12:53:14 +0100 Message-Id: <20231221115319.3067586-10-eperezma@redhat.com> In-Reply-To: <20231221115319.3067586-1-eperezma@redhat.com> References: <20231221115319.3067586-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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: -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.063, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1703159758262100001 It is always VHOST_IOTLB_MSG_V2. We can always make it back per vhost_dev if needed. This change makes easier for vhost_vdpa_map and unmap not to depend on vhost_vdpa but only in VhostVDPAShared. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- include/hw/virtio/vhost-vdpa.h | 1 - hw/virtio/vhost-vdpa.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index 11ac14085a..5bd964dac5 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -49,7 +49,6 @@ typedef struct vhost_vdpa_shared { =20 typedef struct vhost_vdpa { int index; - uint32_t msg_type; uint32_t address_space_id; MemoryListener listener; uint64_t acked_features; diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 458e46befd..38afcbf1c9 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -93,7 +93,7 @@ int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asi= d, hwaddr iova, int fd =3D v->shared->device_fd; int ret =3D 0; =20 - msg.type =3D v->msg_type; + msg.type =3D VHOST_IOTLB_MSG_V2; msg.asid =3D asid; msg.iotlb.iova =3D iova; msg.iotlb.size =3D size; @@ -125,7 +125,7 @@ int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, uint32_t= asid, hwaddr iova, int fd =3D v->shared->device_fd; int ret =3D 0; =20 - msg.type =3D v->msg_type; + msg.type =3D VHOST_IOTLB_MSG_V2; msg.asid =3D asid; msg.iotlb.iova =3D iova; msg.iotlb.size =3D size; @@ -147,7 +147,7 @@ static void vhost_vdpa_listener_begin_batch(struct vhos= t_vdpa *v) { int fd =3D v->shared->device_fd; struct vhost_msg_v2 msg =3D { - .type =3D v->msg_type, + .type =3D VHOST_IOTLB_MSG_V2, .iotlb.type =3D VHOST_IOTLB_BATCH_BEGIN, }; =20 @@ -183,7 +183,7 @@ static void vhost_vdpa_listener_commit(MemoryListener *= listener) return; } =20 - msg.type =3D v->msg_type; + msg.type =3D VHOST_IOTLB_MSG_V2; msg.iotlb.type =3D VHOST_IOTLB_BATCH_END; =20 trace_vhost_vdpa_listener_commit(v->shared, fd, msg.type, msg.iotlb.ty= pe); @@ -593,7 +593,6 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void = *opaque, Error **errp) v->dev =3D dev; dev->opaque =3D opaque ; v->listener =3D vhost_vdpa_memory_listener; - v->msg_type =3D VHOST_IOTLB_MSG_V2; vhost_vdpa_init_svq(dev, v); =20 error_propagate(&dev->migration_blocker, v->migration_blocker); --=20 2.39.3