From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753732AbcHPNtt (ORCPT <rfc822;w@1wt.eu>);
	Tue, 16 Aug 2016 09:49:49 -0400
Received: from mail.skyhub.de ([78.46.96.112]:47295 "EHLO mail.skyhub.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753246AbcHPNts (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 16 Aug 2016 09:49:48 -0400
Date: Tue, 16 Aug 2016 15:49:28 +0200
From: Borislav Petkov <bp@alien8.de>
To: Brian Gerst <brgerst@gmail.com>
Cc: Baoquan He <bhe@redhat.com>, Yinghai Lu <yinghai@kernel.org>,
        Juergen Gross <jgross@suse.com>, Thomas Garnier <thgarnie@google.com>,
        Andy Lutomirski <luto@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
        Alexander Kuleshov <kuleshovmail@gmail.com>,
        Josh Poimboeuf <jpoimboe@redhat.com>, borntraeger@de.ibm.com,
        sds@tycho.nsa.gov, kirill.shutemov@linux.intel.com, jroedel@suse.de,
        Kees Cook <keescook@chromium.org>,
        "Williams, Dan J" <dan.j.williams@intel.com>,
        Mark Salter <msalter@redhat.com>, Borislav Petkov <bp@suse.de>,
        Jonathan Corbet <corbet@lwn.net>, matt@codeblueprint.co.uk,
        guangrong.xiao@linux.intel.com, aneesh.kumar@linux.vnet.ibm.com,
        Ingo Molnar <mingo@kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Dave Hansen <dave.hansen@linux.intel.com>, toshi.kani@hpe.com,
        alpopov@ptsecurity.com,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jan Beulich <JBeulich@suse.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        Denys Vlasenko <dvlasenk@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>, dyoung@redhat.com,
        Thomas Gleixner <tglx@linutronix.de>,
        Dmitry Vyukov <dvyukov@google.com>, lv.zheng@intel.com,
        schwidefsky@de.ibm.com, linux-tip-commits@vger.kernel.org
Subject: Re: [tip:x86/boot] x86/mm: Enable KASLR for physical mapping memory
 regions
Message-ID: <20160816134928.GC11106@nazgul.tnic>
References: <1466556426-32664-7-git-send-email-keescook@chromium.org>
 <tip-021182e52fe01c1f7b126f97fd6ba048dc4234fd@git.kernel.org>
 <CAMzpN2h-CV2e1F_8u5GYkwaFkzoERfi9a83DEO7OeKEJB0RYTg@mail.gmail.com>
 <20160814232657.GA10704@x1.redhat.com>
 <CAMzpN2ixxOEonfgDdFRkB8P9Zb6eiFJF4Vx_HRMgWhm-7wK1hg@mail.gmail.com>
 <20160816134205.GB11106@nazgul.tnic>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20160816134205.GB11106@nazgul.tnic>
User-Agent: Mutt/1.6.0 (2016-04-01)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Aug 16, 2016 at 03:42:05PM +0200, Borislav Petkov wrote:
> I'll try to reproduce and fix this at some point but am away currently
> so don't hold your breath. Does "dis_ucode_ldr" on the kernel cmdline
> get you any further?

Just a stab in the dark: does something like that help?

---
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 27a0228c9cae..2debaf119baf 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -434,6 +434,10 @@ int __init save_microcode_in_initrd_amd(void)
 	else
 		container = cont_va;
 
+#ifdef CONFIG_RANDOMIZE_MEMORY
+	container += PAGE_OFFSET - __PAGE_OFFSET_BASE;
+#endif
+
 	eax   = cpuid_eax(0x00000001);
 	eax   = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
 
---

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--