From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbcGYMgp (ORCPT ); Mon, 25 Jul 2016 08:36:45 -0400 Received: from mail.skyhub.de ([78.46.96.112]:55251 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbcGYMgh (ORCPT ); Mon, 25 Jul 2016 08:36:37 -0400 Date: Mon, 25 Jul 2016 14:36:43 +0200 From: Borislav Petkov To: Nicolai Stange Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arch/x86/kernel/cpu/microcode/intel: don't store initrd's start Message-ID: <20160725123643.GE4901@nazgul.tnic> References: <20160724150549.2833-1-nicstange@gmail.com> <20160725070648.GB24576@nazgul.tnic> <87bn1m5auo.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87bn1m5auo.fsf@gmail.com> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 25, 2016 at 11:24:31AM +0200, Nicolai Stange wrote: > I tested on linux-next-20160722 (I wrote this below the '---' marker). Ok, thanks. So let's try something simpler first. That works in my kvm guest here, can you test it on your box too please? --- diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 6515c802346a..b98e016ba5fc 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -793,10 +793,10 @@ void __init load_ucode_intel_bsp(void) void load_ucode_intel_ap(void) { struct ucode_blobs *blobs_p; + unsigned long *ptrs, start; struct mc_saved_data *mcs; struct ucode_cpu_info uci; enum ucode_state ret; - unsigned long *ptrs; #ifdef CONFIG_X86_32 mcs = (struct mc_saved_data *)__pa_nodebug(&mc_saved_data); @@ -815,8 +815,14 @@ void load_ucode_intel_ap(void) if (!mcs->num_saved) return; + /* + * Pay attention to CONFIG_RANDOMIZE_MEMORY as it shuffles physmem + * mapping too. + */ + start = blobs_p->start + (PAGE_OFFSET - __PAGE_OFFSET_BASE); + collect_cpu_info_early(&uci); - ret = load_microcode(mcs, ptrs, blobs_p->start, &uci); + ret = load_microcode(mcs, ptrs, start, &uci); if (ret != UCODE_OK) return; --- -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --