Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   zhong jiang <zhongjiang@huawei.com>
To:     <dave.hansen@linux.intel.com>, <peterz@infradead.org>,
        <tglx@linutronix.de>, <mingo@redhat.com>
CC:     <luto@kernel.org>, <bp@alien8.de>, <hpa@zytor.com>,
        <zhongjiang@huawei.com>, <x86@kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: [RFC PATCH] x86/mm: Mask out unsupported bit when it set noexec=off
Date:   Mon, 11 Nov 2019 17:53:14 +0800
Message-ID: <1573465994-33249-1-git-send-email-zhongjiang@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit 510bb96fe5b3 ("x86/mm: Prevent bogus warnings with "noexec=off"")
use  __supported_pte_mask to replace __default_kernel_pte_mask to mask
out the unsupported bits. It works when the command line set noexec=off.

It also seems to works to use __supported_pte_mask instead in native_set_fixmap.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 arch/x86/mm/pgtable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 7bd2c3a..13933b9 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -647,7 +647,7 @@ void native_set_fixmap(unsigned /* enum fixed_addresses */ idx,
 		       phys_addr_t phys, pgprot_t flags)
 {
 	/* Sanitize 'prot' against any unsupported bits: */
-	pgprot_val(flags) &= __default_kernel_pte_mask;
+	pgprot_val(flags) &= __supported_pte_mask;
 
 	__native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags));
 }
-- 
1.7.12.4