From patchwork Tue Dec 6 06:43:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li,Rongqing" X-Patchwork-Id: 30109 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2673846wrr; Mon, 5 Dec 2022 23:15:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf652EyfTHaMAjyl3WY8X4XwroHaB0oiOzj9+ZC3R8736LZH4LavYUECmC8GOqTjKLdLKesb X-Received: by 2002:a17:902:db07:b0:189:9ee0:cca4 with SMTP id m7-20020a170902db0700b001899ee0cca4mr33802858plx.74.1670310903865; Mon, 05 Dec 2022 23:15:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670310903; cv=none; d=google.com; s=arc-20160816; b=zb5W8NJP8CnLRpO8mt1FoS75GBaCNO4wcxT7/D0/GTSGkG+g/+HlummrT3YQxTuDSv btVuX56UAuIt4+dZyBcRTc1b8sGNOsSo2mARjN7myRpOAztZr+DeCe/3wAj5/uC8xonY ijeNgfp9/xX2/T4oEH7ylEmusBY0Q2qcntpSe4M31q7YqNISu1UL04Bpctx/J60q8yuM vYlgRNpRrV2bZHXXstOiguEnyWkHzRBwoIuYddB3NvUU7da/W2XXTjvILYMulPGx7agV OjpJEHx47Iz2OtofmvCsLjbDpshOzUIeJmY9UvGa26NzUBoBRm3pzwR5rZ4yKb9Dh2MT GInQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:to:from; bh=PiruzeanwcwTk7aYSgDb1b5VxJPFGnKQI9n/seGNhME=; b=uR1Z1ARXlV9autwL8zUP9ZVNpEjf6/uZPFEi/nJSl67MgwxfirdaGiCGKhrbIAzz6d M7isWIDk2JaJiEZLGALkB93JG0q/wlxlHDNw7fyy6woUb4HiVJVCHhNwlVSGZsjOv9pd CHDwJB9EPnFWpIW3dZwb6nsdCYyniJxDiX98fQ8PFRg+kKAn+LlXyA3GjQGJSg1hmxt7 47tekX/FoP4jzEl3F21AlOKlv0kR4RZUAlVktNlrrz7m0u2TUdB9iuZX9bVZPz39RCRR yEZg37+vd3HUuwzpnPENq25g8r3ZE+CjQsmIRiHNW+5BgWVIFSXB/BqW4inSfzxpm/TF n2bQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f13-20020a17090a638d00b00212d06b4743si18460469pjj.34.2022.12.05.23.14.50; Mon, 05 Dec 2022 23:15:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233748AbiLFGwK (ORCPT + 99 others); Tue, 6 Dec 2022 01:52:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231694AbiLFGwI (ORCPT ); Tue, 6 Dec 2022 01:52:08 -0500 Received: from mx417.baidu.com (mx411.baidu.com [124.64.200.154]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B20D163DE for ; Mon, 5 Dec 2022 22:52:06 -0800 (PST) Received: from bjhw-sys-rpm015653cc5.bjhw.baidu.com (bjhw-sys-rpm015653cc5.bjhw.baidu.com [10.227.53.39]) by mx417.baidu.com (Postfix) with ESMTP id B68D219B80406; Tue, 6 Dec 2022 14:43:18 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by bjhw-sys-rpm015653cc5.bjhw.baidu.com (Postfix) with ESMTP id B00A7D9932; Tue, 6 Dec 2022 14:43:18 +0800 (CST) From: lirongqing@baidu.com To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, rafael@kernel.org, daniel.lezcano@linaro.org, peterz@infradead.org, akpm@linux-foundation.org, tony.luck@intel.com, jpoimboe@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH] cpuidle-haltpoll: Disable kvm guest polling when mwait_idle is used Date: Tue, 6 Dec 2022 14:43:18 +0800 Message-Id: <1670308998-12313-1-git-send-email-lirongqing@baidu.com> X-Mailer: git-send-email 1.7.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751447926483142097?= X-GMAIL-MSGID: =?utf-8?q?1751447926483142097?= From: Li RongQing when KVM guest has mwait and mwait_idle is used as default idle function, Loading cpuidle-haltpoll will make idle function back to default_idle which is using HLT, As the commit aebef63cf7ff ("x86: Remove vendor checks from prefer_mwait_c1_over_halt") explains that mwait is preferred so disable kvm guest polling in this conditions to improve performance, like sockperf localhost test shows that latency is reduced by about 20% Signed-off-by: Li RongQing --- arch/x86/include/asm/processor.h | 2 ++ arch/x86/kernel/process.c | 6 ++++++ drivers/cpuidle/cpuidle-haltpoll.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 67c9d73..159ef33 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -862,4 +862,6 @@ bool arch_is_platform_page(u64 paddr); #define arch_is_platform_page arch_is_platform_page #endif +bool is_mwait_idle(void); + #endif /* _ASM_X86_PROCESSOR_H */ diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index c21b734..330972c 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -896,6 +896,12 @@ void select_idle_routine(const struct cpuinfo_x86 *c) x86_idle = default_idle; } +bool is_mwait_idle(void) +{ + return x86_idle == mwait_idle; +} +EXPORT_SYMBOL_GPL(is_mwait_idle); + void amd_e400_c1e_apic_setup(void) { if (boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) { diff --git a/drivers/cpuidle/cpuidle-haltpoll.c b/drivers/cpuidle/cpuidle-haltpoll.c index 3a39a7f..8cf1ddf 100644 --- a/drivers/cpuidle/cpuidle-haltpoll.c +++ b/drivers/cpuidle/cpuidle-haltpoll.c @@ -17,6 +17,7 @@ #include #include #include +#include static bool force __read_mostly; module_param(force, bool, 0444); @@ -111,6 +112,9 @@ static int __init haltpoll_init(void) if (!kvm_para_available() || !haltpoll_want()) return -ENODEV; + if (is_mwait_idle()) + return -ENODEV; + cpuidle_poll_state_init(drv); ret = cpuidle_register_driver(drv);