From nobody Fri May 10 13:27:43 2024 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 A1F18C636D6 for ; Wed, 22 Feb 2023 17:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbjBVRy4 (ORCPT ); Wed, 22 Feb 2023 12:54:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232000AbjBVRyu (ORCPT ); Wed, 22 Feb 2023 12:54:50 -0500 Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B38203CE10 for ; Wed, 22 Feb 2023 09:54:49 -0800 (PST) X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 7ADD85C20EC for ; Wed, 22 Feb 2023 17:54:47 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1B0A25C220A for ; Wed, 22 Feb 2023 17:54:47 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1677088487; a=rsa-sha256; cv=none; b=nctrzUK76VOvXeO7zHsAKPayMCSKTL7CKSXUViMaTmhWtI1HHpw41CLL9tdtT+x0J6EqnJ ixAQJWbmCgL/lG7WwuASmkan4sEXRK33kkOTDcm15GdXSgpUwoKOrCKfRHtc9ruNfP9f2R +eLINy21XKajNeTmjBRKW+M+2mMdH/LA6Sx9RyTpk8RTPZOKEG8RaC50ndLf7gUGqHakOG /R8/jDoGe1/XChR8gU4oY8AI50CJfklFN2LuRjFwl+VRwfB9z1Sr6Fm+pJdAE+zXelmfR6 DlBSvZdpfZaxhOpgwcz5kgiGAkRqCR0Y+oXVVUjOSmjQbTea6rSAiucyCZrAdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1677088487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jPLOaJx1XC+xepUu7FtXLYzyt2YPI1cX/q7Jp4OSr1s=; b=TgQVHRddwVMproX+4/ztTf4A2wTDDMNKZyEmYD1NaY66Al0OGkr8oxFgE5TXQOPfjJBU3H hRx2YB5ZKcY5FJRxr81o07dPwop6Y21lOg8AYvcjjq3YkMX1/0sRTO28TY+DKbwCHl7cqh QpMUUUJ7aGV5s5g5Gr0twH6BzEGr9v8X4VzSoXJkD967OeOVhFVa1cBEZTglAnQptkHnCa JbKS29MYPbTuaghLTkw/5YGCaEfve1960o+q4Y6Gk+dhycTtazEHexjfJm3/oFe5dgl+jb xm96M4EHrROxNRmZUkOdCWKqXPqhUPfkZ0HRfcEU9t16UxTuAhoApVVlVY17hQ== ARC-Authentication-Results: i=1; rspamd-9788b98bc-ngd69; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Fumbling-Shelf: 27a17fbf61ced001_1677088487351_811464493 X-MC-Loop-Signature: 1677088487351:901770116 X-MC-Ingress-Time: 1677088487351 Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.48.87 (trex/6.7.1); Wed, 22 Feb 2023 17:54:47 +0000 Received: from kmjvbox (c-76-102-200-71.hsd1.ca.comcast.net [76.102.200.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4PMP1f0223z1Nt for ; Wed, 22 Feb 2023 09:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1677088486; bh=jPLOaJx1XC+xepUu7FtXLYzyt2YPI1cX/q7Jp4OSr1s=; h=Date:From:To:Cc:Subject:Content-Type; b=PfqaKgwb9Q4qCwAI1hyYXJ6QTsFQmaVjcqQhOuxkDWs6+Lc5zIuwbbdBrcC/TRPby Ar73uyNbaXjOlnoBre1syBaNtMH30moy0JonO+0NnnIZ875rLx06BR4iwgvqoSr09Q 7ksNIwhFpnxWrhxMICs3B/fqy9DDqAS2Ah8+3XUo= Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e004a by kmjvbox (DragonFly Mail Agent v0.12); Wed, 22 Feb 2023 09:54:42 -0800 Date: Wed, 22 Feb 2023 09:54:42 -0800 From: Krister Johansen To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Jan Beulich , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Marcelo Tosatti , Anthony Liguori , David Reaver , Brendan Gregg Subject: [PATCH linux-next v2 1/2] xen: update arch/x86/include/asm/xen/cpuid.h Message-ID: <94b9046dd0db3794f0633d134b7108508957758d.1677038165.git.kjlx@templeofstupid.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update arch/x86/include/asm/xen/cpuid.h from the Xen tree to get newest definitions. This picks up some TSC mode definitions and comment formatting changes. Signed-off-by: Krister Johansen Reviewed-by: Juergen Gross --- arch/x86/include/asm/xen/cpuid.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/xen/cpuid.h b/arch/x86/include/asm/xen/cp= uid.h index 6daa9b0c8d11..a3c29b1496c8 100644 --- a/arch/x86/include/asm/xen/cpuid.h +++ b/arch/x86/include/asm/xen/cpuid.h @@ -89,11 +89,21 @@ * Sub-leaf 2: EAX: host tsc frequency in kHz */ =20 +#define XEN_CPUID_TSC_EMULATED (1u << 0) +#define XEN_CPUID_HOST_TSC_RELIABLE (1u << 1) +#define XEN_CPUID_RDTSCP_INSTR_AVAIL (1u << 2) + +#define XEN_CPUID_TSC_MODE_DEFAULT (0) +#define XEN_CPUID_TSC_MODE_ALWAYS_EMULATE (1u) +#define XEN_CPUID_TSC_MODE_NEVER_EMULATE (2u) +#define XEN_CPUID_TSC_MODE_PVRDTSCP (3u) + /* * Leaf 5 (0x40000x04) * HVM-specific features * Sub-leaf 0: EAX: Features * Sub-leaf 0: EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT fla= g) + * Sub-leaf 0: ECX: domain id (iff EAX has XEN_HVM_CPUID_DOMID_PRESENT fla= g) */ #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC regis= ters */ #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC acc= esses */ @@ -102,12 +112,16 @@ #define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) /* vcpu id is present in = EBX */ #define XEN_HVM_CPUID_DOMID_PRESENT (1u << 4) /* domid is present in EC= X */ /* - * Bits 55:49 from the IO-APIC RTE and bits 11:5 from the MSI address can = be - * used to store high bits for the Destination ID. This expands the Destin= ation - * ID field from 8 to 15 bits, allowing to target APIC IDs up 32768. + * With interrupt format set to 0 (non-remappable) bits 55:49 from the + * IO-APIC RTE and bits 11:5 from the MSI address can be used to store + * high bits for the Destination ID. This expands the Destination ID + * field from 8 to 15 bits, allowing to target APIC IDs up 32768. */ #define XEN_HVM_CPUID_EXT_DEST_ID (1u << 5) -/* Per-vCPU event channel upcalls */ +/* + * Per-vCPU event channel upcalls work correctly with physical IRQs + * bound to event channels. + */ #define XEN_HVM_CPUID_UPCALL_VECTOR (1u << 6) =20 /* --=20 2.25.1 From nobody Fri May 10 13:27:43 2024 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 EC6F6C61DA4 for ; Wed, 22 Feb 2023 17:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232045AbjBVRzR (ORCPT ); Wed, 22 Feb 2023 12:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231236AbjBVRzO (ORCPT ); Wed, 22 Feb 2023 12:55:14 -0500 Received: from cheetah.elm.relay.mailchannels.net (cheetah.elm.relay.mailchannels.net [23.83.212.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B062F3E629 for ; Wed, 22 Feb 2023 09:55:05 -0800 (PST) X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8BCFA6C0D80 for ; Wed, 22 Feb 2023 17:55:03 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1315D6C0FED for ; Wed, 22 Feb 2023 17:55:03 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1677088503; a=rsa-sha256; cv=none; b=oUdm9hPUqOZPk3vnqDVNvwRGFiGgkP3riHS/4KnKqpryF5x9+kDQ1ctioBviUfZRAx6eBR +1YUfEM9AqlqHDHbiQNSC/cVdzRSg9357PvAdzLD6LnFk0l6xPWHuh6wYka8sRakgD9Gye NCbWybR9dO+RLH+EceZFA4qEuYHe9kVo4D0LDicI5GOW/yNHb/G6tMlfB/o/niJcsAPnDR KeYBueEw/M1qzfDILMnGssRbRinNxXpaKcIiuPrtKQQobQ+FFkEPsfWSCNqFoK9qEGp83N VYbQphexIc82r8gaZO0VYRPxt+vBwqq6tvxAjWfAXyDCShk1Zvl3e6gePesWag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1677088503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SFO62oAKLgPH71Y0Xq/5Q3j7DH6Nq6RDi9wLwjcluGc=; b=2nnWgivDo+ddQX4rXiVJFmvq/Lt3TNfeg2LRMvHtY8AiKcE+pzC/vycn8nbgRTl7yPqU0A LT/Ue7aCX26pdUYZpg8/T907x83j0NB0X77V0Zk/w/Lt/NewKyOi1AZBUDrB8nh/OsCD5m HLa5K/EScxZ4ixB3H6zxM9odvnD5LnsIgpOKu1EYrpFfqh0tRvGIZWjR8Zaa6FmS2WpxET 9Obv94jt83r9628x9ZYi78/eUFyTxuKtrO+5Ggpj+crL88aSqbkbFXYCY303AIyq0ac9zp 1VJc4xeHA2JSG18pZqwu1Vg20wGjC8JwjVjnC0S1/V3OC5PDSEo8GxFUsYNG0Q== ARC-Authentication-Results: i=1; rspamd-5db48964c-tlhbm; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Good X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Whispering-Imminent: 6e390c0c2f524750_1677088503372_3885356842 X-MC-Loop-Signature: 1677088503372:3174618892 X-MC-Ingress-Time: 1677088503372 Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.227.140 (trex/6.7.1); Wed, 22 Feb 2023 17:55:03 +0000 Received: from kmjvbox (c-76-102-200-71.hsd1.ca.comcast.net [76.102.200.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a306.dreamhost.com (Postfix) with ESMTPSA id 4PMP1x5cvdz3L for ; Wed, 22 Feb 2023 09:55:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1677088502; bh=SFO62oAKLgPH71Y0Xq/5Q3j7DH6Nq6RDi9wLwjcluGc=; h=Date:From:To:Cc:Subject:Content-Type; b=eeNdy4H+j7lG6Sne8OpERURhOxfjYoo41SOiAGXZQlESWISax/NRObaYPfTyzFJF7 js3TD4KnZUKPTPauRebQivsARvaC2EYQAHbTJ8toeSAPHu1bDB4FuINUhD1dt/rflX 6+D3NX4iCssGRBTfJ7L/G8wVVzNoKOJmCStUVLb0= Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e004a by kmjvbox (DragonFly Mail Agent v0.12); Wed, 22 Feb 2023 09:54:56 -0800 Date: Wed, 22 Feb 2023 09:54:56 -0800 From: Krister Johansen To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Jan Beulich , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Marcelo Tosatti , Anthony Liguori , David Reaver , Brendan Gregg Subject: [PATCH linux-next v2 2/2] x86/xen/time: cleanup xen_tsc_safe_clocksource Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Modifies xen_tsc_safe_clocksource() to use newly defined constants from arch/x86/include/asm/xen/cpuid.h. This replaces a numeric value with XEN_CPUID_TSC_MODE_NEVER_EMULATE, and deletes a comment that is now self explanatory. There should be no change in the function's behavior. Signed-off-by: Krister Johansen Reviewed-by: Juergen Gross --- arch/x86/xen/time.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 95140609c8a8..94056013a2a4 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -495,11 +496,7 @@ static int __init xen_tsc_safe_clocksource(void) /* Leaf 4, sub-leaf 0 (0x40000x03) */ cpuid_count(xen_cpuid_base() + 3, 0, &eax, &ebx, &ecx, &edx); =20 - /* tsc_mode =3D no_emulate (2) */ - if (ebx !=3D 2) - return 0; - - return 1; + return ebx =3D=3D XEN_CPUID_TSC_MODE_NEVER_EMULATE; } =20 static void __init xen_time_init(void) --=20 2.25.1