From nobody Sun May 19 15:29:24 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=1628699649; cv=none; d=zohomail.com; s=zohoarc; b=UyzvtKn+RoBM26gJrk20T6cjuj9e2/lZgRFUCTWARHSH8XX6n9Z4yexO/Is63dTHyPQZVMs0jm8nLqK4xV09F7BuWumj+iCfxpxsAqrBR048wVqkX3kg2qqjORB0UXYcN3tMGEwTp5eaZo3jcem/PMTn+p23a4fvVZSnup06rIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628699649; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=MYdn+BqoegLtl39oCyMGiuVEk9+YUwiUUysrFIfsZ0w=; b=WF6AGeOso9YJ2iAlL03oZP10/pnp2hsAhJhdaaeys88IQN2G9SSI9rFdQXnUzLuiEh7+edFciG5xpwgqFL/zkzU21WtZe73cgPr1+6UTUe7YEpiggRVqlnqnpNe+n7mvZdReeZfDIEE5gbIUSWU7DCb0/rWDlZhTg21QVu78iVU= 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 1628699649677697.7410203537542; Wed, 11 Aug 2021 09:34:09 -0700 (PDT) Received: from localhost ([::1]:50050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDrB9-0000pA-PH for importer@patchew.org; Wed, 11 Aug 2021 12:34:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDr9b-0008Ut-Js for qemu-devel@nongnu.org; Wed, 11 Aug 2021 12:32:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDr9Y-0001tE-D3 for qemu-devel@nongnu.org; Wed, 11 Aug 2021 12:32:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-De7DJhu_PIab1YKKpbXrOg-1; Wed, 11 Aug 2021 12:32:25 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6901D87D541; Wed, 11 Aug 2021 16:32:24 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id A96996E6E1; Wed, 11 Aug 2021 16:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628699546; 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; bh=MYdn+BqoegLtl39oCyMGiuVEk9+YUwiUUysrFIfsZ0w=; b=E4oz46tm+VhhLoiDIuJU30eU1dHzXP57p5vjlomRjI7wwX1Pv7K77lShbUsCodZdyQZkXG o1D/YuFBPdp763K8Ttsh1J+oVgGHfCXCHBqOcApFb5PzJZ7LFrV5HxF4W+eJ7+6VTCblCm h2j78qLkvKogJbVhpO+WKl2lfWwF+RA= X-MC-Unique: De7DJhu_PIab1YKKpbXrOg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Subject: [PATCH v2] vhost-vdpa: Do not send empty IOTLB update batches Date: Wed, 11 Aug 2021 18:32:11 +0200 Message-Id: <20210811163211.185870-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Eli Cohen , Cindy Lu , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628699651191100001 With the introduction of the batch hinting, meaningless batches can be created with no IOTLB updates if the memory region was skipped by vhost_vdpa_listener_skipped_section. This is the case of host notifiers memory regions, device un/realize, and others. This causes the vdpa device to receive dma mapping settings with no changes, a possibly expensive operation for nothing. To avoid that, VHOST_IOTLB_BATCH_BEGIN hint is delayed until we have a meaningful (not skipped section) mapping or unmapping operation, and VHOST_IOTLB_BATCH_END is not written unless at least one of _UPDATE / _INVALIDATE has been issued. Signed-off-by: Eugenio P=C3=A9rez --- include/hw/virtio/vhost-vdpa.h | 1 + hw/virtio/vhost-vdpa.c | 50 ++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index e98e327f12..6538572a6f 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -23,6 +23,7 @@ typedef struct vhost_vdpa { int device_fd; int index; uint32_t msg_type; + size_t n_mr_updated; MemoryListener listener; struct vhost_dev *dev; VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX]; diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 6ce94a1f4d..512fa18d68 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -89,19 +89,13 @@ static int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, h= waddr iova, return ret; } =20 -static void vhost_vdpa_listener_begin(MemoryListener *listener) +static void vhost_vdpa_listener_begin_batch(struct vhost_vdpa *v) { - 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->device_fd; - - if (!(dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH))) { - return; - } - - msg.type =3D v->msg_type; - msg.iotlb.type =3D VHOST_IOTLB_BATCH_BEGIN; + struct vhost_msg_v2 msg =3D { + .type =3D v->msg_type, + .iotlb.type =3D VHOST_IOTLB_BATCH_BEGIN, + }; =20 if (write(fd, &msg, sizeof(msg)) !=3D sizeof(msg)) { error_report("failed to write, fd=3D%d, errno=3D%d (%s)", @@ -109,6 +103,25 @@ static void vhost_vdpa_listener_begin(MemoryListener *= listener) } } =20 +static bool vhost_vdpa_iotlb_batch_is_started(const struct vhost_vdpa *v) +{ + return v->n_mr_updated !=3D 0; +} + +static void vhost_vdpa_iotlb_batch_begin_once(struct vhost_vdpa *v) +{ + if (!vhost_vdpa_iotlb_batch_is_started(v)) { + vhost_vdpa_listener_begin_batch(v); + } + + v->n_mr_updated++; +} + +static void vhost_vdpa_iotlb_batch_reset(struct vhost_vdpa *v) +{ + v->n_mr_updated =3D 0; +} + static void vhost_vdpa_listener_commit(MemoryListener *listener) { struct vhost_vdpa *v =3D container_of(listener, struct vhost_vdpa, lis= tener); @@ -120,6 +133,10 @@ static void vhost_vdpa_listener_commit(MemoryListener = *listener) return; } =20 + if (vhost_vdpa_iotlb_batch_is_started(v)) { + return; + } + msg.type =3D v->msg_type; msg.iotlb.type =3D VHOST_IOTLB_BATCH_END; =20 @@ -127,6 +144,8 @@ static void vhost_vdpa_listener_commit(MemoryListener *= listener) error_report("failed to write, fd=3D%d, errno=3D%d (%s)", fd, errno, strerror(errno)); } + + vhost_vdpa_iotlb_batch_reset(v); } =20 static void vhost_vdpa_listener_region_add(MemoryListener *listener, @@ -170,6 +189,10 @@ static void vhost_vdpa_listener_region_add(MemoryListe= ner *listener, =20 llsize =3D int128_sub(llend, int128_make64(iova)); =20 + if (v->dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH)) { + vhost_vdpa_iotlb_batch_begin_once(v); + } + ret =3D vhost_vdpa_dma_map(v, iova, int128_get64(llsize), vaddr, section->readonly); if (ret) { @@ -221,6 +244,10 @@ static void vhost_vdpa_listener_region_del(MemoryListe= ner *listener, =20 llsize =3D int128_sub(llend, int128_make64(iova)); =20 + if (v->dev->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH)) { + vhost_vdpa_iotlb_batch_begin_once(v); + } + ret =3D vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); if (ret) { error_report("vhost_vdpa dma unmap error!"); @@ -234,7 +261,6 @@ static void vhost_vdpa_listener_region_del(MemoryListen= er *listener, * depends on the addnop(). */ static const MemoryListener vhost_vdpa_memory_listener =3D { - .begin =3D vhost_vdpa_listener_begin, .commit =3D vhost_vdpa_listener_commit, .region_add =3D vhost_vdpa_listener_region_add, .region_del =3D vhost_vdpa_listener_region_del, --=20 2.27.0