[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0@git.kernel.org>
Date: Mon, 22 Jul 2019 01:22:06 -0700
From: tip-bot for Joerg Roedel <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, mingo@...nel.org, hpa@...or.com,
dave.hansen@...ux.intel.com, linux-kernel@...r.kernel.org,
jroedel@...e.de
Subject: [tip:x86/urgent] x86/mm: Check for pfn instead of page in
vmalloc_sync_one()
Commit-ID: 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0
Gitweb: https://git.kernel.org/tip/51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0
Author: Joerg Roedel <jroedel@...e.de>
AuthorDate: Fri, 19 Jul 2019 20:46:50 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 22 Jul 2019 10:18:30 +0200
x86/mm: Check for pfn instead of page in vmalloc_sync_one()
Do not require a struct page for the mapped memory location because it
might not exist. This can happen when an ioremapped region is mapped with
2MB pages.
Fixes: 5d72b4fba40ef ('x86, mm: support huge I/O mapping capability I/F')
Signed-off-by: Joerg Roedel <jroedel@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Dave Hansen <dave.hansen@...ux.intel.com>
Link: https://lkml.kernel.org/r/20190719184652.11391-2-joro@8bytes.org
---
arch/x86/mm/fault.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 6c46095cd0d9..e64173db4970 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -183,7 +183,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
if (!pmd_present(*pmd))
set_pmd(pmd, *pmd_k);
else
- BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k));
+ BUG_ON(pmd_pfn(*pmd) != pmd_pfn(*pmd_k));
return pmd_k;
}
Powered by blists - more mailing lists