From patchwork Fri Mar 1 20:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 209085 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp146449dyc; Fri, 1 Mar 2024 12:49:52 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWMNfaU8UJlaD/vJhr7mA1t7XhzFLsmf1jcyJo6Wzcc3vLVStRe5cH+qp6ucW7nOViMbgWPWHOwHKO0XHJHkLNCZ69kiQ== X-Google-Smtp-Source: AGHT+IFgB4et//K8mWlRi0KpBwsHNtRd0MAFNZnFtRsek6rs3+uwQVq+hq5/itwrWjY/Xp2tMdnw X-Received: by 2002:a05:6a00:1898:b0:6e5:138:acf with SMTP id x24-20020a056a00189800b006e501380acfmr2938835pfh.10.1709326192657; Fri, 01 Mar 2024 12:49:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709326192; cv=pass; d=google.com; s=arc-20160816; b=bpuzp7izrRVGZv7OdZyK7ELbb/B0UG6M9aJ3EsglyH5pnY0/bkhQUEIgzkIPtH93ku yftmTbZSnrM2aVKJ0jBsdTISBOoVq0Hk1b5KPhSY+CZsEjHh6r9iTIKxssSKT66K7kZH riba/KE8fg3Tvgjw5J7fmXBr6bxTOGdosI2hBhdo5aGWY7baSekJkXFMK6xs0IbqnyAQ +nZPgTSKmL+WzxcNLz/bYuraUufOa5g3fA1+jrKBUj4r2Hge7wDGwYDCFF2js6jJFhf5 QIQmILOGHnCUF9upmqHXNK82sQDGTmw5vQ87e5p4Dvytv2rOTSsFRSe3etr8d2yvcSLf wScg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=pQJ0cFB/y9cWkLzdFv+zCeeLapn0Qvop2py0VkQ2On4=; fh=XfS7VWRu8hBkwZAEkqnBoeS7i9T7xQpJZ2TAW7TKBcg=; b=EO1hO0hJ2fe38qvpDeO+B6qKyWQkFSrJg+8J8sEgkkFM4l+yF7SnhpZ1zbw0hjIRx9 8v6VyqZw6eClsnan+fAHtHfxfQH+oUsontMGe7oHJZlC4zc66y7sW6a1ZVuaMuc/zXLI dM/p+nu3KlKG5xjrO55pNMCqd3LxrK9R2pExtqNzy+oK7yGq1hC2cx8WaizEUgGhDCY4 U2reBBMyC8NZEC1+0X8xGaZx1jfM+ho4MBBGxpKG1AQ+Z194RxfO7r349/wHD59qBhc2 omZhdAiX/c9NG69HSy+QTGRoEHphGbTZhbJZz5q7pmFmwWaFHU8gsmc6HnfqTZfvIUut EESQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Laa2tLjy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-89116-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89116-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id g25-20020aa78759000000b006e5002a2fd0si4051071pfo.214.2024.03.01.12.49.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 12:49:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89116-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Laa2tLjy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-89116-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89116-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7340428FEB2 for ; Fri, 1 Mar 2024 20:49:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 16BD153387; Fri, 1 Mar 2024 20:48:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Laa2tLjy"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2NNufubw" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A667537E5; Fri, 1 Mar 2024 20:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709326128; cv=none; b=H+JG0cxubdr/0jjQKsf9Qf3Jq+17wQ4+34Y7ruDtkUH7vIx65I+gkLwqE+bVFJDqVwGfgZb7aNELUEbKuqmwR8uomRcNVSRPmTqPorPa0m8jCnSTin+c0an+anCk8ccmOSYygXaNTo3U1QuWPMV59Q2R+cm6JDUb3G1MLfPIocc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709326128; c=relaxed/simple; bh=xFSoLRHZ1pg3hz59nq1ZMqlI9iLTuRh6cYkpmEO4s1s=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=PbY6418yOY1RYkSTN+myo6b0egr6IvoHsPMOKmJqDK5SQ+oPruyNXdt2Vm2fVYQr5tAJjDeo2UnLPy+Bxv6Y4KK46hsyyKi1IZFdqhKIEgiV56eNnmV40lm2vC5Nwf2vddKISs8vm0j0SfjPiVKD/nww5SYLZ0dX5NfEUAzn3MI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Laa2tLjy; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2NNufubw; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Fri, 01 Mar 2024 20:48:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709326124; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pQJ0cFB/y9cWkLzdFv+zCeeLapn0Qvop2py0VkQ2On4=; b=Laa2tLjy5fNDYeOEG5h+EdlK4GRSBsiGp/jSlDsUtOeRMDTTFBC8pu+0COTXS/CN1ZKIFj cboFTQFSRggl5MZTuy87mg2FjhyZ1GfZUHJaLcR3CuEGB2JSRVTMYOnaMSyfh2QSyPOPiz qty/k1yMIXLPRw7n0x55wXxITjwihmao5UtVt4/BmE2O/1/NYCJh+wOuGa6q6T5CWsoA+c sTFVtM+0B7JgrYPuEik6UEKRT18GQ4nXjKN9Vl6aeflf7oXZfkgVx/waJHwcexqrty6tKl DaAVWYdv5/rJm5KzuYhKMwWzyVbmwqkhx0B1tDe4us3TLORDEXA4J0A2sPbFiw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709326124; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pQJ0cFB/y9cWkLzdFv+zCeeLapn0Qvop2py0VkQ2On4=; b=2NNufubwUWNAO4hG2W0gxRRkRACJj/25P+uZo1ywkAG6KEEOS1JptqLhCwfFHQnUNowcqx AgjD4UAhJs/1xHDw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/idle: Sanitize X86_BUG_AMD_E400 handling Cc: Borislav Petkov , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <877cim6sis.ffs@tglx> References: <877cim6sis.ffs@tglx> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170932612368.398.10382603040701836222.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792243598858204571 X-GMAIL-MSGID: 1792358421815978162 The following commit has been merged into the x86/core branch of tip: Commit-ID: 3b9b8e89c8e1e97c76be6abc67db702ea978d89b Gitweb: https://git.kernel.org/tip/3b9b8e89c8e1e97c76be6abc67db702ea978d89b Author: Thomas Gleixner AuthorDate: Wed, 28 Feb 2024 23:13:00 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 01 Mar 2024 21:33:05 +01:00 x86/idle: Sanitize X86_BUG_AMD_E400 handling amd_e400_idle(), the idle routine for AMD CPUs which are affected by erratum 400 violates the RCU constraints by invoking tick_broadcast_enter() and tick_broadcast_exit() after the core code has marked RCU non-idle. The functions can end up in lockdep or tracing, which rightfully triggers a RCU warning. The core code provides now a static branch conditional invocation of the broadcast functions. Remove amd_e400_idle(), enforce default_idle() and enable the static branch on affected CPUs to cure this. Reported-by: Borislav Petkov Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/877cim6sis.ffs@tglx --- arch/x86/Kconfig | 1 +- arch/x86/kernel/process.c | 42 ++++++++------------------------------ 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5029862..0802653 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -147,6 +147,7 @@ config X86 select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) + select GENERIC_CLOCKEVENTS_BROADCAST_IDLE if GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_CLOCKEVENTS_MIN_ADJUST select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 45a9d49..5853d56 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -846,31 +846,6 @@ void __noreturn stop_this_cpu(void *dummy) } /* - * AMD Erratum 400 aware idle routine. We handle it the same way as C3 power - * states (local apic timer and TSC stop). - * - * XXX this function is completely buggered vs RCU and tracing. - */ -static void amd_e400_idle(void) -{ - /* - * We cannot use static_cpu_has_bug() here because X86_BUG_AMD_APIC_C1E - * gets set after static_cpu_has() places have been converted via - * alternatives. - */ - if (!boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) { - default_idle(); - return; - } - - tick_broadcast_enter(); - - default_idle(); - - tick_broadcast_exit(); -} - -/* * Prefer MWAIT over HALT if MWAIT is supported, MWAIT_CPUID leaf * exists and whenever MONITOR/MWAIT extensions are present there is at * least one C1 substate. @@ -890,8 +865,8 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c) if (!cpu_has(c, X86_FEATURE_MWAIT)) return 0; - /* Monitor has a bug. Fallback to HALT */ - if (boot_cpu_has_bug(X86_BUG_MONITOR)) + /* Monitor has a bug or APIC stops in C1E. Fallback to HALT */ + if (boot_cpu_has_bug(X86_BUG_MONITOR) || boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) return 0; cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); @@ -942,17 +917,15 @@ void select_idle_routine(const struct cpuinfo_x86 *c) if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) return; - if (boot_cpu_has_bug(X86_BUG_AMD_E400)) { - pr_info("using AMD E400 aware idle routine\n"); - static_call_update(x86_idle, amd_e400_idle); - } else if (prefer_mwait_c1_over_halt(c)) { + if (prefer_mwait_c1_over_halt(c)) { pr_info("using mwait in idle threads\n"); static_call_update(x86_idle, mwait_idle); } else if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { pr_info("using TDX aware idle routine\n"); static_call_update(x86_idle, tdx_safe_halt); - } else + } else { static_call_update(x86_idle, default_idle); + } } void amd_e400_c1e_apic_setup(void) @@ -985,7 +958,10 @@ void __init arch_post_acpi_subsys_init(void) if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) mark_tsc_unstable("TSC halt in AMD C1E"); - pr_info("System has AMD C1E enabled\n"); + + if (IS_ENABLED(GENERIC_CLOCKEVENTS_BROADCAST_IDLE)) + static_branch_enable(&arch_needs_tick_broadcast); + pr_info("System has AMD C1E erratum E400. Workaround enabled.\n"); } static int __init idle_setup(char *str)