From nobody Mon Nov 10 20:52:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558958265; cv=none; d=zoho.com; s=zohoarc; b=mx6XnxqhHXabDqkuRj4LRQ2mrwU6xkXiBb9Otf/NtSgMcG9SrusYNRY4/cyXLWjcx1Z+Fn4N1bNOAfeR9xCGN74jJ2HNvKN9vDfvJEDtcTz3syoTcxYGOpo9kENlTGUug0br6aOqhhNN3sLw21bt2QBWeKjL1DZyZJFwlCu9ALI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558958265; h=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:ARC-Authentication-Results; bh=7Es73i/8SDqw8iluply6lHGWFg91VuOFRZiqbSrnXAM=; b=XOXya71VHHJyc7zUsaPZuDJU0tXy1snA8dcQ/Z7ak5SC8Nbxr596vEaF3gK6tdBJ4guzMsq2GxPGZZJaSuWCK37j0T/DwFc9g0RimX2fl9glXjbsT+OQkYM54ssixyZ1KV7yLz777w+qD/R5g5eZde+tRd97k8Bnm70HPqWN0ic= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558958265235164.35685273289823; Mon, 27 May 2019 04:57:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:44237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVEG2-00067B-8X for importer@patchew.org; Mon, 27 May 2019 07:57:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVE3I-0004M8-IF for qemu-devel@nongnu.org; Mon, 27 May 2019 07:44:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVE3H-0004Py-HQ for qemu-devel@nongnu.org; Mon, 27 May 2019 07:44:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54026) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVE3F-0004Jg-73; Mon, 27 May 2019 07:44:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 76E90308339A; Mon, 27 May 2019 11:44:24 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-67.ams2.redhat.com [10.36.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 386895D962; Mon, 27 May 2019 11:44:15 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Date: Mon, 27 May 2019 13:41:53 +0200 Message-Id: <20190527114203.2762-18-eric.auger@redhat.com> In-Reply-To: <20190527114203.2762-1-eric.auger@redhat.com> References: <20190527114203.2762-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 27 May 2019 11:44:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v4 17/27] hw/vfio/common: Introduce vfio_alloc_guest_iommu helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, yi.l.liu@intel.com, mst@redhat.com, jean-philippe.brucker@arm.com, zhangfei.gao@foxmail.com, peterx@redhat.com, alex.williamson@redhat.com, vincent.stehle@arm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Soon this code will be called several times. So let's introduce an helper. Signed-off-by: Eric Auger --- hw/vfio/common.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 75fb568f95..7df8b92563 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -24,6 +24,7 @@ #include #endif #include +#include =20 #include "hw/vfio/vfio-common.h" #include "hw/vfio/vfio.h" @@ -497,6 +498,19 @@ out: rcu_read_unlock(); } =20 +static VFIOGuestIOMMU *vfio_alloc_guest_iommu(VFIOContainer *container, + IOMMUMemoryRegion *iommu, + hwaddr offset) +{ + VFIOGuestIOMMU *giommu =3D g_new0(VFIOGuestIOMMU, 1); + + giommu->container =3D container; + giommu->iommu =3D iommu; + giommu->iommu_offset =3D offset; + /* notifier will be registered separately */ + return giommu; +} + static void vfio_listener_region_add(MemoryListener *listener, MemoryRegionSection *section) { @@ -604,6 +618,7 @@ static void vfio_listener_region_add(MemoryListener *li= stener, if (memory_region_is_iommu(section->mr)) { VFIOGuestIOMMU *giommu; IOMMUMemoryRegion *iommu_mr =3D IOMMU_MEMORY_REGION(section->mr); + hwaddr offset; int iommu_idx; =20 trace_vfio_listener_region_add_iommu(iova, end); @@ -613,11 +628,11 @@ static void vfio_listener_region_add(MemoryListener *= listener, * would be the right place to wire that up (tell the KVM * device emulation the VFIO iommu handles to use). */ - giommu =3D g_malloc0(sizeof(*giommu)); - giommu->iommu =3D iommu_mr; - giommu->iommu_offset =3D section->offset_within_address_space - - section->offset_within_region; - giommu->container =3D container; + + offset =3D section->offset_within_address_space - + section->offset_within_region; + giommu =3D vfio_alloc_guest_iommu(container, iommu_mr, offset); + llend =3D int128_add(int128_make64(section->offset_within_region), section->size); llend =3D int128_sub(llend, int128_one()); --=20 2.20.1