From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16C40C32771 for ; Sat, 18 Jan 2020 18:29:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7FED24680 for ; Sat, 18 Jan 2020 18:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579372194; bh=SKaZ45stQIC/Zj0BsqBTZSlIRzvC2jTfYCsTtUU5Yh8=; h=Date:From:To:Cc:Subject:List-ID:From; b=ZGVeD0RkioD9InOeCYUlKebwWXrhOXFg0L6AclrN99Glos5o7qQ7qVwMijt6ONB6K FcLxwwYZ/A5xfNw7lRMmYIlBjI5ULVpVxW4DJf0N/Q3/0ZdMJz3ZgUvEazNk1T3Mz0 RhFMag7o1yum2Tkcn4w3RZz1MoAWKqRPikVLval8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727029AbgARS3y (ORCPT ); Sat, 18 Jan 2020 13:29:54 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44468 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726490AbgARS3x (ORCPT ); Sat, 18 Jan 2020 13:29:53 -0500 Received: by mail-wr1-f67.google.com with SMTP id q10so25657550wrm.11 for ; Sat, 18 Jan 2020 10:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=6gl79ho+mKe4vfBg5gI2ydk/iTfOCFwyadWeOZQIjMk=; b=lDYi/OcJz7rSt6K52PCNMi+DMPUvQdlLgvjftp0VpWt9uunCP4r6EhyFhEfQjED0RL w4ASaSaDnOlFy4447Iz/3hhJP+aon70qiu89XNkTIC8oOqsvuiYyk/Iy0zJPOthijXI5 VKA41R7YtfGN6hAP/BOyrKZqKrFF4v5vyw2WKWZozBcZoPuoK8IvLqk56rroHg5t2d1G UlsJbS0p/2XHIZt6qlUVbbL8Dwel7Rl1y2AieZ2b+mgcahG9K8BST3qk6mdv5RHMAzkE lzNjWtKyYKq80W39OUD3KhWINOmsMS5iFK7w9Zr1DAsU8KeF39N6mma4V6BM0yQmmPCa ZLNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mime-version:content-disposition:user-agent; bh=6gl79ho+mKe4vfBg5gI2ydk/iTfOCFwyadWeOZQIjMk=; b=mC+bAI8Ho2OG8CYRrnw+zig6QPRzaqSW42wh7j1KXVJK2sktyleElgkt+JWbDdC+Md o5KsGiY30pbgUUGO0kHTAkljLUaG27h6WhwYE9DTzknnK7+kk+I1EiOYSU4TB8QUpN83 /jwwkQ/40CpFc+dkUn30F3iP3OAEqX/nssHh9+yoCTA9YhFybaQ7PAUXTTRULB9WACUD LVZVGhFHcs4HcN4mAzg4jS+Hd4r3t/4Qt5Ximn25i9CIvsAM1MlLjtxjDz4Gr0kBdrQQ FUMYWdtlXURaXZHQ39lZjuBBv0iIGh1GqYtYf7os7gItMXLTExJ2Kkw9SvjvWtvQjtgM H/hA== X-Gm-Message-State: APjAAAXpZlYrXT7rL5cZeqr34OOKTyat2wCxJTgwfVWihjnn2mUKCtBq OmfrH3Tu5zhIysxTVM9gA/4= X-Google-Smtp-Source: APXvYqwb+Ssi9pNB/lybhVtFbev8i+4QkVv67+lx7kVV74v+VE9A/uMvTsPa4sBGP4cEka8AlJZ9yA== X-Received: by 2002:a5d:4651:: with SMTP id j17mr9624354wrs.237.1579372192180; Sat, 18 Jan 2020 10:29:52 -0800 (PST) Received: from gmail.com (54033286.catv.pool.telekom.hu. [84.3.50.134]) by smtp.gmail.com with ESMTPSA id g9sm39991948wro.67.2020.01.18.10.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2020 10:29:51 -0800 (PST) Date: Sat, 18 Jan 2020 19:29:49 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Thomas Gleixner , Peter Zijlstra , Andrew Morton Subject: [GIT PULL] RAS fix Message-ID: <20200118182949.GA61525@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, Please pull the latest ras-urgent-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-urgent-for-linus # HEAD: 978370956d2046b19313659ce65ed12d5b996626 x86/mce/therm_throt: Do not access uninitialized therm_work Fix a thermal throttling race that can result in easy to trigger boot crashes on certain Ice Lake platforms. Thanks, Ingo ------------------> Chuansheng Liu (1): x86/mce/therm_throt: Do not access uninitialized therm_work arch/x86/kernel/cpu/mce/therm_throt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/therm_throt.c b/arch/x86/kernel/cpu/mce/therm_throt.c index b38010b541d6..6c3e1c92f183 100644 --- a/arch/x86/kernel/cpu/mce/therm_throt.c +++ b/arch/x86/kernel/cpu/mce/therm_throt.c @@ -467,6 +467,7 @@ static int thermal_throttle_online(unsigned int cpu) { struct thermal_state *state = &per_cpu(thermal_state, cpu); struct device *dev = get_cpu_device(cpu); + u32 l; state->package_throttle.level = PACKAGE_LEVEL; state->core_throttle.level = CORE_LEVEL; @@ -474,6 +475,10 @@ static int thermal_throttle_online(unsigned int cpu) INIT_DELAYED_WORK(&state->package_throttle.therm_work, throttle_active_work); INIT_DELAYED_WORK(&state->core_throttle.therm_work, throttle_active_work); + /* Unmask the thermal vector after the above workqueues are initialized. */ + l = apic_read(APIC_LVTTHMR); + apic_write(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); + return thermal_throttle_add_dev(dev, cpu); } @@ -722,10 +727,6 @@ void intel_init_thermal(struct cpuinfo_x86 *c) rdmsr(MSR_IA32_MISC_ENABLE, l, h); wrmsr(MSR_IA32_MISC_ENABLE, l | MSR_IA32_MISC_ENABLE_TM1, h); - /* Unmask the thermal vector: */ - l = apic_read(APIC_LVTTHMR); - apic_write(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); - pr_info_once("CPU0: Thermal monitoring enabled (%s)\n", tm2 ? "TM2" : "TM1");