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;
Date:   Thu, 19 Jul 2018 16:33:15 -0700
From:   tip-bot for Joerg Roedel <tipbot@zytor.com>
Message-ID: <tip-1ac228a7c87f697d1d01eb6362a6b5246705b0dd@git.kernel.org>
Cc:     torvalds@linux-foundation.org, jpoimboe@redhat.com,
        dave.hansen@intel.com, tglx@linutronix.de, peterz@infradead.org,
        pavel@ucw.cz, bp@alien8.de, luto@kernel.org, mingo@kernel.org,
        boris.ostrovsky@oracle.com, jkosina@suse.cz, aarcange@redhat.com,
        David.Laight@aculab.com, hpa@zytor.com, dvlasenk@redhat.com,
        will.deacon@arm.com, jgross@suse.com, linux-kernel@vger.kernel.org,
        dhgutteridge@sympatico.ca, llong@redhat.com, brgerst@gmail.com,
        jroedel@suse.de, eduval@amazon.com, gregkh@linuxfoundation.org
Reply-To: pavel@ucw.cz, bp@alien8.de, torvalds@linux-foundation.org,
          dave.hansen@intel.com, jpoimboe@redhat.com, tglx@linutronix.de,
          peterz@infradead.org, luto@kernel.org, mingo@kernel.org,
          jkosina@suse.cz, boris.ostrovsky@oracle.com, aarcange@redhat.com,
          jgross@suse.com, linux-kernel@vger.kernel.org,
          dhgutteridge@sympatico.ca, hpa@zytor.com,
          David.Laight@aculab.com, dvlasenk@redhat.com,
          will.deacon@arm.com, gregkh@linuxfoundation.org,
          brgerst@gmail.com, llong@redhat.com, jroedel@suse.de,
          eduval@amazon.com
In-Reply-To: <1531906876-13451-29-git-send-email-joro@8bytes.org>
References: <1531906876-13451-29-git-send-email-joro@8bytes.org>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/pti] x86/mm/pti: Keep permissions when cloning kernel text
 in pti_clone_kernel_text()
Git-Commit-ID: 1ac228a7c87f697d1d01eb6362a6b5246705b0dd
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> 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
Precedence: bulk

Commit-ID:  1ac228a7c87f697d1d01eb6362a6b5246705b0dd
Gitweb:     https://git.kernel.org/tip/1ac228a7c87f697d1d01eb6362a6b5246705b0dd
Author:     Joerg Roedel <jroedel@suse.de>
AuthorDate: Wed, 18 Jul 2018 11:41:05 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 20 Jul 2018 01:11:45 +0200

x86/mm/pti: Keep permissions when cloning kernel text in pti_clone_kernel_text()

Mapping the kernel text area to user-space makes only sense if it has the
same permissions as in the kernel page-table.  If permissions are different
this will cause a TLB reload when using the kernel page-table, which is as
good as not mapping it at all.

On 64-bit kernels this patch makes no difference, as the whole range cloned
by pti_clone_kernel_text() is mapped RO anyway. On 32 bit there are
writeable mappings in the range, so just keep the permissions as they are.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Pavel Machek <pavel@ucw.cz>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: linux-mm@kvack.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Laight <David.Laight@aculab.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Eduardo Valentin <eduval@amazon.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: aliguori@amazon.com
Cc: daniel.gruss@iaik.tugraz.at
Cc: hughd@google.com
Cc: keescook@google.com
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Waiman Long <llong@redhat.com>
Cc: "David H . Gutteridge" <dhgutteridge@sympatico.ca>
Cc: joro@8bytes.org
Link: https://lkml.kernel.org/r/1531906876-13451-29-git-send-email-joro@8bytes.org

---
 arch/x86/mm/pti.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index 453d23760941..e41ee93c430d 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -482,7 +482,7 @@ void pti_clone_kernel_text(void)
 	 * pti_set_kernel_image_nonglobal() did to clear the
 	 * global bit.
 	 */
-	pti_clone_pmds(start, end, _PAGE_RW);
+	pti_clone_pmds(start, end, 0);
 }
 
 /*