From: Ma Wupeng <[email protected]>
Patch #1 move follow_phys to memtype.c since only pat use this.
Patch #2 cleanup parameter in follow_phys.
Patch #3 drop the unnecessary WARN_ON_ONCE if follow_phys fails.
Changelog since v2:
- rebase to latest linux
Changelog since v1:
- split patch #1 into two patches based on Boris's advise
Ma Wupeng (3):
x86/mm/pat: Move follow_phys to pat-related file
x86/mm/pat: Cleanup unused parameter in follow_phys
x86/mm/pat: Remove WARN_ON_ONCE if follow_phys fails
arch/x86/mm/pat/memtype.c | 34 ++++++++++++++++++++++++++++------
include/linux/mm.h | 2 --
mm/memory.c | 28 ----------------------------
3 files changed, 28 insertions(+), 36 deletions(-)
--
2.25.1
From: Ma Wupeng <[email protected]>
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 <[email protected]>
---
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
From: Ma Wupeng <[email protected]>
Parameter flags is always zero in caller untrack_pfn() and
track_pfn_copy(). let's drop it.
Signed-off-by: Ma Wupeng <[email protected]>
---
arch/x86/mm/pat/memtype.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c
index a6a88679c92e..94bcba399701 100644
--- a/arch/x86/mm/pat/memtype.c
+++ b/arch/x86/mm/pat/memtype.c
@@ -951,8 +951,8 @@ static void free_pfn_range(u64 paddr, unsigned long size)
}
static int follow_phys(struct vm_area_struct *vma,
- unsigned long address, unsigned int flags,
- unsigned long *prot, resource_size_t *phys)
+ unsigned long address, unsigned long *prot,
+ resource_size_t *phys)
{
int ret = -EINVAL;
pte_t *ptep, pte;
@@ -965,9 +965,6 @@ static int follow_phys(struct vm_area_struct *vma,
goto out;
pte = ptep_get(ptep);
- if ((flags & FOLL_WRITE) && !pte_write(pte))
- goto unlock;
-
*prot = pgprot_val(pte_pgprot(pte));
*phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT;
@@ -997,7 +994,7 @@ 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, 0, &prot, &paddr)) {
+ if (follow_phys(vma, vma->vm_start, &prot, &paddr)) {
WARN_ON_ONCE(1);
return -EINVAL;
}
@@ -1084,7 +1081,7 @@ 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, 0, &prot, &paddr)) {
+ if (follow_phys(vma, vma->vm_start, &prot, &paddr)) {
WARN_ON_ONCE(1);
return;
}
--
2.25.1
Hi Wupeng,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
[also build test WARNING on tip/x86/mm tip/master linus/master v6.7 next-20240111]
[cannot apply to tip/auto-latest]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Wupeng-Ma/x86-mm-pat-Move-follow_phys-to-pat-related-file/20240111-201305
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20240111120929.2694440-3-mawupeng1%40huawei.com
patch subject: [PATCH v3 2/3] x86/mm/pat: Cleanup unused parameter in follow_phys
config: i386-alldefconfig (https://download.01.org/0day-ci/archive/20240112/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240112/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
arch/x86/mm/pat/memtype.c: In function 'follow_phys':
>> arch/x86/mm/pat/memtype.c:972:1: warning: label 'unlock' defined but not used [-Wunused-label]
972 | unlock:
| ^~~~~~
vim +/unlock +972 arch/x86/mm/pat/memtype.c
5899329b19100c arch/x86/mm/pat.c [email protected] 2008-12-18 952
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 953 static int follow_phys(struct vm_area_struct *vma,
76b476f1ffb4bf arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 954 unsigned long address, unsigned long *prot,
76b476f1ffb4bf arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 955 resource_size_t *phys)
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 956 {
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 957 int ret = -EINVAL;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 958 pte_t *ptep, pte;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 959 spinlock_t *ptl;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 960
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 961 if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 962 goto out;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 963
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 964 if (follow_pte(vma->vm_mm, address, &ptep, &ptl))
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 965 goto out;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 966 pte = ptep_get(ptep);
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 967
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 968 *prot = pgprot_val(pte_pgprot(pte));
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 969 *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 970
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 971 ret = 0;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 @972 unlock:
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 973 pte_unmap_unlock(ptep, ptl);
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 974 out:
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 975 return ret;
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 976 }
b4e07d9667b7ae arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 977
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Wupeng,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
[also build test WARNING on tip/x86/mm tip/master linus/master v6.7 next-20240112]
[cannot apply to tip/auto-latest]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Wupeng-Ma/x86-mm-pat-Move-follow_phys-to-pat-related-file/20240111-201305
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20240111120929.2694440-3-mawupeng1%40huawei.com
patch subject: [PATCH v3 2/3] x86/mm/pat: Cleanup unused parameter in follow_phys
config: i386-buildonly-randconfig-002-20240112 (https://download.01.org/0day-ci/archive/20240112/[email protected]/config)
compiler: ClangBuiltLinux clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240112/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
arch/x86/mm/pat/memtype.c:973:2: error: call to undeclared function 'kunmap_local'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
973 | pte_unmap_unlock(ptep, ptl);
| ^
include/linux/mm.h:2965:2: note: expanded from macro 'pte_unmap_unlock'
2965 | pte_unmap(pte); \
| ^
include/linux/pgtable.h:103:2: note: expanded from macro 'pte_unmap'
103 | kunmap_local((pte)); \
| ^
>> arch/x86/mm/pat/memtype.c:972:1: warning: unused label 'unlock' [-Wunused-label]
972 | unlock:
| ^~~~~~~
1 warning and 1 error generated.
vim +/unlock +972 arch/x86/mm/pat/memtype.c
5899329b19100c0 arch/x86/mm/pat.c [email protected] 2008-12-18 952
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 953 static int follow_phys(struct vm_area_struct *vma,
76b476f1ffb4bf1 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 954 unsigned long address, unsigned long *prot,
76b476f1ffb4bf1 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 955 resource_size_t *phys)
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 956 {
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 957 int ret = -EINVAL;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 958 pte_t *ptep, pte;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 959 spinlock_t *ptl;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 960
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 961 if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 962 goto out;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 963
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 964 if (follow_pte(vma->vm_mm, address, &ptep, &ptl))
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 965 goto out;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 966 pte = ptep_get(ptep);
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 967
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 968 *prot = pgprot_val(pte_pgprot(pte));
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 969 *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 970
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 971 ret = 0;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 @972 unlock:
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 @973 pte_unmap_unlock(ptep, ptl);
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 974 out:
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 975 return ret;
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 976 }
b4e07d9667b7ae8 arch/x86/mm/pat/memtype.c Ma Wupeng 2024-01-11 977
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki