From patchwork Mon Jan 15 10:37:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Duan, Zhenzhong" X-Patchwork-Id: 13519508 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDA25C47258 for ; Mon, 15 Jan 2024 10:42:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPKOD-0001a8-0C; Mon, 15 Jan 2024 05:40:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPKO9-0001SW-3r for qemu-devel@nongnu.org; Mon, 15 Jan 2024 05:40:18 -0500 Received: from mgamail.intel.com ([192.198.163.8]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPKO6-0002kC-Ab for qemu-devel@nongnu.org; Mon, 15 Jan 2024 05:40:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705315214; x=1736851214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H5UO03Ip2ltkt3njo/jpsR/+1XU0cjOXRwPae/dLvQk=; b=OTew5hmWYnP0UuBUCzt/y8woKnn7NV8IaIO3TBRZBi45SN8r1R9adWEE 4CU0t1Do9ttU/7Npl9sEFVmCAHo8InBiesH2rBSCsInhP5glFDtIKfDHk c5BSg7yOqhIhjn3Rk4GdG+W6my4VIIhbmi68Tb989FiOUq/ESawaFIvGg pbi+rzucgsuUF57i1g6auJalGILU+LgjnyvwQudokcu4v5Z432UJOpwsf DcPtgVRCoOtNxbtT/vAr1qupyn2LWakE/IG+yrkgGPJHx3PKKkClxb8Q9 C/LhEhaDhGmnZiDb4lKv/p3MaFzuhqiTKGEyvr2C3KgPApFxyL/MEskWZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="13067661" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="13067661" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 02:40:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10953"; a="874065349" X-IronPort-AV: E=Sophos;i="6.04,196,1695711600"; d="scan'208";a="874065349" Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 02:40:09 -0800 From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com, mst@redhat.com, jgg@nvidia.com, nicolinc@nvidia.com, joao.m.martins@oracle.com, kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH rfcv1 09/23] vfio/iommufd_device: Add ioas_id in IOMMUFDDevice and pass to vIOMMU Date: Mon, 15 Jan 2024 18:37:21 +0800 Message-Id: <20240115103735.132209-10-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240115103735.132209-1-zhenzhong.duan@intel.com> References: <20240115103735.132209-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.198.163.8; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -48 X-Spam_score: -4.9 X-Spam_bar: ---- X-Spam_report: (-4.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.758, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sometimes vIOMMU needs to re-attach device to ioas id of vfio, i.e., when vIOMMU is disabled by guest. This is a prerequisite patch for following one. Signed-off-by: Zhenzhong Duan --- include/sysemu/iommufd_device.h | 3 ++- backends/iommufd_device.c | 3 ++- hw/vfio/iommufd.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sysemu/iommufd_device.h b/include/sysemu/iommufd_device.h index 799c1345fd..7aeec9b980 100644 --- a/include/sysemu/iommufd_device.h +++ b/include/sysemu/iommufd_device.h @@ -26,6 +26,7 @@ typedef struct IOMMUFDDeviceOps { struct IOMMUFDDevice { IOMMUFDBackend *iommufd; uint32_t dev_id; + uint32_t ioas_id; IOMMUFDDeviceOps *ops; }; @@ -36,5 +37,5 @@ int iommufd_device_get_info(IOMMUFDDevice *idev, uint32_t len, void *data); void iommufd_device_init(void *_idev, size_t instance_size, IOMMUFDBackend *iommufd, uint32_t dev_id, - IOMMUFDDeviceOps *ops); + uint32_t ioas_id, IOMMUFDDeviceOps *ops); #endif diff --git a/backends/iommufd_device.c b/backends/iommufd_device.c index 26f69252d2..f93a201453 100644 --- a/backends/iommufd_device.c +++ b/backends/iommufd_device.c @@ -52,7 +52,7 @@ int iommufd_device_get_info(IOMMUFDDevice *idev, void iommufd_device_init(void *_idev, size_t instance_size, IOMMUFDBackend *iommufd, uint32_t dev_id, - IOMMUFDDeviceOps *ops) + uint32_t ioas_id, IOMMUFDDeviceOps *ops) { IOMMUFDDevice *idev = (IOMMUFDDevice *)_idev; @@ -60,5 +60,6 @@ void iommufd_device_init(void *_idev, size_t instance_size, idev->iommufd = iommufd; idev->dev_id = dev_id; + idev->ioas_id = ioas_id; idev->ops = ops; } diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index c8c669c59a..3aabe41043 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -432,7 +432,7 @@ found_container: QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next); iommufd_device_init(idev, sizeof(*idev), container->be, vbasedev->devid, - &vfio_iommufd_device_ops); + container->ioas_id, &vfio_iommufd_device_ops); trace_iommufd_cdev_device_info(vbasedev->name, devfd, vbasedev->num_irqs, vbasedev->num_regions, vbasedev->flags); return 0;