[PATCH v10 08/10] mm: Clear arch specific VM flags on protection change

From: Khalid Aziz <khalid.aziz@oracle.com>
To: akpm@linux-foundation.org, davem@davemloft.net,
	dave.hansen@linux.intel.com
Cc: Khalid Aziz <khalid.aziz@oracle.com>,
	mhocko@suse.com, jack@suse.cz, kirill.shutemov@linux.intel.com,
	ross.zwisler@linux.intel.com, lstoakes@gmail.com,
	dave.jiang@intel.com, willy@infradead.org, hughd@google.com,
	ying.huang@intel.com, n-horiguchi@ah.jp.nec.com,
	heiko.carstens@de.ibm.com, mgorman@suse.de, aarcange@redhat.com,
	ak@linux.intel.com, aneesh.kumar@linux.vnet.ibm.com,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	sparclinux@vger.kernel.org, Khalid Aziz <khalid@gonehiking.org>
Subject: [PATCH v10 08/10] mm: Clear arch specific VM flags on protection change
Date: Wed, 15 Nov 2017 15:46:23 -0700	[thread overview]
Message-ID: <e4656969f15fe0b43135b6e3f301695b77c885fc.1510768775.git.khalid.aziz@oracle.com> (raw)
In-Reply-To: <cover.1510768775.git.khalid.aziz@oracle.com>
In-Reply-To: <cover.1510768775.git.khalid.aziz@oracle.com>

When protection bits are changed on a VMA, some of the architecture
specific flags should be cleared as well. An examples of this are the
PKEY flags on x86. This patch expands the current code that clears
PKEY flags for x86, to support similar functionality for other
architectures as well.

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Khalid Aziz <khalid@gonehiking.org>
---
v7:
	- new patch

 include/linux/mm.h | 6 ++++++
 mm/mprotect.c      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 43edf659453b..f97bc6184c52 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -277,6 +277,12 @@ extern unsigned int kobjsize(const void *objp);
 /* This mask is used to clear all the VMA flags used by mlock */
 #define VM_LOCKED_CLEAR_MASK	(~(VM_LOCKED | VM_LOCKONFAULT))
 
+/* Arch-specific flags to clear when updating VM flags on protection change */
+#ifndef VM_ARCH_CLEAR
+# define VM_ARCH_CLEAR	VM_NONE
+#endif
+#define VM_FLAGS_CLEAR	(ARCH_VM_PKEY_FLAGS | VM_ARCH_CLEAR)
+
 /*
  * mapping from the currently active vm_flags protection bits (the
  * low four bits) to a page protection mask..
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 1e0d9cb024c8..a071f72309c0 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -468,7 +468,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
 		 * cleared from the VMA.
 		 */
 		mask_off_old_flags = VM_READ | VM_WRITE | VM_EXEC |
-					ARCH_VM_PKEY_FLAGS;
+					VM_FLAGS_CLEAR;
 
 		new_vma_pkey = arch_override_mprotect_pkey(vma, prot, pkey);
 		newflags = calc_vm_prot_bits(prot, new_vma_pkey);
-- 
2.11.0
