From nobody Fri May 3 08:41:58 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=1643012738; cv=pass; d=zohomail.com; s=zohoarc; b=l+uIHO+LJe3VtdxrSfGHIF6+7Qq60khiRVt/IEcXMyNlY4NhBkUofFlaIMmCI49k4k0kTOtxnxs88d6uyqRpnJf7fSrNa19CAbfWiMGkHUDv3IZc7MahqMMivDMbwo1myI8cCbpvupL7YR0nkn3sri7kGgNR6veaAxEjuE7jvt0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643012738; 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=ilZxZGw1TjgKK7WvV1Lh0ZuGM3SnwOvPz3fO9dftywI=; b=OhaixDopx7RXC4N4N9HxgzAd5obV5aRu4rf4OM36xkQccvErindeBYgO99aOFGL4HN0co9UWfbrSmMU7aIkNBll0klDZyVMw+7+zCWjBYOG/xIyhxDhSLRJ0LXWfjPtkfAxBonc1NKwi250RUA12wshi8dXxhJ/gRd1QHWzrCN0= 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 1643012738618698.3471723233819; Mon, 24 Jan 2022 00:25:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.259732.448224 (Exim 4.92) (envelope-from ) id 1nBufA-0000lT-75; Mon, 24 Jan 2022 08:25:20 +0000 Received: by outflank-mailman (output) from mailman id 259732.448224; Mon, 24 Jan 2022 08:25:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nBufA-0000lM-3a; Mon, 24 Jan 2022 08:25:20 +0000 Received: by outflank-mailman (input) for mailman id 259732; Mon, 24 Jan 2022 08:25:18 +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 1nBuf8-0000lB-NK for xen-devel@lists.xenproject.org; Mon, 24 Jan 2022 08:25:18 +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 290717b3-7cef-11ec-bc18-3156f6d857e4; Mon, 24 Jan 2022 09:25:17 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2054.outbound.protection.outlook.com [104.47.8.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-hSBwPLKkPZiwJxeDOLmwVA-1; Mon, 24 Jan 2022 09:25:15 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBBPR04MB7883.eurprd04.prod.outlook.com (2603:10a6:10:1e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 08:25:13 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 08:25: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: 290717b3-7cef-11ec-bc18-3156f6d857e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1643012716; 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=ilZxZGw1TjgKK7WvV1Lh0ZuGM3SnwOvPz3fO9dftywI=; b=MFtCa/YC8KUfspfUHjoP7WlZKQWFwfo1HtRoDWT5N7QEN1DocRqH8zCSETz1TWXeCJ2Z99 Bh8ARWPKexvZ6uNnxrxj9RsuG7Q0IWzO0zFt7V7KNKYOzQjFpoEwdB42fF7Nz0fNhjyreN UkKqtF/L4Fd2JXuZOpmsE8mTuFVpx9E= X-MC-Unique: hSBwPLKkPZiwJxeDOLmwVA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VUtPM7oa7n8YChl+RkHMn81hZsMmgGbK0FZgUcI8otmesp0AsezY9HOFkdzM8EzIkQlFmkEdBYFKg855eqDrmjQPz7naTf/RKNOAYDZNwAC4tym2Ic0HVN8+xN6CuHJtqN/zbEKbY8gu5gZrYDYqNoMDcwsmGWRYUFEZQNhoOgKlw24zmzVuLPi6KPVwrdD7qaGuXvA3jUALldzsaJPQDFIB0zEwy0x/HxRD9r6tc9S5thF7pbvNK5me+LHzcMpwFwGEL4ea2BlBVL2bqkafZfuVpSUm6orLIaiKM79zO5xcMDx+59sO4UFdBwIu4JrOIh/u4Ka+UU4QnNihRjpIZA== 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=ilZxZGw1TjgKK7WvV1Lh0ZuGM3SnwOvPz3fO9dftywI=; b=JIN5vmfgzwrxfK5EfbGb+65ll+uui7SRo+NfXrxxxq9vnDATrKmPpVivLGdsKKTsUXAfvuVUZm0/A2xFH/7ecfpN4ACBaQhkpTre3PBUzQfjtKFvmddE3/ygLjWyMHfAiRQo1zWJuaGyT0hQNxO9cOkh5W9GQiwMgaVRDYNFxcJFGcPHJJDkajIbmV8/tbuPEU4PAx6dnLQ6kt3bUzO0FTnprXctMxA8uDfdzTKxXGPZlcp03x883AYgjSAsjAZ+Qfj32g1a987nazHA4djiLAqt0Cn6/6Afccp/tRlcYL1KAj7LMoyr8hFRm5zPs9slCh6eYTJgQH6L8lyhB8uLrQ== 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: <2e97dd91-5e43-3312-2e47-534f425c28c4@suse.com> Date: Mon, 24 Jan 2022 09:25:15 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: [PATCH v2 1/4] x86/time: further improve TSC / CPU freq calibration accuracy 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: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> In-Reply-To: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8P250CA0027.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::32) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee9e9890-c196-447e-dffc-08d9df130b5a X-MS-TrafficTypeDiagnostic: DBBPR04MB7883: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: kHoYpEcbK7TaeLUyCXn90bwo72P3QDp3Ol/PkFvSSJwBGXN6P0zuvFu7G0BudVQnV0f4ogp+fuqt5STqg2WwnvryY1Slyp6sWME7pO8brBnkE+ThbwpnqVSgErRLavgr20p/fkFyX7t1sodCpNgnKgPK4VYVoQV/b7UVnilTF0TTyFGtVdtiDV+sVgagZnGrrWg7epdustmZSpCClh5WGl2eGQwsizqOIt+r89xiVqFf/rMGwB8avFiJCij1dLoBega2IOoBninmVG5l8hMEMpcpCqgDxNKTY8B2eP1fKjA3BEq6uDJsYxvUi5Xb6Si85JJIscZvh/X16h1RumTPMAlmCKZ+gJuV9vLQj4CNnO+wVuB2CKN59qce/d/cuoVOD4hrC4dNu+6/PV1/2fH5PDrT1tFnLAiyNXuuCJw3SmfbVhRuJqZV7B0KnwgKOEWTvoOusxmOn9LVVEj/w4mUtMJBzJr2Codjhs5sSxusT7rmTztGjaar4RhZrnI48yZyOUBl++X2vI2KipQeCWCoMrKDcso+VGovkaDgmPv9FuTTvfKLQU4GeiFTDxDZTpurKFmRxQgVu5wu9eGLJORelXNeCn7emqyaiUOLzpkPBXbuZ7sZdZS1mJUjJ28mhoW1HUt61HBi5PQSLRk3WYL0Mqh6Y1vEslrm0Ab74w2dH42wg57EjB1yoDRVS8OeVpPYMEaXX/5ux91EpPaCy3NHcmDPUYIVS2+hjBObfbwnhBw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(36756003)(38100700002)(54906003)(4326008)(83380400001)(86362001)(66946007)(6916009)(8676002)(31686004)(316002)(31696002)(5660300002)(6512007)(26005)(508600001)(66476007)(2906002)(66556008)(6486002)(186003)(6506007)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z044T3hYOFZpQW9QeGF2QTExaUVQVXdNQWVaMnMrbWphdnl6R0FxL0pQNnRm?= =?utf-8?B?aVBVZ1VYVGVON2FRUi9VS1B2TXFpRVBPOW13aHdHTlpuWVpoQVlrQlNzMkpP?= =?utf-8?B?L0JGUExyZW1tRXUxYjRwbDJTU0pkNWVjKzBqeVVRbmp1NS9ENzRiR0p0dDdE?= =?utf-8?B?Tjc5dEFKVzVOT1hkMjFId21zZ2VBbXlPZloxN1lkQjZWR2V5cGRjVzhLdlBt?= =?utf-8?B?VFJpZXhkZCtIL2w3WnJ6cVNUdDJNNCszQ0hndGpHbmZubHJyN2tGYW5VWUsz?= =?utf-8?B?UDlGd0hMQmFyUDlyMDFDZXc5alhVOHlFRjBES3M0V2tTMGhHemt6R000dXF1?= =?utf-8?B?Z05ZUnJMZjJlQm54aGFJY1RaUkV2OWhzR0p4VWhZcXo3dHhYT3dsT3Z6L1ZU?= =?utf-8?B?NjVCdmF2cW1oT0NYRmpybk9YZHdiVEpYd2JHUUtQVHpCUDltT0J0N2lTLzRt?= =?utf-8?B?Nm1JZnh5dTFuR1lvaDZzQlNOWXFvNzdTQ04xNWlmQkRkR21jWWpqS3dGajBG?= =?utf-8?B?eDNNNkNJRGszS0NFc29BdXJZaHZhTXpCUk40OVhCZjdwODh0ajBMTWQzN1lI?= =?utf-8?B?QUVTaCt5R0ttVXZ1dVV0cTRkZ3F1cDZSb0t1cVlNc0pTQ1lWQm9tNFRWWjRp?= =?utf-8?B?Q2g1bXJpb29IMXVaRW1RY1R1N2JOYkgvU2dpajN5MklnL2U3RS9HSlVRUHdW?= =?utf-8?B?V3ZQbUcxQ0pDVnFGVm5OMm5nWHh1U2dYWUZmU1lXK202V1pzcGtidEhxOFhN?= =?utf-8?B?V1BtOTlBYU5aSzh4RW1lc3Y5cG5LRkFVdk4rYkM1bGkvVi9pUENrWXNiWTEw?= =?utf-8?B?WVlxZytlWVQ5MThDb0o4WC9DQVZod3RBM1VLZkFXMHpjUUlteHhsRFc2OGFz?= =?utf-8?B?MG5DcTlNcTF3UENLMWZsaEJRTDcvT0RHbHJwNjg0b1Bzazh1aFUwS1BaWHY0?= =?utf-8?B?V3RFeHBEdjY3NWlhNUJHbkV3MEt2SmU1MnFLcjdVY3JRcSsvNFlpdm4veHlT?= =?utf-8?B?UGNwTmlUaGdwTVlod0NkNzE1VHJwandNbitlWUttVlVVQmowd2JkQnJ6Z1Jr?= =?utf-8?B?UVBqV0EvZENFRS9MV1RmZHpYMnB3WEFPbmQrTloxMVVpVHoyTTFUSCtRYTFY?= =?utf-8?B?RDJEcGZxM2l5ak1yTU1VWi9NRE82ci91bFc1WncxQUJ0L1grRlZzdzVCUURx?= =?utf-8?B?eml6T3E1MjV0Ty8vL0VVQXIxSUtQdXVPTnFJUmdkTzhRUEJpczU2TGZXdXRL?= =?utf-8?B?WWhYZmhxb1FheUIwRzlHdE5aR2ZrTE50WnNSRWhOTWVoZkhWVDRhSHhqWDhJ?= =?utf-8?B?NTBpT25QQXNqQlU5aE1yeWZCNXFXd3hNTHNvQjNaYm9DZzQ4ZExyRDZlWndv?= =?utf-8?B?aWpzMnNwL0hIQkYzbzA3YitUdEdISEg3b0ROOEcwYVlmdGdMOExpRStPejVW?= =?utf-8?B?RjNNZTF5NXJiK0V6dlE5S3hxUmdKNEE5Rks1MFQxY2dOWkxaOEdjYnNTSm9O?= =?utf-8?B?ZkpJaXZObGo2UlVxUW9JeVZiaWRVY1JBZjg4eFRjc2dnWElRMVhMWFJhWFQ1?= =?utf-8?B?R0JuUUdSeGgwaUtUNDJaWllLRFZwR1JRWktqdXB4ZHJDYlhBNkNHQXRUN3Ja?= =?utf-8?B?clFaZ1Y2aXlLbUFrMjRNejJwK3dkYTluSTN3cVNacmhlZWw5SWRGc1FuNERE?= =?utf-8?B?NmsxOFZhNFErM2JIVlNWNk1wRy9jYUFIcXRQNGdNSWNtalh5RzYyV3VRQWVV?= =?utf-8?B?dk9KeWdzZUFZOHNHdWZ4TWxNVDJWczlEcTh1dDlKU3piMEtIeWFaaGFiemVo?= =?utf-8?B?S3g3b3F0QWpJSWg1N0NvKzhoTzc0SkhNTzE2L3VJN2pLQm5BbzVQaEJKVmpz?= =?utf-8?B?OEErMTZPZWcxTjU2ODdqQ2hRTWpOeVI3MDc5TkJqTnJWL3F0c01oQkZoOWww?= =?utf-8?B?aCtyWWNvZW83eGNXd0pLMENMdm5uRHRwT2ZYTjZwdHVtbEFLL3hYeUJuRFpk?= =?utf-8?B?NE9mRWthRGtYTk9aWlN3bHU4bkFzMVo3RWg0cmhGdUh2d2o1QXh4VWJyTHRk?= =?utf-8?B?b0FmMUlHUUR3NnFsa3pKbm9XQTF6VlpUK21VM09CNVVjN2dwU1NNRDJEcVNG?= =?utf-8?B?blNXZnByZVFYTHFuVG9JSFVMdkpWTHFobGJCMHZ6NEZtRkw3dDJBbWZjZjF4?= =?utf-8?Q?3z/M/zxcbrhnbec5sqSWVDU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee9e9890-c196-447e-dffc-08d9df130b5a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 08:25:13.8662 (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: c02/+7xw14JTzcu17DVWam6NudqQCg7lI1jVjl2zQ4uSl9f5xKrA09qLVzRqhA51uV62D0H2mlTIL0PmkTQ2qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7883 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1643012740095100001 Content-Type: text/plain; charset="utf-8" Calibration logic assumes that the platform timer (HPET or ACPI PM timer) and the TSC are read at about the same time. This assumption may not hold when a long latency event (e.g. SMI or NMI) occurs between the two reads. Reduce the risk of reading uncorrelated values by doing at least four pairs of reads, using the tuple where the delta between the enclosing TSC reads was smallest. From the fourth iteration onwards bail if the new TSC delta isn't better (smaller) than the best earlier one. Signed-off-by: Jan Beulich --- When running virtualized, scheduling in the host would also constitute long latency events. I wonder whether, to compensate for that, we'd want more than 3 "base" iterations, as I would expect scheduling events to occur more frequently than e.g. SMI (and with a higher probability of multiple ones occurring in close succession). --- v2: Use helper functions to fold duplicate code. --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -287,9 +287,47 @@ static char *freq_string(u64 freq) return s; } =20 -static uint64_t adjust_elapsed(uint64_t elapsed, uint32_t actual, - uint32_t target) +static uint32_t __init read_pt_and_tsc(uint64_t *tsc, + const struct platform_timesource *p= ts) { + uint64_t tsc_prev =3D *tsc =3D rdtsc_ordered(), tsc_min =3D ~0; + uint32_t best =3D best; + unsigned int i; + + for ( i =3D 0; ; ++i ) + { + uint32_t pt =3D pts->read_counter(); + uint64_t tsc_cur =3D rdtsc_ordered(); + uint64_t tsc_delta =3D tsc_cur - tsc_prev; + + if ( tsc_delta < tsc_min ) + { + tsc_min =3D tsc_delta; + *tsc =3D tsc_cur; + best =3D pt; + } + else if ( i > 2 ) + break; + + tsc_prev =3D tsc_cur; + } + + return best; +} + +static uint64_t __init calibrate_tsc(const struct platform_timesource *pts) +{ + uint64_t start, end, elapsed; + uint32_t count =3D read_pt_and_tsc(&start, pts); + uint32_t target =3D CALIBRATE_VALUE(pts->frequency), actual; + uint32_t mask =3D (uint32_t)~0 >> (32 - pts->counter_bits); + + while ( ((pts->read_counter() - count) & mask) < target ) + continue; + + actual =3D read_pt_and_tsc(&end, pts) - count; + elapsed =3D end - start; + if ( likely(actual > target) ) { /* @@ -395,8 +433,7 @@ static u64 read_hpet_count(void) =20 static int64_t __init init_hpet(struct platform_timesource *pts) { - uint64_t hpet_rate, start; - uint32_t count, target, elapsed; + uint64_t hpet_rate; /* * Allow HPET to be setup, but report a frequency of 0 so it's not sel= ected * as a timer source. This is required so it can be used in legacy @@ -467,13 +504,7 @@ static int64_t __init init_hpet(struct p =20 pts->frequency =3D hpet_rate; =20 - count =3D hpet_read32(HPET_COUNTER); - start =3D rdtsc_ordered(); - target =3D CALIBRATE_VALUE(hpet_rate); - while ( (elapsed =3D hpet_read32(HPET_COUNTER) - count) < target ) - continue; - - return adjust_elapsed(rdtsc_ordered() - start, elapsed, target); + return calibrate_tsc(pts); } =20 static void resume_hpet(struct platform_timesource *pts) @@ -508,22 +539,12 @@ static u64 read_pmtimer_count(void) =20 static s64 __init init_pmtimer(struct platform_timesource *pts) { - uint64_t start; - uint32_t count, target, mask, elapsed; - if ( !pmtmr_ioport || (pmtmr_width !=3D 24 && pmtmr_width !=3D 32) ) return 0; =20 pts->counter_bits =3D pmtmr_width; - mask =3D 0xffffffff >> (32 - pmtmr_width); - - count =3D inl(pmtmr_ioport); - start =3D rdtsc_ordered(); - target =3D CALIBRATE_VALUE(ACPI_PM_FREQUENCY); - while ( (elapsed =3D (inl(pmtmr_ioport) - count) & mask) < target ) - continue; =20 - return adjust_elapsed(rdtsc_ordered() - start, elapsed, target); + return calibrate_tsc(pts); } =20 static struct platform_timesource __initdata plt_pmtimer =3D From nobody Fri May 3 08:41:58 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=1643012832; cv=pass; d=zohomail.com; s=zohoarc; b=ackFTipjmqgmG7oX4pYzpUZP0fotdI1lE1iEnXfaWv6VCQkEP+sDPOAYMwH/tLwgl/+JBQDm4IKeAnWqabRAEJWeaRWti0ltkFCyV1y7b0VuI+VJ8EKofyUGmWZG7TiE/nxaVMmpMpY1IXaAXiYF7xALJ+go9vMRkEKbpWzwX0A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643012832; 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=jCxscIvq6zLulNKcY3/NWbd2vQ3CrupkD38ZmXXmcn4=; b=f0QEKeCjil595A5Nef+WtRFZ41XIMZZRMpaZLT/XWqG8OPhFzb+hQp8W91hzryW3DQuLaNMeLxOu9ZtNKeUh1cRZ3L/BxIG+vy6Z2+Y3FhPVH3xtecFYzZYFHFW/ycMuQjG5Q8C7Jc2R+t+RiCSMWUzGvEWqrWXnvNZ/knh5RcE= 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 164301283224283.27306172414387; Mon, 24 Jan 2022 00:27:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.259735.448235 (Exim 4.92) (envelope-from ) id 1nBugZ-0001Mu-IO; Mon, 24 Jan 2022 08:26:47 +0000 Received: by outflank-mailman (output) from mailman id 259735.448235; Mon, 24 Jan 2022 08:26:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nBugZ-0001Mn-FC; Mon, 24 Jan 2022 08:26:47 +0000 Received: by outflank-mailman (input) for mailman id 259735; Mon, 24 Jan 2022 08:26:45 +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 1nBugX-0001Me-NV for xen-devel@lists.xenproject.org; Mon, 24 Jan 2022 08:26:45 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5d1f0baa-7cef-11ec-8fa7-f31e035a9116; Mon, 24 Jan 2022 09:26:44 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2057.outbound.protection.outlook.com [104.47.8.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-I5i16AvjNoCmc-t5nOJ-EA-1; Mon, 24 Jan 2022 09:26:43 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBBPR04MB7883.eurprd04.prod.outlook.com (2603:10a6:10:1e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 08:26:42 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 08:26:42 +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: 5d1f0baa-7cef-11ec-8fa7-f31e035a9116 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1643012804; 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=jCxscIvq6zLulNKcY3/NWbd2vQ3CrupkD38ZmXXmcn4=; b=HN0hRmA14MVo2DTQzISJTY0T3R+bQOPbGZZosJtfYUgzyOXC3IHfail6D6j+d19eRwL8CH OhBIhOmacAqSpkOWctgbcZ74Qkgawr/BHWcytUoYxsCWvRON7IWJu6oBzaQ0lXYli9je2x m5wtvRZqz5rBOJF5CFNE7lSBHuNh+kc= X-MC-Unique: I5i16AvjNoCmc-t5nOJ-EA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UdaXG49nSwNhZQ6t0hhqLxCiBJtHlTE+FrlM2zvz69qhhnNTZ1kEfC5wWEJFDdzAgZUkBIkFOWubI5FlI2wHiAkCyGEvL1lzXor6zYI9gKDiXlJUYbe7wC7Tv1ZoJA48l08rrK6ugDLbRU11MPLHCqe0qKtB1I8PzfuDPpLV1q8sh5DE318ny7j7mli21G1VFHRaPdf6EOzxc8RXd1GLqBP3EIRI0ehqlD5wMvoxngKSe09OwCK18Y7H0+Xraafqo7PD7OtRlR2F5a9UPPkPZzOirCvJykPkIuXJ2bKr7ybbg09Pl90XEX3OHZfjtcN+wraQYc5LS3oYEJga1ZgeCg== 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=jCxscIvq6zLulNKcY3/NWbd2vQ3CrupkD38ZmXXmcn4=; b=MdZpHVMhraP5u85KQC3ijSjnCOgIAXTEfWvBB4yW5cAqxOMxV2panTgSHYwjeSCh8UZApVYec0MPGqFSKqJ6ef0gMlZw1jK4zzlUEWeb0xLaBA0Xpn/27YNjhUJz8Oi2vXhMbnfnoeMCM14/nJzXehr8vqDahE766cDHJ1wnouA8uND46FhofSkB6zAtYbeL/Zj/KHgBwljjAdFPl2ZJlSL/cRwYMtuSgTHYC+3oZW2SMNXAkLX8afLTEojEAtqm1cxrPsc6h2q305Q1F+KY45En0dL5xJUYUVS6nYT/9kAxqQ/nJKPXT0++yadreIci5+MvpYH0fWrQuwRdaPbmzQ== 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: <0ab22edc-bc06-4c52-8cd4-c7dd57746779@suse.com> Date: Mon, 24 Jan 2022 09:26:43 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: [PATCH v2 2/4] x86/APIC: calibrate against platform timer when possible 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: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> In-Reply-To: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0077.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::18) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c3c46a5c-72fb-4004-e411-08d9df133ff8 X-MS-TrafficTypeDiagnostic: DBBPR04MB7883:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kIR1S95DfiauCMPUtHG/XBUnwyx9R0Y2EwnNkaEifUTV5cZ7e7t4gSI5sxwDlO5hKRzAVtE153LvTsn3JlT5EdEZyg1mprOwADyaBoa2dxuuKmeIXcx49W4iXdJI5Svcs/VGApetzPfN2juCamZb3IGp3/sPdFIuu2Ynn6nwCA3TIkDaDI++TWX6aYIx/bgYymsSNrBP10XXUEYRDKNrIrPg+InKKJ/Yj3KjSdSsBosVB8t3Adqom9ZYJtkZVyAXNyj2C9JYaOa3BU4r1nmu5Q8plBtnfRNjRKa208OhE9WKJZjzpldvUvi4nYkyklmoYO3JoWyqYOeR/K5D23cbyJuiuPq2zb8KZbT4hDILBXqbta1fzNQVIpQxCMS3eGuWGxaldvb920yKbwYPrNobT09FcTA2I9+XfKmz+IYrDefri0lzZkmbcbMZqdtINCqyX/PC60gmSaYCZu7NC3lLPLE0xJkUkGzkqwGLWjMz+9tUqhEWnxRlVjhhMRf8MP/6dq3LTSjlpv//15fUEiiN4J49AhnjeYuAwnWXudy/USYG2ORKZMfXaZi6OlK524DhKNyx5ZDo7qZUr9Hr5BRQNnGnUIE2IB7jMyu3VHn2oyjtoOjjXsVccxumd+Mc1HTfP2670wN7kl5lStvtb9p+667CPGOd+Lt+O3lVYLjQZQBbWtlai0et8VtV++WjNFrmfADdJ2DNhGa5Kmy9nikIyMBTq50DZKYkquSzUlEMYGM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(36756003)(38100700002)(54906003)(4326008)(83380400001)(86362001)(66946007)(6916009)(8676002)(31686004)(316002)(31696002)(5660300002)(6512007)(26005)(508600001)(66476007)(2906002)(66556008)(6486002)(186003)(6506007)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NjV5bVFOc2JjS09vL0JaNURPYUQ5Qy92bVVLdDladGV4NlQ4TnN2WWJ1eWdw?= =?utf-8?B?UHFna3EybE9ET0hNODdrSVpXNHdQWU54U3g2ZldzMXdOTjdMZ2VsNmNFc1Zy?= =?utf-8?B?eEtZTmxmQmttaWtHMmtzQVZFcmg3eFBoK2VuVU84Zm5pS0FlV245M2FKQytz?= =?utf-8?B?aVd3UXhkUlpJL29NNUVpVVJrVmtJRXprekUwTnVzTnVnaXpBbUdqSkRWT0pl?= =?utf-8?B?c3VPeGQzNmtVL01LVDdVZ2lwdko5UG1lWjVaV2t4RVJMaHhQMXQvUUduRTVR?= =?utf-8?B?ODRaSGJORHdBcTZZZEo4RlRJeUhNM2Z5RWJHaTFjKzByK0tyRnZiL2VsZ1BO?= =?utf-8?B?ejFnYTFFNG8xK3RZRUZyM21IcnkxcnhCRXdIaVFwNjdWMDRuckM2VW92ZGlU?= =?utf-8?B?dUJRaGdLSmNQaWpzbTRMaXR4VXZDdGlkOUY2OHhGM0pLSm1mbWtHdm5jcEJC?= =?utf-8?B?ZFBDeEN5c2ZkUG1OQUJ0M3A0a0xzeDZ0T0hvL0NTTUxqZDZSNUt6cUV3VUhN?= =?utf-8?B?RjVEUitxbCs5YnROTVdoNU1aU2l3SXEvQUxlUHE3cnc2UW5BbnUzM0xhNkJp?= =?utf-8?B?NlBSWEhpaTV3aHUwQlZSSC9tRUxEMTFteWZjWTFoQTJaNThhT1Z1dEZSRjR2?= =?utf-8?B?VngvOUUybGhaMTh2OE0xU0hNNGhzTTFxOVZGWXJOQ2JIdEtWK0J1YWl1RjFB?= =?utf-8?B?d2tBY25HL0NxeEJrRkZHdDBxK2lCdURuQ0FWVnFhaE13ODVoSnhxd3ZvaXg2?= =?utf-8?B?VklkZ2VxcVhhQldWd2ZlVVpialpURDRkeEJlSzROSFAzK1FlZHJIRnRzVktC?= =?utf-8?B?V3RiRnljd3h5KzI1ZjRXb0s4b2hLZE9NbDhyR2VCUmc5cTZDSDFZdjNKSER1?= =?utf-8?B?YXhjOTJsZkpFUDFOOFh6USt2ZFI4eUF4ZzBodjdsK092a1cxZTdVSDluRll4?= =?utf-8?B?eTVpUnVSVUZSTy9lMlB0cWtoSUtRd3l3NDQ0VWJ4QlgyeGFTcHQ2K2lxMGdv?= =?utf-8?B?N3gzaG10YVBwUWFPNmNLZEduU0hxTFp2ajIzcm8vc2dPOUJVOWRpWWRWcDdU?= =?utf-8?B?MGE5SzNSZTdKMHN2T0kzdE42dzhmZURCVkk5RzhYUWFKalZsaHFSOTYwY28r?= =?utf-8?B?bVNBQkdHMzU4NGQyRHJOUytIZHl5RGVMeDM2SUxPT1crbWxoem9YQXFWWjFn?= =?utf-8?B?SzUzZlMyMDdKV2hSS2NxNVZSdm9ZR3FtM0l5WWE0QURkQ2pHNFJsOXpuTmEw?= =?utf-8?B?Um1ZYzlaSHpHUWpLTHRtbklOZ3k3NEJ1cERuYnhZQW0rNU0rLzNBNWR0R3NO?= =?utf-8?B?cXpCQUNDR1FBaVdMZy9oK2tzT2tVcU50bnZVMzZnTlV1OVlXdXZTRG1UdlZC?= =?utf-8?B?UnJYTXpVN1pHVC91QXh4RWhGMWpHLzlpcDFDSTVVRGFWMTNja3hndDJKWlYw?= =?utf-8?B?azlvcUxaT2pSa2dmL1ViNnYxYUlENXBHbmMvZ0NrQW43cTZXa1lKd1FmREdo?= =?utf-8?B?eUNURTV4ekRJMForTkZSVWYrOGNlbXBtRFJkVWtaRFFDTFRHQkRoS2lmVXB5?= =?utf-8?B?SFY1U3VlZkJaVURTdXQrSnVhbkRSeFJVa0ZyQnoxdDR6M1A5bnI3dFhCTXlL?= =?utf-8?B?MmtZTzFnMCt1aHNucXhCMWwyVFFhOWRIK29nZDF6alRMcW5JRk1pZnhPclFs?= =?utf-8?B?c21Eb2NNenc5Tjc4VXhITlJJbG5nMkN1UVBKSzlqb2hXZkxyK0U2cnk3cHhz?= =?utf-8?B?L3kvN1JxTmFvUGlBMmZMRXlxNEdveFpuZGlxUmZ5ek1VcG1pMWgrSXdQTEY2?= =?utf-8?B?N05BOUt4Um1PY3Ivd1Y1ZVlUTFhCU1lkUTYzOWJSZGtUMjh0K1hTMFp6THNx?= =?utf-8?B?VTVxUDhPdlRNbzVRQWJQa3JJV21mRDVISUUxckxreXVsOHNacXZxMFlrdktJ?= =?utf-8?B?OHlGVDlMbDFsMXU5cTZWWGFFUnhmcEljR3QySHNRZmJLeE05SnExVVdXZWNk?= =?utf-8?B?T2s4QXJ5anNGZFZLT2lBcjVMZktWSDhtNklaTmhxS29kb2NJelFhdm1wbTA2?= =?utf-8?B?VmNhNzlMam1jZFFpOFZJMjdJZFQ3YnRHVWZ1MWlKVVpkQXZyNW4xZXRvdEVi?= =?utf-8?B?WVV1Z2ZhOFRNMWw4bjRqaTBUSER0Q3dFSERGNlZTQ3hUM29kVGQ3VTRmaHRF?= =?utf-8?Q?Vu53VnRM+qUUkZd/UwrtaX0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3c46a5c-72fb-4004-e411-08d9df133ff8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 08:26:42.1463 (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: wiiV6bjMJvu4qdgLAcW2h85PTwqjNvUzCHICSQOgFUlhg7Xz2to3PMzecEE6C7HAHKY/SdEETslr35gKUie6WA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7883 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1643012835273100001 Content-Type: text/plain; charset="utf-8" Use the original calibration against PIT only when the platform timer is PIT. This implicitly excludes the "xen_guest" case from using the PIT logic (init_pit() fails there, and as of 5e73b2594c54 ["x86/time: minor adjustments to init_pit()"] using_pit also isn't being set too early anymore), so the respective hack there can be dropped at the same time. This also reduces calibration time from 100ms to 50ms, albeit this step is being skipped as of 0731a56c7c72 ("x86/APIC: no need for timer calibration when using TDT") anyway. While re-indenting the PIT logic in calibrate_APIC_clock(), besides adjusting style also switch around the 2nd TSC/TMCCT read pair, to match the order of the 1st one, yielding more consistent deltas. Signed-off-by: Jan Beulich --- Open-coding apic_read() in read_tmcct() isn't overly nice, but I wanted to avoid x2apic_enabled being evaluated twice in close succession. (The barrier is there just in case only anyway: While this RDMSR isn't serializing, I'm unaware of any statement whether it can also be executed speculatively, like RDTSC can.) An option might be to move the function to apic.c such that it would also be used by calibrate_APIC_clock(). Unlike the CPU frequencies enumerated in CPUID leaf 0x16 (which aren't precise), using CPUID[0x15].ECX - if populated - may be an option to skip calibration altogether. Iirc the value there is precise, but using the systems I have easy access to I cannot verify this: In the sample of three I have, none have ECX populated. I wonder whether the secondary CPU freq measurement (used for display purposes only) wouldn't better be dropped at this occasion. --- v2: New. --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1182,20 +1182,6 @@ static void __init check_deadline_errata "please update microcode to version %#x (or later)\n", rev); } =20 -static void __init wait_tick_pvh(void) -{ - u64 lapse_ns =3D 1000000000ULL / HZ; - s_time_t start, curr_time; - - start =3D NOW(); - - /* Won't wrap around */ - do { - cpu_relax(); - curr_time =3D NOW(); - } while ( curr_time - start < lapse_ns ); -} - /* * In this function we calibrate APIC bus clocks to the external * timer. Unfortunately we cannot use jiffies and the timer irq @@ -1211,9 +1197,6 @@ static void __init wait_tick_pvh(void) =20 static void __init calibrate_APIC_clock(void) { - unsigned long long t1, t2; - unsigned long tt1, tt2; - unsigned int i; unsigned long bus_freq; /* KAF: pointer-size avoids compile warns. */ unsigned int bus_cycle; /* length of one bus cycle in pico-seconds */ #define LOOPS_FRAC 10U /* measure for one tenth of a second */ @@ -1226,39 +1209,38 @@ static void __init calibrate_APIC_clock( */ __setup_APIC_LVTT(0xffffffff); =20 - if ( !xen_guest ) + bus_freq =3D calibrate_apic_timer(); + if ( !bus_freq ) + { + unsigned int i, tt1, tt2; + unsigned long t1, t2; + + ASSERT(!xen_guest); + /* - * The timer chip counts down to zero. Let's wait - * for a wraparound to start exact measurement: - * (the current tick might have been already half done) + * The timer chip counts down to zero. Let's wait for a wraparound= to + * start exact measurement (the current tick might have been alrea= dy + * half done): */ wait_8254_wraparound(); - else - wait_tick_pvh(); =20 - /* - * We wrapped around just now. Let's start: - */ - t1 =3D rdtsc_ordered(); - tt1 =3D apic_read(APIC_TMCCT); + /* We wrapped around just now. Let's start: */ + t1 =3D rdtsc_ordered(); + tt1 =3D apic_read(APIC_TMCCT); =20 - /* - * Let's wait HZ / LOOPS_FRAC ticks: - */ - for (i =3D 0; i < HZ / LOOPS_FRAC; i++) - if ( !xen_guest ) + /* Let's wait HZ / LOOPS_FRAC ticks: */ + for ( i =3D 0; i < HZ / LOOPS_FRAC; ++i ) wait_8254_wraparound(); - else - wait_tick_pvh(); =20 - tt2 =3D apic_read(APIC_TMCCT); - t2 =3D rdtsc_ordered(); + t2 =3D rdtsc_ordered(); + tt2 =3D apic_read(APIC_TMCCT); =20 - bus_freq =3D (tt1 - tt2) * APIC_DIVISOR * LOOPS_FRAC; + bus_freq =3D (tt1 - tt2) * APIC_DIVISOR * LOOPS_FRAC; =20 - apic_printk(APIC_VERBOSE, "..... CPU clock speed is %lu.%04lu MHz.\n", - ((unsigned long)(t2 - t1) * LOOPS_FRAC) / 1000000, - (((unsigned long)(t2 - t1) * LOOPS_FRAC) / 100) % 10000); + apic_printk(APIC_VERBOSE, "..... CPU clock speed is %lu.%04lu MHz.= \n", + ((t2 - t1) * LOOPS_FRAC) / 1000000, + (((t2 - t1) * LOOPS_FRAC) / 100) % 10000); + } =20 apic_printk(APIC_VERBOSE, "..... host bus clock speed is %ld.%04ld MHz= .\n", bus_freq / 1000000, (bus_freq / 100) % 10000); --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -192,6 +192,8 @@ extern void record_boot_APIC_mode(void); extern enum apic_mode current_local_apic_mode(void); extern void check_for_unexpected_msi(unsigned int vector); =20 +uint64_t calibrate_apic_timer(void); + extern void check_nmi_watchdog(void); =20 extern unsigned int nmi_watchdog; --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -1004,6 +1005,78 @@ static u64 __init init_platform_timer(vo return rc; } =20 +static uint32_t __init read_tmcct(void) +{ + if ( x2apic_enabled ) + { + alternative("lfence", "mfence", X86_FEATURE_MFENCE_RDTSC); + return apic_rdmsr(APIC_TMCCT); + } + + return apic_mem_read(APIC_TMCCT); +} + +static uint64_t __init read_pt_and_tmcct(uint32_t *tmcct) +{ + uint32_t tmcct_prev =3D *tmcct =3D read_tmcct(), tmcct_min =3D ~0; + uint64_t best =3D best; + unsigned int i; + + for ( i =3D 0; ; ++i ) + { + uint64_t pt =3D plt_src.read_counter(); + uint32_t tmcct_cur =3D read_tmcct(); + uint32_t tmcct_delta =3D tmcct_prev - tmcct_cur; + + if ( tmcct_delta < tmcct_min ) + { + tmcct_min =3D tmcct_delta; + *tmcct =3D tmcct_cur; + best =3D pt; + } + else if ( i > 2 ) + break; + + tmcct_prev =3D tmcct_cur; + } + + return best; +} + +uint64_t __init calibrate_apic_timer(void) +{ + uint32_t start, end; + uint64_t count =3D read_pt_and_tmcct(&start), elapsed; + uint64_t target =3D CALIBRATE_VALUE(plt_src.frequency), actual; + uint64_t mask =3D (uint64_t)~0 >> (64 - plt_src.counter_bits); + + /* + * PIT cannot be used here as it requires the timer interrupt to maint= ain + * its 32-bit software counter, yet here we run with IRQs disabled. + */ + if ( using_pit ) + return 0; + + while ( ((plt_src.read_counter() - count) & mask) < target ) + continue; + + actual =3D read_pt_and_tmcct(&end) - count; + elapsed =3D start - end; + + if ( likely(actual > target) ) + { + /* See the comment in calibrate_tsc(). */ + while ( unlikely(actual > (uint32_t)actual) ) + { + actual >>=3D 1; + target >>=3D 1; + } + elapsed =3D muldiv64(elapsed, target, actual); + } + + return elapsed * CALIBRATE_FRAC; +} + u64 stime2tsc(s_time_t stime) { struct cpu_time *t; From nobody Fri May 3 08:41:58 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=1643012863; cv=pass; d=zohomail.com; s=zohoarc; b=WTHi74usBSTFlYzt/Ab3Mi6CPN08SpmCY6mov43mdzFa4pzDkO13eRUogfJROJedXpSSWfDKceQ0zi3We5Ww3lNsjqbFfFog9m118ZW0mQetNj6ZxPtSXYUSknlL09b/1dHHhf5zktzq4akRnQ95sndji2R4D6Q5EU9PnIxPAVc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643012863; 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=O+QV9f4zvS046E/T2Qkac91dJy0u0hz2Q9q4aDSre0U=; b=SFmwgBOnkacOB8itdTrhOZTkfGucskd7yqR2UbVy5hDIUf1iRaWhH1gEGhYSwTtktKHRcEFmzVzWt0EbKyZdbZe6CV3M5O7M+3Qor2KQM77CcBaBZazNjzmwItGCAI9al/PLMyGAVajOqnt+nPmmOwuAevu4JlHTBzN5tkAkYQ4= 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 1643012863248205.03432014201042; Mon, 24 Jan 2022 00:27:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.259740.448246 (Exim 4.92) (envelope-from ) id 1nBuh9-00020q-Vq; Mon, 24 Jan 2022 08:27:23 +0000 Received: by outflank-mailman (output) from mailman id 259740.448246; Mon, 24 Jan 2022 08:27:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nBuh9-00020j-SG; Mon, 24 Jan 2022 08:27:23 +0000 Received: by outflank-mailman (input) for mailman id 259740; Mon, 24 Jan 2022 08:27:22 +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 1nBuh7-0001ma-RO for xen-devel@lists.xenproject.org; Mon, 24 Jan 2022 08:27:21 +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 72f826c3-7cef-11ec-bc18-3156f6d857e4; Mon, 24 Jan 2022 09:27:21 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2056.outbound.protection.outlook.com [104.47.8.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-MlpCDL89PwaveK-ItzmYGA-1; Mon, 24 Jan 2022 09:27:19 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBBPR04MB7883.eurprd04.prod.outlook.com (2603:10a6:10:1e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 08:27:19 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 08:27:19 +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: 72f826c3-7cef-11ec-bc18-3156f6d857e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1643012840; 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=O+QV9f4zvS046E/T2Qkac91dJy0u0hz2Q9q4aDSre0U=; b=SSvWxix2sqHQ+3V0n8akPVEOeNbNO9aS9+7jkirrDXZ9c76Zeu4LgdiRDv1ia2upE1tzkW TPePX0ububpok2pJrN/cC4LsRDpLb39t8gEqwCZYx0XGgGdZeb2ZWroHbqZSCzgm/BgRo5 3WI/2z9LKmqBl8DM8ryUheHrx2ycJHY= X-MC-Unique: MlpCDL89PwaveK-ItzmYGA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jPF3fsv677gRFuI+4lcPe0QcHd1jGlmbuSV0l8k7Xhk6kPAxoswPpzK3btFfUJmfi+J9yzmjJs0qmTSfswnD0ohXE2dAv2zREWOkuIs7TEsi65EtW1eRefC1NsH9JBfw0UFbnlWBLGv7KJpbf5+7Jtb3LoipQUU9dsMM2Cyo+dwROZXBYKXLLBr/a9Q4pIQYmPOO6mHIlD1U/2FztA0xyJxKm0lTU1DdnuZ9lsG04HURlzN0afiMFGRnaYuebb34bBd7Iugnz7VPADyUzfow4rWw6nk+YQwWZAlcfw05coYM5PU7bcdIOs0uhAK7EUHONiORluRvxADFhYqGkrndqQ== 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=O+QV9f4zvS046E/T2Qkac91dJy0u0hz2Q9q4aDSre0U=; b=V9d9w6t7xoQ+ElksITgGs/TMhq6hGDXGB2i/t+3P86OfJEz/CeW1cj+YBZ+segw2X3vsMZI7PthV46/dGjTJREawEjH5w9f/gFKpTe40Iih43ltRPAiNP4o5wnBdf7CnqbvQFJz61gE8yf1cNYy3jw372dd5UrLs8OfnzdRtZJmcLyu+R5zqME3sJG7FDcGnNY1LM9OKpbc4I2Tu8UuWKL/kOK4qKrj2/6qFOsILFbZxFU+uUaEwHuU8ho1uGeuppBclOSo8xv20dQ+ilSabnDF93pc1+rg6pLwdtKBmk8jkAWhfoN1bq/0GTCKbxMJDadZVyVOmBsDrhd+BNLTUaQ== 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: Date: Mon, 24 Jan 2022 09:27:20 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: [PATCH v2 3/4] x86/APIC: skip unnecessary parts of __setup_APIC_LVTT() 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: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> In-Reply-To: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0094.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::35) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dec3f041-acac-4aae-75d9-08d9df1355e8 X-MS-TrafficTypeDiagnostic: DBBPR04MB7883:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kW74TiHBbTl44YAsDTfMXiV3lDwzJGrEsCQ32HFjqJc75uZD5/pwmCdCYuxk2SUqhOSBXOqqzp6AZDK37dSDcFf1DfUt5cS5rH5CDSOxyPdYtYnpZAPu4DQDTOdoNJVwI2bZTcH9BD59aOMHF4CXU+nsHWCNOOxgavNBpxfdqdvgES2sPfaq+9TC9GyvmaR/4BQeOOH0TSfctvPGXrYnYVhVFOxUvFea1FTJAdB+aWQxeiLEc5ThE5NIihXhPG/EbjrpsDbdH3zl3G18F9n0ST7g7hRaWT4xKYaMJFJLh9j/c1pd0+/tq1bNRSUR2JYzNBIFSWdlRaN/MHYQxnOAb5fegSuJkcKqpsJX5GEyo4b3dqqKsEDuobb3o3G5iN29SIIYkIwd1mbtz6xrP9ZTJUDr/f3+8yqDpdb3d4PqivgHBAs+dZ/u5lxtV6T/OZvs0IQcGts/UJijNe28OFf8ruROsAOul+qo5/AdDXWz72vrG6amCWJEDydb0Qdn99IqAIux7MduNlgsmyGz7BNOp1odUALgqSBh74PNw2rzG5dthBwX7nJB5IsrPGVc6RQx3hmetjU8hCqyio7AzLkOygqgjC4hpYkXM5OsyG1v/mBH0533tMPsAFmK6nswh41UycWU7xEcbrujPF0LjUC25uymU5Aq/C0Vf7+hw4caf0YH37P4UwrLbZ0YI1sK7Lsk0KLNRi3yPZvTp31K0lU0iKV5VMWjeq4drQS4/C4csMIYZ+p2k3+nUerY3XDlGAvd X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(36756003)(38100700002)(6666004)(54906003)(4326008)(86362001)(66946007)(6916009)(8676002)(31686004)(316002)(31696002)(5660300002)(6512007)(26005)(508600001)(66476007)(2906002)(66556008)(6486002)(186003)(6506007)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b000cTNhN0JPQTQyeEJRczQ2VWhJdHdwdHhDQnNnR3VPbE9xcXFDdVRlSnpi?= =?utf-8?B?T3RUMjR5TkZUODRFNEpVa0s4ZUtmNW1rZC9qUlZHUVdDQVJxQ0JEdFBQTG1n?= =?utf-8?B?TzVuL0hHVmZoTVQ2ZXpPaDl5dUtrbGxIQU9jMTFNRExHOHYyc1UrR3hoM05C?= =?utf-8?B?ZklSSURnRDNCb01SZEI4aTl0dUVnaVJkUXZIMU4wU0I4RytRdzc3MzhOZlFj?= =?utf-8?B?M2grMWllRFRLcWNScHhIbWI2L0VpRC9WbGVoOFN5NFFvMkg1K01PSkhBd3lP?= =?utf-8?B?OUxSZ0UyMlhRTWR1NFl1ZG5OeTF4NXgzKys1MitrK0JnQ3pPK0hIOTF0WERZ?= =?utf-8?B?ZGRCMnB1RUhpN2FZaHdwRUFCc3NVcGRCd3U0OE1EN0oyMkcwbzA0Yk9SbDVj?= =?utf-8?B?Nm1vSUEyYlVkT0dvVVhvRnFuZ2JyaGlYbmw0cjU1c0g1eGJTb0psVHRJWG9R?= =?utf-8?B?L2puVkdRemxBNXM0Q3FUTER6dlRMU3pNbXA0RnZycEsrYjEzbjNFV3ZJYnZz?= =?utf-8?B?N0Y4WVVMZXBGRzd6b1RRSG5QM2VDWnZaQUpKNjBJTVpoT1lNVnJCenc0SGk1?= =?utf-8?B?aXlINVRMNGo0STN3ajhqZ2lVNitJUkJ6YXVmK0xqTmR5RXhOSG83NWhrNnZx?= =?utf-8?B?VEQ2a2o1dWgvSXpWdFUvandtay9keVZ5NmxsamVkK2M5T3FxdTloRTZyUWdU?= =?utf-8?B?VGFGbEVXMGxkeDd3RjR3MUJaVFIrNU1MalFFVm0zVFNqMER2M0dSNi9VV25x?= =?utf-8?B?d2xTT1o2VmVCTmFBRzU3TElsc2oyZEFpcFBFbGFBaXZuWHhBVkxrZDIzK1Zt?= =?utf-8?B?dzJtTlcreHhMRk9PWmF3QjJvWWFiMGRlT3hwenh3K3loa0pPbTVBbGRIeWtV?= =?utf-8?B?SThFRE81c3Zad2E4Tk04and2dTVFOVNJK3BXNU5VcEdmVWUyWFoxSlAxR1E4?= =?utf-8?B?Z0IyMkYzVUVkOTVCT3hLdEZDOWpVRkhldGg2Rko5cG01RW01QzVxRnp2eE1S?= =?utf-8?B?S1Q1Z0hVZk1MdVV6R3MwVWFLdysydE5DWnhjdXpLdnRMTWZ1cFI1V0xFS2tv?= =?utf-8?B?dlZTQWJwTTIzZFZVdzYxamdrZU9uOGhwbUlnYVFjcmhGNlFldFFQOC84di9F?= =?utf-8?B?bmlUOTlramlZQ0dVR0xWcWwxTUtDTFdGbitlRVVFOVAwZFE5MkoycW9scEIz?= =?utf-8?B?R0x6cXY5WTNvK3hMb1hFUGtHUWg4RTQ1MzFaRStkdWlWN1Jjcm55TEFGdjVJ?= =?utf-8?B?MVVBZjRHOE5mdnJHeHJ5K3ZHTVpXNEpzS2VreVlXc3VnTjBVZ0ROem1uOXJo?= =?utf-8?B?VGQwNGtEWGpadU80ZDlRZGZoZjVwZHprZS9Ra0l4L2tYWXhORERLUjZHSEM2?= =?utf-8?B?NDBPMmp1UG54M0xMVjlxUnFkcHVIb2JJK3hEcnlET0R4VjhnclY0eTRTMTQy?= =?utf-8?B?VVNxRkk5THN6akNRYmFYMmt4MXFmNG9SSTBzc25BZW9mdWhObXJBZ2NEeGEx?= =?utf-8?B?NFhUaStqTUFpRlp5VEZNNzVUc3hzR0UrMDlSM20yZ0NsNEhMSmo3bmJlSGND?= =?utf-8?B?ZGFlaXV4dTAwbUo3d3Y0NTMyMWN6R3ZGdklQSDgxU0JmVGFHdkZ1aTZXWlFx?= =?utf-8?B?MUYxQzVOaU50WGZQdE9KdEJOb2hTTVBrTWpMWXhoVTdnSFhJWHZKbGpXK0hv?= =?utf-8?B?YkFxcVJBRUNOR2JZVTFUOFQ5QVFhcnBqblAvZnpYd2VjdS9KaXd6OUdMRzJM?= =?utf-8?B?YndkUW1OQjQ1WUdWV1g4WndxVEhZL0RqUVFCeEhDeWV5VEJxY3cyQTJWUWha?= =?utf-8?B?U3pOdkg3eTlKVEEvaSsyMVcrd1BpZGMwUVpjRFFZZm5wZnNHMk55Q1J0eGhp?= =?utf-8?B?RUp5SGZqNnp0eElJR2l6NElFUE5sRWlwVTlhZkl6Z0Yyc3R1Wit1cHN3aHVC?= =?utf-8?B?SDdIT05GZTJwdTE1RjhmNm5BcnVIQ1pmV0I1VS9sY3dIcjA2WndTTE56d2xY?= =?utf-8?B?M1FGRC80eGgwTkRZUXpKOUE3ZjlsU3pDZnE0VFNqT2dDb2Njemk4NGxjdThW?= =?utf-8?B?L3BkZUQyd3lZaTJ1c1EwZmZoeFF1U1piQUhweGl4Y0V5MVluM2J6Z3JZK255?= =?utf-8?B?U3poWlo2WFBVdUJXd2VaaDUwQVk3UjQ0L2xZRU0wZG5INTVDcnZMLzBRT3NX?= =?utf-8?Q?Vh1Mf4TJ5Xhy4SZH3FqKLTA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dec3f041-acac-4aae-75d9-08d9df1355e8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 08:27:18.9445 (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: 1tNHaldZRTsmwLmum13HagpSllmxajMicpmk5S//yG7XnCg2a3XFGisu8SIXzbQn24Z1ZcgEzbBB9ZTt6mQNXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7883 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1643012865743100001 Content-Type: text/plain; charset="utf-8" In TDT mode there's no point writing TDCR or TMICT, while outside of that mode there's no need for the MFENCE. No change intended to overall functioning. Signed-off-by: Jan Beulich --- v2: New. --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1059,24 +1059,25 @@ static void __setup_APIC_LVTT(unsigned i { unsigned int lvtt_value, tmp_value; =20 - /* NB. Xen uses local APIC timer in one-shot mode. */ - lvtt_value =3D /*APIC_TIMER_MODE_PERIODIC |*/ LOCAL_TIMER_VECTOR; - if ( tdt_enabled ) { - lvtt_value &=3D (~APIC_TIMER_MODE_MASK); - lvtt_value |=3D APIC_TIMER_MODE_TSC_DEADLINE; + lvtt_value =3D APIC_TIMER_MODE_TSC_DEADLINE | LOCAL_TIMER_VECTOR; + apic_write(APIC_LVTT, lvtt_value); + + /* + * See Intel SDM: TSC-Deadline Mode chapter. In xAPIC mode, + * writing to the APIC LVTT and TSC_DEADLINE MSR isn't serialized. + * According to Intel, MFENCE can do the serialization here. + */ + asm volatile( "mfence" : : : "memory" ); + + return; } =20 + /* NB. Xen uses local APIC timer in one-shot mode. */ + lvtt_value =3D /*APIC_TIMER_MODE_PERIODIC |*/ LOCAL_TIMER_VECTOR; apic_write(APIC_LVTT, lvtt_value); =20 - /* - * See Intel SDM: TSC-Deadline Mode chapter. In xAPIC mode, - * writing to the APIC LVTT and TSC_DEADLINE MSR isn't serialized. - * According to Intel, MFENCE can do the serialization here. - */ - asm volatile( "mfence" : : : "memory" ); - tmp_value =3D apic_read(APIC_TDCR); apic_write(APIC_TDCR, tmp_value | APIC_TDR_DIV_1); =20 From nobody Fri May 3 08:41:58 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=1643012900; cv=pass; d=zohomail.com; s=zohoarc; b=Mwf93ngnm1ZDvSs4hx9700dBjG44W9/sJkId+K4VyWnqwn41asyLHXQXZbzLVfpDfnsQuVG3gmnYkcRyqINprIYyNmiPAWhryHYQZuS7Jrz8sc0ZcPTARxmUr/6SjuRCYxPnS9rWsC497vW/bpMazrrlC37a+NvQUkek7oMLgQQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643012900; 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=UMb8XxBGQTglh7QS0g0uFzDDbX+ZM/GP4Y8wGvBBNIg=; b=DAu6+KrB524yxzm//l1DzpuPXyTd8MgFIZrqtIoax6CUHOR4YG8mjL1QPnxGS9+8Fcd5FgrfYcTBaujcwlcIAksaYt6NWI1bsBNzEhlZfjX++AOB3TcdZE+PItq0U/g4IWu/6uIinf2QENNFofma700NNU19X0XHCOI5Om69AzE= 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 1643012900525391.68724681789445; Mon, 24 Jan 2022 00:28:20 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.259743.448257 (Exim 4.92) (envelope-from ) id 1nBuhk-0002aX-AP; Mon, 24 Jan 2022 08:28:00 +0000 Received: by outflank-mailman (output) from mailman id 259743.448257; Mon, 24 Jan 2022 08:28:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nBuhk-0002aQ-56; Mon, 24 Jan 2022 08:28:00 +0000 Received: by outflank-mailman (input) for mailman id 259743; Mon, 24 Jan 2022 08:27:58 +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 1nBuhi-0001Me-HY for xen-devel@lists.xenproject.org; Mon, 24 Jan 2022 08:27:58 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 88c5dacf-7cef-11ec-8fa7-f31e035a9116; Mon, 24 Jan 2022 09:27:57 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2056.outbound.protection.outlook.com [104.47.13.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-9-8PjrLE-cO4WCL-quvZmFRA-1; Mon, 24 Jan 2022 09:27:56 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBBPR04MB7883.eurprd04.prod.outlook.com (2603:10a6:10:1e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 08:27:54 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 08:27:54 +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: 88c5dacf-7cef-11ec-8fa7-f31e035a9116 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1643012877; 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=UMb8XxBGQTglh7QS0g0uFzDDbX+ZM/GP4Y8wGvBBNIg=; b=CegIi2wfwN1GTNoPhAlIMu7m2nh6KWizrgc7s1veWAPCpaPBwpwbZi9jQirf0RK+qi3UKw Z/x0yI/gCFibItyzcMhq64lGS+mUfiMDS0ahHUvaJ1xm44MHCWdf6GDRX++rX0uohyPXBe t7e35/N8kbLGaxzKQKCjKYmz6qJMtQg= X-MC-Unique: 8PjrLE-cO4WCL-quvZmFRA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XtlXun0YoRDoow9UiIRjwFmLOGI++5tfdBKyHtmOOvrGHVAVqRwym+P1Lawmju0WRMELh/1RLEOCGcNGbHjydPBSwfIXsrDFwnWSQKd/Yoh4zamx/1rIe2lPINRa1OfkCvgZUvTX9VEfazbY+tcuRIMQRLZdptuGiijZ7e5lG4tjHYAhGd1UVHtALy7+BLjoXr0f4hUV5SuyWu0hBxv3H52LviNNrCg7b/0/0iD6bdQSKV0BStBa6QuPUD8avQ6cHJO7sjEtxyiRNelOcR85v05baXur2AXsYzkdvYNt6kNsJsLcygsv1+9ZCvECrfB4OwiqJKM2qFavWiLKN6VqkA== 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=UMb8XxBGQTglh7QS0g0uFzDDbX+ZM/GP4Y8wGvBBNIg=; b=ToyHKaIJZuXRtFf/PGF2AOMjcCf9JT154MxbA7k3f7tNd+UV6k8A7lHcnmcxmsOdZgQ5YibTtYL2TGCIAlv6iYD5ksZE9Gw8FN/9tNXwndHbQaIZzsecXcyIWiOaIO5Syi8aERVeqs0hzcwDWv9Ru+ibwx5s0tfhZF9KU/yWLIBj+NXvsrL4xnCiD5d8Idd/wCGPi1PaTQOpYddZMBGlgjNvQ9lgkaF+vhDa0CAiHYZ/GleWMMuHT8cDuowBGmIPtO5jqGW5t8vVC0jhYU4lFT0pbbAGcqvQn6Rl9Ky0JNmjTKCYlyYhX6ZQVmmsblAwCMlf+rUO3jY3cURUpZjd+Q== 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: <8495dd5d-f72a-24c5-3127-dd37767dd7c3@suse.com> Date: Mon, 24 Jan 2022 09:27:55 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: [PATCH v2 4/4] x86/APIC: make connections between seemingly arbitrary numbers 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: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> In-Reply-To: <879e5b70-bffd-b240-b2c8-c755b09d41a9@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P194CA0047.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::24) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 198e876d-fedf-4589-5bb0-08d9df136b41 X-MS-TrafficTypeDiagnostic: DBBPR04MB7883:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:913; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w+oA7gxG2sw3n9BCzQ/Dkfkt+Dc3xayFRxzQ/9Y6qs5GfYgudPh7ZaCrB+LOQqOgYtZoOxSmSZoqqNbx7ttUPbU1IjAERFuiuH2bMoUwZX41QO4Yu3xm6YbAJqv92ABNewEGemvR/Q4A1/OjQ+kEWkszVcdMbloBegbx8GB3cEBiPMITsFXvIHRK/M2RhoaVL0GT4OJ2A9W5pP7zE6aAzcHl6qz+OP7Xh8CldoGvNH4ll/h6KkbLHopt5IzQa58a0o2ObQXOdZdk7Umw7DqSM/p31Cd3vTJ/zuUbmX0cYR14Q2yNteZF8prAPsgW21oxN9WFdjmqDo3E5EmVwvxZslkY5nxs3HLHKHjaTBQ+XQEA+TT6TFHB0+v122wY9VE4QW2475BIzGgScyRyJnKdcjv5vGf+aZ1HO0xmhFXxcsg4EPcZKGow+2DcDahPFKbpwuFDuWy2B+4U0D8X4j5HQPo7UuLr2nUwD6JiLgLv+D4Th3rsOGpcIejfFOjF67H9ph7fBgCm5YER7kbAcs8cRcRM1pupJto339HlRRECYbug5RovC2bVktQFZET5Me+GkerB9umDjmELK5CxZ0q2uP6BCUXB3ZHoKiDd2Nw6bqSr5CAY9iOFcZTlEyE7jvwfkgHR/wSeK2t8MMGVVfSsjWcWrlb2JqPYfhnVrEldNyskCzt3Spg36r69sJRUkRZ4Z/Rm8XV4TbVqJe7x4OFziN6MgfTD9lJICFmLvhHHu/Ej3+nN3mrROPZj6qnFsmUR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2616005)(36756003)(38100700002)(54906003)(4326008)(83380400001)(86362001)(66946007)(6916009)(8676002)(31686004)(316002)(31696002)(5660300002)(6512007)(26005)(508600001)(66476007)(2906002)(66556008)(6486002)(186003)(6506007)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TENtSU5sczFseVpHMEZvb05pSmhMdUQrYitpU1Yyakp2dkM1YmdGKzBUaDRr?= =?utf-8?B?c2JZb2p4T011M21maG1oTCtPTFJlSENRd2tkZ0NrS1JvY1NzL1VyYWtiNnRn?= =?utf-8?B?N1dxVC9ZK1JUbmkxQlFLSzNqTWFpOS9jWXhjL0JxMS9ieXR3eWszbTlXV2Ry?= =?utf-8?B?ZUYzMkR5eFJiWm5xdnhmMHFLOTdGek9zVnRjbWhvSFhyaEYzamtpREFZdlVR?= =?utf-8?B?Z3d1SllYbkZUMW4zT0ZvdVlqenBqZjJRVHp0ZjZPMVYvNER5dStiOUd4ckJC?= =?utf-8?B?Qzl5N3RKWlE1RnF1bG1NMjBjbFBGdG5aQzk3NkxrcldUSXltdmJ3U21lMHMz?= =?utf-8?B?dWhqY1NiUmxFQ3BFajdzY2N2UnRJOTU3a3lxVTNPM2RsKzUwUnhUWU1lRUVR?= =?utf-8?B?RENpb0hxT3ljMUt4VS9FaXhwdUVHRUUxTURieHlESUJjWlhraXRTSUlvT0t6?= =?utf-8?B?NHI0dm1TU0NvdE5QNnJzcVc0S2tlYXBKRDlSSzgyVkdyS083ajNRczZiTkhS?= =?utf-8?B?MU1yeFo4TmdjQ25hVERSVlRCcVhCUjdFd3haU3BBcjF5bEFUNWhkd1VDQTRk?= =?utf-8?B?cXZRSHl4VDV6R0xxTG9kck0veFdrNmo0RHdwREpkNmpNdUF6VitEcWdaUGRJ?= =?utf-8?B?UVZTdnpQK3dpMUVkVUM3NjBuOHVqM0VMbzFJS0NZQ2dkN2hmVEtYYVVLV0dr?= =?utf-8?B?Q2x5VWZSTGo5N2hTTnBKbDM3ekdTZjViWUtkOCtEd2pnN2FXMlcwN2EvSU1p?= =?utf-8?B?c095U08zenV1Vk9wOFRLc0grZGNody9ESG8rSHgzV2d2S21yT2VBeDVuclFO?= =?utf-8?B?Q3UrWWRWb2wvLzV3NWhZaTg0K05HRWdpc3NGWmpYdk1SNmdoQlREMFNXdzJp?= =?utf-8?B?VlJVY3JVK3NwTlhOWkxublZkSGticlFoK2Z2WDlGenlwT3RmWk1SZFBXU1l5?= =?utf-8?B?MXZvYUF6bTVRaUlHS2o2NXBCQndRNW9EWWdla2dHYUlDRXNFMTRjcW85NWhM?= =?utf-8?B?b0RUNDdXUUZsTW5kUW5EakNHbGVWOEdsY1ZNdTlYd2N6NW45c1lnN0hGdGVs?= =?utf-8?B?OHZvaTJ4QXdVVmY5L0R4TzJzdU9lMGE2SlZOdzRWTWtUZVlMWVhVWW4zMWdE?= =?utf-8?B?YzlPb28wT0NKNUoyZ05yKzIyczJubmhhdm1kMGhLSVMvUGdYWGwwZ1kzMHRa?= =?utf-8?B?V3YwVzAyaXBtREZhUUd2SE95MTk4UnlUK29ueUQreWhuUmdYa0ZuVWZDRXFC?= =?utf-8?B?MlNlSFAweTVNYll0WHBPR0VBdW5ONmE5d2dwTlVUYk1IRmZaRVhIV2s2elRZ?= =?utf-8?B?aElMeFJndVdWZWQ5Ni9CR0RDWmdGMkE1a2FBd3NZdjdUdHl1b3JZZUdKQXJy?= =?utf-8?B?WDJUdDEvTEo5aENlS2tGb09DamVoZHV2ZHNrVE5NeG9LdS83U1E4a2Vrd2Nz?= =?utf-8?B?bllDUnVoTStUcTlWK1pYeVdpOU1wQnZUcE84NmlKWnFPNkhTRTcyaU5oUXRR?= =?utf-8?B?MnFRdE9ETlRLb3hGUURpYTU1UDZZOWMwdlJ0blZUc09UVWtLUkl0a1hiOFNO?= =?utf-8?B?VnEvTzhURmxoRWprU1FsRWNTRE1RcHAzcWhtamZBTFFnZmh2Sm9tNUpqQXdI?= =?utf-8?B?RTlhVGVHTUtUZ0RkeGJNR002d0NIQ21CaHRBNEhpdVNhL1BSN0pINCttVkV3?= =?utf-8?B?VmJXcHNuTGMycWlaMS9RZVFONzRLNGg5OWxFcUZtamN2MmxoWmtoVVBhaVpv?= =?utf-8?B?QldiZUpFWm9sSWVad1hsVHhZRTZEcDl1UzZmeGttdEFVemFmbkhvbkhpaFRW?= =?utf-8?B?UCt3YW5GWE1ldEtCYTYydjZMUUtJenRXemUzWXJDdU1kSHpsSmZORXlnRTho?= =?utf-8?B?L1p0UW80R3lEWnJPMWlRK00vZDFzVFM5UFBoWVdhUjNac3JKN2tqd013TzJU?= =?utf-8?B?NTExNVRab0Ftd3NlajhzMjZYVnZ5OFo0VEhaQ1BNdFRhRXlRWTg4M0Q0ZW9W?= =?utf-8?B?Uk5NZFNiKzhIUVZrRXYrZ1pVMzh4UG9PUkpuUHNyR1VsSWYybnAyMjVybEdL?= =?utf-8?B?ekRMWDVOK0FIdUNrYzNwdm1raWVXRGp0N0NpZ0NxU013QThnM3B4MDhMbmVn?= =?utf-8?B?bnhDVEUwTGIzWW9xK3E5SWE1c2dXU2hoQVBJOEMwUnJRaW0yUzhnWE1DRGd2?= =?utf-8?Q?8Iv82PxMWffJEJlYGvEvsnI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 198e876d-fedf-4589-5bb0-08d9df136b41 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 08:27:54.7713 (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: Ms5Ug2BQkWqIrvqoz/hdXaSi7+KZBz+wXILOVf1RMPw5XKreCWIBQk1HonZxW2p1HkTC7/Voa/Exn8hT2iLqnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7883 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1643012902023100001 Content-Type: text/plain; charset="utf-8" Making adjustments to arbitrarily chosen values shouldn't require auditing the code for possible derived numbers - such a change should be doable in a single place, having an effect on all code depending on that choice. For one make the TDCR write actually use APIC_DIVISOR. With the necessary mask constant introduced, also use that in vLAPIC code. While introducing the constant, drop APIC_TDR_DIV_TMBASE: The bit has been undefined in halfway recent SDM and PM versions. And then introduce a constant tying together the scale used when converting nanoseconds to bus clocks. No functional change intended. Signed-off-by: Jan Beulich --- I thought we have a generic "glue" macro, but I couldn't find one. Hence I'm (ab)using _AC(). --- v2: New. --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1078,8 +1078,8 @@ static void __setup_APIC_LVTT(unsigned i lvtt_value =3D /*APIC_TIMER_MODE_PERIODIC |*/ LOCAL_TIMER_VECTOR; apic_write(APIC_LVTT, lvtt_value); =20 - tmp_value =3D apic_read(APIC_TDCR); - apic_write(APIC_TDCR, tmp_value | APIC_TDR_DIV_1); + tmp_value =3D apic_read(APIC_TDCR) & ~APIC_TDR_DIV_MASK; + apic_write(APIC_TDCR, tmp_value | _AC(APIC_TDR_DIV_, APIC_DIVISOR)); =20 apic_write(APIC_TMICT, clocks / APIC_DIVISOR); } @@ -1196,6 +1196,8 @@ static void __init check_deadline_errata * APIC irq that way. */ =20 +#define BUS_SCALE_SHIFT 18 + static void __init calibrate_APIC_clock(void) { unsigned long bus_freq; /* KAF: pointer-size avoids compile warns. */ @@ -1249,8 +1251,8 @@ static void __init calibrate_APIC_clock( /* set up multipliers for accurate timer code */ bus_cycle =3D 1000000000000UL / bus_freq; /* in pico seconds */ bus_cycle +=3D (1000000000000UL % bus_freq) * 2 > bus_freq; - bus_scale =3D (1000*262144)/bus_cycle; - bus_scale +=3D ((1000 * 262144) % bus_cycle) * 2 > bus_cycle; + bus_scale =3D (1000 << BUS_SCALE_SHIFT) / bus_cycle; + bus_scale +=3D ((1000 << BUS_SCALE_SHIFT) % bus_cycle) * 2 > bus_cycle; =20 apic_printk(APIC_VERBOSE, "..... bus_scale =3D %#x\n", bus_scale); /* reset APIC to zero timeout value */ @@ -1337,7 +1339,8 @@ int reprogram_timer(s_time_t timeout) } =20 if ( timeout && ((expire =3D timeout - NOW()) > 0) ) - apic_tmict =3D min_t(u64, (bus_scale * expire) >> 18, UINT_MAX); + apic_tmict =3D min_t(uint64_t, (bus_scale * expire) >> BUS_SCALE_S= HIFT, + UINT32_MAX); =20 apic_write(APIC_TMICT, (unsigned long)apic_tmict); =20 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -580,7 +580,7 @@ static uint32_t vlapic_get_tmcct(const s static void vlapic_set_tdcr(struct vlapic *vlapic, unsigned int val) { /* Only bits 0, 1 and 3 are settable; others are MBZ. */ - val &=3D 0xb; + val &=3D APIC_TDR_DIV_MASK; vlapic_set_reg(vlapic, APIC_TDCR, val); =20 /* Update the demangled hw.timer_divisor. */ @@ -887,7 +887,7 @@ void vlapic_reg_write(struct vcpu *v, un { uint32_t current_divisor =3D vlapic->hw.timer_divisor; =20 - vlapic_set_tdcr(vlapic, val & 0xb); + vlapic_set_tdcr(vlapic, val); =20 vlapic_update_timer(vlapic, vlapic_get_reg(vlapic, APIC_LVTT), fal= se, current_divisor); @@ -1019,7 +1019,7 @@ int guest_wrmsr_x2apic(struct vcpu *v, u break; =20 case APIC_TDCR: - if ( msr_content & ~APIC_TDR_DIV_1 ) + if ( msr_content & ~APIC_TDR_DIV_MASK ) return X86EMUL_EXCEPTION; break; =20 --- a/xen/arch/x86/include/asm/apicdef.h +++ b/xen/arch/x86/include/asm/apicdef.h @@ -106,7 +106,7 @@ #define APIC_TMICT 0x380 #define APIC_TMCCT 0x390 #define APIC_TDCR 0x3E0 -#define APIC_TDR_DIV_TMBASE (1<<2) +#define APIC_TDR_DIV_MASK 0xB #define APIC_TDR_DIV_1 0xB #define APIC_TDR_DIV_2 0x0 #define APIC_TDR_DIV_4 0x1