From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752488AbcGYM7z (ORCPT ); Mon, 25 Jul 2016 08:59:55 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35667 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940AbcGYM7q (ORCPT ); Mon, 25 Jul 2016 08:59:46 -0400 From: Nicolai Stange To: Borislav Petkov Cc: Nicolai Stange , 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 References: <20160724150549.2833-1-nicstange@gmail.com> <20160725070648.GB24576@nazgul.tnic> <87bn1m5auo.fsf@gmail.com> <20160725123643.GE4901@nazgul.tnic> Date: Mon, 25 Jul 2016 14:59:43 +0200 In-Reply-To: <20160725123643.GE4901@nazgul.tnic> (Borislav Petkov's message of "Mon, 25 Jul 2016 14:36:43 +0200") Message-ID: <871t2hkh4w.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Borislav Petkov writes: > 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? Applied on top of next-20160722 and it boots (again, with the additional http://lkml.kernel.org/g/tip-530dd8d4b9daf77e3e5d145a26210d91ced954c7@git.kernel.org that I need on by box). But please see below. > > --- > 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); Am I overlooking something or is this an unrelated cleanup? > @@ -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; > Doesn't this break the builtin-ucode case (!blobs.valid) where blobs.start is supposed to be zero? Thanks, Nicolai