Skip to contentSkip to conversation

mm: cleanup with VM_ACCESS_FLAGS

PATCH Applied Kefeng Wang 2 participants 8 messages Oct 19, 2022 – Oct 23, 2022

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover mm: cleanup with VM_ACCESS_FLAGS

Kefeng Wang (5):
nios2: remove unused INIT_MMAP
x86/sgx: use VM_ACCESS_FLAGS
mm: mprotect: use VM_ACCESS_FLAGS
mm: debug_vm_pgtable: use VM_ACCESS_FLAGS
amdgpu: use VM_ACCESS_FLAGS

 arch/nios2/include/asm/processor.h      | 3 ---
 arch/x86/kernel/cpu/sgx/encl.c          | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
 mm/debug_vm_pgtable.c                   | 8 ++------
 mm/mprotect.c                           | 3 +--
 5 files changed, 6 insertions(+), 14 deletions(-)
Signature · 1 line
2.35.3
#1 lore raw

PATCH 1/5 nios2: remove unused INIT_MMAP

It seems that INIT_MMAP is gone in 2.4.10, not sure, anyways, it is useless now, kill it.

---
 arch/nios2/include/asm/processor.h | 3 ---
 1 file changed, 3 deletions(-)
arch/nios2/include/asm/processor.h +0 -3
index 8916d93d5c2d..eb44130364a9 100644
@@ -50,9 +50,6 @@ struct thread_struct {
 	unsigned long kpsr;
 };
 
-#define INIT_MMAP \
-	{ &init_mm, (0), (0), __pgprot(0x0), VM_READ | VM_WRITE | VM_EXEC }
-
 # define INIT_THREAD {			\
 	.kregs	= NULL,			\
 	.ksp	= 0,			\
Signature · 1 line
2.35.3
#2 lore raw

PATCH 2/5 x86/sgx: use VM_ACCESS_FLAGS

In reply to Kefeng Wang

Simplify VM_READ|VM_WRITE|VM_EXEC with VM_ACCESS_FLAGS.

Cc Jarkko Sakkinen <[email protected]>
Cc Dave Hansen <[email protected]>
---
 arch/x86/kernel/cpu/sgx/encl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +2 -2
