From nobody Sun May 19 14:14:30 2024 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1644504977; cv=pass; d=zohomail.com; s=zohoarc; b=XyVPmMnrRUoqxAGGjdREQysnHMpUbKIkhATk0nOH5voXrnau1twGsK1A7uQGmdUowSfK++DITYg5cyicrLvs937tt/EQ1d0giFRzn0tTHmiANg1vSesRtGB3eBOsAIU8YjXLYypIEMj0JuAIoqEQMWE8vSX8JOdnzXWvRCVU25c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644504977; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eUtuGMPyAObdf0J2/GPNj4BgwRzlxjTEV6wyVRInaNs=; b=XNay9xuBJmgjdN4ctKPp/EgevPKMVqVGqSOQcK/Z3OSJQNHGIQU6ih6lowHG36Zst2KVX82z2c/SywpMFyBTeA1FQwRmmyjhRNtEAElJ2CUdQTs5l2CZrnMci9KhMfq7nKVTAuovvc4F0yqK1AV1Tv4Rh/MNMVOQ2zMS4qtZCGc= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 164450497797685.63700062152452; Thu, 10 Feb 2022 06:56:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.269882.464026 (Exim 4.92) (envelope-from ) id 1nIArW-0004jJ-I6; Thu, 10 Feb 2022 14:55:58 +0000 Received: by outflank-mailman (output) from mailman id 269882.464026; Thu, 10 Feb 2022 14:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nIArW-0004jC-F0; Thu, 10 Feb 2022 14:55:58 +0000 Received: by outflank-mailman (input) for mailman id 269882; Thu, 10 Feb 2022 14:55:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nIArU-0003wV-IS for xen-devel@lists.xenproject.org; Thu, 10 Feb 2022 14:55:56 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8ca15171-8a81-11ec-8f75-fffcc8bd4f1a; Thu, 10 Feb 2022 15:55:55 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2056.outbound.protection.outlook.com [104.47.2.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-26-tmHgBpWCOYuVdGtyZDh-cA-1; Thu, 10 Feb 2022 15:55:54 +0100 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) by AM8PR04MB7443.eurprd04.prod.outlook.com (2603:10a6:20b:1d6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 14:55:53 +0000 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84]) by AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84%3]) with mapi id 15.20.4951.019; Thu, 10 Feb 2022 14:55:53 +0000 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: 8ca15171-8a81-11ec-8f75-fffcc8bd4f1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644504955; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eUtuGMPyAObdf0J2/GPNj4BgwRzlxjTEV6wyVRInaNs=; b=JtUHnqR6JqKfYBMPMmtGYMPmwLDPa/y5rXL02be2GHxliIXct8U2AMq3XVddxY89es4uhw /NPwiPfrYoAElydDL0Q/misPZ23k8cp9NYHjEVC8Wa0vY/tDgSoRycVp0RdmS0kWibm7Ai SYNOOmP4WcJere0zVOgBXtkXjJhRoDk= X-MC-Unique: tmHgBpWCOYuVdGtyZDh-cA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJAKDzwgRvv8cJ7D4aRFUNlUpbWv1FTaINtIVn7BHLbTIBK0wixv4c8huL8watjjoIZ3BPXh82v5a5r2/JnQoLthu6Y7o+yfy2leRJOXUAZ8D+FDuje/BEij0L5RbW0eM7nWgfA2t5G/fxrlIXOGI3yIX1eFsiIetDsYjdSrNalun5Q2Gmux3xw4LacQRc4Ve7SCVPbPqhqsr5qqXvpR6Q/AVK5zFzNDijUAHDF1E/zYrxvjUWd6BYjFcvKQCHSs1oXg+/ugLDV4mBiAXgFDfu/ZwB+yBagCj0VWl6mFeI/NXYHWK3x5pkHQ/BX5YpNaHX8887M/a09LOnAwLVzUaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eUtuGMPyAObdf0J2/GPNj4BgwRzlxjTEV6wyVRInaNs=; b=HlRoy07vaIM5qMBm2TSWgpFCYJ1ewdZGeQjIBzPQk+xnLWUovYCndKjMoukVX+JSVa9zkAkgzFn9299gyKAsEju+zo2VBVP+HDvMt1WBIHd5HjoRunjGL85EWp66lwsJl/ZLh1F1ir+hLJhuF4QeuuJmplLMnpAvEORyrGXneYbKbxDPixhkJGqkzI5zvfhbzc1BQTWffFIZHYWIFrj4Zmq/XHwDSEaH0kSK6t5xDAj18FSPWu1FYHRPRL2q7gZjIZ3dhre55Ce/R2AKggcg/G+QdLRQTpDdEFuCemlax1XPxB5JJY2VzbzVL+sWcs8l3FHSbKX6wkzuoLT2IuOWPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <6f56a75c-cd68-0dad-b1ef-a3421271ee47@suse.com> Date: Thu, 10 Feb 2022 15:55:52 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: [PATCH 1/3] x86/Intel: skip PLATFORM_INFO reads on family 0xf Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> In-Reply-To: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6PR05CA0025.eurprd05.prod.outlook.com (2603:10a6:20b:2e::38) To AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b8a3236-040a-4120-7573-08d9eca56f75 X-MS-TrafficTypeDiagnostic: AM8PR04MB7443:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MsRv84qwoEk3Ic6kSsJbxS13Vx4wTSJD8vkIHaiSRGP+8Hl4sBX2/Ffyp7A4WpTxXJaVqUySFNeiA40X3HAKfMdL5agKGetsahbUhvW9xOpeyjdSCSJu6DP/fq+wibw3pSmDBFP0OtWio5LyrBgeeV8LKnzzM2lXa3b2nE5sneecOi3f94YMAMDsq0LNbPags9VW3M4qALCcwir0mI8a8Nb6HzSQOGREJmlRdL88rwS43n2Dr73N1Qd2kXQjRnGBrGTO8OOWyeKFgW5BxUShbN6jtvpzqlWCIswwa9QdWimncdOl1BowbAjSqBmXXeTlgJUMV131iH5kaWJ1WLRFhUA0aAZGk7OF3TNPFlMC7ag0QL42OTfcH+/RNR7SvH6eKrpBnumiUmkrTONrqia2gXF3LRCUu5PQQ8VK12IgpVoGPXmu22nN/T10P4xPWiLds1qY0vgnpMA3iF7APRO/O1gxce243cxOs7qW/F3bF0Fc0zPJC0aucaha7GDdpjavjOtFfI1WA0GNeq9upNQ5rceFM6v++BTp9EJ602PvQ+NEpb8piH8DzLwaDF87T1GsWPVqWGeyT5W5z4Zxttmck64HfpZCNLoaUMlZpwRR/kVvoe6tbc1it5kbnS2IeuB+RszlWrSZDcOGHK6GGuatiAWvr+vT/C3h1BTpHOUPIXAPJeXWO5a/nONyv6Skd+7jfPSnzSBVRMUKo5fMakFG4YBv6Ue0CwrVEVTxNh6jo9YdlgC1w3qR7qb+mGULRr5P X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5587.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6486002)(186003)(2616005)(31686004)(26005)(6512007)(508600001)(5660300002)(6506007)(8676002)(31696002)(36756003)(8936002)(66556008)(6916009)(66476007)(66946007)(54906003)(316002)(86362001)(38100700002)(2906002)(4326008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RXV4VzFmck9lcnZzZ0Y0c0ErYWFxWFZFTTZJV0xxTTF2QkFROWZQYmVybkNY?= =?utf-8?B?N0RBd2xTVVpNWksvSCtZaUVCUUVkQWRhUGJ4Wk9DM1pGakF0aVJ1eEpuS0dJ?= =?utf-8?B?bm1zSXRNeWEybDM5eWw3K2o5WGdlV1p6Vmx4ZFArQituckdCZ1pZTi8ya1d1?= =?utf-8?B?dW5wemZMKytubThWU01TTTAyYnZSOFJPcHJ4b1dBMTAzZThWeUlVOEdWMWc1?= =?utf-8?B?MmdvcWZqRlYzaHI2N25rN2RGWHVzL0U3SUdrOGFNcUcwY3RjeWNib25vaWMr?= =?utf-8?B?V1RHb3FhY05GejVHRldvY2lGc20vQ1JpcG1YZE1UWGU3TlZTZGdtTVgyMGdK?= =?utf-8?B?K1IzME85Z2VmR3h6UmhRSU5hWENFbmt1RHptWitMYnFxY2U5SDZHNmdVTDlK?= =?utf-8?B?Q1FDMncxRkdBaXF0Y1dBR0M2RFB4cWhBN3AxM2VFbGNJQ21NY1JUL1lnWnZZ?= =?utf-8?B?VTZaN2lyaU02V1BXcWMvV2FuZW9tajlpMG90RG0rL25sUFBmV0xRQ3VoN1Mw?= =?utf-8?B?YkNMZG5Ickh1aHA4ZlFBR2xaTnUyNFJPYlRoWFVnbHFDeTNnY0Z1eTczRDZW?= =?utf-8?B?aWlVRkovaTRtV080TzJhdnArbk5OdEpEdE92R0p5OU9nUU1NM3lkaTdpamxW?= =?utf-8?B?OUVsUlJkRVN3eWtEak5RV2xZZEIydVVOeXd5TVpRdm1XNlFQVUprVXNOMlRt?= =?utf-8?B?UVVaQllpdHRuM0lHTGlndmViTVFEYmk0citWVjlHL2pscmVrZVVvNmZROWYv?= =?utf-8?B?Q1J2WjgvZ2V2SGMrWlVXM2RiMXJISFN0NVBLdThvT1U3Y1R0WkF2QWZFL1di?= =?utf-8?B?bmhMSmI4ajZ5b1F0c2ZlWnpGTkFJQWVRekNESkVyU0VGd1lRZ1dGc2wyc2lr?= =?utf-8?B?eXYwTXoxMWRQUkptRjVTWGZodzNSaDVXODEyVzNLRVVDUzlyaGQ2TTRHaU10?= =?utf-8?B?T2c4VThGbTVZK25vTXJQd2NLOXMyYW9keU9PR21qV1Y3RHVQNEY5N2E5MFRL?= =?utf-8?B?bEI5OFdVUERxUFNNOFpOYkdFZHJwd1NFQ0FvUkhRYm9YcktPb256bmNPOG90?= =?utf-8?B?Qkp3MU02dE1jNHJTS2NycmMyNjFhRzhpVHNNRFdrbHlMWk9uelhZYTFVbENN?= =?utf-8?B?UUlDT2lWeDRKWjlDbWwrazhudDF5R29YNENvZ0hydDZUSnFRdWpyek9Cczk0?= =?utf-8?B?NW5rMW5HNmE1ZEhYY2FZbHAzcXdKbS83YlBRZUdxN0Z5Z25mV1lkVWUrQTll?= =?utf-8?B?UUFQbjgwdTFkaUZML2tCVHdvdkVJN3Nsdm1BZVpISTUrNXg1K0hoVnFFS3JE?= =?utf-8?B?RC9kWWcvWWoyK29QSmUrWnNuWFQ2ZUw4RlArcFlURGFkWHp5MGx0MllDSUxR?= =?utf-8?B?V25ocHk1UTdPK1RXTWNndXBZMTM1R1gwSnQvK0ZSMnJscDJRbTgzV2pJTHBU?= =?utf-8?B?SGJyanpCdXNiTzJBQ0xKN1FnVVJiUjVnYVJOMnpjY3NZTzIyZFpNWlptSDhy?= =?utf-8?B?QitUbm5UeGVxdkxEbU5DaE1CYmdsZlYvR0U2VDh5QStURkR2Zm9vMlpWT2wv?= =?utf-8?B?cW1TQWtTV1V5am1CcklPOTdocEl2VVR5SnFXWHptS2VyZDZUNnNkTzJtM1NG?= =?utf-8?B?bytSS3JhTlRYcG5XVkVTUTFYeTlUU2g3SlhBTEFGVUVXS3ZtUFhuRlNIKzE1?= =?utf-8?B?ZHJTMHFIejZJZUQvTHhTSEFlOXJWTjZrQVhwLzlPaEN6K1kvTW1VZnp3YlNt?= =?utf-8?B?MUwyZlF2MzhLZUFzdXF1YzNueDZ3S2RtOFVkVUxkb092OFovVTV0NnE5OW53?= =?utf-8?B?amVEUTBSdXgvRFpQa2lZNmtGd2loMG5IMk5vTFhRaUhhN2VNbjdqQ0lUK2FQ?= =?utf-8?B?T0xPQ0NMNm9KZk9tblU5K2VNTUc2RXBob3h2Y3hJc1A1em0zblQwOEVSb3R3?= =?utf-8?B?aVcxRjEyR3N6a0NnVitLMnpIdDcwaWUvVXFYcnVZK3BoNXFvdGQ1RUdLemRt?= =?utf-8?B?cUVkZGl1c0xKakpwSC8rcEFCRWZsTkc3NjBTNnZCVUVMd0o3M0t0MHlBWm9a?= =?utf-8?B?WDhUdzRTZVE3SmxRWlRpeDRZTmtRUllWUGo3S01mclJhVlpDaWlpQXRKaG1H?= =?utf-8?B?YkJ4TmF0cm1qMWNiaWV3TGM4QjRGWXc2VVdwazI1VFJ0bjc3KzU1RUFlcjM3?= =?utf-8?Q?ZgzLEBztrA+uKBY/f7uBA40=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b8a3236-040a-4120-7573-08d9eca56f75 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5587.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 14:55:53.4144 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JF4i5uevj3Us2pG66yQINEkt9v1FCfNkl0nI3kJuoeVoo0WXvy6cNtr2qo2qsk5TQxFBv1nvx3CWjvXceglD1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7443 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1644504979806100003 Content-Type: text/plain; charset="utf-8" This avoids unnecessary (and always somewhat scary) log messages for the recovered from #GP(0). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- Perhaps even use "!=3D 6" in at least the CPUID-faulting family check? --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -127,9 +127,12 @@ bool __init probe_cpuid_faulting(void) =20 /* * Don't bother looking for CPUID faulting if we aren't virtualised on - * AMD or Hygon hardware - it won't be present. + * AMD or Hygon hardware - it won't be present. Likewise for Fam0F + * Intel hardware. */ - if ((boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) && + if (((boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) || + ((boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL) && + boot_cpu_data.x86 =3D=3D 0xf)) && !cpu_has_hypervisor) return false; =20 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -455,7 +455,7 @@ static void intel_log_freq(const struct } } =20 - if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + if ( c->x86 =3D=3D 0xf || rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) return; max_ratio =3D msrval >> 8; =20 From nobody Sun May 19 14:14:30 2024 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1644505000; cv=pass; d=zohomail.com; s=zohoarc; b=bO4UJfukpEtTOOr8ebuZuKijTiTREFGAIYO1ZZLQ/k9NloIHV6IZSvkDlrfHtT9VgK5JoBC3aWysJwrnq9clwViQPl22AyFKsc8hvsOAeVrIvyJZO/0ndcM2tiiGno6B0YsmFaTJW5SD1bgGCgqc4wdp4Nkb7Dp3i4HuU7AzIAQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644505000; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j5zMM3qKdb6oVy6iS2IeBm7vTPi70YImKG2OphmjMjY=; b=cCRcxPyIfWqWZ1pnaSaYwcfRysAGXwzjGBGkBV9aurgNpLdldHPH/BQChxSIUAkKbmfjYEk/lD/czJ80N+PR534KsYryzqQCa4adjq9hX5VvPTnGewrnDO72y6ifrzeJeudqHtlNAWEV30Frok1c+Zwoo69OrAPKGknRqnA6hYk= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 164450500029454.78429518477151; Thu, 10 Feb 2022 06:56:40 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.269887.464037 (Exim 4.92) (envelope-from ) id 1nIArq-0005EH-Qr; Thu, 10 Feb 2022 14:56:18 +0000 Received: by outflank-mailman (output) from mailman id 269887.464037; Thu, 10 Feb 2022 14:56:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nIArq-0005EA-Nb; Thu, 10 Feb 2022 14:56:18 +0000 Received: by outflank-mailman (input) for mailman id 269887; Thu, 10 Feb 2022 14:56:16 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nIAro-0003wV-JZ for xen-devel@lists.xenproject.org; Thu, 10 Feb 2022 14:56:16 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 989d30bc-8a81-11ec-8f75-fffcc8bd4f1a; Thu, 10 Feb 2022 15:56:15 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2050.outbound.protection.outlook.com [104.47.12.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-5VJ5TEBbOs2s_-h9RH1w1w-1; Thu, 10 Feb 2022 15:56:14 +0100 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) by AM8PR04MB7443.eurprd04.prod.outlook.com (2603:10a6:20b:1d6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 14:56:13 +0000 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84]) by AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84%3]) with mapi id 15.20.4951.019; Thu, 10 Feb 2022 14:56:13 +0000 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: 989d30bc-8a81-11ec-8f75-fffcc8bd4f1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644504975; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j5zMM3qKdb6oVy6iS2IeBm7vTPi70YImKG2OphmjMjY=; b=gwrQP7MHythQtvnvIzAB4mt2BSeUmbB8BVoyWbSkcMN7OfpM6C+kJw1/MAAIV3Z726T/7c NXm+gFLuInPnBCRUh0nJUhjFJSw3etN4LkuUJJNHMaGv5IcnlptBkbmJvLKTEb/9C67EXp DLfW3ExJv+N3Dw8/OKu52kCba7F7H6Y= X-MC-Unique: 5VJ5TEBbOs2s_-h9RH1w1w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOL2RxalxbJXiqJO7LoesobC6ldSk3kT9B1nHUf2BB23g+/DpFtvbELlTB3bFHzv4cTX5lyN61Jmy+GHwyLS8ATpeL4qbtLRwWQn38cICDi42wxdWckjCTiSSFN94POmkiS2vRcGr0gSxmme3H3y5fy82Xu+d3WIecyVzHNOtEpd+njef19U2NS+fg2dLu7kjU+scjrRo65gv1diZCnm3E4rhtwVXfzwds5K2uuO46a+a8yEV/Ggo+TQAB3zB6HYAmXzZ60noqc1OZSA9AIbS1v101RXiRl4CTR19jdU1ELgSxn6Vyn6CyTpdwLHrdhw1IsE9vA6UIXvC+RH206iKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j5zMM3qKdb6oVy6iS2IeBm7vTPi70YImKG2OphmjMjY=; b=nCujtQU5viKNhfguBQQYW87CQHSO150Qk8NkY26zLEm1fny41yDBMJOFcoU3YsjD4/ma6jo72JV1cPVQ+mJTMt3BB0QwGJsnijhNssKK8RVVYJQ1UXfgbiqQgcHQdVDIxeucNjBXkz/lc3wFdqbxuLtdc9VhCW436RUumkXx0KkU/isGTwHXVu4ZiOut46+CW3jt0e/EgzfPlMu2+MPHQ6IDxbwL1/xJ8fIuxs+PDTBv3gqhivZD2SvudA7ebzbLAseQN24rrzhG/3be/FSAfK1MSNR/NjuZ/NdvN6ySbRzRb7aTKW9YI2gwkMwupFfMZnryGdD9Fdzh+Ko8owzaHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <1c16c2c4-0943-1db5-e22d-a6e1ffe5d00e@suse.com> Date: Thu, 10 Feb 2022 15:56:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: [PATCH 2/3] x86/Intel: skip CORE_THREAD_COUNT read on family 0xf Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> In-Reply-To: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0015.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::28) To AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bb6a289-30dc-4b35-f13d-08d9eca57b6c X-MS-TrafficTypeDiagnostic: AM8PR04MB7443:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C4SyDc+UKdaSHwy8HYua6yKeMfH97RwbRB8cOjqhH0XReA/KcMi+OyScGOmzQpk2Hnx4fSPSR+rj8a3DcQUh125XFTG5MCtja5ow0FTemE4/nlQi1zkruGpZwYNLEWKaaECACHhAayt6brxY2nrLgAccVUP2eOBz5nHT4cXMvzbcnMxOfY3ZfLS8Gti5TP38kQ44UZNU2/DHgLlG5u6Wy7Mwwl8Ys1xr/H6pGMOiHAnXAGDl0OttdRTH34/I2v20BxHYhzp3Z0prBZiUpf655wPVKti1MIMBKIm2+bw+wcAkQSt6nkxP62Si+jG9g8lIyozkVyTxU7UJbedg+FyJ6mprBH1S2QRUIdU4lPRsDy3siTzB5BXYf+GH9iDFh1sQM8neVQy6d5KETzXE1/EuKJhbUFR2B0PBemmzLAraUpozkZRAg/bEwzwnncP/m2Up9YPPOKooot0zkQYHJyVxXz5ukHK+ZMvOkjwsLhbZNPeGHsqLkk7KEd5MOWPbBCer0BSkqZz9y1Uy5EbJY00uZh4HE+aaQF+60QnhhFZge4vnreERjQbQMOGnI1mItyaii6mL/Gf2zj07sbnQFr4u+qR+Xv4mcS+FJAkmeY2Ja1pjBPCNEPqH82988Q69AC5vnDGtcrA9BcwZ7z3T59OdGg4Z7j2dZul3EuSOIEdKysZiA3sm4tLh8qeO0cVQfWTr5V9sCI0GH5beqWNdxXs4rK7GWYQE6Yxaug7dZ3ouJb4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5587.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(4744005)(6486002)(186003)(2616005)(31686004)(26005)(6512007)(508600001)(5660300002)(6506007)(8676002)(31696002)(36756003)(8936002)(66556008)(6916009)(66476007)(66946007)(54906003)(316002)(86362001)(38100700002)(2906002)(4326008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VndrRXN5TVRKNExGdTdzYjRDWFllc1FCcnlGRWU2dXBSSXZxQWJ2VS9ka2Ri?= =?utf-8?B?d3owV1JZWEVrYmRsMWxiME0wUEUyTXljY2FEZzkvV2p3VXR2TFdSNlNEdmFB?= =?utf-8?B?K3U2Q2t6c09RYXkxSkQ5Z3RpSnMrYk1zOXlPcXBkL0pNSWgvSm1uOXI0N1Ba?= =?utf-8?B?ckY1QVRxejNuNEErU2RXallIZVJZTzJjV0JrWlJLN3lOMFZJWU1Qck5vQzhi?= =?utf-8?B?NU9mZHpBTDAxWFNOenhWTW1GazlzZDVmd1FRcUZHdDBuUXJITWI4Z1NUc1Bx?= =?utf-8?B?dEJtYmxMZkgxeWkwUmtCZTc0MVZIT2QrL2JqTWYzOTAwQ2NYSmpYOS9BSjJ3?= =?utf-8?B?elZJR1l2aDBPQmVNeUJNSDVOcy96OW5wNzBiZ2JJV1M2dm9NbWMyaHJCazE0?= =?utf-8?B?cTVBc0xXYWJlcWxGcHVVUWFRRVFTUytOd2o4MkRLMkZmRFlLTmYzMk81YVM5?= =?utf-8?B?ZWhsYnQ2Z2tVQ1A1VHhET0RNTnA1em5neFFwNE1weGNPbUhJM1Rja29JOE1t?= =?utf-8?B?aTVhRWpVSktaUDV3TitmSkdZa2pEdkNGRTF5czBLdGx6UEJ0dEZIU2dXTmc0?= =?utf-8?B?OVRoQlNWTmNjSnV1T2QzVDNoQ2Y3NUpiYkRiSW51azNkNGpnUEo0U1p3ZXY1?= =?utf-8?B?dmZpRitHdjJyR3BEL2ZuSCtLSUJWZzlVT2lpdjJQVUJFWEhqT3BtcSt1NXB3?= =?utf-8?B?cTR4Y3VFUmRQTTQ3MUZPUGo1UGxwb0pQRnlKNnQ5S3drOXA2UVkvRHhtZGRF?= =?utf-8?B?Y2VRMDhVQ3AzeEg5dmhxcTcvUzZOSTJad1Rxdzd1WnRwUVVXenk1WW5ZdzYw?= =?utf-8?B?Snh4REhZbG50K3MzWC83VTc5bTNWRmFtdmNKclI1MUtwVEVnNWk0djlRREpx?= =?utf-8?B?MjVneFlaM3R3dXlLSTJsR1hOQmd0Q296dFkyYnBMckxUTGM5dURMQlFwYWhr?= =?utf-8?B?eURONHd3MThuanpuTks2MHE3alhMaUhleHJ4SGlsd3FwK3pXOVFoWisycnRJ?= =?utf-8?B?UUZEejVOZzI5NzdNK1c4WnhaenZ4RkRROXZtNWlPOUUvcGJNTnJWSUloNlhz?= =?utf-8?B?T3FBS05lYk1ERWZnOG02bEtOZFh3T2JtdlFReTlMaWpMMGp3SWlYY1hOYVNY?= =?utf-8?B?Z0ZOSXZ3NVphSEtQd1JncnpyaFlmOEpHdWpHRHNBNEVMRmljZzNWc0FaWHJa?= =?utf-8?B?U3I5VDAxdDlYaUYvdzkyT1ZnbVgxODZpa2RWcmRNNnNPSHNaTm5OOFJxWVQ3?= =?utf-8?B?UEpqUERtdHRyQk9GRW1tNW9qSTJDWFVITktvQXV5OW5UYlZRb1lSRTZWMFZQ?= =?utf-8?B?YjFHTFhwb3RIaENnMDlWYms1b3g0MVZYZ29LcUtVNlFmNnJLQUlydnNtYXlm?= =?utf-8?B?dFBRUDArY1hGL0pZWk0wRGZ2cWEvR1FFbGNYa1QvblJjTWFWNGZEMkNlMTFS?= =?utf-8?B?c1QxUktBU21WQlFpSStzdEpmem9uaEEyTVp5ak5GOVM2NzJkc08wUDFnYkNP?= =?utf-8?B?TDMwbzhhQldtbkFyQ0RlNjQyNGN1ODUyYTEraGZIbUw1UEpRR1dMTC8wZ3Q1?= =?utf-8?B?RXJOU3kyU3dUT29WRndEM0ZXL1pMR0ttOHdiZ1Q3ZkFrMTlsUGNFaHU0WGJa?= =?utf-8?B?NXJHd0g0bGRlVjJpaXM0RnlzYWNiWE1venBkUi90eHVDRGgwTnZQeHE0UEJ0?= =?utf-8?B?KzlQVlFrL3dCc2tSWmVISWRUcjd1ejRpUzRwbzdsRVlFYytraW1mcGlsZ1dP?= =?utf-8?B?c0RxM011aTgyVUxsVHNxOTM0WExCT1o1RXZoN2czQkVZa3RpdmhLNm1Ndm15?= =?utf-8?B?Umx6YTJQM2tzeHgreFRkelJUd3d3OXZoNWp3eWtDcTBocEJ4SWROUVpDQVQr?= =?utf-8?B?VHJKYmdsZ2xORkhoTlZZOTZadW8rblhjZnYzL1l4TW5yL04rekd4SGcwdEgy?= =?utf-8?B?dkYxZ3UvS3RmU2dnK2V0aVorY1gvZXk0Q1pIYnVFQmsvbHNNYU95dkRMNFlV?= =?utf-8?B?YUl0MG5id1FNc0RMMHhmTzRaYmE2TzJNNVpKRXBzWURXczZkQ3YxSzBCQzRB?= =?utf-8?B?WVZiSEVIb1kzRTVNRElyYWgrZDNIVDRYU0lMNjB0TEp3U1ZBK01YODluOFVs?= =?utf-8?B?MEJWWXdQbjI1cnFnV09NNmx6T2dDK2RGM2pmbHNZQnp5Wm5WaVdCRmkwYW9H?= =?utf-8?Q?Y9fmBgjnn+U72BF2YtGW4bw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bb6a289-30dc-4b35-f13d-08d9eca57b6c X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5587.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 14:56:13.4756 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s50CwxQrHxCE3aNif6wOaBG9n+aq/DeuSq0wwXbcH5f4Rpda1q0RaL0ZEbtw7EE+ujDrpzM3CJusIMuXC0pjmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7443 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1644505002008100001 Content-Type: text/plain; charset="utf-8" This avoids an unnecessary (and always somewhat scary) log message for the recovered from #GP(0). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- Perhaps even use "=3D=3D 6" in the family check? --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -453,7 +453,8 @@ static bool __init check_smt_enabled(voi * At the time of writing, it is almost completely undocumented, so is= n't * virtualised reliably. */ - if ( boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL && !cpu_has_hype= rvisor && + if ( boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL && + boot_cpu_data.x86 !=3D 0xf && !cpu_has_hypervisor && !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) return (MASK_EXTR(val, MSR_CTC_CORE_MASK) !=3D MASK_EXTR(val, MSR_CTC_THREAD_MASK)); From nobody Sun May 19 14:14:30 2024 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1644505034; cv=pass; d=zohomail.com; s=zohoarc; b=XSL3Yc+K73PR6SWZz1f+IYh4fswyNDVaAJdTUsO+EYh3ig6sCIlI6O5NuqtCGj7IAhRHPpa4pxlQBQp/hMQ2oNCTVaZxkRazgut0/A2NS28V9GGus4LAzupJv9xElSqtUKr0Qpt8fwFsea0xV6J+zI0QdkpM6EZ/J79npHyGCTI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644505034; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YE7MboGMkLZsy6AR5le9057gKgoWX82z397TyOpBdFU=; b=i+s2cos/K4dhsw/VH4UK8oGnltMwbhVAxCkOZyuE8ErN+L8qtuuNK+EtSAMt0LruAlQDnN7AkmwCW1/4+s28QH9UQk6ZwAy8nlWfmhu4kj5uvwFLjOBzUb4xDYqMmK9mRW42zJUP/DhIPlyoTp7evCHNhtvU3CVV0OaZevA1Y3o= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1644505034887513.8340187407662; Thu, 10 Feb 2022 06:57:14 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.269897.464048 (Exim 4.92) (envelope-from ) id 1nIAsQ-0005zs-Ap; Thu, 10 Feb 2022 14:56:54 +0000 Received: by outflank-mailman (output) from mailman id 269897.464048; Thu, 10 Feb 2022 14:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nIAsQ-0005zl-7D; Thu, 10 Feb 2022 14:56:54 +0000 Received: by outflank-mailman (input) for mailman id 269897; Thu, 10 Feb 2022 14:56:53 +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 1nIAsP-00056E-0y for xen-devel@lists.xenproject.org; Thu, 10 Feb 2022 14:56:53 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ae355fb3-8a81-11ec-8eb8-a37418f5ba1a; Thu, 10 Feb 2022 15:56:52 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2058.outbound.protection.outlook.com [104.47.12.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-BSB99X3_NP-Sbok7g9Ki-A-1; Thu, 10 Feb 2022 15:56:50 +0100 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) by AM8PR04MB7443.eurprd04.prod.outlook.com (2603:10a6:20b:1d6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 14:56:49 +0000 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84]) by AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::54e:e7d:545a:da84%3]) with mapi id 15.20.4951.019; Thu, 10 Feb 2022 14:56:49 +0000 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: ae355fb3-8a81-11ec-8eb8-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644505011; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YE7MboGMkLZsy6AR5le9057gKgoWX82z397TyOpBdFU=; b=Yov7ixtt7IeInxiL3TTvftE02KhjVYLUYGIn1kcWGxlXiOJUfMrzPVfnbQof/jtY8OZS2R XUGOQsz2zBsdk7ynfv11OH9/+//fjH9VhQZB82Md1kvpGe8B+ScMlpbT+gx9S9TWxDej5M mfrR7eNyqFNaSA+1z1mtjBDgmbFoyYE= X-MC-Unique: BSB99X3_NP-Sbok7g9Ki-A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tx37mHSH6rJjrFrs4JidzYTpQr2mgPykYDtZvIVsOBz8xtZbfyKO1ovmbocif8StD1haRO2pEpK/PznN/uuSn0f+C19aWOsVreQoCG73nM+bdO4UwZwbjy66stLylc01XYZS8ZZHE2SuWjlfA7uQtUpS8Nc8p8KaOMBcup4IDCcIqX/u5iC08dknKpsCGPv/aNexTWmb0wYU9JeFXtZsYkZ7tA3qELx2hixTCGqitys91FQxrwY7E1keOS2TWW6FIdQG4K6V5vmI+6aGswP80A8o/NoFj3Bt5Qgn428o9zKOEFYH3vdzKjuhPqfAwJ7rcuEUTAvRT91gbI3HJ2WQVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YE7MboGMkLZsy6AR5le9057gKgoWX82z397TyOpBdFU=; b=nyOJBSC9YcMJTzdZP3F6zKw11GrbvNW4ou1j7Ac1gKjSJNbrx7z/0u52utyq/RGjSr/YLhAMB3A/B+ziDTdqWNIZidJMg5+eSMrbvfQ5Uu9uMnMqT+8bSAUyHy5h5c9vlH8UaFrXY47q2JfvhmHRDztvbHuyUj3X/pox1JmhD3ziCMUfoiINaWAGro/IlPd9Lx7NhodUSEc94c5Xqu+2IxEmSmwsb1KvuQv2tuAHK/oWjZmC1AV6XmpuEwwbrfFoOlF99NTQV1aOwl1DueH1yQUYPUAWFu1oZPMxcXjydFiM87f7Wvj5AjVcoXS9NwEa8KzCA1wuEBXHRhruuvauog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <58f81931-cb7d-1710-4f52-380c8f880156@suse.com> Date: Thu, 10 Feb 2022 15:56:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: [PATCH 3/3] x86/Intel: also display CPU freq for family 0xf Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> In-Reply-To: <5d275d7a-7751-af19-db4f-d91e3592d30f@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P193CA0111.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::16) To AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 664c832b-1a7d-414c-e86d-08d9eca590e8 X-MS-TrafficTypeDiagnostic: AM8PR04MB7443:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iv9j8AQpWROW4F5d3J0s56Mjd+r1qrI6MP1pHdceWzS8tUyGXtxkPXu+gWC6OzTJ4LrZFk38TVYxjgp03YjCqo1EFvb4dDTUjI7DwQPZqpxgT6cLE/08GksVv40k8KEvxGY8j8DKyphuIqug9d1Zt0qxfKEv985b2RRmh7U8+p+QFkKcM4IF7NM9l1tCRcEeg0FGM3+j+Nv76HdHh+UPekEmx2I8Kw25dkQ6N+ty5/FUFtllFWqdR+LNY12v5CVjHLq3RCocVCeyov8wBVIXRrTKIKH0AqkkRGyAEcrbhp8xV5SKWr00HT0390N0HlgAfHGNg2qOeDYEfCkUGfCHpOruGscPrNl/VAMHeA1QpoOxDjxdk02xWKWjNJywHytJ9px3KWVXo1L3VkJWhC2aIVTPKKXdC6krHeBGhn3vVjVrnPrcbuPfxl1Z4zlO6elgKOqZ2bKZWqL4wZUcVzC3vzAUl012d7z8MYscr6sVuuazC6FEwIrbasUoG0pEvIoR47TBNm46KdLpoUZXjlwD0wAD1CYf63EygeiBRynh46iVR8W9BvMnCC/JruLV1blGtLhcm3O0eTWnqRKmNhToh0LPIOr4gsgCSoMP923qbRtthYb2svdna7NLP3cjyHdsEdgvsQWDO7ulj9iTfFkxSnTjrw2bAsZnupHasNv0dGEFfR8EMIQ/Zh2ZfthM8YFNqZQKLsVbm3XS3aGx6hAyqP+5kYXDZe5Gvho9TYz13dM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5587.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6486002)(186003)(2616005)(31686004)(26005)(6512007)(508600001)(5660300002)(6506007)(8676002)(31696002)(36756003)(8936002)(66556008)(6916009)(66476007)(66946007)(54906003)(316002)(86362001)(38100700002)(2906002)(4326008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aFFTVGt0QmdFU0N1eGxqRVg5dnhSaHpqeFp0eEZkbUltWFdKRS9CSm1kNTUw?= =?utf-8?B?ZHphTTRRTzRDMjZINGQ3b0FBVFhKT0txeG5pRkV6UXBHR3V6ZVdON2xYQmxo?= =?utf-8?B?SldmMldxSzFjcmQ1RGY4RXV3VTlHOXNFZGRzWjhEbGo0cjdqRzNUQjVPcVNY?= =?utf-8?B?WnVPd210TVIxMWZ4T3FFOHJlbFZ3UDRIdXV2R3A0OWwyTGJPNlg4SUNOaU1I?= =?utf-8?B?OExzMVVlTnI4TW9QRXR2Z3ZWMDJDa3VHVmxzbGw1N1BPUHdlM2FUZlJSS2VO?= =?utf-8?B?dFNVR1JJbUZsbFBReEROTG5yWGYvUEF2bTFIS1pveTI3Z2FUYm9WbmRheWlX?= =?utf-8?B?Q25xeit2SjNDRVhWVEkyeEJPeVdtT0ZjSHQyUCtBTmYvbXl3RGd0YXhFd0NW?= =?utf-8?B?d3ZmMXQ2WDhvNjhPQUE2T1o4K1FGbjJ1RWNBU1Z3bVQybkFXRU8vSmlibEZN?= =?utf-8?B?RXJhcHAyQXFQODNtdiswUE1ERHpwelMyUG9sRXdBeXVoTEUzUFU3Vm5US1hL?= =?utf-8?B?VG56cWpOaUZrbVpyRU4wRHFBRWh5US9pZStRSWkvMTcwN0pKK25JMm9Vclcz?= =?utf-8?B?Vk83MDFQazhjN3daS3hGbXFIaGtNOG5vSjZjVjIyd05zckFRL0EySy9DZHhX?= =?utf-8?B?MmcvSXArZHduUHRlbXdIWGxrVW03M08vY0ZCbis2Mmo5YmhzWTFYV0k5Uk1k?= =?utf-8?B?cWx2cTV5Z1F2SWZPOFZmaEg4K2JZVVFiWU5zTDZVUFJUSnZwbEI1dDdlL2RR?= =?utf-8?B?Y0FXbThFdFV1WW9nS2lLOEVHenJVVkpnSDdWbE5EanpqM0pUUnVmekUxdnhi?= =?utf-8?B?T1NPdmc4R1ZoOHVXSm9SRXJTcGRlT21Ud1lzNFN0ZWxMU29qcTNUQjVxV3Vx?= =?utf-8?B?RTR0cEVrOEtjSis1V3ZqM0N3Zm9lUUdRbFVFemVyOWlhR3ExcDdaelZkOTBs?= =?utf-8?B?WEFnS2o3TVIyWUo2MzRmVm1CcXpIRWRWckZFZ2NvWTFqbFFiLzFkdDU3MWxI?= =?utf-8?B?WnlaYXNsSjlmOCtUQndSVkJ6ck5yeVZzYjlNR1dDRkw3RE9XWkRPRXdKT2tO?= =?utf-8?B?Ym9iS2ZEdU9qenM3RjhQeEx1d0VPSDVFS3JPL1h6VzlUZjFMNmZ6bTN1WWFs?= =?utf-8?B?Y3JRSHJORElKN3NtT3Jjcm1sL2c2VURtSHlnMlJMK3RVNlZGemcxbkY5T0xz?= =?utf-8?B?L1FaczNEY3BmTjRVTG9TZEorZFUvLytRbDdNWFJEc2wwYU9FeUowYzJpbitD?= =?utf-8?B?V1hlb0w0VlVWeG5XVFlxMklCb2NoTm81OStTVjY4RHVVbkJTWGNLcUc4Z0kw?= =?utf-8?B?NXZ1ZkU0TlI4aUtSVVVFSkRnRXN5Z05HU2Vmb1NmS1pwNFRRR3BmcU5rN2hN?= =?utf-8?B?QUprek9hZGZ2NURab2Znb1czZlhrczdkMUt4VUR1ZGp5RUdvbGY2c3lZQkg4?= =?utf-8?B?N0xSZ0tDNEl1TS9uZ3p2N3lmNWowdG9VRXdLZmtFaXdNdTV0bUszUjFVeGVT?= =?utf-8?B?d09EYk9jMGpRYTJmZDZHVXROR2VjUnYwcDZNUlh1RHl1QmN3VkhHT1dWNm5W?= =?utf-8?B?b3p3TVFTM251Um55SnhsaE1hOHdIM3ViNFFxYndtOG52dmhTTmQ1RHlZOVFH?= =?utf-8?B?c2sxYzZaakFhcnVLYjMrekE3TjF6YmtxM2FHTmVhOTFTUFFvT3VRRGtraGI2?= =?utf-8?B?YzBoYU5tQWRraW56U1ppb1VXY204ZjlWU2dIMEcvdjEvU044a1V2cUhVN3FV?= =?utf-8?B?dTZFOUVySUVKZit0T3VLdUJsaG1vQzJnRzFXdWF0VUovNjl4VEdzVWd6dmR1?= =?utf-8?B?REdkaXo5bTY4V0xpV1VZbndzem1QcHBmM3JwQmRBREhNc3BrSmc1bE9mNkhM?= =?utf-8?B?ejZmRkdzR2xuLzhpNFlyaDdJOTNOSFVYTWd2M0h1WEllVEpaTTUvbnFVeDZ6?= =?utf-8?B?d3hBU0pWYnhpR0VaWHE5V243RkFTSHV0WjFkKzUzdkpPWlM2cmVZY2x2KzAz?= =?utf-8?B?Q0h5RE5mdGpEL2Z2SWQyeVVDODNGRmhpcFlrWmxsb2pqd2FPeUZFWE9XRGdz?= =?utf-8?B?bXlSNS9xdHozdzl6MDJRODFoRE9hUVBIR0RsbXRYR2tPK2pLdzFOL1NGZmJq?= =?utf-8?B?a1FlVVdLQ0xocDFCeWF3Z0VCVXpHY3ZDTkNMZ05JdnRMMnVxZHE2eUU1MUNJ?= =?utf-8?Q?CaqY7FbtW2oswzXngqTZ84c=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 664c832b-1a7d-414c-e86d-08d9eca590e8 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5587.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 14:56:49.5827 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6QPH8e2BnbSa4y9aeIPY3FNnb2/h4I7tNmUYA38ltNL/DJzNjd91bIZwRMwBJcmA7+qwsh7753kY95qbVhuy0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7443 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1644505037291100001 Content-Type: text/plain; charset="utf-8" Actually we can do better than simply bailing for there not being any PLATFORM_INFO MSR on these. The "max" part of the information is available in another MSR, alongside the scaling factor (which is encoded in similar ways to Core/Core2, and hence the decoding table can be shared). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- The inner switch() is left indented one level too much (and with an extra pair of braces) to limit the diff. I'd prefer to make a follow-up patch reducing the indentation, unless I'm told to do so right here. --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -412,9 +412,9 @@ static int num_cpu_cores(struct cpuinfo_ =20 static void intel_log_freq(const struct cpuinfo_x86 *c) { - unsigned int eax, ebx, ecx, edx; + unsigned int eax, ebx, ecx, edx, factor; uint64_t msrval; - uint8_t max_ratio; + uint8_t max_ratio, min_ratio; =20 if ( c->cpuid_level >=3D 0x15 ) { @@ -455,21 +455,22 @@ static void intel_log_freq(const struct } } =20 - if ( c->x86 =3D=3D 0xf || rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) - return; - max_ratio =3D msrval >> 8; - - if ( max_ratio ) + switch ( c->x86 ) { - unsigned int factor =3D 10000; - uint8_t min_ratio =3D msrval >> 40; + static const unsigned short core_factors[] =3D + { 26667, 13333, 20000, 16667, 33333, 10000, 40000 }; + + case 6: + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + return; + max_ratio =3D msrval >> 8; + min_ratio =3D msrval >> 40; + if ( !max_ratio ) + return; =20 - if ( c->x86 =3D=3D 6 ) + { switch ( c->x86_model ) { - static const unsigned short core_factors[] =3D - { 26667, 13333, 20000, 16667, 33333, 10000, 40000 }; - case 0x0e: /* Core */ case 0x0f: case 0x16: case 0x17: case 0x1d: /* Core2 */ /* @@ -491,13 +492,33 @@ static void intel_log_freq(const struct case 0x25: case 0x2c: case 0x2f: /* Westmere */ factor =3D 13333; break; + + default: + factor =3D 10000; + break; } + } + break; + + case 0xf: + if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, msrval) ) + return; + max_ratio =3D msrval >> 24; + min_ratio =3D 0; + msrval >>=3D 16; + if ( (msrval &=3D 7) > 4 ) + return; + factor =3D core_factors[msrval]; + break; =20 - printk("CPU%u: ", smp_processor_id()); - if ( min_ratio ) - printk("%u ... ", (factor * min_ratio + 50) / 100); - printk("%u MHz\n", (factor * max_ratio + 50) / 100); + default: + return; } + + printk("CPU%u: ", smp_processor_id()); + if ( min_ratio ) + printk("%u ... ", (factor * min_ratio + 50) / 100); + printk("%u MHz\n", (factor * max_ratio + 50) / 100); } =20 static void init_intel(struct cpuinfo_x86 *c)