From nobody Mon Feb 9 06:34:12 2026 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=1555063920; cv=none; d=zoho.com; s=zohoarc; b=SROPvye58toQHF/DnPCsziBQzq2JDp6BHtg2A1HKOwP+mDu8rTFHWLlxgsng1tppWScukZYBCPWzfTlOPWvxlkXV4mc4wjQGqLAONbzxme2dWTcm8gWZj/Ne0+wc7IZi0O0EdaGJs7/oGEWUEswRyHcLHnkYW77Ke/0DQc+dEjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555063920; 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=eybzNwX4P2v0fNLB1ymiUe5goBuHfuevlcDLn9aj46I=; b=WTMW38rdmd4IEwz/HJc/2TeJ0WfvoZzvKTesQJLJLt+5ZwdCvWm5nFX5JsPB1uiFz9pwA6p6de1S2V6KKvsfarcX7PzU459S7I2HQhq9mSLnpykbktkQNXAUZrp28RhJ+ZfBPaaa1FeGit8rSe5imRe9xf2g30H+dlzSBVnwnRI= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555063920286881.8485744753225; Fri, 12 Apr 2019 03:12:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:33631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEt9v-0007jp-V6 for importer@patchew.org; Fri, 12 Apr 2019 06:11:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEt4N-0002Dk-LW for qemu-devel@nongnu.org; Fri, 12 Apr 2019 06:06:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEt4L-0004ml-NX for qemu-devel@nongnu.org; Fri, 12 Apr 2019 06:06:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42200) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEt4G-0004eS-86; Fri, 12 Apr 2019 06:05:57 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 792003091753; Fri, 12 Apr 2019 10:05:55 +0000 (UTC) Received: from laptop.redhat.com (ovpn-117-161.ams2.redhat.com [10.36.117.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA0F419C65; Fri, 12 Apr 2019 10:05:44 +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: Fri, 12 Apr 2019 12:03:44 +0200 Message-Id: <20190412100354.6409-18-eric.auger@redhat.com> In-Reply-To: <20190412100354.6409-1-eric.auger@redhat.com> References: <20190412100354.6409-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 12 Apr 2019 10:05:55 +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 v3 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: yi.l.liu@intel.com, mst@redhat.com, jean-philippe.brucker@arm.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 0853c8c376..cf876d5264 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" @@ -480,6 +481,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) { @@ -587,6 +601,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); @@ -596,11 +611,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