From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947966AbcBRUUe (ORCPT ); Thu, 18 Feb 2016 15:20:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46905 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947639AbcBRUU3 (ORCPT ); Thu, 18 Feb 2016 15:20:29 -0500 Date: Thu, 18 Feb 2016 12:19:03 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: hpa@zytor.com, bp@alien8.de, torvalds@linux-foundation.org, tglx@linutronix.de, xiexiuqi@huawei.com, koct9i@gmail.com, kirill.shutemov@linux.intel.com, mingo@kernel.org, vdavydov@parallels.com, valentinrothberg@gmail.com, dan.j.williams@intel.com, oleg@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, brgerst@gmail.com, riel@redhat.com, sasha.levin@oracle.com, vbabka@suse.cz, dvlasenk@redhat.com, mgorman@suse.de, mhocko@suse.com, akpm@linux-foundation.org, luto@amacapital.net, dave@sr71.net Reply-To: vdavydov@parallels.com, valentinrothberg@gmail.com, dan.j.williams@intel.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, tglx@linutronix.de, koct9i@gmail.com, xiexiuqi@huawei.com, torvalds@linux-foundation.org, hpa@zytor.com, bp@alien8.de, dave@sr71.net, luto@amacapital.net, akpm@linux-foundation.org, mhocko@suse.com, mgorman@suse.de, vbabka@suse.cz, sasha.levin@oracle.com, riel@redhat.com, dvlasenk@redhat.com, oleg@redhat.com, brgerst@gmail.com, dave.hansen@linux.intel.com, jack@suse.cz, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <20160212210208.81AF00D5@viggo.jf.intel.com> References: <20160212210208.81AF00D5@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:mm/pkeys] mm/core, x86/mm/pkeys: Store protection bits in high VMA flags Git-Commit-ID: 63c17fb8e5a46a16e10e82005748837fd11a2024 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 63c17fb8e5a46a16e10e82005748837fd11a2024 Gitweb: http://git.kernel.org/tip/63c17fb8e5a46a16e10e82005748837fd11a2024 Author: Dave Hansen AuthorDate: Fri, 12 Feb 2016 13:02:08 -0800 Committer: Ingo Molnar CommitDate: Thu, 18 Feb 2016 09:31:50 +0100 mm/core, x86/mm/pkeys: Store protection bits in high VMA flags vma->vm_flags is an 'unsigned long', so has space for 32 flags on 32-bit architectures. The high 32 bits are unused on 64-bit platforms. We've steered away from using the unused high VMA bits for things because we would have difficulty supporting it on 32-bit. Protection Keys are not available in 32-bit mode, so there is no concern about supporting this feature in 32-bit mode or on 32-bit CPUs. This patch carves out 4 bits from the high half of vma->vm_flags and allows architectures to set config option to make them available. Sparse complains about these constants unless we explicitly call them "UL". Signed-off-by: Dave Hansen Reviewed-by: Thomas Gleixner Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dan Williams Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jan Kara Cc: Kirill A. Shutemov Cc: Konstantin Khlebnikov Cc: Linus Torvalds Cc: Mel Gorman Cc: Michal Hocko Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Sasha Levin Cc: Valentin Rothberg Cc: Vladimir Davydov Cc: Vlastimil Babka Cc: Xie XiuQi Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20160212210208.81AF00D5@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 1 + include/linux/mm.h | 11 +++++++++++ mm/Kconfig | 3 +++ 3 files changed, 15 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3632cdd..fb2ebeb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -155,6 +155,7 @@ config X86 select VIRT_TO_BUS select X86_DEV_DMA_OPS if X86_64 select X86_FEATURE_NAMES if PROC_FS + select ARCH_USES_HIGH_VMA_FLAGS if X86_INTEL_MEMORY_PROTECTION_KEYS config INSTRUCTION_DECODER def_bool y diff --git a/include/linux/mm.h b/include/linux/mm.h index 4c73178..54d173b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -170,6 +170,17 @@ extern unsigned int kobjsize(const void *objp); #define VM_NOHUGEPAGE 0x40000000 /* MADV_NOHUGEPAGE marked this vma */ #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ +#ifdef CONFIG_ARCH_USES_HIGH_VMA_FLAGS +#define VM_HIGH_ARCH_BIT_0 32 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_1 33 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) +#define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) +#define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) +#define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) +#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC) diff --git a/mm/Kconfig b/mm/Kconfig index 03cbfa0..6cf4399 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -669,3 +669,6 @@ config ZONE_DEVICE config FRAME_VECTOR bool + +config ARCH_USES_HIGH_VMA_FLAGS + bool