From patchwork Mon Oct 2 11:59:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1443810vqb; Mon, 2 Oct 2023 06:57:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOcQrfEG4yv+wPeT/ImFqYJqeFCFVyyt0bAOdjUP3QKXNkOHuN9I8ShDzmDDh+sgZJBDKa X-Received: by 2002:a17:902:dac8:b0:1bf:1a9e:85f7 with SMTP id q8-20020a170902dac800b001bf1a9e85f7mr13688157plx.1.1696255065367; Mon, 02 Oct 2023 06:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696255065; cv=none; d=google.com; s=arc-20160816; b=ZnCK2tgvYtXLyQnpcCSwTCBIGuFsPDIYrB42Qai+yx9HBhGU9CtqRnY1DV4M4P2Qli tI3WS6gqoLjBPpQLHJHeJfoMhGGwUY+zg9HD3M+lU2cJHkFnQScfRQB0VVTa2duaHOOF FQ8NNzQWxH78lbzohsqj7ueFggOHV8ny6M6PacnrLbDB83yGD7724k1aHSzNFevhP2lA 1pMHt3MKXE/+jM5Lv3KZdiY/h7/Ca+ozkkgU/X7VwEQHQ4K5ro3dgbUCaJUOZ3Xo1aSd M73vlolFNLzBBhrB7RzZrzy2JiHEPCyO3ZcsaPBJgfOjfH7SUkX3arpjF0+QJKm89iNe dRHA== 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=AKE/XS6SEIbqho91Hmin0oksrMtPi1Xkc5zYgAfFhzQ=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=YL0//M8ceXBZH+eYuZSg/aTGU7p978mLTHaU0Y1Q2apGvZgmKONigXaukfrFGrXFZz D3uwtzrtngzQrkfaPAKSG6Ozf0YSuwXQMbfpGe3HGGPcZdv4rG+m4NRvF5/HwCLoMR+K DOSt0aMimfApFtAKLM9SrdjNwCE8TgstV7JnFQqvK7sTkLCRTVSboYZQvjB2j3KOt6Dw +DYDXn7dmk8rPc0UIPmk7RmcK/dun3vi7PamWEMt99vZLSNj/cYHpjRFjii92d0Q3ySH BjxDh6uY9va+JWX1dq6aDmOd/zBLE126LNfVnd9QlP3Zs4X4LVlbWFn1zK70WwwWc6KP ocBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=onKOuI3K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ag8vZTbF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id lq13-20020a170903144d00b001b9fb1a0465si24844388plb.385.2023.10.02.06.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 06:57:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=onKOuI3K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ag8vZTbF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 48549810C2E4; Mon, 2 Oct 2023 05:00:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236981AbjJBMAm (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236915AbjJBMAX (ORCPT ); Mon, 2 Oct 2023 08:00:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FE71E3 for ; Mon, 2 Oct 2023 04:59:59 -0700 (PDT) Message-ID: <20231002115903.145048840@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247998; 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=AKE/XS6SEIbqho91Hmin0oksrMtPi1Xkc5zYgAfFhzQ=; b=onKOuI3KLeunKNft9ejU67gHNGLSwK0diHMkh49crfc162JLJuX/jFLh/QdbHI/WqAZDoA fNYeninSONC1fv6Xg73oTNdA5fqv4scX9rAPgqjoEVcmKELWeLiLSGqM0qcID7mMI3Fe9T 9GkEpXp0hTx9HCs6qijlCRy9qiQmAru+HVNwOgk4iaAa0g8lomv1G/8nutRLZvY/lBn9Px vqAz8/jwn2tyKZo/IDwjjOvQtcTz6IqwdE4yTHBfTlIT703c9IONKN0DmVWeax0x3pLtdq Ja1MOtc2GNJ+QR6/EYE7GbRHQaBnRWC3kwHYDuDZSgot0CqYX3DAP11EZo9KMw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247998; 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=AKE/XS6SEIbqho91Hmin0oksrMtPi1Xkc5zYgAfFhzQ=; b=ag8vZTbFFEGB9v4EDRB9E+KijGSPy2iC083XmbmRZFXl4zOqMomeo56sRzwNBytrOUODoT RPdU92cAESVk0JCw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 19/30] x86/microcode: Clarify the late load logic References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:57 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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]); Mon, 02 Oct 2023 05:00:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778652351422059088 X-GMAIL-MSGID: 1778652351422059088 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 | 41 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 22 deletions(-) --- --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -391,11 +391,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; } @@ -428,40 +428,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);