From patchwork Tue Oct 24 13:20:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 157456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1937943vqx; Tue, 24 Oct 2023 06:22:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIFoj2jmGDQEPMjTQWM1pyPGl1jRp4kXHQFTNiAoI4ZGiJW89as5OxjtJLY//2NjoHkn+/ X-Received: by 2002:a17:902:f542:b0:1ca:8e43:765a with SMTP id h2-20020a170902f54200b001ca8e43765amr11858517plf.9.1698153770340; Tue, 24 Oct 2023 06:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698153770; cv=none; d=google.com; s=arc-20160816; b=LHC+5Ca5vPUYpbjExtQ99tfI8XjNM/vtpuoMeOguP2lp339XaTgXRU0+Kra84Fbdfg p1fGGmAC+11fOYSYL0jBGsX35WXDes7+Jm7kMzzca+tnE5GdeN+KYPKPedfNdV53Pk7s YEgpj6FxVShKADu0eGdbV/1K76Ko5w3K3jgB5UNMcACDKOcsWGZDqQVHeHF9arrG8cfs yIddSoV6W0hfQhrQwPkDjc6onmp/yFKfNt61Oq0hIS3CvrS+smmerOh/ejkM5F/NMiDY UhT6soesmOrphPEW34J2Dd6gv96qnD/SRKFowqP1XB81LEh/vYDPuZzTkdvEPpRQdJxB WxJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=A3tYL+xCvoJzygrP0yYanGm8iOxXgmx3YuzRvfTV+v8=; fh=sb4qIpjvq8lbMgujEGaFliPojITybYXhCiHHIn/zgx0=; b=J90CiNAug5yUGVpkBwqYkdmVH+iX6xqk65r8ZAqgatQVvBd4Ssr7YLBJcsldalSyS3 T+RVHbLNNgcKWnPzQ0LUp9T2rPlV8pRAccmP/jCRirqVk30g8L0QSpQb2xf9mnzO5Zmw h7WD5gbPtt1Vd/ZBDv7ebNdM73V3KJ3sB0eKKZr8xphkKVmRWNF+1kG9tANYG8Zgo1y+ bdZCpQkp4mF5B8wbihs6dCQaCKkzyJXRZu6U0znS98Xy6pziZvzTZin6Iflf3c8zl/RN TYUNCpkVWbsLrZ9yfCs9jf6yHcpqFgB2elhDkukBFjnwROvn5dZMOZdoS0AcMDKDJkVl Tcrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3ot5VNoc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=36yJ743P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id l21-20020a170902eb1500b001c9c83947d1si7960358plb.645.2023.10.24.06.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 06:22:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3ot5VNoc; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=36yJ743P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id CB126807E012; Tue, 24 Oct 2023 06:22:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343531AbjJXNWY (ORCPT + 26 others); Tue, 24 Oct 2023 09:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234605AbjJXNVU (ORCPT ); Tue, 24 Oct 2023 09:21:20 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01B631700; Tue, 24 Oct 2023 06:20:58 -0700 (PDT) Date: Tue, 24 Oct 2023 13:20:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698153657; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A3tYL+xCvoJzygrP0yYanGm8iOxXgmx3YuzRvfTV+v8=; b=3ot5VNocTehPk3TAWW84qp5vw7WOX3KH8w1h8EqrSnL2jw+Az2Ze0u+BP17g3akuvE/fjW 22yYXHkJ2jFWwYnBHRXgRY4OPnJuBKoRd5nj1p4njzGTBgmd3lF44OaqrrEO9dm+dcG8yv k93g7M+64wx1osxIu400IjCCxR49mt1Rxm7p2FNHQlZ26XzXb/S6UtgaDdlxECliLgx2if RFCKhCPvqOouU6YHrNUjRCSYyrpgH0Bv3JyR5RoKsR4O7BWG/7AOEiy95aqbHkcxWSZkV8 NpQZ97NqEeRXmZj0o0S07xgSC6DvRHFul7UznToOjHJaX8HEb9KPDvDxun8p6Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698153657; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A3tYL+xCvoJzygrP0yYanGm8iOxXgmx3YuzRvfTV+v8=; b=36yJ743Plok0t0jfTGPPc+83kxF5TN+cYr13pb3s40NXcBK33ZGt4x4IBnfV0G9zvQumad MnBbq4VeT7HZvvCg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode: Clarify the late load logic Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , Nikolay Borisov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231002115903.145048840@linutronix.de> References: <20231002115903.145048840@linutronix.de> MIME-Version: 1.0 Message-ID: <169815365668.3135.6098105876703309302.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 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 morse.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 (morse.vger.email [0.0.0.0]); Tue, 24 Oct 2023 06:22:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778652351422059088 X-GMAIL-MSGID: 1780643287697425856 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 6f059e634dcd0d725854514c94c114bbdd83950d Gitweb: https://git.kernel.org/tip/6f059e634dcd0d725854514c94c114bbdd83950d Author: Thomas Gleixner AuthorDate: Mon, 02 Oct 2023 13:59:57 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 24 Oct 2023 15:05:54 +02:00 x86/microcode: Clarify the late load logic reload_store() is way too complicated. Split the inner workings out and make the following enhancements: - Taint the kernel only when the microcode was actually updated. If. e.g. the rendezvous fails, then nothing happened and there is no reason for tainting. - Return useful error codes Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Nikolay Borisov Link: https://lore.kernel.org/r/20231002115903.145048840@linutronix.de --- arch/x86/kernel/cpu/microcode/core.c | 41 ++++++++++++--------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 7af1b60..63c4e12 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -362,11 +362,11 @@ static int microcode_reload_late(void) pr_info("Reload succeeded, microcode revision: 0x%x -> 0x%x\n", old, boot_cpu_data.microcode); microcode_check(&prev_info); + add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK); } else { pr_info("Reload failed, current microcode revision: 0x%x\n", boot_cpu_data.microcode); } - return ret; } @@ -399,40 +399,37 @@ static bool ensure_cpus_are_online(void) return true; } +static int ucode_load_late_locked(void) +{ + if (!ensure_cpus_are_online()) + return -EBUSY; + + switch (microcode_ops->request_microcode_fw(0, µcode_pdev->dev)) { + case UCODE_NEW: + return microcode_reload_late(); + case UCODE_NFOUND: + return -ENOENT; + default: + return -EBADFD; + } +} + static ssize_t reload_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) { - enum ucode_state tmp_ret = UCODE_OK; - int bsp = boot_cpu_data.cpu_index; unsigned long val; - ssize_t ret = 0; + ssize_t ret; ret = kstrtoul(buf, 0, &val); if (ret || val != 1) return -EINVAL; cpus_read_lock(); - - if (!ensure_cpus_are_online()) { - ret = -EBUSY; - goto put; - } - - tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev); - if (tmp_ret != UCODE_NEW) - goto put; - - ret = microcode_reload_late(); -put: + ret = ucode_load_late_locked(); cpus_read_unlock(); - if (ret == 0) - ret = size; - - add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK); - - return ret; + return ret ? : size; } static DEVICE_ATTR_WO(reload);