index 1ec20807de1e..6225c525372d 100644
@@ -268,7 +268,7 @@ static struct sgx_encl_page *sgx_encl_load_page_in_vma(struct sgx_encl *encl,
 						       unsigned long addr,
 						       unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *entry;
 
 	entry = xa_load(&encl->page_array, PFN_DOWN(addr));
@@ -502,7 +502,7 @@ static void sgx_vma_open(struct vm_area_struct *vma)
 int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,
 		     unsigned long end, unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *page;
 	unsigned long count = 0;
 	int ret = 0;
Signature · 1 line
2.35.3
maintainer
#3 lore raw

Re: [PATCH 2/5] x86/sgx: use VM_ACCESS_FLAGS

Quoted 34 lines · Kefeng Wang

Simplify VM_READ|VM_WRITE|VM_EXEC with VM_ACCESS_FLAGS.

Cc Jarkko Sakkinen <[email protected]>
Cc Dave Hansen <[email protected]>
---
 arch/x86/kernel/cpu/sgx/encl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +2 -2
index 1ec20807de1e..6225c525372d 100644
@@ -268,7 +268,7 @@ static struct sgx_encl_page *sgx_encl_load_page_in_vma(struct sgx_encl *encl,
 						       unsigned long addr,
 						       unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *entry;
 
 	entry = xa_load(&encl->page_array, PFN_DOWN(addr));
@@ -502,7 +502,7 @@ static void sgx_vma_open(struct vm_area_struct *vma)
 int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,
 		     unsigned long end, unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *page;
 	unsigned long count = 0;
 	int ret = 0;
Signature · 1 line
2.35.3

Why?

BR, Jarkko

maintainer
#4 lore raw

Re: [PATCH 2/5] x86/sgx: use VM_ACCESS_FLAGS

Quoted 22 lines · Jarkko Sakkinen
Quoted 21 lines · Kefeng Wang

Simplify VM_READ|VM_WRITE|VM_EXEC with VM_ACCESS_FLAGS.

Cc Jarkko Sakkinen <[email protected]>
Cc Dave Hansen <[email protected]>
---
 arch/x86/kernel/cpu/sgx/encl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.c +1 -1
index 1ec20807de1e..6225c525372d 100644
@@ -268,7 +268,7 @@ static struct sgx_encl_page *sgx_encl_load_page_in_vma(struct sgx_encl *encl,
 						       unsigned long addr,
 						       unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *entry;
 
Quoted 15 lines
Quoted 13 lines
arch/x86/kernel/cpu/sgx/encl.c +1 -1
 	entry = xa_load(&encl->page_array, PFN_DOWN(addr));
@@ -502,7 +502,7 @@ static void sgx_vma_open(struct vm_area_struct *vma)
 int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,
 		     unsigned long end, unsigned long vm_flags)
 {
-	unsigned long vm_prot_bits = vm_flags & (VM_READ | VM_WRITE | VM_EXEC);
+	unsigned long vm_prot_bits = vm_flags & VM_ACCESS_FLAGS;
 	struct sgx_encl_page *page;
 	unsigned long count = 0;
 	int ret = 0;
Signature · 1 line
2.35.3

Why?

Only benefit I see is a downside: you have xref VM_ACCESS_FLAGS, which is counter-productive. Zero gain.

BR, Jarkko

#5 lore raw

PATCH 3/5 mm: mprotect: use VM_ACCESS_FLAGS

In reply to Kefeng Wang

Simplify VM_READ|VM_WRITE|VM_EXEC with VM_ACCESS_FLAGS.

---
 mm/mprotect.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/mprotect.c +1 -2
index 668bfaa6ed2a..99762403cc8f 100644
@@ -756,8 +756,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
 		 * If a permission is not passed to mprotect(), it must be
 		 * cleared from the VMA.
 		 */
-		mask_off_old_flags = VM_READ | VM_WRITE | VM_EXEC |
-					VM_FLAGS_CLEAR;
+		mask_off_old_flags = VM_ACCESS_FLAGS | VM_FLAGS_CLEAR;
 
 		new_vma_pkey = arch_override_mprotect_pkey(vma, prot, pkey);
 		newflags = calc_vm_prot_bits(prot, new_vma_pkey);
Signature · 1 line
2.35.3
#6 lore raw

PATCH 4/5 mm: debug_vm_pgtable: use VM_ACCESS_FLAGS

In reply to Kefeng Wang

Directly use VM_ACCESS_FLAGS instead VMFLAGS.

---
 mm/debug_vm_pgtable.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
mm/debug_vm_pgtable.c +2 -6
index dc7df1254f0a..2b61fde8c38c 100644
@@ -38,11 +38,7 @@
  * Please refer Documentation/mm/arch_pgtable_helpers.rst for the semantics
  * expectations that are being validated here. All future changes in here
  * or the documentation need to be in sync.
- */
-
-#define VMFLAGS	(VM_READ|VM_WRITE|VM_EXEC)
-
-/*
+ *
  * On s390 platform, the lower 4 bits are used to identify given page table
  * entry type. But these bits might affect the ability to clear entries with
  * pxx_clear() because of how dynamic page table folding works on s390. So
@@ -1125,7 +1121,7 @@ static int __init init_args(struct pgtable_debug_args *args)
 	 */
 	memset(args, 0, sizeof(*args));
 	args->vaddr              = get_random_vaddr();
-	args->page_prot          = vm_get_page_prot(VMFLAGS);
+	args->page_prot          = vm_get_page_prot(VM_ACCESS_FLAGS);
 	args->page_prot_none     = vm_get_page_prot(VM_NONE);
 	args->is_contiguous_page = false;
 	args->pud_pfn            = ULONG_MAX;
Signature · 1 line
2.35.3
#7 lore raw

PATCH 5/5 amdgpu: use VM_ACCESS_FLAGS

In reply to Kefeng Wang

Simplify VM_READ|VM_WRITE|VM_EXEC with VM_ACCESS_FLAGS.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "Pan, Xinhui" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -1
index 8ef31d687ef3..4728be161828 100644
@@ -255,7 +255,7 @@ static int amdgpu_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_str
 	 * becoming writable and makes is_cow_mapping(vm_flags) false.
 	 */
 	if (is_cow_mapping(vma->vm_flags) &&
-	    !(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)))
+	    !(vma->vm_flags & VM_ACCESS_FLAGS))
 		vma->vm_flags &= ~VM_MAYWRITE;
 
 	return drm_gem_ttm_mmap(obj, vma);
Signature · 1 line
2.35.3