From patchwork Wed Aug 24 23:42:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Shier X-Patchwork-Id: 12954096 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCD7CC04AA5 for ; Wed, 24 Aug 2022 23:42:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231219AbiHXXmT (ORCPT ); Wed, 24 Aug 2022 19:42:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231482AbiHXXmQ (ORCPT ); Wed, 24 Aug 2022 19:42:16 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7839751A11 for ; Wed, 24 Aug 2022 16:42:15 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id i191-20020a6387c8000000b0042b44ad723bso479927pge.19 for ; Wed, 24 Aug 2022 16:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc; bh=GgNtt8XHsncrMgE4IbFRR5+V66rX8top3EG46fAYnRQ=; b=TkwbARh0dZMRE7NNmMKzQlT77SIZaFyNqwvglcl62fiCu+FaVN1DDQfnQNcqxl1vll PhPkHhlVODagqIz4tOQH43BaiM2ryWm+xZSXhAossnzohFLZSs+2A8oX3zn//MSOMIEB urVepvzcnyoWCw8fvVDJPxIuspFkyvYUrga4TCZ14ZMrMeVpUJJMfRYK5dD0aP+Sossv cU6qmYxY2kKa5AlDkc3R705d9YOAeNYmXbHg2hE5AnBn51FwPSreQ31kq4W8fi2ILaCi o5uUEvWoWzQnYliEL6hJCdZ55gk3zSKWuIxJm4oZY3fzNdDPICAZzK1Q09wgMrreTAl4 f5LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc; bh=GgNtt8XHsncrMgE4IbFRR5+V66rX8top3EG46fAYnRQ=; b=MBFEI3YiESf/RHK+7odsdSnX5DJiBKtAuBtXSs6i7yaZKm1yATfq30NsRiXvItPcE+ zvV1DBt8m0xVDLyA2JanjLn3jaPP13mtCxRtQM83HjFfT+F5d0PhJbk2s4UFx2AKtyJk x076IVW9gojVpIrANYQed+59dcpkL3Ug7HLSX7SP6tA03ODKQpaCvqSCrsWWW/p3vzb1 Fh+LRRYKXfiqPs+M3Pc9k6gGZnYs/UWE2Ya/J1lscaMF937b/kN0WDfCcM64fkuXJ7mB L2UyZFyO8PqqgnFL6ehNUgHCL4IM9IIPKSbHF8/FAo3W/wqe0sqWewdFk9RvQzDYRVIc rWSg== X-Gm-Message-State: ACgBeo2eXbMqBihsn4YTDUoRO5JpKh2BcDCF87hspY9Mi5dYkBF4f1OC ykcGQ/d1x9XlzPQ90eCF5JlVVmBipnc= X-Google-Smtp-Source: AA6agR6x5JpK2ntXNc8GBL28Et5asGmcl9MZgoMJ3jvSRbAgpvHAOAHK5SwfyRyWL8p/UZjWA2Fo4nhGynM= X-Received: from pshier-dev.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b0b]) (user=pshier job=sendgmr) by 2002:a17:90b:33d2:b0:1fb:971b:c5e9 with SMTP id lk18-20020a17090b33d200b001fb971bc5e9mr1509609pjb.90.1661384534988; Wed, 24 Aug 2022 16:42:14 -0700 (PDT) Date: Wed, 24 Aug 2022 16:42:11 -0700 Message-Id: <20220824234211.1625026-1-pshier@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v2] intel_idle: avoid tracing MSR writes while idling From: Peter Shier To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Jacob Pan , Len Brown , Peter Zijlstra , Michael Roth , Alexei Starovoitov , Josh Poimboeuf Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Peter Shier Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org With commit bf5835bcdb963 ("intel_idle: Disable IBRS during long idle"), enabling wrmsr trace with CONFIG_LOCKDEP causes "suspicious rcu_dereference_check() usage" warning because do_trace_write_msr does not use trace_write_msr_rcuidle. Change intel_idle_ibrs to use native_wrmsr to avoid tracing Sample warning: ============================ WARNING: suspicious RCU usage 6.0.0-dbg-DEV #7 Tainted: G S O ----------------------------- arch/x86/include/asm/msr-trace.h:48 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 RCU used illegally from extended quiescent state! no locks held by swapper/59/0. stack backtrace: CPU: 59 PID: 0 Comm: swapper/59 Tainted: G S O 6.0.0-dbg-DEV #7 Call Trace: dump_stack_lvl dump_stack lockdep_rcu_suspicious trace_write_msr do_trace_write_msr intel_idle_ibrs cpuidle_enter_state cpuidle_enter do_idle cpu_startup_entry start_secondary secondary_startup_64_no_verify Tested on skylake using: echo "msr:write_msr" >/sys/kernel/debug/tracing/set_event with and without patch. Signed-off-by: Peter Shier Acked-by: Peter Zijlstra (Intel) Acked-by: Rafael J. Wysocki --- v2: - changed to avoid tracing v1: https://lore.kernel.org/all/20220823234353.937002-1-pshier@google.com/ drivers/idle/intel_idle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 3e101719689a..df129c73786f 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -187,12 +187,12 @@ static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev, int ret; if (smt_active) - wrmsrl(MSR_IA32_SPEC_CTRL, 0); + native_wrmsr(MSR_IA32_SPEC_CTRL, 0); ret = __intel_idle(dev, drv, index); if (smt_active) - wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl); + native_wrmsr(MSR_IA32_SPEC_CTRL, spec_ctrl); return ret; }