From patchwork Tue Sep 12 07:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 138012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp246072vqx; Tue, 12 Sep 2023 01:01:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEmgoifb2Wc39isi3qT9eDXMhmVgGblG4NDHSLIwMFYHDV/ecWsUxYWbJes0eWQUlFktrH X-Received: by 2002:a05:6a20:a120:b0:14c:d494:77d1 with SMTP id q32-20020a056a20a12000b0014cd49477d1mr12750494pzk.10.1694505688288; Tue, 12 Sep 2023 01:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694505688; cv=none; d=google.com; s=arc-20160816; b=e/n9/suAaZhlezm5PmbRnnPq7Lg5C2y+zNyu0zmunrntn2Y4HCq7DXWX1jYKTupj8u Gr2eOfWcSQodZSZhSGAg8BPWF7KEK3zLDo7BysFCYwMUxf45mAiZbsvhR5PnqWhwd7UM TYAtW/+rWJXcQl5u8+r0Wp8Wt3UPJ6FqbA6sRtcvtPZRWGr1jLmwEciborJaLBaWapai w9DeiJB4X/fzS+X0ZENChnouazwe8Db8sivHy4yhUyJ471X2KjxrynTZ6HBty+PmHUjM CQP914xqUDRb4H8CM2R4db5zP1s2higlKJ8EeNDjhEbqc+6Y6+Z9baRxwDoehhFpllKK rRqw== 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=1lBdPitYyTH3fsPE7V/4ABSpwPZct6295smjQAkgNa4=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=TcnGBGMXOWoCHK/RX5kVYHxGdFhYqtEZCqoVwG2lTlvAUn05wlcmHnbdiQKDCjD+Sh +8seCFIe/knRtRmFNYtNTX5BJNcQkSnhHqPWZGfE69ZAPOr7N0G6wncEE96OFpQS9/NY IO9ywNLktPfUdu2YK3P1+6szlz6iyILyrtpSKWN4DxAOX6Cd8z7YgV4Qi6o+6aXEouSA qGAGDK1v1k7g6Iape1cZqkW+i6lCHkecvkmCclSTNsE7gpUPXQU9uG4W4RJvwiiaMDne eSBLwDRgp/26YZto5nT/4e8MRTDdLbIfPK3UNg7ASKu4dvuNpOiYIEDQ4Q/puscXs14I iKUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ftqcaC+b; dkim=neutral (no key) header.i=@linutronix.de header.b=5TFRvLxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id n11-20020a17090a670b00b00271bc76ca5fsi7551362pjj.39.2023.09.12.01.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 01:01:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ftqcaC+b; dkim=neutral (no key) header.i=@linutronix.de header.b=5TFRvLxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 70CB282C92D2; Tue, 12 Sep 2023 00:59:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231800AbjILH70 (ORCPT + 39 others); Tue, 12 Sep 2023 03:59:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231984AbjILH6u (ORCPT ); Tue, 12 Sep 2023 03:58:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE0F10D7 for ; Tue, 12 Sep 2023 00:58:15 -0700 (PDT) Message-ID: <20230912065501.961705755@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694505494; 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=1lBdPitYyTH3fsPE7V/4ABSpwPZct6295smjQAkgNa4=; b=ftqcaC+bXsFBXJg518lIMU2YZ+XCbYlWfLkJDQ+ggwR43AVjKULRrKmYqwJVuRHIfb9IM8 mRAN/rfy8F+TTDo+w80gLMR0HUkB2fOzPpk7idfojOGhkANnQSJNq6G8X+7/8WN7fd/ubu 2WBVMLsVVy8Dqgnwus1NkyiVBZTdTwfxUxkVCSjBiOa+ygV4uzKKS4ckvXOMygvDTer8yD XiCG7wG8BjFEKXY1m0Pzq2+Ox47uWhp7NEFECWlTlvqgsHnlwCdjkQGjhFGK1GIEKTQeUG /P/7cmGlDzlyObunNmqVYkjH4X6O3OcRgTakYCtW935HRbXuv5T/GQ8Tm6Y27w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694505494; 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=1lBdPitYyTH3fsPE7V/4ABSpwPZct6295smjQAkgNa4=; b=5TFRvLxvtYwar2kxPLc4wxw6Uxwqbs5L/fMbICJx4ZHjBGNBNX0dKeScZkx4F7bKzPRf39 ngy7S5oODr13RlDA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V3 19/30] x86/microcode: Clarify the late load logic References: <20230912065249.695681286@linutronix.de> MIME-Version: 1.0 Date: Tue, 12 Sep 2023 09:58:13 +0200 (CEST) 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 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:59:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776817996813103310 X-GMAIL-MSGID: 1776817996813103310 From: Thomas Gleixner 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 rendevouz fails, then nothing happened and there is no reason for tainting. - Return useful error codes Signed-off-by: Thomas Gleixner Reviewed-by: Nikolay Borisov --- arch/x86/kernel/cpu/microcode/core.c | 39 +++++++++++++++-------------------- 1 file changed, 17 insertions(+), 22 deletions(-) --- --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -434,11 +434,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; } @@ -471,40 +471,35 @@ static bool ensure_cpus_are_online(void) return true; } +static int ucode_load_late_locked(void) +{ + int ret; + + if (!ensure_cpus_are_online()) + return -EBUSY; + + ret = microcode_ops->request_microcode_fw(0, µcode_pdev->dev); + if (ret != UCODE_NEW) + return ret == UCODE_NFOUND ? -ENOENT : -EBADFD; + return microcode_reload_late(); +} + 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);