From nobody Tue Feb 10 01:31:54 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=1614689480; cv=none; d=zohomail.com; s=zohoarc; b=nXQyVhtIl11E3uJ5AKv+WwU1RZzACe0B9pLAeHznBb78TNm+BBkOTEBGZj+4naDiGX1yCsJZOvx9drQpi0uVROIBM6Y15sLIg+JIz2sJzHVJin6xB7k7LnHxAq1ndziKfM31SAlDXF8vRsAH2VKWYHx39nj4JmJQfcxamUW6y30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614689480; 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; bh=7YWCFeYh0lVn5oPT6bDdNAc38h8gQ+athAdNqky4Wag=; b=UZddd18Io0jxXrYucrU4xeWZ+vsURg4caNWv70MGQQLp0niqLtxOm950gcQWTxZNnFa0n+awvScHwOMphvnV9WdbMYQoSleY9FQjsU21M5NrYFRpTSbyFepSlaSMAZoSg2D5bZfkEB0nXm/Us4AI3Du6yvUPPemp5pKiC5/6ZdY= 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 161468948059037.9084343298166; Tue, 2 Mar 2021 04:51:20 -0800 (PST) Received: from localhost ([::1]:35460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH4Uh-0002eH-Gr for importer@patchew.org; Tue, 02 Mar 2021 07:51:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH4Js-0007Os-EI for qemu-devel@nongnu.org; Tue, 02 Mar 2021 07:40:08 -0500 Received: from mga09.intel.com ([134.134.136.24]:30230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH4Jn-0002gL-Rv for qemu-devel@nongnu.org; Tue, 02 Mar 2021 07:40:08 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2021 04:40:02 -0800 Received: from yiliu-dev.bj.intel.com (HELO dual-ub.bj.intel.com) ([10.238.156.135]) by fmsmga004.fm.intel.com with ESMTP; 02 Mar 2021 04:39:58 -0800 IronPort-SDR: ekAjfepFIi1YbY3ghw3qBn3B73M3iEwkA8iLYY0tpjujBeU1QlTi0C7RYKJ0CTmnARAhuEdmGj GFjrKKgMpKdg== X-IronPort-AV: E=McAfee;i="6000,8403,9910"; a="186914717" X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="186914717" IronPort-SDR: btrSUPgz3QbnkqBUOPX3XoGo5aHkL2h6PRi3dnBG61ML97vw0TKrOl2VsgxP/4N5JD+NLK0JZR td9lz4hvFNuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="427472795" From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com, jasowang@redhat.com Subject: [RFC v11 08/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support Date: Wed, 3 Mar 2021 04:38:10 +0800 Message-Id: <20210302203827.437645-9-yi.l.liu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210302203827.437645-1-yi.l.liu@intel.com> References: <20210302203827.437645-1-yi.l.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.24; envelope-from=yi.l.liu@intel.com; helo=mga09.intel.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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, Lingshan.Zhu@intel.com, hao.wu@intel.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" VFIO needs to check VFIO_TYPE1_NESTING_IOMMU support with Kernel before further using it. e.g. requires to check IOMMU UAPI support. Referred patch from Eric Auger: https://patchwork.kernel.org/patch/11040499/ 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 Signed-off-by: Eric Auger Signed-off-by: Yi Sun --- hw/vfio/common.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 44097875e2..883815d5b0 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1543,30 +1543,44 @@ static void vfio_put_address_space(VFIOAddressSpace= *space) } =20 /* - * vfio_get_iommu_type - selects the richest iommu_type (v2 first) + * vfio_get_iommu_type - selects the richest iommu_type (NESTING first) */ static int vfio_get_iommu_type(VFIOContainer *container, + bool want_nested, Error **errp) { - int iommu_types[] =3D { VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU, + int iommu_types[] =3D { VFIO_TYPE1_NESTING_IOMMU, + VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU, VFIO_SPAPR_TCE_IOMMU }; - int i; + int i, ret =3D -EINVAL; =20 for (i =3D 0; i < ARRAY_SIZE(iommu_types); i++) { if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])) { - return iommu_types[i]; + if (iommu_types[i] =3D=3D VFIO_TYPE1_NESTING_IOMMU) { + if (!want_nested) { + continue; + } + } + ret =3D iommu_types[i]; + break; } } - error_setg(errp, "No available IOMMU models"); - return -EINVAL; + + if (ret < 0) { + error_setg(errp, "No available IOMMU models"); + } else if (want_nested && ret !=3D VFIO_TYPE1_NESTING_IOMMU) { + error_setg(errp, "Nested mode requested but not supported"); + ret =3D -EINVAL; + } + return ret; } =20 static int vfio_init_container(VFIOContainer *container, int group_fd, - Error **errp) + bool want_nested, Error **errp) { int iommu_type, ret; =20 - iommu_type =3D vfio_get_iommu_type(container, errp); + iommu_type =3D vfio_get_iommu_type(container, want_nested, errp); if (iommu_type < 0) { return iommu_type; } @@ -1666,7 +1680,7 @@ static void vfio_get_iommu_info_migration(VFIOContain= er *container, } =20 static int vfio_connect_container(VFIOGroup *group, AddressSpace *as, - Error **errp) + bool want_nested, Error **errp) { VFIOContainer *container; int ret, fd; @@ -1738,12 +1752,13 @@ static int vfio_connect_container(VFIOGroup *group,= AddressSpace *as, QLIST_INIT(&container->giommu_list); QLIST_INIT(&container->hostwin_list); =20 - ret =3D vfio_init_container(container, group->fd, errp); + ret =3D vfio_init_container(container, group->fd, want_nested, errp); if (ret) { goto free_container_exit; } =20 switch (container->iommu_type) { + case VFIO_TYPE1_NESTING_IOMMU: case VFIO_TYPE1v2_IOMMU: case VFIO_TYPE1_IOMMU: { @@ -1968,7 +1983,7 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *= as, group->groupid =3D groupid; QLIST_INIT(&group->device_list); =20 - if (vfio_connect_container(group, as, errp)) { + if (vfio_connect_container(group, as, want_nested, errp)) { error_prepend(errp, "failed to setup container for group %d: ", groupid); goto close_fd_exit; --=20 2.25.1