From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35205 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992827AbbHHUhz (ORCPT ); Sat, 8 Aug 2015 16:37:55 -0400 Subject: Patch "x86, perf: Fix static_key bug in load_mm_cr4()" has been added to the 4.1-stable tree To: peterz@infradead.org, Valdis.Kletnieks@vt.edu, aarcange@redhat.com, acme@kernel.org, bp@alien8.de, brgerst@gmail.com, dvlasenk@redhat.com, gregkh@linuxfoundation.org, hillf.zj@alibaba-inc.com, hpa@zytor.com, keescook@chromium.org, luto@amacapital.net, mingo@kernel.org, mpatocka@redhat.com, paulus@samba.org, tglx@linutronix.de, torvalds@linux-foundation.org, vince@deater.net Cc: , From: Date: Sat, 08 Aug 2015 13:37:54 -0700 Message-ID: <143906627446166@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled x86, perf: Fix static_key bug in load_mm_cr4() to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-perf-fix-static_key-bug-in-load_mm_cr4.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From a833581e372a4adae2319d8dc379493edbc444e9 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 9 Jul 2015 19:23:38 +0200 Subject: x86, perf: Fix static_key bug in load_mm_cr4() From: Peter Zijlstra commit a833581e372a4adae2319d8dc379493edbc444e9 upstream. Mikulas reported his K6-3 not booting. This is because the static_key API confusion struck and bit Andy, this wants to be static_key_false(). Reported-by: Mikulas Patocka Tested-by: Mikulas Patocka Signed-off-by: Peter Zijlstra (Intel) Cc: Andrea Arcangeli Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Valdis Kletnieks Cc: Vince Weaver Cc: hillf.zj Fixes: a66734297f78 ("perf/x86: Add /sys/devices/cpu/rdpmc=2 to allow rdpmc for all tasks") Link: http://lkml.kernel.org/r/20150709172338.GC19282@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/mmu_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -23,7 +23,7 @@ extern struct static_key rdpmc_always_av static inline void load_mm_cr4(struct mm_struct *mm) { - if (static_key_true(&rdpmc_always_available) || + if (static_key_false(&rdpmc_always_available) || atomic_read(&mm->context.perf_rdpmc_allowed)) cr4_set_bits(X86_CR4_PCE); else Patches currently in stable-queue which might be from peterz@infradead.org are queue-4.1/x86-kasan-fix-kasan-shadow-region-page-tables.patch queue-4.1/x86-perf-fix-static_key-bug-in-load_mm_cr4.patch queue-4.1/x86-kasan-fix-boot-crash-on-amd-processors.patch queue-4.1/x86-init-clear-init_level4_pgt-earlier.patch queue-4.1/x86-kasan-flush-tlbs-after-switching-cr3.patch