From nobody Fri Oct 31 09:26:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1750783220; cv=none; d=zohomail.com; s=zohoarc; b=mX5f+EDDvap2H97CTT7+h/gtZK0Ntt2tmOmipuVktgi8giz8w7SAWXtrgF2FiCcKs7CKw1cDPKo0B3n2Vkwmc4VBt2g63CIqRSNT98TiHqFrC4IAbwictRRhBuAYfkSu9k9LsGPeU+sRdMn+GbAQrMEgiyFoeIyVh5bOFazcSCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750783220; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=F6JXyUMx3IjQ54X/lCoYWUS3iBYfCqkhLOnaKoIjagI=; b=VHGTOJIdaacvbCrCH+m6o2ZyRd7LbudaKrGpRS5qvOhYBCeGAP1E2xgGym87cqPiUuqVNzIqnksLD8ftY1ZxCIARtoz7w3R06mC1oXyUpIeoY4mpq120Jxy8S/vj+kMUy+tQmuoJqkidOXevnJKgQqJfRD4mJwHegDx93pQRgz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1750783220752380.36506834739896; Tue, 24 Jun 2025 09:40:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1023952.1400019 (Exim 4.92) (envelope-from ) id 1uU6gj-00006X-4H; Tue, 24 Jun 2025 16:40:01 +0000 Received: by outflank-mailman (output) from mailman id 1023952.1400019; Tue, 24 Jun 2025 16:40:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU6gi-00006Q-V1; Tue, 24 Jun 2025 16:40:00 +0000 Received: by outflank-mailman (input) for mailman id 1023952; Tue, 24 Jun 2025 16:40:00 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU6gi-00006A-6B for xen-devel@lists.xenproject.org; Tue, 24 Jun 2025 16:40:00 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id de293fa2-5119-11f0-a30f-13f23c93f187; Tue, 24 Jun 2025 18:39:59 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4536b8c183cso315165e9.0 for ; Tue, 24 Jun 2025 09:39:59 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e810caefsm2295472f8f.87.2025.06.24.09.39.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jun 2025 09:39:58 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: de293fa2-5119-11f0-a30f-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1750783198; x=1751387998; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F6JXyUMx3IjQ54X/lCoYWUS3iBYfCqkhLOnaKoIjagI=; b=t7DzAA+ZcKtrqS5X1zuCZyD23c2N2WCkq1o4yME6hlampDzGiqGdSgDmKtPzb2yU7r 8h7xuC8dFxtmvyZzrkELvYVTUO+5VIPFAt9jHDbbi5Ea+6DJFunqVity82Rl2Rkuu5KS 5ZmkDis16Fyl1hszwD1WK4iCLfRLGD/3t8KEA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750783198; x=1751387998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F6JXyUMx3IjQ54X/lCoYWUS3iBYfCqkhLOnaKoIjagI=; b=HF5VGeUDRGdmq22pTWpvCCHyBZ1DDWN4xLwtWPIedIJxCqzU1+spgO2yF3yT9p0aXg Ci8oWvrh4gvATOcZgbTuTvtaFrP/goSqzAcC293NPHJDPujTwsmYvdjObq9SpdUJFSJZ m50eBztkgPIX1B61bJWa6Zsg3GbOo2x4uWoyNnopZWglV9dNYC+DuuY4ucDCFfBLKFPP XNsUN0sUcXYmd06qmN+EL7rOjz80DzVl5Pv7FEUEI/nbqgUSD8nv2eQCy8Ff2UfE+Rbr IVlPBzULey/yFIbAmnAbmk1O+WSoda5OlI2pkSO2zbZzvOFeEezRar2M/UaJss7LFL06 xJCg== X-Gm-Message-State: AOJu0YwSlFXiYwK1JS8QF2FhHDuSExvIgReaAJ20NRfSWog+F2Q4j89z TtG++7Z3GLbreaMIlL/Z791khjc/931OiAKA3wgFI8LmYwx97jGOtyJdjrlP+XKs1aRLnOaUZc7 j6msWxGBPoA== X-Gm-Gg: ASbGnctS1vUBTGoeWeZk1a0ehIXANvnUSuOXYYaU2zUwZL2ostZLR0JKQz6WxJPXqvr JE1iTdC+fWtWSqWtmm9f9G8kdY+wYabwuOtQzx02j+CDqr6jI3EkkSyP63SxaI58zzlTWwaKH2H gTcOZnPcqgLLp15RMG9hlG93kPnPaFuJXfBTCsiZpkopdSEST93v5PwTdYwTuvt+kq1Yfr5uxB7 hYrj/2p8uURsW8puOqoN+83pKKhXA2Rb6jZaqVwy0Yq4WVjMXp05jwbMgsCbrU15u09R08v6W9K zUlHeXSK4FGs6JofajCyGTNwhZpD98EId/M1kKPhkF485Mw2lvVroI1eo3h6MIcL/96w4sF38TZ 1unRwnwwCroq558q5NrfgouEUHGwf1fKxPAc= X-Google-Smtp-Source: AGHT+IFQPLT83iQ184sq26JwFUC7OyLxsojaK3bBbVO5G1nNWggAhvjJkebTS7WzIykBYxvVMQQYbQ== X-Received: by 2002:a05:600c:a107:b0:453:9b3:5b58 with SMTP id 5b1f17b1804b1-4537b73816bmr35245505e9.4.1750783198505; Tue, 24 Jun 2025 09:39:58 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 1/4] x86/idle: Move monitor()/mwait() wrappers into cpu-idle.c Date: Tue, 24 Jun 2025 17:39:48 +0100 Message-Id: <20250624163951.301743-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250624163951.301743-1-andrew.cooper3@citrix.com> References: <20250624163951.301743-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1750783221654116600 They're not used by any other translation unit, so shouldn't live in asm/processor.h, which is included almost everywhere. Our new toolchain baseline knows the MONITOR/MWAIT instructions, so use them directly rather than using raw hex. Change the hint/extention parameters from long to int. They're specified to remain 32bit operands even 64-bit mode. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 --- xen/arch/x86/acpi/cpu_idle.c | 21 +++++++++++++++++---- xen/arch/x86/include/asm/processor.h | 17 ----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 1dbf15b01ed7..40af42a18fb8 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -60,6 +60,19 @@ =20 /*#define DEBUG_PM_CX*/ =20 +static always_inline void monitor( + const void *addr, unsigned int ecx, unsigned int edx) +{ + asm volatile ( "monitor" + :: "a" (addr), "c" (ecx), "d" (edx) ); +} + +static always_inline void mwait(unsigned int eax, unsigned int ecx) +{ + asm volatile ( "mwait" + :: "a" (eax), "c" (ecx) ); +} + #define GET_HW_RES_IN_NS(msr, val) \ do { rdmsrl(msr, val); val =3D tsc_ticks2ns(val); } while( 0 ) #define GET_MC6_RES(val) GET_HW_RES_IN_NS(0x664, val) @@ -470,7 +483,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned i= nt ecx) mb(); } =20 - __monitor(monitor_addr, 0, 0); + monitor(monitor_addr, 0, 0); smp_mb(); =20 /* @@ -484,7 +497,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned i= nt ecx) cpumask_set_cpu(cpu, &cpuidle_mwait_flags); =20 spec_ctrl_enter_idle(info); - __mwait(eax, ecx); + mwait(eax, ecx); spec_ctrl_exit_idle(info); =20 cpumask_clear_cpu(cpu, &cpuidle_mwait_flags); @@ -915,9 +928,9 @@ void cf_check acpi_dead_idle(void) */ mb(); clflush(mwait_ptr); - __monitor(mwait_ptr, 0, 0); + monitor(mwait_ptr, 0, 0); mb(); - __mwait(cx->address, 0); + mwait(cx->address, 0); } } else if ( (current_cpu_data.x86_vendor & diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/as= m/processor.h index 96b9bf5f5edb..04824c3633cf 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -315,23 +315,6 @@ static always_inline void set_in_cr4 (unsigned long ma= sk) cr4_pv32_mask |=3D (mask & XEN_CR4_PV32_BITS); } =20 -static always_inline void __monitor(const void *eax, unsigned long ecx, - unsigned long edx) -{ - /* "monitor %eax,%ecx,%edx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc8;" - : : "a" (eax), "c" (ecx), "d"(edx) ); -} - -static always_inline void __mwait(unsigned long eax, unsigned long ecx) -{ - /* "mwait %eax,%ecx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc9;" - : : "a" (eax), "c" (ecx) ); -} - #define IOBMP_BYTES 8192 #define IOBMP_INVALID_OFFSET 0x8000 =20 --=20 2.39.5