From nobody Mon Feb 9 09:16:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1593862593; cv=none; d=zohomail.com; s=zohoarc; b=ApuqnfDGS3AS9xpXfNcboxuSWPS6i7oKz3SV8xEJ7UPzWmsJ4dmYqHmXxCGGXzgeLBuMjiBKSX39spJCqqk6Wv1tkSPcUtXZTkigdD2bZdL4kyxWXfV5oq9b0Ct5PQCZ49Lu6TESkeh80vfu+Lz7LFpHDjJc51vXMfDHvqEIxOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593862593; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=iDDGsxLCRdxsFdB56rPh51Pjxv+q1wjGb0xbq2oWsZc=; b=D7yANPLOK7MG2vrgevDG2ya1ndN1e1LTId7nESVOgnAEp94AYTipn0GVa4q8k4kiOUAbTszPWYWBPQkeyjkEIq48FQ2R12dALfVctG6L4uiniSsajTT/DnUBXFyo0Xt7CbJNmbEBADnv627IQoV0F6bg6KdvKFgsLFCrLO2pU3M= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 1593862593481866.5084837245079; Sat, 4 Jul 2020 04:36:33 -0700 (PDT) Received: from localhost ([::1]:43718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrgTA-0003gY-5m for importer@patchew.org; Sat, 04 Jul 2020 07:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrgNH-0000aL-HM for qemu-devel@nongnu.org; Sat, 04 Jul 2020 07:30:27 -0400 Received: from mga05.intel.com ([192.55.52.43]:24793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrgNE-0004K6-Px for qemu-devel@nongnu.org; Sat, 04 Jul 2020 07:30:27 -0400 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2020 04:30:17 -0700 Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by fmsmga007.fm.intel.com with ESMTP; 04 Jul 2020 04:30:16 -0700 IronPort-SDR: evO+5QkMIvQnOYC9aqn5OQ66a9x3MuDUtl/9bUBiYXi9ugspqcINTl0Xl8EizFjUxEa3qVXwah RWsDCR2ucjSA== X-IronPort-AV: E=McAfee;i="6000,8403,9671"; a="232105521" X-IronPort-AV: E=Sophos;i="5.75,311,1589266800"; d="scan'208";a="232105521" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: 4UpUzR1eycOUk+bmq1pt0wdXbhpgrDM7Aqn6W9/8Ze4w804HUDKr8ua8quhxtNpQ8UueepopeD RJp2rwAhJyzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,311,1589266800"; d="scan'208";a="266146786" From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com Subject: [RFC v7 06/25] vfio: pass nesting requirement into vfio_get_group() Date: Sat, 4 Jul 2020 04:36:30 -0700 Message-Id: <1593862609-36135-7-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593862609-36135-1-git-send-email-yi.l.liu@intel.com> References: <1593862609-36135-1-git-send-email-yi.l.liu@intel.com> 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=192.55.52.43; envelope-from=yi.l.liu@intel.com; helo=mga05.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 07:30:14 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: jean-philippe@linaro.org, kevin.tian@intel.com, yi.l.liu@intel.com, Yi Sun , kvm@vger.kernel.org, mst@redhat.com, jun.j.tian@intel.com, eric.auger@redhat.com, yi.y.sun@intel.com, Jacob Pan , pbonzini@redhat.com, hao.wu@intel.com, jasowang@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch passes the nesting requirement into vfio_get_group() to indicate whether VFIO_TYPE1_NESTING_IOMMU is required. Cc: Kevin Tian Cc: Jacob Pan Cc: Peter Xu Cc: Eric Auger Cc: Yi Sun Cc: David Gibson Cc: Alex Williamson Signed-off-by: Liu Yi L --- hw/vfio/ap.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/common.c | 3 ++- hw/vfio/pci.c | 9 ++++++++- hw/vfio/platform.c | 2 +- include/hw/vfio/vfio-common.h | 3 ++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 95564c1..933b118 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -82,7 +82,7 @@ static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev,= Error **errp) =20 g_free(group_path); =20 - return vfio_get_group(groupid, &address_space_memory, errp); + return vfio_get_group(groupid, &address_space_memory, false, errp); } =20 static void vfio_ap_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 06e69d7..7c20103 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -620,7 +620,7 @@ static VFIOGroup *vfio_ccw_get_group(S390CCWDevice *cde= v, Error **errp) return NULL; } =20 - return vfio_get_group(groupid, &address_space_memory, errp); + return vfio_get_group(groupid, &address_space_memory, false, errp); } =20 static void vfio_ccw_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 0b3593b..89c6a25 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1453,7 +1453,8 @@ static void vfio_disconnect_container(VFIOGroup *grou= p) } } =20 -VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp) +VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, + bool want_nested, Error **errp) { VFIOGroup *group; char path[32]; diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 6838bcc..9d8d27f 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2717,6 +2717,7 @@ static void vfio_realize(PCIDevice *pdev, Error **err= p) int groupid; int i, ret; bool is_mdev; + bool want_nested; =20 if (!vdev->vbasedev.sysfsdev) { if (!(~vdev->host.domain || ~vdev->host.bus || @@ -2775,7 +2776,13 @@ static void vfio_realize(PCIDevice *pdev, Error **er= rp) =20 trace_vfio_realize(vdev->vbasedev.name, groupid); =20 - group =3D vfio_get_group(groupid, pci_device_iommu_address_space(pdev)= , errp); + if (pci_device_get_iommu_attr(pdev, + IOMMU_WANT_NESTING, &want_nested)) { + want_nested =3D false; + } + + group =3D vfio_get_group(groupid, pci_device_iommu_address_space(pdev), + want_nested, errp); if (!group) { goto error; } diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index ac2cefc..7ad7702 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -580,7 +580,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev, = Error **errp) =20 trace_vfio_platform_base_device_init(vbasedev->name, groupid); =20 - group =3D vfio_get_group(groupid, &address_space_memory, errp); + group =3D vfio_get_group(groupid, &address_space_memory, false, errp); if (!group) { return -ENOENT; } diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index fd56420..a77d0ed 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -174,7 +174,8 @@ void vfio_region_mmaps_set_enabled(VFIORegion *region, = bool enabled); void vfio_region_exit(VFIORegion *region); void vfio_region_finalize(VFIORegion *region); void vfio_reset_handler(void *opaque); -VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp); +VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, + bool want_nested, Error **errp); void vfio_put_group(VFIOGroup *group); int vfio_get_device(VFIOGroup *group, const char *name, VFIODevice *vbasedev, Error **errp); --=20 2.7.4