From patchwork Thu Feb 10 14:55:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12742034 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AAB8AC433F5 for ; Thu, 10 Feb 2022 14:56:09 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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> 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?q?EuxW1frOervsgF4sA+aaqXVEM6IW?= =?utf-8?q?LqM1vBAQ9fPbernCX7DAwlSUZMZK/H+YiEBQEdAdaPbxZOC3ZFjAtiRuxJnKGInms?= =?utf-8?q?ItMya2l39yl7+j9XgeWZzVlxdP+B+nrGBgZYN/2kWuunpzfL++nm8VSMSM02bvR8R?= =?utf-8?q?OprxoWA103e8VyIU8GV1g52goqfjFV3hr67nk7dFXus/E7IGk8aMqG0ctcycbonoi?= =?utf-8?q?c+WTGoqacNFz5GFWociFsm/CRipmXdMTXe7NVSdgmMX20gJ+R30O9gefGxzRhQINa?= =?utf-8?q?XCEnkuDzmZ+Lbqqce9H6G6gUL9JCQC2w1FGAiqtcWAGC6DPxqhA7p13eElcICmMcR?= =?utf-8?q?T/YgZvYU6Z7iriM6WPWqc/Waneomj9i0otDm+/nlPPfWLQCuh7S0bCLdnHrHuhp8f?= =?utf-8?q?QAGlZNu24RObThXUglqCy3gcFuy73D6ViiUFJ/i4mWO4O2avp+nNNtJDtOvGJy9Og?= =?utf-8?q?QMM3ydi7ijlV9ElRRdESwykDjNQWlYdB2uUNywyMZQvmW6QPUJkUsN2TmQUZBYitt?= =?utf-8?q?n3IGLigvebMQDbi4r+VV9G/jlrekeUo6fQ9f/CRvZ8/gevHc+ZUW3db1rHHSt5PKu?= =?utf-8?q?8oOU7cTtZAvAfE/WbnhLJb8j6yoQtsfeZzFNAIAeQzCDJErSEFwYQgWFsl2sikyv0?= =?utf-8?q?Mz11dPRJmF5SXfhw3Rh5W812W3KEUCS9rhd6M4GiMtOg8U8Fm5Y+noMrPwcK9s2ao?= =?utf-8?q?dyOOGmjWV7DuP4F97a90TKlB98WUPDqPSM8ZNbGEdrpwSECAoRHQboXrKOonzncO8?= =?utf-8?q?otBJw1M6tMc4rSKcrrc261aG8iTsMDWklyLZOnzXYa1UlCMQICOiVx4JZ9Cml+k8n?= =?utf-8?q?t1yGoX4CogHrt6TJqQujrzOBs945nk1nG6a5dHXcaYlp3qwJm/7bPQeGq7FygnfWY?= =?utf-8?q?dUe+A9eQAPn80u1diFL/kBTwovEI7slvmAeZHI5+5x5+HhVqEKrDD/dYg/Yj2+oPJ?= =?utf-8?q?e+ZsnXT6eL8FP+pYTDadXzy0lt2YCILQWnhpy5Q7O+TWMcgupY135GX0Jt/+FR2rl?= =?utf-8?q?p2Qm83WjILpTHbrjzBusbO2ACLJ7QgURbR5gaRN2zccsYO22dZMZZmH8rB+TnnTxe?= =?utf-8?q?qvLDmNChMBbglfV/GE6T8yA+TFDvfoo2ZVOl/qmSAkSWUyjmBrIO97hpIvUTyJqWX?= =?utf-8?q?zmKerd6T6sdO2m3SFo+RKraNTXpnWVESQ1Xy9TSh7JXALAFUEWKvmPXnFSH+15drS?= =?utf-8?q?0qHz6IeD/LxSHAe9rVN6kAXp/9OhCz+Y/MmUfzwbSm1L2fQv38KeAsuquc3nx6wKd?= =?utf-8?q?m8UdULdoOv8Z/U5t6q99nwjeDQ0Rux/DZPkiY6kFwih0nH2NoLXQiHa7eMn7jCIT+?= =?utf-8?q?aPOLOCCL6oJfOmnU9+eMMG6EphoxvcxIsP5zm3nT08ERotwiW1F12GszkCgV+K2zH?= =?utf-8?q?t70ie/UqXruY+ph5qotd5EGKzdmqEddiusLJjJpH/+pABEflNG760S6vBUELwJ73K?= =?utf-8?q?t0yAZoZX8Tw4SeQ7JlQZTix4YNkQRYVPj7KMfrRaVZCiiiAtJhmGbBxNatrmj1cbi?= =?utf-8?q?ewLc8B4FYw6UWpk25TRtn77+55EAer37ZgzLEBztrA+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 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é --- Perhaps even use "!= 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) /* * 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 == X86_VENDOR_INTEL) && + boot_cpu_data.x86 == 0xf)) && !cpu_has_hypervisor) return false; --- 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 } } - if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + if ( c->x86 == 0xf || rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) return; max_ratio = msrval >> 8; From patchwork Thu Feb 10 14:56:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12742035 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F65CC433FE for ; Thu, 10 Feb 2022 14:56:30 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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> 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?q?VwkEsyMTJ4LFu7sb4CXYesQBryFE?= =?utf-8?q?e6upRIvqAbvU/dkdbwz0WRYXEkbdl1lb0M0PE2MyccaDg9/WjwUtvLWR6SDvaA+u6?= =?utf-8?q?CkzsOQay1JD9gtiJs+bMs9yOqpd/JMIh/Jmn9r47PZrF5ATqz3n4A+SdWjYHeRYO2?= =?utf-8?q?cWBkZRK7yN0VIYMPrNoC8b5OfdzAL01XSNzxVMmFk9sd5fwQQqFGt0nQrHMb8gSTs?= =?utf-8?q?PqtBmblLfH1yi0RkBe741VHOd+/bjMf3900CcXJjX9/AJ2wzVIGYvh0OBeMyBMH5N?= =?utf-8?q?s/z9np70bgbIWS6voMmc2hrBk14q5AsLWabeqlFpuUQaQEQSS+Nwj82DK2FfDYKNf?= =?utf-8?q?32O5aS9ehlbt6gkUCP5TxDODMNp5zngxQp4MpxcOmHI3TckoI8Mmi5aEjUJKZP5wN?= =?utf-8?q?+fJGYkjDvCFE1ys0KtlzPBttFHSgWNg49ThBSVNccJuuOd3T3hCf75JbbDbInuk3d?= =?utf-8?q?4jgPJ4SZwev5vfiF+Gv2rGpD/fnH+KIBVg9UOiiv2PUBEXHjOpmq+u5pwq4xcuERd?= =?utf-8?q?PM471FOPj5PlpoJPFyJ6t9Kwk9p6QY/DxmddEceQ08UCp3xH9vhqq7/S6NI2ZwTqw?= =?utf-8?q?7uZtpQUWzy5YnYw60JxxDHYlnt+s3X/7U79m3VFamvcJrR51KpTEg5i4v9QDJq25g?= =?utf-8?q?xYZ3twuyKI2lGXNBgtCoztY2bpLrLTLc9uDLBQpahkyDN4ww18njznNK60q7jXLiH?= =?utf-8?q?exrxHilwqp+zW9QhZ+2rtIQFDz5Ng2977M+W8ZxZzvxFDQ9vm5iO9E/pbMNrVIIh6?= =?utf-8?q?XsOqAKNebMDEfg8m6lKNdXwObmvQQy9LijL0jwIiXcXNaSXgFNIvw5ZaHKPwRgrzr?= =?utf-8?q?hYf8JGujGDsA4ELFicg3VsAZXrZSr9T01t9XiF/w92OVgmX186ikdVrdM6sOHsZNn?= =?utf-8?q?N8RqYT7PJjPDmttrBOFEmm5ojI2CXUHNKoAuy9nTbVQoYRE6V0VPb1GLXpotHhCg0?= =?utf-8?q?9Vbk5ox41VXgoKqKU6Qf6rKAIrvsmayftPQP0+cXF/JYZM0Dfvqa/GQElcXkT/nRc?= =?utf-8?q?MaV4fD2Ce11RsT1RKASmVBQiI+stJfzonhA2MZyjNF9S672dsO0P1gbCOL30o8aBW?= =?utf-8?q?mnArCDe6424cu852a1+hfHmL5PJQGWLL/0gt5ErNSy2SwTOoVFwD3FW/ZLGKm8wbg?= =?utf-8?q?T7fAk19lPcEhu4XbZ5rGwH4ldeV2iis4FysacbXMozpdR/txuCDh0NvPxq4PBt+9P?= =?utf-8?q?VQk/wBskRZeHIdTr7uz4iS4po7lEYEc+kimfpilgWOsDq3Mui82ULlTsq934XLBOZ?= =?utf-8?q?5Evh7g3BEYktivhK6mMvmyRlza2P3ksxx+xTdzRTwww9vh5jwykCq0hpBxIdNQZCA?= =?utf-8?q?T+TrJbglglNFHhNVY96Zuo+nXcfv3/YxMnr/N+zGxHg0tH2vF1gu/KtfSgg+etiZ+?= =?utf-8?q?cX/ey4CZHbuEBk/lsMaOyvDL4YUaIt0nbwQMsDL0xfO4Zba6O2M5ZJEpsYDWs6dCv?= =?utf-8?q?1K0BC4AYVbHEHoY3E5MDIrah+d3HT4XSIL60tLJwSVA+MX89n8Ul0BVYwPn25rqgW?= =?utf-8?q?OM6lzOgC+dF3jflsYBzyZnViWBFi0aoGY9fmBgjnn+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 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é --- Perhaps even use "== 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 isn't * virtualised reliably. */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && !cpu_has_hypervisor && + if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + boot_cpu_data.x86 != 0xf && !cpu_has_hypervisor && !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) return (MASK_EXTR(val, MSR_CTC_CORE_MASK) != MASK_EXTR(val, MSR_CTC_THREAD_MASK)); From patchwork Thu Feb 10 14:56:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12742036 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11C5DC433F5 for ; Thu, 10 Feb 2022 14:57:05 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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> 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?q?hQSTktBgESCuxljEX9vxRhzjxZtx?= =?utf-8?q?FdmImXWJE/BJmd550dzaM4QO4C26H4d7oAATXJOKqxniFEzQpGGuzeWN7lXBlhJWf?= =?utf-8?q?2WqK1crd5Df8EuwU9G9sEddsZ8Dlj4r7jG3TB5OqSXZuOwmtMR11fxOqE8relVwP4?= =?utf-8?q?HuuvGp49l2LbO6X8ICNiMH8Ls1UeNr8MoPEtvgvV02CkuGVlsll57POPwe3aTfRRK?= =?utf-8?q?eNtSUGRImFllPQxDNLnrXf/PAvm1HKZoy27gaTboVndayiWCnqz+vJ3CEXVTI2xBO?= =?utf-8?q?yWmOFcHt2P+ANf/mywDgtaxEwCVwvf1t6X8o68OAA6OZ8+QFn2uEcASVwmT2nAWEO?= =?utf-8?q?/JiblFMErapp2AqP83mv+0PMDDzpzS2PolEwAyuhLE3PU7VnTKXKTnzqjNiFkmZrE?= =?utf-8?q?N0DqAEhyQ/ie+QIi/1707JJ+nI2oUrW3VO701Pk8c7wZKxFmqHhkM8noJ6cV22wNs?= =?utf-8?q?rAQ/A2K/CdxW2g/Ip+dwnPtemwHXlkUm73O/cFBn+62j9bhsY1XWI9RMdqlvq5ygQ?= =?utf-8?q?vIfO8VfhH8+bYUQbYNsL6UPRTJvplB5t7e/dQcAWm8EtUuYogKiK8EGzrUVJgH7Vl?= =?utf-8?q?NDjzj3JTRufzE1vxbOSOvg8GVh8uWJoRErSpdeOmTwYs4StelLSojq3TB5qWuqE4t?= =?utf-8?q?pEk8KcJ+5Wvj3CwfoeQGQlUEzer9iaGq1p7ZzVd90lXAgKj7MR2YJ634fVmBqzHEd?= =?utf-8?q?VrFEgcoY1jlQb/1dt571lHZyZaslJ9f8+TBwRVBzrNryVsb9MGWCFL7DOWZDOEwJO?= =?utf-8?q?kNbobKfDuOjzs7F8PxLuwEOH5EKrO/XzW9Tf1L6fzm3uYalcrQHrNDIJ7smOrcrml?= =?utf-8?q?/g6UDmHyg2RL+tU6VFzg1nF9OLs/QZs3DcpfN4ULoSdJ+dU//+Ql7MXRDsl0aOEyJ?= =?utf-8?q?0c2in+CWXeoL4VUVxnWTYq2IBochNo59+SV68DuUnBSXcKqG8gI05vufE4NR8iKRU?= =?utf-8?q?UEJDgEsygNGSefoSfKZp4TQGpfqNk7hMAJkzOadfv5DZofgoW3fXks7d1KxUDudjy?= =?utf-8?q?EGolf6syYBH87LRgKC4IuM/ngzv7yf5j0toUEwKfkEiwMu5tmK3R1UxeSwODbOc0j?= =?utf-8?q?Qa2fd6GUtNGecRv0p6MRXuDyuBcwVHGOWV6nVozwMQS3nuRnyJxlhMa8wH3ub4Qqb?= =?utf-8?q?wm8nvvhSNd5DyY9QGsk1c6ZjAaruKb3+zA7N1zbkq3aGNea91SPQoOuQDkkhb6c0h?= =?utf-8?q?aNmAdkinzSZioUWcm8f9VSgH0G/v1/SN8kUvqHU7qUu6E9ErIEJf+tOuKuBlhmoC2?= =?utf-8?q?gG1WuatUJ/69xTGsUgzvduDGdiz9m68WLiWUYnwszmPppf3rpBdADHMspkJg5lOf6?= =?utf-8?q?HLz6fFGsGln/8i4Yrh7I93NHUXMgv3HuXIeTJZM5/nqUx6zwxASJVbxiGEZXq9Wn7?= =?utf-8?q?FASHutZ1d+53vJOZS6reYclv+03CHyDNftjD/fvId2yUC83FFhipYkZllojjwaOyF?= =?utf-8?q?EXOWDgsmyR5/qtz3w9z02Q81hDOaQPHGDlmtXGkO+jKw1N/SFfbjkQeUWKCLhp1By?= =?utf-8?q?awgEBUzGcvCNCLgNIvtL2uqdq6yE51CICaqY7FbtW2oswzXngqTZ84c=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 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é --- 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_ 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; if ( c->cpuid_level >= 0x15 ) { @@ -455,21 +455,22 @@ static void intel_log_freq(const struct } } - if ( c->x86 == 0xf || rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) - return; - max_ratio = msrval >> 8; - - if ( max_ratio ) + switch ( c->x86 ) { - unsigned int factor = 10000; - uint8_t min_ratio = msrval >> 40; + static const unsigned short core_factors[] = + { 26667, 13333, 20000, 16667, 33333, 10000, 40000 }; + + case 6: + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + return; + max_ratio = msrval >> 8; + min_ratio = msrval >> 40; + if ( !max_ratio ) + return; - if ( c->x86 == 6 ) + { switch ( c->x86_model ) { - static const unsigned short core_factors[] = - { 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 = 13333; break; + + default: + factor = 10000; + break; } + } + break; + + case 0xf: + if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, msrval) ) + return; + max_ratio = msrval >> 24; + min_ratio = 0; + msrval >>= 16; + if ( (msrval &= 7) > 4 ) + return; + factor = core_factors[msrval]; + break; - 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); } static void init_intel(struct cpuinfo_x86 *c)