[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240111120929.2694440-4-mawupeng1@huawei.com>
Date: Thu, 11 Jan 2024 20:09:29 +0800
From: Wupeng Ma <mawupeng1@...wei.com>
To: <akpm@...ux-foundation.org>, <dave.hansen@...ux.intel.com>,
<luto@...nel.org>, <tglx@...utronix.de>, <peterz@...radead.org>
CC: <linux-kernel@...r.kernel.org>, <x86@...nel.org>, <mawupeng1@...wei.com>,
<bp@...e.de>, <mingo@...hat.com>
Subject: [PATCH v3 3/3] x86/mm/pat: Remove WARN_ON_ONCE if follow_phys fails
From: Ma Wupeng <mawupeng1@...wei.com>
Since there is no obvious reason to keep this WARN_ON_ONCE if follow_phys
fails in track_pfn_copy/untrack_pfn, Drop it.
Signed-off-by: Ma Wupeng <mawupeng1@...wei.com>
---
arch/x86/mm/pat/memtype.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c
index 94bcba399701..2fd37c2b29d6 100644
--- a/arch/x86/mm/pat/memtype.c
+++ b/arch/x86/mm/pat/memtype.c
@@ -994,10 +994,9 @@ int track_pfn_copy(struct vm_area_struct *vma)
* reserve the whole chunk covered by vma. We need the
* starting address and protection from pte.
*/
- if (follow_phys(vma, vma->vm_start, &prot, &paddr)) {
- WARN_ON_ONCE(1);
+ if (follow_phys(vma, vma->vm_start, &prot, &paddr))
return -EINVAL;
- }
+
pgprot = __pgprot(prot);
return reserve_pfn_range(paddr, vma_size, &pgprot, 1);
}
@@ -1081,10 +1080,8 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
/* free the chunk starting from pfn or the whole chunk */
paddr = (resource_size_t)pfn << PAGE_SHIFT;
if (!paddr && !size) {
- if (follow_phys(vma, vma->vm_start, &prot, &paddr)) {
- WARN_ON_ONCE(1);
+ if (follow_phys(vma, vma->vm_start, &prot, &paddr))
return;
- }
size = vma->vm_end - vma->vm_start;
}
--
2.25.1
Powered by blists - more mailing lists