From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48301C3F2D1 for ; Thu, 5 Mar 2020 14:33:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FEB720732 for ; Thu, 5 Mar 2020 14:33:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JUHKsOwf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FEB720732 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9rYg-0001GF-WC for qemu-devel@archiver.kernel.org; Thu, 05 Mar 2020 09:33:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35458) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9rX8-0007U2-2L for qemu-devel@nongnu.org; Thu, 05 Mar 2020 09:31:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9rX6-0002jF-OC for qemu-devel@nongnu.org; Thu, 05 Mar 2020 09:31:29 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46123 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9rX6-0002it-Jw for qemu-devel@nongnu.org; Thu, 05 Mar 2020 09:31:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583418688; 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=0oUugQEab4bqH2Kasf8WtgB6oPJtcM2uppzFCmdwZI8=; b=JUHKsOwfi1Kc0W/U2f6gTaLNzEItgpz1+Dup93ILvn1F+lrF2Ohwd5YNpfw/hCMQpEcEr0 zjMTvMVXs5cw5InhGt0e2Z8q1t4C6skyGYQ3kEDzMZhYqlSiqGuin3l6yMs2K3zcS+VENu TiEtM8wfS5gBc4Wq2j0jMG+k37h6GUs= 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-408-YfrNahMhMHGve8jcxcwk8A-1; Thu, 05 Mar 2020 09:31:21 -0500 X-MC-Unique: YfrNahMhMHGve8jcxcwk8A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7638107ACCD; Thu, 5 Mar 2020 14:31:19 +0000 (UTC) Received: from t480s.redhat.com (ovpn-120-166.rdu2.redhat.com [10.10.120.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id E882E90538; Thu, 5 Mar 2020 14:30:55 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v4 03/15] util: vfio-helpers: Factor out removal from qemu_vfio_undo_mapping() Date: Thu, 5 Mar 2020 15:29:33 +0100 Message-Id: <20200305142945.216465-4-david@redhat.com> In-Reply-To: <20200305142945.216465-1-david@redhat.com> References: <20200305142945.216465-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Eduardo Habkost , "Michael S . Tsirkin" , Igor Kotrasinski , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Alex Williamson , Murilo Opsfelder Araujo , Igor Mammedov , Paolo Bonzini , Stefan Hajnoczi , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Factor it out and properly use it where applicable. Make qemu_vfio_undo_mapping() look like qemu_vfio_do_mapping(), passing the size and iova, not the mapping. Reviewed-by: Peter Xu Cc: Richard Henderson Cc: Paolo Bonzini Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: Alex Williamson Cc: Stefan Hajnoczi Signed-off-by: David Hildenbrand --- util/vfio-helpers.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 7085ca702c..f0c77f0d69 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -518,6 +518,20 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOStat= e *s, return insert; } =20 +/** + * Remove the mapping from @s and free it. + */ +static void qemu_vfio_remove_mapping(QEMUVFIOState *s, IOVAMapping *mappin= g) +{ + const int index =3D mapping - s->mappings; + + assert(index >=3D 0 && index < s->nr_mappings); + memmove(mapping, &s->mappings[index + 1], + sizeof(s->mappings[0]) * (s->nr_mappings - index - 1)); + s->nr_mappings--; + s->mappings =3D g_renew(IOVAMapping, s->mappings, s->nr_mappings); +} + /* Do the DMA mapping with VFIO. */ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void *host, size_t size, uint64_t iova) @@ -539,29 +553,22 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, voi= d *host, size_t size, } =20 /** - * Undo the DMA mapping from @s with VFIO, and remove from mapping list. + * Undo the DMA mapping from @s with VFIO. */ -static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping) +static void qemu_vfio_undo_mapping(QEMUVFIOState *s, size_t size, uint64_t= iova) { - int index; struct vfio_iommu_type1_dma_unmap unmap =3D { .argsz =3D sizeof(unmap), .flags =3D 0, - .iova =3D mapping->iova, - .size =3D mapping->size, + .iova =3D iova, + .size =3D size, }; =20 - index =3D mapping - s->mappings; - assert(mapping->size > 0); - assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size)); - assert(index >=3D 0 && index < s->nr_mappings); + assert(size > 0); + assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size)); if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) { error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno)); } - memmove(mapping, &s->mappings[index + 1], - sizeof(s->mappings[0]) * (s->nr_mappings - index - 1)); - s->nr_mappings--; - s->mappings =3D g_renew(IOVAMapping, s->mappings, s->nr_mappings); } =20 /* Check if the mapping list is (ascending) ordered. */ @@ -621,7 +628,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, assert(qemu_vfio_verify_mappings(s)); ret =3D qemu_vfio_do_mapping(s, host, size, iova0); if (ret) { - qemu_vfio_undo_mapping(s, mapping); + qemu_vfio_remove_mapping(s, mapping); goto out; } s->low_water_mark +=3D size; @@ -681,7 +688,8 @@ void qemu_vfio_dma_unmap(QEMUVFIOState *s, void *host) if (!m) { goto out; } - qemu_vfio_undo_mapping(s, m); + qemu_vfio_undo_mapping(s, m->size, m->iova); + qemu_vfio_remove_mapping(s, m); out: qemu_mutex_unlock(&s->lock); } @@ -698,7 +706,10 @@ void qemu_vfio_close(QEMUVFIOState *s) return; } while (s->nr_mappings) { - qemu_vfio_undo_mapping(s, &s->mappings[s->nr_mappings - 1]); + IOVAMapping *m =3D &s->mappings[s->nr_mappings - 1]; + + qemu_vfio_undo_mapping(s, m->size, m->iova); + qemu_vfio_remove_mapping(s, m); } ram_block_notifier_remove(&s->ram_notifier); qemu_vfio_reset(s); --=20 2.24.1