From patchwork Tue Apr 7 06:33:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 11477613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9437992C for ; Tue, 7 Apr 2020 06:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 729252072A for ; Tue, 7 Apr 2020 06:34:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="fXiQ1qW3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727104AbgDGGd5 (ORCPT ); Tue, 7 Apr 2020 02:33:57 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:34753 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgDGGd5 (ORCPT ); Tue, 7 Apr 2020 02:33:57 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 6917a9d6; Tue, 7 Apr 2020 06:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=BzxdK8qX7RPMFKrWffaobEdiW Aw=; b=fXiQ1qW3kilIqRdGH9MIIuHs+vzTNW4T/NuK8lAzfJzSjQbhm/qNou8NZ OV3ylqBANDqhURB9qTb8wE89Sq7RpWLpE2s+EMf+8OH8QTRXEiCaEkjn0468f6yl YwWkVcDkIZUvkE6wpNamzA/ZktpKbCTuEjvUMQOlTvAWzTWt83mLb8ZfTrix+THW nlxw36s5r/2lABHK67dP5GTrFkTh2v0J2aSkBHvmyatVSLWEssWGMhWZJb1XaySu rXy8Zn6BSax1+wsV8QP1iiAq2d8dUQwm5OAS4RmIZZkEKB22g4oUX/AkLMep7sEf GAef5h9L8TjainUlvq0EwLhdRAkww== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 715c3be1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 7 Apr 2020 06:25:01 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, x86@kernel.org, arnd@arndb.de, srinivas.pandruvada@linux.intel.com, bberg@redhat.com, bp@suse.de Cc: "Jason A. Donenfeld" Subject: [PATCH 2/3] x86/mce/therm_throt: allow disabling verbose logging Date: Tue, 7 Apr 2020 00:33:44 -0600 Message-Id: <20200407063345.4484-2-Jason@zx2c4.com> In-Reply-To: <20200407063345.4484-1-Jason@zx2c4.com> References: <20200407063345.4484-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org There is an enormous amount of fiddly book keeping and an auxiliary workqueue just for the purpose of ratelimiting and reliably printing messages regarding thermal events and throttling, which uses CPU in a rather common interrupt. Add an option to disable this verbose reporting. Signed-off-by: Jason A. Donenfeld --- arch/x86/Kconfig | 9 +++++++++ arch/x86/kernel/cpu/mce/therm_throt.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index beea77046f9b..39e7444353af 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1159,6 +1159,15 @@ config X86_THERMAL_VECTOR def_bool y depends on X86_MCE_INTEL +config X86_MCE_THERMAL_VERBOSE + bool "Verbose logging for thermal events" + depends on X86_THERMAL_VECTOR + ---help--- + Display messages in the kernel log when thermal events are triggered, + such as overheating and throttling. This mostly only uses extra CPU + for ratelimiting and book keeping, so unless you need these logs, it + is safe to say N. + source "arch/x86/events/Kconfig" config X86_LEGACY_VM86 diff --git a/arch/x86/kernel/cpu/mce/therm_throt.c b/arch/x86/kernel/cpu/mce/therm_throt.c index f904e85eb68f..6d726190a40a 100644 --- a/arch/x86/kernel/cpu/mce/therm_throt.c +++ b/arch/x86/kernel/cpu/mce/therm_throt.c @@ -313,6 +313,9 @@ static void therm_throt_process(bool new_event, int event, int level) u64 now; struct thermal_state *pstate = &per_cpu(thermal_state, this_cpu); + if (!IS_ENABLED(CONFIG_X86_MCE_THERMAL_VERBOSE)) + return; + now = get_jiffies_64(); if (level == CORE_LEVEL) { if (event == THERMAL_THROTTLING_EVENT)