From nobody Wed Nov 27 00:23: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=1703582759; cv=none; d=zohomail.com; s=zohoarc; b=mCQfXJt3l4HrMDeXZXNDJV02+5qVTswf7u4s9ASpuVS5xOYRyvbOmcjuL53HvAAtQDrNF823i3tKUnIzrJsoCOAuF1H/moQQg2MtdOlzYK6vwu6LAs23/rldoOZFb2ebU9iQF3nqHHu2Gwm+tj74ZfYoLoZROKlXEesWGNGl268= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703582759; 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=D+Sy8LokVxiUP811D8nldNN2ZDdnJt8aAbJYeHozE3g=; b=aYXNBGdziuTEk8ff4KPxg+SuyplJOjFEwIoNbhannKm5+DvfuuHP8KrZ8vNI2ZQrTiV5u5oECyUIXilYuNXEO/MiU/ZH6SP5TOtHSyPXkai1qeQmG+pw331snBUNQpaMMyHq8/SrAnFuvegAS+b94tsMTPs5fppPLn1LjFHkqYo= 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 1703582759883153.83071232820362; Tue, 26 Dec 2023 01:25:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rI3gc-0003mY-C2; Tue, 26 Dec 2023 04:25:18 -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 1rI3ga-0003fl-LF for qemu-devel@nongnu.org; Tue, 26 Dec 2023 04:25:16 -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 1rI3gY-00005k-SD for qemu-devel@nongnu.org; Tue, 26 Dec 2023 04:25:16 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-NfpOrJI6MB6OGvueCzRemg-1; Tue, 26 Dec 2023 04:25:12 -0500 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3368abe10c5so3113216f8f.0 for ; Tue, 26 Dec 2023 01:25:12 -0800 (PST) Received: from redhat.com ([2.55.177.189]) by smtp.gmail.com with ESMTPSA id g3-20020a5d4883000000b00336e32338f3sm977229wrq.70.2023.12.26.01.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 01:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703582714; 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=D+Sy8LokVxiUP811D8nldNN2ZDdnJt8aAbJYeHozE3g=; b=KitDqQoz78u2vkddC9YooDf40nlD6Pskx+G/TGu9jXJl4u7SH9Jg/MhYX8t69U0jubVq2k ZlxmxEitUxyYsRVo8be0wm6zQPyDlJ/GS2HQO4uq0ONDdXHaZwq7RhE745jPkMzNEC2Yxz sbrzzdbxsAVaneduDc3YmJIv0MYtCPA= X-MC-Unique: NfpOrJI6MB6OGvueCzRemg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703582711; x=1704187511; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D+Sy8LokVxiUP811D8nldNN2ZDdnJt8aAbJYeHozE3g=; b=QxWAWIi/6YYr1AE+Hbrrzj7K5pIDt23Spu3RBvW2Nf8vSVaEI1M0Ews72RWM0Zpt0e OQYAhZy+ezUsWMoAN3QYYGx1AI5RVoxDA8sx0TEyxptLTEbStYQDiSaO2SVY3+k4XAC2 TOnbRD30Hzj52EfBBjOj3XpBiVJeMbbM1Pyltjyohus8bf5u1oWoqmvKB8lqe+GONgid B5mR75mtpFf/Xb7qadsszUct0SPtIlk+Kl3CBLb6GhVRf/gyN204BKlH42btyjzFyfza RnqP1MLp9wQjbHxHSBRWRN4LOl9VLrUX0SQG3KxNyfwr9h8dVSY3C/Qi+QzVMOGgq3ur DE7g== X-Gm-Message-State: AOJu0YzG+SyurQ3tVUxxX4TayzCdakL3KH/C1Y66ECYi4EmIN42RsktS D3jOnCYhuJAocvafCfeiArF9SxJoPmzoPdTcmuGYJfWeOTwhjHi3Qki7Z+sixRWpmHUaJFU+B8C 1dP2dvhDS5XI+R/U0xZMshj/zgWpSdB7nPgoZzVKGta11t0jAMAdkADOVqwGjhGADn6NF4z5dsY 9j X-Received: by 2002:adf:e30a:0:b0:336:7656:ee19 with SMTP id b10-20020adfe30a000000b003367656ee19mr2922257wrj.92.1703582710963; Tue, 26 Dec 2023 01:25:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IED3cPVOnpCAeTIgT6HxEDadxdWPGRU88tb7gjLqILvBNvT2h829kvGs+Xnw29EQ6k/2bPEDQ== X-Received: by 2002:adf:e30a:0:b0:336:7656:ee19 with SMTP id b10-20020adfe30a000000b003367656ee19mr2922248wrj.92.1703582710563; Tue, 26 Dec 2023 01:25:10 -0800 (PST) Date: Tue, 26 Dec 2023 04:25:07 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Eugenio =?utf-8?B?UMOpcmV6?= , Jason Wang , Lei Yang Subject: [PULL 16/21] vdpa: move backend_cap to vhost_vdpa_shared Message-ID: <75478072fdbb26ca7f704cf1da04712cf5ea3c3a.1703582625.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.977, 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: 1703582760500100001 From: Eugenio P=C3=A9rez Next patches will register the vhost_vdpa memory listener while the VM is migrating at the destination, so we can map the memory to the device before stopping the VM at the source. The main goal is to reduce the downtime. However, the destination QEMU is unaware of which vhost_vdpa device will register its memory_listener. If the source guest has CVQ enabled, it will be the CVQ device. Otherwise, it will be the first one. Move the backend_cap member to VhostVDPAShared so all vhost_vdpa can use it, rather than always in the first / last vhost_vdpa. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Message-Id: <20231221174322.3130442-9-eperezma@redhat.com> Tested-by: Lei Yang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost-vdpa.h | 3 +++ hw/virtio/vhost-vdpa.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index 05219bbcf7..11ac14085a 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -38,6 +38,9 @@ typedef struct vhost_vdpa_shared { /* IOVA mapping used by the Shadow Virtqueue */ VhostIOVATree *iova_tree; =20 + /* Copy of backend features */ + uint64_t backend_cap; + bool iotlb_batch_begin_sent; =20 /* Vdpa must send shadow addresses as IOTLB key for data queues, not G= PA */ diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 2ecaedb686..99597c3179 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -161,7 +161,7 @@ static void vhost_vdpa_listener_begin_batch(struct vhos= t_vdpa *v) =20 static void vhost_vdpa_iotlb_batch_begin_once(struct vhost_vdpa *v) { - if (v->dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH) && + if (v->shared->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH) && !v->shared->iotlb_batch_begin_sent) { vhost_vdpa_listener_begin_batch(v); } @@ -172,11 +172,10 @@ static void vhost_vdpa_iotlb_batch_begin_once(struct = vhost_vdpa *v) static void vhost_vdpa_listener_commit(MemoryListener *listener) { struct vhost_vdpa *v =3D container_of(listener, struct vhost_vdpa, lis= tener); - struct vhost_dev *dev =3D v->dev; struct vhost_msg_v2 msg =3D {}; int fd =3D v->shared->device_fd; =20 - if (!(dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH))) { + if (!(v->shared->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH)= )) { return; } =20 @@ -838,6 +837,8 @@ static int vhost_vdpa_set_features(struct vhost_dev *de= v, =20 static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev) { + struct vhost_vdpa *v =3D dev->opaque; + uint64_t features; uint64_t f =3D 0x1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2 | 0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH | @@ -859,6 +860,7 @@ static int vhost_vdpa_set_backend_cap(struct vhost_dev = *dev) } =20 dev->backend_cap =3D features; + v->shared->backend_cap =3D features; =20 return 0; } --=20 MST