Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756176AbcJ1Ik1 (ORCPT ); Fri, 28 Oct 2016 04:40:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51336 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752947AbcJ1IkY (ORCPT ); Fri, 28 Oct 2016 04:40:24 -0400 Date: Fri, 28 Oct 2016 01:37:49 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, luto@amacapital.net, hpa@zytor.com, dvlasenk@redhat.com, jpoimboe@redhat.com, agruenba@redhat.com, torvalds@linux-foundation.org, linux-mm@kvack.org, mingo@kernel.org, rpeterso@redhat.com, peterz@infradead.org, brgerst@gmail.com, bp@alien8.de, mgorman@techsingularity.net, swhiteho@redhat.com, luto@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: rpeterso@redhat.com, peterz@infradead.org, mingo@kernel.org, brgerst@gmail.com, mgorman@techsingularity.net, swhiteho@redhat.com, bp@alien8.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@kernel.org, dvlasenk@redhat.com, luto@amacapital.net, bp@suse.de, hpa@zytor.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, agruenba@redhat.com, linux-mm@kvack.org In-Reply-To: <20161027123623.j2jri5bandimboff@pd.tnic> References: <20161027123623.j2jri5bandimboff@pd.tnic> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/microcode/AMD: Fix more fallout from CONFIG_RANDOMIZE_MEMORY=y Git-Commit-ID: 1c27f646b18fb56308dff82784ca61951bad0b48 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 Content-Length: 2574 Lines: 66 Commit-ID: 1c27f646b18fb56308dff82784ca61951bad0b48 Gitweb: http://git.kernel.org/tip/1c27f646b18fb56308dff82784ca61951bad0b48 Author: Borislav Petkov AuthorDate: Thu, 27 Oct 2016 14:36:23 +0200 Committer: Ingo Molnar CommitDate: Fri, 28 Oct 2016 10:29:59 +0200 x86/microcode/AMD: Fix more fallout from CONFIG_RANDOMIZE_MEMORY=y We needed the physical address of the container in order to compute the offset within the relocated ramdisk. And we did this by doing __pa() on the virtual address. However, __pa() does checks whether the physical address is within PAGE_OFFSET and __START_KERNEL_map - see __phys_addr() - which fail if we have CONFIG_RANDOMIZE_MEMORY enabled: we feed a virtual address which *doesn't* have the randomization offset into a function which uses PAGE_OFFSET which *does* have that offset. This makes this check fire: VIRTUAL_BUG_ON((x > y) || !phys_addr_valid(x)); ^^^^^^ due to the randomization offset. The fix is as simple as using __pa_nodebug() because we do that randomization offset accounting later in that function ourselves. Reported-by: Bob Peterson Tested-by: Bob Peterson Signed-off-by: Borislav Petkov Cc: Andreas Gruenbacher Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Mel Gorman Cc: Peter Zijlstra Cc: Steven Whitehouse Cc: Thomas Gleixner Cc: linux-mm Cc: stable@vger.kernel.org # 4.9 Link: http://lkml.kernel.org/r/20161027123623.j2jri5bandimboff@pd.tnic Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 620ab06..017bda1 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -429,7 +429,7 @@ int __init save_microcode_in_initrd_amd(void) * We need the physical address of the container for both bitness since * boot_params.hdr.ramdisk_image is a physical address. */ - cont = __pa(container); + cont = __pa_nodebug(container); cont_va = container; #endif