From nobody Mon Feb 9 09:16:37 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=1599735682; cv=none; d=zohomail.com; s=zohoarc; b=DaxkBhMSVu/uUd4RmrCP3hYr5tmD+13YEVP17JCT0Wdx48RJuMbamP/U990svW7xoCFbNPYitXQKRBGtReNOxkxn7Te4VC61A0tC+hQDbeQ3baVimgPAr+i3ve24trhBI3XqVABWA4yu3t0iSTugZevttZeQv546HEmMoY3b74c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599735682; 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=TgseqBBRIRzn0c6vNI/HICQOOkkiIoeXEffaUPfSvyg=; b=DmfLdTMKR3Y2YbBAMcKMD+dpnWQTL09Wkk6dNCjtgCP5kiNHo1QnzNunHQEd15iye/59dv8ZE9IcsAaX6I63PIcDVZAjAteoJUVLhXfXYlBlwY4OIzvvjMoU11mAv7i8CndQ7bwaGOC3Dw0A1DKFI2QjcI76ihgwlpbZZdNC+7w= 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 1599735682783748.2440180284543; Thu, 10 Sep 2020 04:01:22 -0700 (PDT) Received: from localhost ([::1]:35174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGKKO-0005Om-RN for importer@patchew.org; Thu, 10 Sep 2020 07:01:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGKEN-0003n8-Uv for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:55:07 -0400 Received: from mga03.intel.com ([134.134.136.65]:26671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGKEJ-0005xE-25 for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:55:07 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2020 03:54:39 -0700 Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga008.jf.intel.com with ESMTP; 10 Sep 2020 03:54:39 -0700 IronPort-SDR: hTYortnHM4jzdojp/Z/zqWC2/nyl7XlE6uG1jSDLqsqp7EmymJ8eV5tkq5Ee1o06DO2T7prFs8 x0BnU38S1Fpw== X-IronPort-AV: E=McAfee;i="6000,8403,9739"; a="158545475" X-IronPort-AV: E=Sophos;i="5.76,412,1592895600"; d="scan'208";a="158545475" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: BAP8G9TiDLMSt9cFgWAHVWLIfy3bchSksLmPjHoKJo9Z3KCXgVGRCkm2ayt7+uNIQVA6acwWy0 UE2OR7TLWOZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,412,1592895600"; d="scan'208";a="334140051" From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com, jasowang@redhat.com Subject: [RFC v10 06/25] vfio: pass nesting requirement into vfio_get_group() Date: Thu, 10 Sep 2020 03:56:19 -0700 Message-Id: <1599735398-6829-7-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599735398-6829-1-git-send-email-yi.l.liu@intel.com> References: <1599735398-6829-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=134.134.136.65; envelope-from=yi.l.liu@intel.com; helo=mga03.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 06:54:39 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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: 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, 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 cec6fe1..b5f3159 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -83,7 +83,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 ff7f369..30d00a7 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -621,7 +621,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 3335714..80d7a00 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1457,7 +1457,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 3611dcd..d33fb89 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2711,6 +2711,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 || @@ -2768,7 +2769,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 869ed2c..5eac6a2 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 c78f3ff..bdb09f4 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