From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2247NPzhVtpCjQXEu6FzK8A3vn5cIIAZoKbZXb0ZSgwK4XmlBZdz4rd6rk7yCPEmo35nQpSm ARC-Seal: i=1; a=rsa-sha256; t=1517256507; cv=none; d=google.com; s=arc-20160816; b=lrXV8cWvWomf5lgj3Qr630hYgkL0TPWzPJFkylbq49nT7tiMX8d+KfP5e2kntRonV+ pZ0xaDF5cYGxgbNA6WT3U6bE1CBzLxYqxme4CBVq5ytPu+mAKwfBZL1YpN0g1lPRQDJo W0SmEzPG6c8NzDGV2o9a22t021pvB9bopaBgwqg6yyxxJrUvZmkBmncq+TldPCNbX7LD khAKDSEBspUczaeCsol1kJYFZiXR8LOA6I9l/RlkHK0UQphaRV4nxYZWIowrUCWUttgn NMU/oaNQ6vSLZpbRl0HMzs6sHkhBwYfNHUyPRvBS6ExrgUU9Lalwj926v3He+cpVTEVZ z70w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=u6KyOVNudpJNTxFXJfOIyQQb5VZKG9wNLPXxXOcTs9k=; b=GgY1NrINDVuZJLLVNCRgXK3nd1ECRZsZKhjVNd6ARbcmTGLdJ75DsvcEyY4eFB6+US 4BTOBMRfamrv69EGJpCJT/RrD7qN7m870XMNygjl+cBxYhZW1owl4DBT8mQfR2MoCbdB hw3FddyMRvFc06TJTtHgwPMJ/Qyxsxgr3XfmLqPJmQoxF/FIwLls4tGpdVm9bHJjCn8n ko7LYS8JNPpbfymLtuz4GJ9cY6iwO9eofX1iMfpg3xHYIlIg22zoX+MiGH+AscVFWzRK DMjowQLtUjjmbW8091GmW2FQwMynpn+VgELUS0/92k7lZMUbmIp/sopPYFB3jq02VIjg bffA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia Zhang , Borislav Petkov , Thomas Gleixner , Tony Luck Subject: [PATCH 4.14 61/71] x86/microcode/intel: Extend BDW late-loading further with LLC size check Date: Mon, 29 Jan 2018 13:57:29 +0100 Message-Id: <20180129123831.709681800@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123827.271171825@linuxfoundation.org> References: <20180129123827.271171825@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958760100707478?= X-GMAIL-MSGID: =?utf-8?q?1590958760100707478?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jia Zhang commit 7e702d17ed138cf4ae7c00e8c00681ed464587c7 upstream. Commit b94b73733171 ("x86/microcode/intel: Extend BDW late-loading with a revision check") reduced the impact of erratum BDF90 for Broadwell model 79. The impact can be reduced further by checking the size of the last level cache portion per core. Tony: "The erratum says the problem only occurs on the large-cache SKUs. So we only need to avoid the update if we are on a big cache SKU that is also running old microcode." For more details, see erratum BDF90 in document #334165 (Intel Xeon Processor E7-8800/4800 v4 Product Family Specification Update) from September 2017. Fixes: b94b73733171 ("x86/microcode/intel: Extend BDW late-loading with a revision check") Signed-off-by: Jia Zhang Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Acked-by: Tony Luck Link: https://lkml.kernel.org/r/1516321542-31161-1-git-send-email-zhang.jia@linux.alibaba.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/microcode/intel.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -45,6 +45,9 @@ static const char ucode_path[] = "kernel /* Current microcode patch used in early patching on the APs. */ static struct microcode_intel *intel_ucode_patch; +/* last level cache size per core */ +static int llc_size_per_core; + static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1, unsigned int s2, unsigned int p2) { @@ -912,12 +915,14 @@ static bool is_blacklisted(unsigned int /* * Late loading on model 79 with microcode revision less than 0x0b000021 - * may result in a system hang. This behavior is documented in item - * BDF90, #334165 (Intel Xeon Processor E7-8800/4800 v4 Product Family). + * and LLC size per core bigger than 2.5MB may result in a system hang. + * This behavior is documented in item BDF90, #334165 (Intel Xeon + * Processor E7-8800/4800 v4 Product Family). */ if (c->x86 == 6 && c->x86_model == INTEL_FAM6_BROADWELL_X && c->x86_mask == 0x01 && + llc_size_per_core > 2621440 && c->microcode < 0x0b000021) { pr_err_once("Erratum BDF90: late loading with revision < 0x0b000021 (0x%x) disabled.\n", c->microcode); pr_err_once("Please consider either early loading through initrd/built-in or a potential BIOS update.\n"); @@ -975,6 +980,15 @@ static struct microcode_ops microcode_in .apply_microcode = apply_microcode_intel, }; +static int __init calc_llc_size_per_core(struct cpuinfo_x86 *c) +{ + u64 llc_size = c->x86_cache_size * 1024; + + do_div(llc_size, c->x86_max_cores); + + return (int)llc_size; +} + struct microcode_ops * __init init_intel_microcode(void) { struct cpuinfo_x86 *c = &boot_cpu_data; @@ -985,5 +999,7 @@ struct microcode_ops * __init init_intel return NULL; } + llc_size_per_core = calc_llc_size_per_core(c); + return µcode_intel_ops; }