From patchwork Mon May 20 08:28:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Duan, Zhenzhong" X-Patchwork-Id: 13668132 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 9BF9FC04FFE for ; Mon, 20 May 2024 08:34:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8ySP-0001Tk-9e; Mon, 20 May 2024 04:33:21 -0400 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 1s8yQT-0001HQ-So for qemu-devel@nongnu.org; Mon, 20 May 2024 04:31:24 -0400 Received: from mgamail.intel.com ([192.198.163.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8yQQ-0001Bv-24 for qemu-devel@nongnu.org; Mon, 20 May 2024 04:31:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716193878; x=1747729878; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LbnaxeeB8fQ/p/ETgQhEcEepiTVhjCwy7zoWH2HH8/c=; b=n+/OdTX8qXcu83vvOMsqhpJh291xXRhuGS4uXi5lnqCPEn3YnRYg+Wls frYstJ18+unZGXdYfa/Cb9zEE1y+3Guw2SuNudBSl11JJIF71C6Ebi9PY BwVSogR4sz9GfF+TNS5q8gqZUC+GT+TxElQKuW3Fi/DxSneKxmqOk46wF cYuf2oGBA058bhZv8GiKUsnx45weW58UFrcM8WIszgm0aW9Dua/ziNXL/ LUOd3xjcOl5iLo2YcWJgVxQou9yqaL+b0Yb04pR0//3ZkOmChRDLIuMyY 0QZKG+5osZ6mawuHUk178QjMNWSciL9VPBdgFqCgKVt2fLRbAf2pO4sk+ g==; X-CSE-ConnectionGUID: PBAiOJXFTWOwgT/Xr1CAMA== X-CSE-MsgGUID: cDYaxdJcTTuxpjxyoLGKOQ== X-IronPort-AV: E=McAfee;i="6600,9927,11077"; a="12106791" X-IronPort-AV: E=Sophos;i="6.08,174,1712646000"; d="scan'208";a="12106791" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 01:30:44 -0700 X-CSE-ConnectionGUID: 0J4qVAgXRkulJyXvqkt4eQ== X-CSE-MsgGUID: IqSbXu/XRUuE3TKygg4izg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,174,1712646000"; d="scan'208";a="63683769" Received: from unknown (HELO SPR-S2600BT.bj.intel.com) ([10.240.192.124]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 01:30:41 -0700 From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: yi.l.liu@intel.com, chao.p.peng@intel.com, Zhenzhong Duan , "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v2 2/2] intel_iommu: Make pasid entry type check accurate Date: Mon, 20 May 2024 16:28:15 +0800 Message-Id: <20240520082815.260745-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520082815.260745-1-zhenzhong.duan@intel.com> References: <20240520082815.260745-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.198.163.18; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.383, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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.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 When guest configures Nested Translation(011b) or First-stage Translation only (001b), type check passed unaccurately. Fails the type check in those cases as their simulation isn't supported yet. Fixes: fb43cf739e1 ("intel_iommu: scalable mode emulation") Suggested-by: Yi Liu Signed-off-by: Zhenzhong Duan --- hw/i386/intel_iommu.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 098db79602..35d0e85566 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -734,20 +734,16 @@ static inline bool vtd_pe_type_check(X86IOMMUState *x86_iommu, VTDPASIDEntry *pe) { switch (VTD_PE_GET_TYPE(pe)) { - case VTD_SM_PASID_ENTRY_FLT: case VTD_SM_PASID_ENTRY_SLT: - case VTD_SM_PASID_ENTRY_NESTED: - break; + return true; case VTD_SM_PASID_ENTRY_PT: - if (!x86_iommu->pt_supported) { - return false; - } - break; + return x86_iommu->pt_supported; + case VTD_SM_PASID_ENTRY_FLT: + case VTD_SM_PASID_ENTRY_NESTED: default: /* Unknown type */ return false; } - return true; } static inline bool vtd_pdire_present(VTDPASIDDirEntry *pdire)