Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4555875pxj; Wed, 12 May 2021 08:07:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqnRzD0dVW7FCOf9/ckbixHSe68Q03BEWqG2HNLYTPQyll43w1+ygcZ+YkGJtIAXjcikXe X-Received: by 2002:ac2:5d4c:: with SMTP id w12mr16198935lfd.494.1620832063710; Wed, 12 May 2021 08:07:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620832063; cv=none; d=google.com; s=arc-20160816; b=A9g84a1LAQtjlAPkIYsOLktlLp7O53AP1tVybYlRUCltUXTPHtnVI2Q4UqdiDPp7B4 dsSmnxItNCLDGZuzfz6/bo3WA4mK70FRN2pArAHIge298A0Ahv41E0fDg/yDVNwuH8MI pPYUVLGp/6UMVNWRKej6ZURHlpyhCEJKOzIu9HRCS5oYoOo6lmTryQPZDxTIlLcmldxn V4gQo35c41IUXf+qHGm5uswG7yV3T6Y5C7Ap4XaDlR3S73Q5QmInyaPOD5E990d0h6jH LqnhlQJIo/XsqqWRELh0IIT6xdXq7hMprn5yHhlzzwmPUdiHBUcR2CgK5OAyhKqH5OJ5 h5uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QXjCiNWf2I5dZhY7taaPsZTFofl9HrcAbZXyKfKqCus=; b=bBMDxiPoXYGDbqO+jyYLU3pCdgyCY/1IF9AIH46IFQt1vT0eIW7MthgF34FPy5lPlG QSKf2y7GLeOltjDiUM6M3Lol/PfcQV4UvNcFrIQJ5zq3N0EsZgpLeXbgF31hAFBhEUQQ Pr9Ka3WhcAFCxqTtlrD3e4Pj485gEFlrtHyvFHUVluJfQeGdljHb9MrSExgz5LTqqK9/ shqeb2bo8P1s//ARTyU+Mk11x9HnOmzUx8Cbib684gTHoxuh//ywoEzw9ixa2WxgvFu4 5OwkI6NWom5dm9fpfXPo7c4biXkd/3BjK3iPaGPr2TkFuh/RN9ugM3R7MmV5WgAPFe1T ADTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WcOM/bwL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s18si45509ljg.574.2021.05.12.08.07.11; Wed, 12 May 2021 08:07:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WcOM/bwL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232660AbhELPDe (ORCPT + 99 others); Wed, 12 May 2021 11:03:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:55808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232161AbhELPAM (ORCPT ); Wed, 12 May 2021 11:00:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A11B61434; Wed, 12 May 2021 14:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620831414; bh=g0pt6+vqRylFc4VYWkBWA/2XzDJrouTWCBn+Dnr+JFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WcOM/bwL3QU8R2YSC+g84ucHLV62fh/15JcLyNaqButgMldlpTkg9EwWJ0OPvEvu5 NgmKuhg+9CBgN30AfY9jZM+M9a4vFmJC1VN2wy/0NxquYrQDrdGJMwMWuObVNL1Mo4 kkg0W8C2gKzrEcny4gFOSvE+lLwCiyJQoeaKZ7j0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Otavio Pontes , Borislav Petkov , Tony Luck , Ashok Raj , Sasha Levin Subject: [PATCH 5.4 083/244] x86/microcode: Check for offline CPUs before requesting new microcode Date: Wed, 12 May 2021 16:47:34 +0200 Message-Id: <20210512144745.689336894@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144743.039977287@linuxfoundation.org> References: <20210512144743.039977287@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Otavio Pontes [ Upstream commit 7189b3c11903667808029ec9766a6e96de5012a5 ] Currently, the late microcode loading mechanism checks whether any CPUs are offlined, and, in such a case, aborts the load attempt. However, this must be done before the kernel caches new microcode from the filesystem. Otherwise, when offlined CPUs are onlined later, those cores are going to be updated through the CPU hotplug notifier callback with the new microcode, while CPUs previously onine will continue to run with the older microcode. For example: Turn off one core (2 threads): echo 0 > /sys/devices/system/cpu/cpu3/online echo 0 > /sys/devices/system/cpu/cpu1/online Install the ucode fails because a primary SMT thread is offline: cp intel-ucode/06-8e-09 /lib/firmware/intel-ucode/ echo 1 > /sys/devices/system/cpu/microcode/reload bash: echo: write error: Invalid argument Turn the core back on echo 1 > /sys/devices/system/cpu/cpu3/online echo 1 > /sys/devices/system/cpu/cpu1/online cat /proc/cpuinfo |grep microcode microcode : 0x30 microcode : 0xde microcode : 0x30 microcode : 0xde The rationale for why the update is aborted when at least one primary thread is offline is because even if that thread is soft-offlined and idle, it will still have to participate in broadcasted MCE's synchronization dance or enter SMM, and in both examples it will execute instructions so it better have the same microcode revision as the other cores. [ bp: Heavily edit and extend commit message with the reasoning behind all this. ] Fixes: 30ec26da9967 ("x86/microcode: Do not upload microcode if CPUs are offline") Signed-off-by: Otavio Pontes Signed-off-by: Borislav Petkov Reviewed-by: Tony Luck Acked-by: Ashok Raj Link: https://lkml.kernel.org/r/20210319165515.9240-2-otavio.pontes@intel.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/microcode/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index cb0fdcaf1415..4a4198b806b4 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -626,16 +626,16 @@ static ssize_t reload_store(struct device *dev, if (val != 1) return size; - tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev, true); - if (tmp_ret != UCODE_NEW) - return size; - get_online_cpus(); ret = check_online_cpus(); if (ret) goto put; + tmp_ret = microcode_ops->request_microcode_fw(bsp, µcode_pdev->dev, true); + if (tmp_ret != UCODE_NEW) + goto put; + mutex_lock(µcode_mutex); ret = microcode_reload_late(); mutex_unlock(µcode_mutex); -- 2.30.2