From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759611AbbIVTvq (ORCPT ); Tue, 22 Sep 2015 15:51:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54786 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758251AbbIVTvo (ORCPT ); Tue, 22 Sep 2015 15:51:44 -0400 Date: Tue, 22 Sep 2015 12:45:58 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: tglx@linutronix.de, toshi.kani@hpe.com, bp@alien8.de, mingo@kernel.org, konrad.wilk@oracle.com, jgross@suse.com, linux-kernel@vger.kernel.org, mingo@redhat.com, elliott@hpe.com, akpm@linux-foundation.org, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, elliott@hpe.com, hpa@zytor.com, akpm@linux-foundation.org, mingo@redhat.com, bp@alien8.de, toshi.kani@hpe.com, tglx@linutronix.de, jgross@suse.com, konrad.wilk@oracle.com, mingo@kernel.org In-Reply-To: <1442514264-12475-12-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-12-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Fix no-change case in try_preserve_large_page() Git-Commit-ID: 55696b1f664e52b3036f21631f9c2247b667f587 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: 55696b1f664e52b3036f21631f9c2247b667f587 Gitweb: http://git.kernel.org/tip/55696b1f664e52b3036f21631f9c2247b667f587 Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:24 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:33 +0200 x86/mm: Fix no-change case in try_preserve_large_page() try_preserve_large_page() checks if new_prot is the same as old_prot. If so, it simply sets do_split to 0, and returns with no-operation. However, old_prot is set as a 4KB pgprot value while new_prot is a large page pgprot value. Now that old_prot is initially set from p?d_pgprot() as a large page pgprot value, fix it by not overwriting old_prot with a 4KB pgprot value. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Juergen Gross Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: Konrad Wilk Cc: Robert Elliot Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-12-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index ab9465b..e2621a8 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -518,7 +518,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address, * up accordingly. */ old_pte = *kpte; - old_prot = req_prot = pgprot_large_2_4k(old_prot); + req_prot = pgprot_large_2_4k(old_prot); pgprot_val(req_prot) &= ~pgprot_val(cpa->mask_clr); pgprot_val(req_prot) |= pgprot_val(cpa->mask_set);