From patchwork Mon Oct 2 11:59:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1380492vqb; Mon, 2 Oct 2023 05:12:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFTEXXxfyVSoPbIJJ0qKG+C4fIlUTmkodQgdV3Zo4KV85+an3+Cx929B1RSjMm+QCftroOj X-Received: by 2002:a17:902:e5cd:b0:1c4:16f7:d95b with SMTP id u13-20020a170902e5cd00b001c416f7d95bmr10690884plf.63.1696248743024; Mon, 02 Oct 2023 05:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696248743; cv=none; d=google.com; s=arc-20160816; b=bCJ/aFZIslN2fFgZONINDRAjfjE4VJMbzBtPwHufFQ0T5sVokm3VdOC3xV5Y9T/lhY OFMn8OZJt/jQBT2ZZVKHJA4YEYes2j5HOchVG37sUnza5u6UhIQ0B6Ey70nclJclRPL2 s9+pGpq94itYVeNdei3IbJZWkguGoEg8c5w+gbQqCRUGgzZXzgYwyl9RtNO+MM+AQthB RM+EyPrMwem04nGKBraSYX9wF/649o5afSLQogN+oki5oyJQiYhsD78duJ6JuIlTCtnN Gdc5HjtfpgWf507yc8T/ubhIPycmX9+pAnbz4U+a2ZIv5LMvUJgdh04pQTuKFtAGi5mv BJdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=hWimmhBWR+BZVXFP5DyDAkJLyIyydcdqq/jEuDzsXXE=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=lwdQirsZtlTq8xPglwttfgTC9PULHA5gAI1AmkIipmbRZxrNFE8xqmreTIw5XQ+h1n BwQcGnfLkclFyhzO1ZpaUjijLFSOYzPgBRXQZXKLr4ERmVrn/LtY2G5gsT+3Ajqj6Fmr DUKeovLA1oN8KNwaqoNL3HR8BWFLzYFAEs4u7X20RvkIbFNPriWlII9TbhJEiglhibcR ADJiTrJH98vtR0DWj645WnlYP2RpAaIl01o//t1yFLPJXeyKLqIOYAof95c17s/VbVpW yufj8ksVUgtddqjO2SE5Hm5TRx0nd2+oeX8CJ7tDkG2GGi5IjaMncOnM6eDVBJOU63FA 6nAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mROG4cEu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=5JmYzRjZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id w3-20020a170902e88300b001c574110eecsi3017726plg.341.2023.10.02.05.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:12:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mROG4cEu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=5JmYzRjZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 3F85680842DB; Mon, 2 Oct 2023 05:00:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236899AbjJBMAI (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236862AbjJBL7t (ORCPT ); Mon, 2 Oct 2023 07:59:49 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8E3CC6 for ; Mon, 2 Oct 2023 04:59:45 -0700 (PDT) Message-ID: <20231002115902.505491309@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=hWimmhBWR+BZVXFP5DyDAkJLyIyydcdqq/jEuDzsXXE=; b=mROG4cEuDKMkiq1Q7i9PgDp/heruLruWDUKLvCDXvPCA/gNJxEJUlqW4DWDY5hIGVMydzb W/sP576bJccluy6YwVGeTUvEDJRdeQ4iP/c1DunlRlTjzjQ12xDSEcmp+FXozX4e4K4wrR 7XVBZ3VpYAeSICZBqLTs9Xmo/I0G5SlQC4Z2GjRfasEvs/1X+mvs6tigk9wi0HlKhlXLVb jPCPtb15843sr7g33HOBklvNcVxcdFeJe7OBp/iHd2UReLM0Mth62mvQDaSH9SBd7ImU3O RKJf6KvO2LUPvMImx0AKyV5cUsqytvhdOu8UO7LqaWeH7ArysD2SjcXSvmedNQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=hWimmhBWR+BZVXFP5DyDAkJLyIyydcdqq/jEuDzsXXE=; b=5JmYzRjZ9Uk8G1KZH5Im+FCLK4DDglUFfk8X/Izt/a2RagOGUVUCH4we7nalt14DEq9lkD kiWxrg4zyQ4R8yBg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 08/30] x86/microcode/intel: Save the microcode only after a successful late-load References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:44 +0200 (CEST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778645722338788849 X-GMAIL-MSGID: 1778645722338788849 From: Thomas Gleixner There are situations where the late microcode is loaded into memory, but is not applied: 1) The rendezvouz fails 2) The microcode is rejected by the CPUs If any of this happens then the pointer which was updated at firmware load time is stale and subsequent CPU hotplug operations either fail to update or create inconsistent microcode state. Save the loaded microcode in a separate pointer from with the late load is attempted and when successful, update the hotplug pointer accordingly via a new microcode_ops callback. Remove the pointless fallback in the loader to a microcode pointer which is never populated. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/core.c | 4 ++++ arch/x86/kernel/cpu/microcode/intel.c | 30 +++++++++++++++--------------- arch/x86/kernel/cpu/microcode/internal.h | 1 + 3 files changed, 20 insertions(+), 15 deletions(-) --- --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -400,6 +400,10 @@ static int microcode_reload_late(void) store_cpu_caps(&prev_info); ret = stop_machine_cpuslocked(__reload_late, NULL, cpu_online_mask); + + if (microcode_ops->finalize_late_load) + microcode_ops->finalize_late_load(ret); + if (!ret) { pr_info("Reload succeeded, microcode revision: 0x%x -> 0x%x\n", old, boot_cpu_data.microcode); --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -34,6 +34,7 @@ static const char ucode_path[] = "kernel /* Current microcode patch used in early patching on the APs. */ static struct microcode_intel *ucode_patch_va __read_mostly; +static struct microcode_intel *ucode_patch_late __read_mostly; /* last level cache size per core */ static unsigned int llc_size_per_core __ro_after_init; @@ -461,12 +462,9 @@ static enum ucode_state apply_microcode_ if (WARN_ON(raw_smp_processor_id() != cpu)) return UCODE_ERROR; - mc = ucode_patch_va; - if (!mc) { - mc = uci->mc; - if (!mc) - return UCODE_NFOUND; - } + mc = ucode_patch_late; + if (!mc) + return UCODE_NFOUND; /* * Save us the MSR write below - which is a particular expensive @@ -585,15 +583,7 @@ static enum ucode_state parse_microcode_ if (!new_mc) return UCODE_NFOUND; - /* Save for CPU hotplug */ - save_microcode_patch((struct microcode_intel *)new_mc); - uci->mc = ucode_patch_va; - - vfree(new_mc); - - pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n", - cpu, cur_rev, uci->cpu_sig.rev); - + ucode_patch_late = (struct microcode_intel *)new_mc; return UCODE_NEW; } @@ -650,10 +640,20 @@ static enum ucode_state request_microcod return ret; } +static void finalize_late_load(int result) +{ + if (!result) + save_microcode_patch(ucode_patch_late); + + vfree(ucode_patch_late); + ucode_patch_late = NULL; +} + static struct microcode_ops microcode_intel_ops = { .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info, .apply_microcode = apply_microcode_intel, + .finalize_late_load = finalize_late_load, }; static __init void calc_llc_size_per_core(struct cpuinfo_x86 *c) --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -31,6 +31,7 @@ struct microcode_ops { */ enum ucode_state (*apply_microcode)(int cpu); int (*collect_cpu_info)(int cpu, struct cpu_signature *csig); + void (*finalize_late_load)(int result); }; extern struct ucode_cpu_info ucode_cpu_info[];