From nobody Tue Nov 26 02:35:59 2024 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D1A71991CC for ; Tue, 22 Oct 2024 09:53:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729590805; cv=none; b=tZ8RIBUX13mG/CTLYspNVI1UHj35Z/1UBaEBjj1idfTebFk26Yh5mr+rWRNYKxv/qLCXrXllMSaEGuy8Y4wv5tTGKi9vpFj+jUArC3KuckI+X0S1/CCYX8fJ7OZKZhFzkV4MiPIkr1CzqnZZduDT/2tt0UsY+0+/TqgavtXYlRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729590805; c=relaxed/simple; bh=vhXxUumZV/ND0LwAlvGNUtYRRyRAOFMzsBRrz5SZqDU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Pr5MK+6+y2xEmazmn56ZLMZbzVw8TSVNLvgpH3UomeK2P5cm/C1W6N/jubfyXsSJPEh+2onF22wqUN11lw+OwsAeIxpe/yJivTEyVHd4IM6AELDBfNejhCtVdKI6Nr4b1VF4KX0/7NVTovSQHW1EjKriNLDO/WiVTYSevC/uYrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=OncEXgZJ; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OncEXgZJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729590803; x=1761126803; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vhXxUumZV/ND0LwAlvGNUtYRRyRAOFMzsBRrz5SZqDU=; b=OncEXgZJ8tv+MBBarKFYiWFSncnF9gAtU/3v6dL9WyoEA8K6W4eNl02p aQXf7n4YDKmZOjYSS+pducz2ys6HNoswN6rxtxsANyb31djSS+dCd4Ajs fkukaF9js347yZNoW9NR6c4l/G9tk+6PUu2+1Z75S843uKi6IdXsDwEG0 af7x+cTx9wQ9cGoB1EwhMhk9aSrwEa7TQJmJrW2Vw6lVSYox+ZVqCMnD7 dvuLW3MmNapX44nnCfkJIjm+e7QMkmUwntIJpINDm5ofC7mE1tk/yY2et /LyUZlYJQtBj9ew1/MxXAqae+TjRrg1BMvHWv/ST/w9zDcG+ZN0CoTsI0 Q==; X-CSE-ConnectionGUID: xxtxTc74R4GlWSE135N5+w== X-CSE-MsgGUID: WpL3w2YjSTm+pMd0VjClpg== X-IronPort-AV: E=McAfee;i="6700,10204,11232"; a="31976805" X-IronPort-AV: E=Sophos;i="6.11,222,1725346800"; d="scan'208";a="31976805" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 02:53:23 -0700 X-CSE-ConnectionGUID: QN0kUc6CR0m4z1OmiuB5eg== X-CSE-MsgGUID: MxGcUg1zSdiZmUJWNl2HNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,222,1725346800"; d="scan'208";a="84412597" Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 02:53:20 -0700 From: Zhenzhong Duan To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: dwmw2@infradead.org, baolu.lu@linux.intel.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH 1/2] iommu/vt-d: Fix checks in dmar_fault_dump_ptes() Date: Tue, 22 Oct 2024 17:50:16 +0800 Message-Id: <20241022095017.479081-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241022095017.479081-1-zhenzhong.duan@intel.com> References: <20241022095017.479081-1-zhenzhong.duan@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In dmar_fault_dump_ptes(), return value of phys_to_virt() is used for checking if an entry is present. It's never NULL on x86 platform at least. This makes some zero entries are dumped like below: [ 442.240357] DMAR: pasid dir entry: 0x000000012c83e001 [ 442.246661] DMAR: pasid table entry[0]: 0x0000000000000000 [ 442.253429] DMAR: pasid table entry[1]: 0x0000000000000000 [ 442.260203] DMAR: pasid table entry[2]: 0x0000000000000000 [ 442.266969] DMAR: pasid table entry[3]: 0x0000000000000000 [ 442.273733] DMAR: pasid table entry[4]: 0x0000000000000000 [ 442.280479] DMAR: pasid table entry[5]: 0x0000000000000000 [ 442.287234] DMAR: pasid table entry[6]: 0x0000000000000000 [ 442.293989] DMAR: pasid table entry[7]: 0x0000000000000000 [ 442.300742] DMAR: PTE not present at level 2 Fix it by checking present bit in all entries. Signed-off-by: Zhenzhong Duan --- drivers/iommu/intel/iommu.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index a564eeaf2375..8288b0ee7a61 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -733,12 +733,17 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, = u16 source_id, u8 devfn =3D source_id & 0xff; u8 bus =3D source_id >> 8; struct dma_pte *pgtable; + u64 entry; =20 pr_info("Dump %s table entries for IOVA 0x%llx\n", iommu->name, addr); =20 /* root entry dump */ rt_entry =3D &iommu->root_entry[bus]; - if (!rt_entry) { + entry =3D rt_entry->lo; + if (sm_supported(iommu) && devfn >=3D 0x80) + entry =3D rt_entry->hi; + + if (!(entry & 1)) { pr_info("root table entry is not present\n"); return; } @@ -766,28 +771,32 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, = u16 source_id, goto pgtable_walk; } =20 + /* For request-without-pasid, get the pasid from context entry */ + if (pasid =3D=3D IOMMU_PASID_INVALID) + pasid =3D IOMMU_NO_PASID; + /* get the pointer to pasid directory entry */ dir =3D phys_to_virt(ctx_entry->lo & VTD_PAGE_MASK); - if (!dir) { + dir_index =3D pasid >> PASID_PDE_SHIFT; + pde =3D &dir[dir_index]; + + if (!pasid_pde_is_present(pde)) { pr_info("pasid directory entry is not present\n"); return; } - /* For request-without-pasid, get the pasid from context entry */ - if (intel_iommu_sm && pasid =3D=3D IOMMU_PASID_INVALID) - pasid =3D IOMMU_NO_PASID; =20 - dir_index =3D pasid >> PASID_PDE_SHIFT; - pde =3D &dir[dir_index]; pr_info("pasid dir entry: 0x%016llx\n", pde->val); =20 /* get the pointer to the pasid table entry */ - entries =3D get_pasid_table_from_pde(pde); - if (!entries) { + entries =3D phys_to_virt(READ_ONCE(pde->val) & PDE_PFN_MASK); + index =3D pasid & PASID_PTE_MASK; + pte =3D &entries[index]; + + if (!pasid_pte_is_present(pte)) { pr_info("pasid table entry is not present\n"); return; } - index =3D pasid & PASID_PTE_MASK; - pte =3D &entries[index]; + for (i =3D 0; i < ARRAY_SIZE(pte->val); i++) pr_info("pasid table entry[%d]: 0x%016llx\n", i, pte->val[i]); =20 --=20 2.34.1 From nobody Tue Nov 26 02:35:59 2024 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02485199E9C for ; Tue, 22 Oct 2024 09:53:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729590807; cv=none; b=pjGyO3KoOcnwkBrrM4+F338DMwH6zki5f5NHtR4RZcqN1n4ShRtT6t6Dbk2kXlGbb8U7U2N6Y2FtloaPAc1O6YmR2MWhkNSmhAEKwXv4AW0X3pxCBlRSB2GOuR0pyvMrjNGJfY3Q6PvQUltHwuJoX7eVBg4xBtX/BUaxCYXB/34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729590807; c=relaxed/simple; bh=Z/F6SkUpljXci2a8Q61yoocqs/lynbRbpXoFGemFnjc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EyLxfos2gvhVsN30yCgK7GWGbU2AwpHoqz553TWJl7fyR/82bUujymJPudT22y/q7Djj5O7hqhboaqZhOIkfx4vvpzi+PP4QJdypf7wDRrdjVhfufiI+C2z68hP1f18dJC5BC/y993BqnoIQA+7CYda+KUOpmfNtDZMsiHGv2iY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fj/5eNIh; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fj/5eNIh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729590806; x=1761126806; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z/F6SkUpljXci2a8Q61yoocqs/lynbRbpXoFGemFnjc=; b=fj/5eNIhGkZHjg37zs+y7bySBWNxOF5Kz7gL9VZl19jR+wWn9b+wQHT8 mQcegVmsI7cpJ5+My5WAjHsjL9VhfAi3IBPKp09Pmf4lppoP03MfhSvDO Bj8WWFOfBk5jFCTKmb3g6+BdFMr+cXnPZH9altCET4xmlFYZ8ITPNABSS fq8DoNDX5Rm62n03YrOtdlL+v7lzwVzGIIbC7HeRDovOt2+8coN8+R/V1 77MTWZrdtM0NGy+DslWZuqj49qWVLJLk/0f6JlhC8495TvRNCv1xzgmOL DE1ad87MAXn/IxsmUtG2OsgsFpC4QexA1dodRXSucxsNqqgChKaqQV1jN w==; X-CSE-ConnectionGUID: IWsYSxhZTV+MkhAKGA5ZeQ== X-CSE-MsgGUID: sdlSUG8LQrGGinb/sF/wBg== X-IronPort-AV: E=McAfee;i="6700,10204,11232"; a="31976831" X-IronPort-AV: E=Sophos;i="6.11,222,1725346800"; d="scan'208";a="31976831" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 02:53:26 -0700 X-CSE-ConnectionGUID: 8dWegeQSRIWPgt7RJuYuvg== X-CSE-MsgGUID: lknjUmMLTIS5ltfXgZKzMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,222,1725346800"; d="scan'208";a="84412642" Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2024 02:53:23 -0700 From: Zhenzhong Duan To: iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: dwmw2@infradead.org, baolu.lu@linux.intel.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, chao.p.peng@intel.com, Zhenzhong Duan , Kyung Min Park Subject: [PATCH 2/2] iommu/vt-d: Fix checks in pgtable_walk() Date: Tue, 22 Oct 2024 17:50:17 +0800 Message-Id: <20241022095017.479081-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241022095017.479081-1-zhenzhong.duan@intel.com> References: <20241022095017.479081-1-zhenzhong.duan@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's not accurate to dump super page as non-present page, meanwhile bit7 in first level page table entry is PAT bit, also pointer pte is never NULL in pgtable_walk() context. Fixes: 914ff7719e8a ("iommu/vt-d: Dump DMAR translation structure when DMA = fault occurs") Signed-off-by: Zhenzhong Duan --- drivers/iommu/intel/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 8288b0ee7a61..fec5cc1147f3 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -707,14 +707,14 @@ static void pgtable_walk(struct intel_iommu *iommu, u= nsigned long pfn, while (1) { offset =3D pfn_level_offset(pfn, level); pte =3D &parent[offset]; - if (!pte || (dma_pte_superpage(pte) || !dma_pte_present(pte))) { + if (!dma_pte_present(pte)) { pr_info("PTE not present at level %d\n", level); break; } =20 pr_info("pte level: %d, pte value: 0x%016llx\n", level, pte->val); =20 - if (level =3D=3D 1) + if (level =3D=3D 1 || dma_pte_superpage(pte)) break; =20 parent =3D phys_to_virt(dma_pte_addr(pte)); --=20 2.34.1