From nobody Sat May 18 23:14:55 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=1648719014; cv=pass; d=zohomail.com; s=zohoarc; b=f1qzrIulPIouKhyC1r2xINfpF3L19FPFwS9XHQ1vqKYd2ovwzHDAQNVULnWvIMA4y56a/nl9vdyBzEEFPMwolW4D6lRPFMErBM1U7mu3HA+n3ThO/gKljXer/e5IrHjdhDXcIkXIxSNgBtxYMBG7I79xGSpdiv5jnjbjru10NAA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648719014; 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=izkM3/z4sPkt4zpxlsHGtY1fc5KRMyoYNoGbHZjH4Q0=; b=Gr34rttoohQa7orxRa9TYzFqDNySyu7MqHGzarqv9Q1RWA7OPD+iVU8CJRuE/1hS6RVjvAVSqEZS7xt58uQdJTa3e60zjv35o1Jy9g9w8/cBvZWpz5N4LwgwndHd8aJRQbiPe0OxoS9+vgi6PV6rWSkUEyfrRJst/Ojn6vRfQwQ= 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 16487190141281009.9998884951391; Thu, 31 Mar 2022 02:30:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.296805.505348 (Exim 4.92) (envelope-from ) id 1nZr7o-0007dX-Pn; Thu, 31 Mar 2022 09:29:52 +0000 Received: by outflank-mailman (output) from mailman id 296805.505348; Thu, 31 Mar 2022 09:29:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nZr7o-0007dQ-Mn; Thu, 31 Mar 2022 09:29:52 +0000 Received: by outflank-mailman (input) for mailman id 296805; Thu, 31 Mar 2022 09:29:51 +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 1nZr7n-0005JJ-8y for xen-devel@lists.xenproject.org; Thu, 31 Mar 2022 09:29:51 +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 1cf5c3a4-b0d5-11ec-8fbc-03012f2f19d4; Thu, 31 Mar 2022 11:29:50 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2058.outbound.protection.outlook.com [104.47.5.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-SGmMGXfgO_667l57DKBIug-1; Thu, 31 Mar 2022 11:29:47 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by AM0PR04MB6161.eurprd04.prod.outlook.com (2603:10a6:208:148::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Thu, 31 Mar 2022 09:29:46 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.021; Thu, 31 Mar 2022 09:29:46 +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: 1cf5c3a4-b0d5-11ec-8fbc-03012f2f19d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648718990; 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=izkM3/z4sPkt4zpxlsHGtY1fc5KRMyoYNoGbHZjH4Q0=; b=mYWhfAt4wjtQW5Cxn3zhirewX7CVQsGTnGi5PlKCL3WcRDOaBnw7RD3lxewT44z4yRdM+2 R71SpBWA40/e/HshBctJFzJyCIP5+YjkCKuZ7cUVa2HgRGbv67nTuU95K1giuDFxKgrxjY R1SC6y5OmqElHynqPN5PehWSdHbumPI= X-MC-Unique: SGmMGXfgO_667l57DKBIug-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TCRIT5/BMJ3RHYIz3kjxkjPL8Nw8rd20IpoCeFWWKn2oIgMIe6FoIFmpYiNIjZVFp/1f/C33YROc6wsHcWYzubMEdBedVtZ/XsYsVeevq9/IOorDjwZuFjs5sDixuKw9bMcmIa4s9DV7N+3MxBtaAH71TLebn5MnNuxEQabydnjUbbKtNmD30QCFzIHuW7zTDMOssWsVLELiQIFKLGpDwYNB5o+uEYoNHd2KCuXVtVMVNNA+e1XxBS4zvQk9QLh8Y3pwaZd59BJecTqa+m+nYsz1buAM7iiqXuc/8kJjLZG/3VyK/gRLg7J+1k56QoGBnYL8lx5KDb9Q8yd3APWHAg== 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=izkM3/z4sPkt4zpxlsHGtY1fc5KRMyoYNoGbHZjH4Q0=; b=TS4TuKTtl+T7D+tlbqCyAA/F1RxlZTGihpOyzIzLxJdw7XKrMOZtj9TZU2hKh9fuiivrCV3Vh+0JK1M9Kj9IcDcQSlxy0RrtRqWfiNnZ0TFlP74tjBHF4NQTdyCaaFnjpkgzqfEucKWFTnzoQVeIdQodRXfDjuX6xN3DS+avOzaoCatTTRX5pz3K79Sw5HK2avZm7llaZ1LJFNFJX85Goj5M11Ti/6BcgicFqq9WjbKf+RbeDUbXzZHuQJ0ELjN+Gd8pDgheAvU/gUHXjpcxsiYVJJLRro6phoIjtuPTCzS90zwv0dMTUl+P4sqi2UoyM82uBhzn386pTYyHcQ3mLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <37ee7fe7-1218-7fa3-bc29-0fb45389bf75@suse.com> Date: Thu, 31 Mar 2022 11:29:44 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH v4 1/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: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> In-Reply-To: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR07CA0007.eurprd07.prod.outlook.com (2603:10a6:20b:451::6) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74fd2d73-fabe-4521-68f5-08da12f8febc X-MS-TrafficTypeDiagnostic: AM0PR04MB6161:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0uPofuTbHtC9SMECRn2gXw/CZqa+1EY637Qh0bQ+NBUz5rbycj8lpTtX/zYYtTRXoyUzIChe0LEYBu+b+SfitBqcrfy7pbamFkMjzDu+DK2PejOnb6u5rQXTQ0tb2po3l/DbwDQw0f5lYqZOQENwc1Af+bTEte4V6aM0BOuEgmEul8CU0vSCdRo8FgpVhRe8Kje8z8Q/TK0i98ekpcjmfWa9eoKjAFLD2LxeL9GYFn7U3bBxwkt07JBQeldOIUU8jRF+F6T3Wsvnbcb8NYvmRhmNzOe6ruSKkw22WYZApt2VTd/RlGjChu4qCBzpl6JBAYmK1RGxK98fbnqiHvAbAFttSZ3N7MDvTpdMFXlD1YgnkEMkyNO4ULvBGzCAhQasHtwOAuP9/TZym3qQD+jov6tdWRPXfunK8UGk26vkm2XHET3UZx781z/ezb1wyb/TMvBtnP0ug0I3s/vHvVyVi4/T0KAOJEJ/RalUwCYTpTWr5+gNlPovY2donD3d5Y4rnFs08nR3QyUqm59eQkdl9tf1Z1WRa/7niFeCbS/CdSVLF+VhAj/OtYVRgFxG71ISLBgtJIkWKMoHCUHOSTz2P6mi9loovRRmaSBmAOqXgJ+matVcswA8FqAzJoADwseSU5raygnzn4yyINS7rkdiNV0bKi1mYSHkXj+8QP9zG4qxvw2qh9zOrr8XKPL9GeuOywQu52bxzAqrO7XCnJ1FD6dL1gfOx0OZioKHxOJtjt4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6916009)(54906003)(66946007)(38100700002)(2616005)(8936002)(6506007)(66556008)(5660300002)(8676002)(186003)(2906002)(4326008)(66476007)(26005)(316002)(86362001)(6486002)(83380400001)(6512007)(31696002)(31686004)(508600001)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzBac3dDclZQVGIzbkN0cHpyVk1iYk01bUdIdjdObDB0STNJMGxQMUU4c094?= =?utf-8?B?RTJ1L2tiemNYb2tOWHhZWnJKaHEzajBrWC80aE5mN0htYUlTUDhsN0ozZkxE?= =?utf-8?B?UnBhYWFZblY0TmRsZHc3ZlF5WFBFSGsrQ2xkZkFXdzdqRFU3dkRkNUU3U0Nz?= =?utf-8?B?bVdvZ0g5aFVMVHhXSFFVSVZIazRLbFlFUEJ0S2xFclRtd1JVNVRoOTFqSnhl?= =?utf-8?B?M3lBM3RNZDlvUERZUlpMdjZ3aEpQKzJSVllsMEQ5eld4M1dWRWhjYWJVbW9S?= =?utf-8?B?Mm14dlF0U3h6QnJ0TDB0QU80Uzd5L1Rsa0h6d052bUUvQitaakcwSmVROU9S?= =?utf-8?B?ZU9FS2ZENUgxYU1PZVdVM3huL0haSGNCaHhId05JLzJmazJqQWJBektCcjhO?= =?utf-8?B?S1VnL2E5Ky9sYzBUY0NoRlc0SmZ5ZDN1TlpkNHk2K2ZXMXgrYnJWMFNsbzND?= =?utf-8?B?Uy9DRDgwcStiYVBycG16VkF2YTAzMlFSQWw4b2hKZzc1YThWTG5ZNVllc3dt?= =?utf-8?B?TkdDVW1vbithRmo2QUt0UTJ5ZmR6QlJFUU84Y2V6bTROZVpHSHljb2JNMFlS?= =?utf-8?B?a2hPYTdZWm4wbVBQSm93UlFZRlc1cytQelpOeDk1a1N6VDdjNGliTXVqVGRR?= =?utf-8?B?NTVvMWxIbGRhWmJoNllSTkZlVEQweXJpdEpPajNPQnR2Zk5YYWwybXIvdjQ0?= =?utf-8?B?RHg4b2YyVUVFeVVaTWR1Uy9DTjY5YjlOOEQrMXhucm9OVC9TU2p4Z1JWdUF4?= =?utf-8?B?UUVkcFBDRzZLeGZhTGt0czZmT2NJK0t5NUNiais2bEx4QkRMNXFiWWVEd1Nn?= =?utf-8?B?bGdZMS84SlpwRVNqVlhLQzBvcmxKalI0Qm5WQ2FIRjVoLzk2K2ttZjFobnMx?= =?utf-8?B?TFF2MFRLQldzL2srZUJlbHdNREhzVHVFbDduaWhOZ1VzNjBTNE9YT0JXY1pj?= =?utf-8?B?bC96YXNCa1RNbE9kYmQxeWNiMDJORFhWVG93TDJ3NTZVK2c4eFd0TkY4NjJQ?= =?utf-8?B?RWNpMmFpdUVmaU1WaTY0UzRSVER6aWRydjdITUlrb1FSWm03RlFuMUxsZ2x6?= =?utf-8?B?clltNnJhSVBMWHhUVXh1TndoSXpXZGxHZkZGbjJnaDhSZ0d1aUxGWG1VY3h1?= =?utf-8?B?eWhYU29yMFk3Z3MvUW9UOFljY2pzelpRZFk0Nm0rRTA0c0RVVmdtK3ZYdEhn?= =?utf-8?B?MlVYYi8vQ3ZlbFY3OHNvZFBuSnFvQXF0UzAwVWdoV2N3N0dHcHZob0FIbVFv?= =?utf-8?B?VHhyYU82RzhscTZ5bWdCQ1A1OU9mR1ozRDdWSWo1UWh4TWJ2R2Y4YUw1OGIz?= =?utf-8?B?TDhFNWlPcnVwdk5icG9LMlFDZU92VDV3cFdNK3Mrb1hCeFV4YzZ0dlAwMlhU?= =?utf-8?B?dnZ1WW03ZGVZYnN6VjN1bkI0SDVWWnZNTS95WUpCVnpsVlgrRDNadW1TUFN5?= =?utf-8?B?MFE5d1V0K0JyMkJ1WlY0R09oY0s5Z0thWnROdmtDYWFyYkxvTVRXYlFEMlIv?= =?utf-8?B?M1RMRWJWaEY0Wm1rYlRYNU9Na1ZDejlYbDRHMDBpUnBkM3ppeU14aU5QMFV4?= =?utf-8?B?YWhUKys5Q09pa0ZCMmdoc3Y2RGEzcW5PbkdDTDNiYVpQK3JTY1ljU0YzcGg3?= =?utf-8?B?RWxKZ05SU2JUY0x6Q09CbVRPWjhzcWNNRVlXVm92c0dNTjhSZEVhN3FoTlRy?= =?utf-8?B?bDRrLzByOXZMalhHQ0dmUnR1d1F6bGk3RnJTT2UxQWNjTXhiZTFSMkZTS2Jr?= =?utf-8?B?RDRHU0ZFYzBoc2JpOXI2aUV5QU8yRE4xOEtrUE9LNWdMbTZWc3RFb0Y1cWEy?= =?utf-8?B?dEZwbXBVOXhTbzQreWhlc0NWa1UzZjRoWFh4WXNkYVV2K3dmcXN3WXlZOVdk?= =?utf-8?B?ZFFsOXJCSzlCMlMrS3lEVExnRTcyblBWTjl3dE1CajNvOE9vMVpMTXJuYkZP?= =?utf-8?B?cWVCdXpvR2ZsNUN3SDlTRVlDL1UyMG9XNmhaVmcxZGwrY0ptSnk3V1IwNm1t?= =?utf-8?B?UjZhTjR2NTB6aTdZRFdIaVkzN1dYcWllNjB3UXdMc01QbTNjV3ViZXJtbTdp?= =?utf-8?B?ZC9jQXNwSHFuaDJQU0RqU3RsMFJWMTE4ekNPYk11d3RvNGpOOC81cnp1c3VE?= =?utf-8?B?N1E0MDRxeTdYZ0hEYjN6a0lsMFlmVlo0MytqOHlTRnQ0TlVhcmNZMW94SUxM?= =?utf-8?B?UzA3T01JeXY4T0tDYVQrUVYrU0VRODZsY3RJY1hTZVh3TzJPNnJmM21FQTcx?= =?utf-8?B?NEhKaFpSQkJOdldWV08ybUFXZUl4MS92TjB5aFloK0VSWTEzQ2pOM0dqalZn?= =?utf-8?B?OE9DU0hDS0FrVEVkNUd2dVk4WTU3ZlNqMitLOEpsaXFub3JYVHlFZz09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74fd2d73-fabe-4521-68f5-08da12f8febc X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:29:46.2546 (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: 9mmIUx9VUgow94qic/LnAooyQrhZF66/Z1VoDKGqZU5LewpiXQu5xCC1pEZYjeQm0z9uUBNj1hg1/+YQWzqokg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6161 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1648719014798100001 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 Reviewed-by: Roger Pau Monn=C3=A9 --- Open-coding apic_read() in apic_tmcct_read() isn't overly nice, but I wanted to avoid x2apic_enabled being evaluated twice in close succession. And I also wouldn't want to have the barrier there even for the (uncached) MMIO read. 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. Aiui 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. --- v3: Move (and rename) read_tmcct() as previously suggested. v2: New. --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1183,18 +1183,20 @@ static void __init check_deadline_errata "please update microcode to version %#x (or later)\n", rev); } =20 -static void __init wait_tick_pvh(void) +uint32_t __init apic_tmcct_read(void) { - u64 lapse_ns =3D 1000000000ULL / HZ; - s_time_t start, curr_time; - - start =3D NOW(); + if ( x2apic_enabled ) + { + /* + * Have a barrier here just like in rdtsc_ordered() as it's + * unclear whether this non-serializing RDMSR also can be + * executed speculatively (like RDTSC can). + */ + alternative("lfence", "mfence", X86_FEATURE_MFENCE_RDTSC); + return apic_rdmsr(APIC_TMCCT); + } =20 - /* Won't wrap around */ - do { - cpu_relax(); - curr_time =3D NOW(); - } while ( curr_time - start < lapse_ns ); + return apic_mem_read(APIC_TMCCT); } =20 /* @@ -1212,9 +1214,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 */ @@ -1227,39 +1226,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,9 @@ 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); +uint32_t apic_tmcct_read(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 @@ -1018,6 +1019,67 @@ static u64 __init init_platform_timer(vo return rc; } =20 +static uint64_t __init read_pt_and_tmcct(uint32_t *tmcct) +{ + uint32_t tmcct_prev =3D *tmcct =3D apic_tmcct_read(), 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 apic_tmcct_read(); + 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 Sat May 18 23:14:55 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=fail (BodyHash is different from the expected one); dmarc=pass(p=quarantine dis=none) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1648719494536329.7540791765525; Thu, 31 Mar 2022 02:38:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.296826.505384 (Exim 4.92) (envelope-from ) id 1nZrFX-00028N-9V; Thu, 31 Mar 2022 09:37:51 +0000 Received: by outflank-mailman (output) from mailman id 296826.505384; Thu, 31 Mar 2022 09:37:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nZrFX-00028G-65; Thu, 31 Mar 2022 09:37:51 +0000 Received: by outflank-mailman (input) for mailman id 296826; Thu, 31 Mar 2022 09:37:49 +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 1nZr8B-00057w-QY for xen-devel@lists.xenproject.org; Thu, 31 Mar 2022 09:30:16 +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 2b92bb21-b0d5-11ec-a405-831a346695d4; Thu, 31 Mar 2022 11:30:15 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2054.outbound.protection.outlook.com [104.47.5.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-U0TuF9ktOt-h5zTVKqsFpQ-1; Thu, 31 Mar 2022 11:30:05 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by AM0PR04MB4817.eurprd04.prod.outlook.com (2603:10a6:208:c2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Thu, 31 Mar 2022 09:30:04 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.021; Thu, 31 Mar 2022 09:30:04 +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: 2b92bb21-b0d5-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648719014; 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=3QN0fYa0oMl7IDnTsZt7IRjYRX2ba78F7K2wvp/PpMw=; b=ZCt6B91Oa7DiTlHVE5OnFiW0b8QX5JytE/Dya4+OoDRRw3bQMTRdI4NZvfo8HymdgKePwp q++0ThB+ZX/19nUHxd71NLVacsq27sFSK51emuo3zdhcfI+oeuomyk/pk0pckv4nzHZJky +X28gEoBu1JgBuFViEMoKd42vsxS4d0= X-MC-Unique: U0TuF9ktOt-h5zTVKqsFpQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mE/dgmmFpD1MHBeaiac2Qb1sN1o2XByB6vGhfD69zJYIXi6k+0wla+sTKN1RETZgxxhF6YfkYQLBK2mYqsL5vvO8fcSyWgdKRrUNKLtZKD8lHkyU0L6/jUJbzzfpuiIDg2D1BtnMZ74BN/M+S4V9KnGtrRI0QU9o7CP8CiSt9fcfq12K2NNXPYhM9iRuYRhTIutbppwmGb57PEZgmJnsN3fr+di0TAQWEMH3kd3p6/SFFxsVgB+NZp9bfrINIB0+gy2XWLhQUPcZZ/rXiuXKUEmBTYySzYSDaBYdy1cMtCa717Gugebxq16e0t1eICk+CSpJyEHv/hrJzAcSIsWrsw== 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=wcbWh8araaOsLGTP+eR3aRWtZQ9q+jMuD82Drem89xU=; b=mk1sNRcZYfCYDBJ/0WAGcQD8JLkqXjtNHcXILSwHdu7m7F15jz1e/ldE7UEVr3vNEHZ+hS7tN54cTo80RdYNsY8/pw5E3QR+NzJBX0HHcF50WIyArF0vS6y/OoJzW3Q4HYK1aiUaCySiG1gvnlK15HiTD5VUdYGBP4oJ+TfYb5U8RjjXK/CE6HnTF7vchfCYJkdm+SBVyMD2Med2JBTrzB6u2+XrXy6JA/D4/uHrXBxcuNlVLdM7jKrntweXUQVmEUVNS0TANVB2lWcj5bdFReOMoG2MROaYoodZND55/iFzqDPXdw3MgsKjDYt65gmgGHACKAS8aCU324b9vBSmKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 31 Mar 2022 11:30:02 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH v4 2/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: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> In-Reply-To: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR07CA0022.eurprd07.prod.outlook.com (2603:10a6:20b:451::17) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 913e51fd-876e-41dc-fcf9-08da12f9099c X-MS-TrafficTypeDiagnostic: AM0PR04MB4817:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tYLzOJJY8URVXEMKABH47c+scSVSO6nA5Ip4Ktj+feTSn9rHyhF4ZT1NQK0a77dME5lg+eDGjL6Nj2UFnye2Ebucj7xHf1eaJPNe2yKAtRlw/Rb5qGLeDdK0itsbpAcUsNIXn1rvNSGl31LptOsFBgO5BKwTCbwwzwzNmGn3nzQ0lSeCZ61V3OhpXDYK90fYtK7eTL05dgmqxA45MbMv7sNh8a+bTwmoms5VQ9endsh5N20N6Fi7QODUwhYhxht8PMVt1Glr13nE0c3gogKsCg+ODMsQ4xD/goL+gWeNzuMNqpxRLLW84ezfmPQqQ3LxZmg8IDiqwdIK3v1s+aV9hp/uDSFpi8in/Wwkf624s3Wd1DmUJaOYLvFt7AWNZH3Iixibgyefq+8sL04OLWRo/1mRnW30zA+xA8bDrjBuGwNFYfw9xVCO7ebaNl0zeK/Yi92g+JBkA0TvNRLrRZCCRSqXlp/6CM7aEoGa8SqDXpmHHjJLJAmDB3+70BYOm7C3dljEkK+/Hmq8XyKpum2K6rvaMOrr+2wuZCp5XfVvA5nbYucaszmId62WOw9Y2Glk+oP29qTXtduS1sQvpTwFEpIOWTjJKdFIeOrjSt6fsArTZO5DAhrZMuAplhkQf49Vh0J/+MK9uw/4JuaDwtCIK2YucntVm0uE1rzmXiTVGdOnjfOBSZxXik9S4lpYd2acxYOTXnqgYhtSEpBQ6VFY21dQgnYZTec3gKj1WadBA4iXc0ncHGvGnXaV82Z6I3dI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6486002)(38100700002)(31686004)(5660300002)(508600001)(186003)(83380400001)(8936002)(26005)(2906002)(316002)(8676002)(4326008)(66476007)(31696002)(54906003)(6916009)(66946007)(86362001)(66556008)(2616005)(6506007)(6512007)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?11HFNgP9te8TFcyFrr6mtsEjqwkLTfK7IKU1v0OUGdhPicbl60VRWuYNFH04?= =?us-ascii?Q?j8I/umHdU73pMY7VSub+bn2iriyQeern8fbHIJfLQ6xge58xGadetvRXOKJZ?= =?us-ascii?Q?5+QRUMjoX1NXZ9Ui0TeqlnQf75gDRmydV9Di7T53h66DHggQcOgs4Gz+G9+l?= =?us-ascii?Q?TLKDF3nIou97/fKLE1LiyeCKuEhTgA4bqI5FdiMaOsFXP+MGT+ELodhBdtcD?= =?us-ascii?Q?ELvb+DZHpGM1JtL0AhRxv8oOvGy27scoZ/pu1qzDvjRZcLhea3LSfdNY1Fz4?= =?us-ascii?Q?JuXjja8YVerWAj7DQUoSINzBo2kEOaOAH4NmR5QDjEqCmgX29VrYd29e1Kx+?= =?us-ascii?Q?TFtYg8qSGZ2RNq6JZl0bKEInZpYTd06akvt08x55W8pm+z1WstcQ7K2WG+9F?= =?us-ascii?Q?4r2jhCG/LUcbmae6jdfdwmESHgYPo5TOYRh6Ly4/fTvGeQDB9vWK8DXaZR0F?= =?us-ascii?Q?upii1thJCbJrJJk4RjvYOtWrPyiYE2+jWXDyMYScRWtRekmaf3ExlpRDYJVq?= =?us-ascii?Q?LgKx1AYgBkn9NEfJMCfkSoBiOen0ieIcG+ocpcldq7RkgUkrlMWq4H9nTgLv?= =?us-ascii?Q?/5gTBRI2Ym0AjlJwTrbL3b0tRjMqzOgja1e/nx1J/HOatXJcyl0Uhso2/Tve?= =?us-ascii?Q?gnBIe4fCG0H7LTeI53xaS6ixIjyfSQqkBjrca8oTVUlmCcpX03WebOzUN9AB?= =?us-ascii?Q?gSXRHS9UFR3Ga7d9oBNAtbHzdWnNZ3oKhANZvhubRGwREHiJpU4bTe1/ycP3?= =?us-ascii?Q?W9Vd2Nak5zoFI2I0/u5diIbsuzoV30T2gxw71ip1bkY2aRzOPnENTW/Yr81W?= =?us-ascii?Q?Pejo1A/omqL2vwYx2tWTdwr65mAUwC+GNp0acRwMXYa2z2x5nZdcIHps8BXu?= =?us-ascii?Q?906aDM8l4qc6BKfW8Ho7pUqZV3BUueTU/C5iMcv1knWn7Hj83nwPBM1sOKAM?= =?us-ascii?Q?Kz7Ece1Zkw6jZWFtaP0P/1FpwusdHzc0aZ7w2kRqY3LhCoAMeZEVT6P9UFKv?= =?us-ascii?Q?UEHwmyr9jPM6UFQ28AKia+oNMwSK/ZabiDHwiBjAyuB+r6wcou1ZNwb0Twud?= =?us-ascii?Q?pbkv3+pAFLDq+QD/Pf4Sg6BrxZUgdrwgqCveIsa342yzrhT7nEnBrvcNZT7N?= =?us-ascii?Q?puaHwzPjyxW2gb/1wYnyIap2xNuvASgOWurIR/ovta8tJgzXdEmSTEbd/mpM?= =?us-ascii?Q?1JjNCH8o/abaAsc/IKkCXqaNKoToQUmduuScChSJQGYgau6K0v5Uf0/cuV3p?= =?us-ascii?Q?DBZ8moBxYwQeM7d+QO7x49oynTPzWnGdSIb44aWhhefzMH4ge4NCNU7uLMlE?= =?us-ascii?Q?kXISa6pPJw9TiDa9+3ObqUW3mqi60oWWxSLOBfMxrgvJW646QKYMZRooB7U4?= =?us-ascii?Q?nlosd2lbLU0oX23nUE1920hVBduWWFBNN63+8hQ1XMUO2da3yDwf4XxJXV8a?= =?us-ascii?Q?gsKPCyNB3tYvmqxFVQurgJtTmcwCFsyJzv0CllqVryaFwT4UE9l8LWdBoLDY?= =?us-ascii?Q?WTL3Xm9nqsQRtvtKhL1gRRStNUkAVlBz4I/onszmpmc0SrmRL8YFeouPuWzo?= =?us-ascii?Q?ppc1rCS8nkK4Fj6dEazvT2OuIdBpQr1vhk6tB1YnyjFX6bxDyAgc8g1ZP4o6?= =?us-ascii?Q?zmfdE7lvTZaAGzKYsyad688PiMR4Ca9Mg/7uxPHucMSOh2y/WAfT3OVYkT9m?= =?us-ascii?Q?g1x9XO9SbFuXUFEWX2Brd4Va4c8inl1AsUMTjFHxU+w08uvz7u/6sH8FzW1n?= =?us-ascii?Q?ur0YfvN9Sw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 913e51fd-876e-41dc-fcf9-08da12f9099c X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:30:04.4723 (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: xjZ1aTJ7T1kf4pyTcCMMTUIc814PdL2n+rEIRPpVgZFjb9oMpSj4uV46orw/KIIXacs73BigcNPOPgBdeByPXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4817 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1648719495391100001 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 Reviewed-by: Roger Pau Monn=C3=A9 --- v3: Introduce and use PASTE() instead of (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_ONESHOT | 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 | PASTE(APIC_TDR_DIV_, APIC_DIVISOR)); =20 apic_write(APIC_TMICT, clocks / APIC_DIVISOR); } @@ -1212,6 +1212,8 @@ uint32_t __init apic_tmcct_read(void) * 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. */ @@ -1265,8 +1267,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 */ @@ -1353,7 +1355,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. */ @@ -888,7 +888,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); @@ -1020,7 +1020,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 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -13,6 +13,10 @@ #define count_args(args...) \ count_args_(., ## args, 8, 7, 6, 5, 4, 3, 2, 1, 0) =20 +/* Indirect macros required for expanded argument pasting. */ +#define PASTE_(a, b) a ## b +#define PASTE(a, b) PASTE_(a, b) + #ifndef __ASSEMBLY__ =20 #include From nobody Sat May 18 23:14:55 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=1648719099; cv=pass; d=zohomail.com; s=zohoarc; b=cYgoPJPCm0mC2y87sL8c81GXV14moPXXx3nWBzxTOMMpIxuzH3v2uz9GPMS45+PYsIWtuaWegpBwH3JzhdMiwCNfcOSNjzuiC7Altbx3w74tAOafsSDYyl8cCKiHVV7utBQ3c3BVjc2AgHJidf4Kti+HoLSs1BCEcN74j/rCkFw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648719099; 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=6S1HpDENtJ7ubBweYtGrl5poiiLyhdsWba6MqBcEJhM=; b=SxKUwJhGUZ+mlaS7eg5HsUYq0jUD2IzRt6B12wv846bg2s/YKaTCZBg4jmWVNZDpIne/rYlvpFOBMt2P/z2tpvFEEk0LkPhw6XooDcYDA7dwOQ6l6IuNjZd8/4f5y3E8KxfIxCzkpoAXTrHlQflNKwwrjcmpy74yh7fqz53b8ds= 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 1648719099816208.8622173195149; Thu, 31 Mar 2022 02:31:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.296811.505359 (Exim 4.92) (envelope-from ) id 1nZr9D-0000fM-6E; Thu, 31 Mar 2022 09:31:19 +0000 Received: by outflank-mailman (output) from mailman id 296811.505359; Thu, 31 Mar 2022 09:31:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nZr9D-0000fF-39; Thu, 31 Mar 2022 09:31:19 +0000 Received: by outflank-mailman (input) for mailman id 296811; Thu, 31 Mar 2022 09:31:18 +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 1nZr9C-0000f9-FY for xen-devel@lists.xenproject.org; Thu, 31 Mar 2022 09:31:18 +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 50e03e4f-b0d5-11ec-a405-831a346695d4; Thu, 31 Mar 2022 11:31:17 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2052.outbound.protection.outlook.com [104.47.6.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-gRSW_mqeP9yo4G6zBTyBgw-1; Thu, 31 Mar 2022 11:31:06 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by AM0PR04MB4785.eurprd04.prod.outlook.com (2603:10a6:208:c2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Thu, 31 Mar 2022 09:31:05 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.021; Thu, 31 Mar 2022 09:31:05 +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: 50e03e4f-b0d5-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648719077; 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=6S1HpDENtJ7ubBweYtGrl5poiiLyhdsWba6MqBcEJhM=; b=QOn1Y0KXP5Ng5TnCmNJmGjITdOzhuA7NRwJcW61TIVGRleU4TdFOhN+ZWq38BVvITjD9oQ Tq3ajD/cG/9cYBaZMNpwojRBRHtiIgJABRqKrzobClXuGQX79Ug4UFFabHisyG27nIfZD0 PORPYEB6X72ibnv2m5r4AXTNklPJNGU= X-MC-Unique: gRSW_mqeP9yo4G6zBTyBgw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UC0dpPWDisbFK77x9NKqkHvYBfBYBJC5/LqvKLpR/Ag6iCeOvoMYCAp6La3M8ivSqXZjgoXh9dIz0uoVKMgzltx7fOxL5Bvbm6774RO90kwIKibyfcid2ZGh9sdePSkhVurbUZMGzsyskLnH603NrUbUorJpSnmG4WQ8SkF904IluKnBVbO0ec68ERDbU3jCzDwfNJQDuRgMZfH6HpoHo1Hv70udwve94hLyn1cXIUOBpaLWQO1npjIuwGGtr6yqUdW5xSYwRVS6ONvE2LCFjz9BnMaV3o2+D29WO55kqkLGtv30VROx0ytcqBuTDVecRANtUEji9Y2RGOV62NxCoA== 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=6S1HpDENtJ7ubBweYtGrl5poiiLyhdsWba6MqBcEJhM=; b=G/CvAumSVmKG3+SKVSitG3KZ/o8Sug/S2l3Z3FUpLpEG6xTfL7aNn5/X/RgLkAWwrBXlyA7U1rkrjR5oudC3byxjrgl8GezSoa31CiTtK7z4P6yiyldicBEhX8E2V6xnYrhaKzLPzFz67P/ugVox4kF4uqzlYH190YTQyjwFtdB3EhUUtflzgZkte+od9kwuJMcogdbrhFynbw+P6l1D+aqxMg6hxNyx0WuIoW0x4G40htPRFxnmHNF+OWS15bNTvD8if6G+A8LlQMUvP0fg3qLWA83zvKv57K6eIr2GF+OYzJTFqBReUF1YyTGokRbw1ICvLliFCIcuMOolIU99zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9a0cf101-17fa-cad2-e791-15d8d8cc5b79@suse.com> Date: Thu, 31 Mar 2022 11:31:02 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH v4 3/4] include: move STR() and IS_ALIGNED() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , Bertrand Marquis References: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> In-Reply-To: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P195CA0084.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::25) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfe9777b-35ee-4364-9c30-08da12f92d99 X-MS-TrafficTypeDiagnostic: AM0PR04MB4785:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bvotVQF+FjFhDv++DtZH9hiCfEvuwzQ9U3JALWnl7l968Lkay3EHtBUBOaBGxUS3tXQZG/N/12L814prU787IgaTRcE7AxpXATeNODS3v3qo0xCc8Hh2bjTHgijNke59ivEovq04aid9VEqTZSUUjgvUFnnw0blfHKZN12+agv/Ho/8TW2v2yURa7s5+XvgnbHi7xfQql/2VboymB4ndoCOH5C5VLqaA8lRspW4q+ESjVg26GPmpMmwOc5/n7kk+kSziGD4b4Uc1U1q6EL2leFpPQ3oy3n7Q5N305/ajuUBpy6DrTFbeVPV9ol1gNZBg3zDc4WaleqnFwVwJWe40apZ7xaClYH+xLXlRBZFsN4gots/61CU87y/+5fO7jACb8EwgR3ovD11JXQyAQ965llQRgJ5xvl8r7P6J3Vk6ladwfXLgtPKqcVChiKUXopXpIELxEGJrPcIpKkI7TA+7J4j6njtB/CA3h4BpEBupor5+DsoZ4qKKETXmzKOk3DZ62MGj2nG9v91OudH3dbwvkLwGCYpV0YMbZpP23szTuZcQEx5d8m/I3+ylJFA0o5Ve3ru2Jn9MviQIZPfPzO84X2GBI5lldzZzPbX9Mo2/YrR1G16nLuLitG762n0gOs1gV4pNzuVcIrdlEluSKDwigjiZ9OUgpgzAsQHCJcU8HNWkZEKK/cXN+oGua6gBRQj2BN0Bdvnh+xTVFDwPYiItg2LRMdmYQPifvWcN2h4ZaUwy+3T4+C8ML15Sgp7bOfvz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(86362001)(186003)(6512007)(6506007)(2616005)(31696002)(26005)(38100700002)(2906002)(4326008)(36756003)(8936002)(31686004)(66556008)(66946007)(66476007)(5660300002)(8676002)(6486002)(6916009)(54906003)(508600001)(316002)(6666004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QTMzb2hodDBNT08zMzBEcVlPclVDZnVodTU1ODFqRVNjUXlLTzR4Qm9lc2J2?= =?utf-8?B?ZEJ4WnhiRnowZGdMN1RlNXEzdUtIWm9mWld5MzJtRG1HS0RmNG5JUzVmK2h6?= =?utf-8?B?S1IzeDIzZnd0bUNFOU5Tc2ExVjBpRmVJUWJ3VlptWUJyME5rTHJjcjR1dER0?= =?utf-8?B?MzFmTzE5R090ak1LLzd1dG81UER0YWRhWlhZdFI2R1BJTjlpNldva1ZnbmVH?= =?utf-8?B?MGdJVUMwTW9tcnZsR2c5ZFpsZmx2eWZYeG1Fd1JGNzJuRzd6T2l4OStMRmhr?= =?utf-8?B?ckZ5VkUyWUhMaGNxc09FZi8rR0RlVk56M0daa1I5dlVqejlpTng0akUyZEhW?= =?utf-8?B?cHNaOEdiOERSMVpFU01McDd2OFNEU0xrOC9pU3JMMkdrajdKZUFGcGZnSHZ0?= =?utf-8?B?OVBnaXVuMEJLWFJTL0tKaTQ2b1RSVFkvSVdlakpVN1JCT3FvNTBtK1h1MHNs?= =?utf-8?B?THQvYWR0RytPelU3YmlkMzZWN21MMFd3RjlYWEJxaXNoRWRqV3dCVWM2djhZ?= =?utf-8?B?OUZiL0ZFM3kyOHJMMXBmbnRPUDdnWXdVZ1pSaENwVHV1WUZrSHRYNUtPcmJK?= =?utf-8?B?bWJkbHhVdDVPUFNDVWFvSDJqOTNUMG9WQVo5SWo5My81ZVBoc2kvT3FkOXd4?= =?utf-8?B?WlBhOXRETmJ0UTQ4cnpiY3h4c3FPUzhwaHlZN0luNFBiNmRNU1pCZVNSeFVv?= =?utf-8?B?WStwTGZXYnlhaTlZUGF1aXVrdVpCWnlKbW42Q2ZINXAyVEJTRE50WkZac1Vo?= =?utf-8?B?WFZ4U2hCdHVmcmQxc0o4d3BrcmpuZkVUR0E0TWlzOHdmUFRLVngwY1VMbTNu?= =?utf-8?B?WDVOUTZkSmc5b0pFK01ZZ2RobkdPTmZuTE5US3BIL01kellCQ2J0cXRFZktW?= =?utf-8?B?eisyb2hGc1dmTUQyU2pRZmdQNU9vTXdCMGd5MFBxaUhmRTN0U1R4UTJTNkRV?= =?utf-8?B?S08wK2pNN011ZzRLOFVxaUF6dkJ3WUp5ZG4vUS92ZDlZc2F3Q2FwRFNLMk13?= =?utf-8?B?dGlBUDJONllRSkFyUDVEelNvWFloZDFIVjZNZ1hsektFQ1NidmxjdDFqSWhL?= =?utf-8?B?MGN4b0NzbVZ0VlhqRU9ETnRnWmhoMEhNU2NEWURKdWFjbHc5OGF2blR5WHhm?= =?utf-8?B?V3ZqNG53UVlBVEdUZ2N2QWFDQzBqZDc0czRlbmFxMDQrZXFROC84MVRqQnJN?= =?utf-8?B?MTFvOHZMdlorM2s2WkhsdENyMnZIaXRsckJ4VmFIOFNxb0lWTzlUTnlnTnQx?= =?utf-8?B?S1FxdExMSlNsSElCQU9QSW1INzMxeEpNYVVaTnphcmZiOTdQdjJIaXM4clUx?= =?utf-8?B?UVVqU21qM0xLSWJyV0p0ZGZkaEdaTGFFNTI0U3JFQ1ArUE1SSVYxVGlWOHk2?= =?utf-8?B?bjJkd1R6bTI4bEdwT0o5WXlVeGN4WitRSm02MjZVWG1sMU9wM0JGcmhPSUZX?= =?utf-8?B?RVlyYUdmVGVtYW1OaVJCTTdxYjJKQWRDTnIvMzJGNGlQbWt5TTM1dEN1K0JL?= =?utf-8?B?Vm5YR2d3d1RvMXY3bmcrQkxQaVVKemVneVRYUENQRWNFb0ViZ0ZaMmREMGZM?= =?utf-8?B?U2VhbHRzNkhVUnE3dkdGRjlGUjBadmhabjc1TUM4WFovRUYwUnZhZmxXa3lE?= =?utf-8?B?bUxveHdRbFhtTGpjanNKN01BTk9UZ2FzcG5rUHZERVpjL2VaNk9KR0k0eEg2?= =?utf-8?B?eldad0RwNGJhQzBBb1liYUJRRUExT3hZb2ludVhXSG5nU1I3WVFpdGNTNVZC?= =?utf-8?B?M205WGpjV0N0dlRLd2gxQWo5NlBVT1FUQWkvR3pCRzRLZXpWdWNsSVU1eVdW?= =?utf-8?B?KzlPOHRRMnJVOHR3Uzl4NGNGWEhXekxBNUFKOTkzc3RYZFQzMjBuYzBoVGFZ?= =?utf-8?B?WEM4bHE2dHV2RXN4ZWN3NE5OZUUyalZwZDlQcXJ5d081VkhGV1l5N2xjNVNK?= =?utf-8?B?VWsvQVVCblB3Nk03MnQ1ak1HWDFGeDlDMEdqeUQwL1VncG50aVFWSFNqMmJr?= =?utf-8?B?d1A4ckNkWHFHU1A5ckdBL05iempQVkExaUJLUHJ1djYyR1dIVzNoQ0NkK0Iy?= =?utf-8?B?aWxOQ0tiNGtOVTZlNW1kck8rRzlGMnVnVmpxMzYzeWl2cDBsWktHc09XeFZo?= =?utf-8?B?aXlXRjRTRFFJMTJTWWpma1hHcHdGcVowSURoQTBnSFZNNmNRZzQ2T0VPOGg2?= =?utf-8?B?djFEbDY3Qjc5QWxuMk1BdEpFZDdmTWo0VVkxby9vUXphMzJCWWZvalE3NFEw?= =?utf-8?B?NDR4ZzloVzNzYXZ0dStidWZ6TXQzNnFkKzJpUlB0SnJPTVdYdGt6aUpvWkh1?= =?utf-8?B?L0ppMXUzcS96VUpFb2JiUHJXRERZaENuM1A3a3JzOG9aLzB1emNqUT09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfe9777b-35ee-4364-9c30-08da12f92d99 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:31:05.0513 (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: iyQo+QIxmnywGGchhQ7FiWugKU5JHj7Q2YpbMLh9pjeJs7pXaiSNg6/dQm+imuItCIJoLYUReW/A3furLsg9iQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4785 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1648719101255100001 Content-Type: text/plain; charset="utf-8" lib.h is imo a better fit for them than config.h. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- v4: New. --- Originally I thought I'd also move KB() etc, but they're used in places where yet further adjustments (adding of #include) would be necessary. --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -3,6 +3,7 @@ /* Modified for ARM Xen by Ian Campbell */ =20 #include +#include #include #undef ENTRY #undef ALIGN --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -2,6 +2,7 @@ /* Modified for i386/x86-64 Xen by Keir Fraser */ =20 #include +#include #include #undef ENTRY #undef ALIGN --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -82,11 +82,6 @@ #define MB(_mb) (_AC(_mb, ULL) << 20) #define GB(_gb) (_AC(_gb, ULL) << 30) =20 -#define IS_ALIGNED(val, align) (((val) & ((align) - 1)) =3D=3D 0) - -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* allow existing code to work with Kconfig variable */ #define NR_CPUS CONFIG_NR_CPUS =20 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -3,6 +3,8 @@ =20 #define ROUNDUP(x, a) (((x) + (a) - 1) & ~((a) - 1)) =20 +#define IS_ALIGNED(val, align) (!((val) & ((align) - 1))) + #define DIV_ROUND(n, d) (((n) + (d) / 2) / (d)) #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) =20 @@ -17,6 +19,9 @@ #define PASTE_(a, b) a ## b #define PASTE(a, b) PASTE_(a, b) =20 +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #ifndef __ASSEMBLY__ =20 #include From nobody Sat May 18 23:14:55 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=1648719129; cv=pass; d=zohomail.com; s=zohoarc; b=e4PBP3+Azt9JDIXCOlHa95i9ZZZImUDOPPeDikXtSR1uhfRuXVlTxv6AA30XYn4uT9bWXVG8Irgdd+Q7o/VLy2JlfGnTjWIOAnJAEviK/ikzaaIJ2fYIeGMdf9685RH5rl57jrFwfHRjvmTG8I+dzlJNC0xhTEjhYIhGlsDXjAg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648719129; 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=jBAjZm98iC0F+YOWTsR9A+UOqJAYXH4F89jCY3IBJtM=; b=nZGDhsXEm7kO4Pzx4QSRnuaHNzoqtVshMNFRWdaKCm9Z5BVKNNhB5T8uvoarcSNGRSbvooKp7banwXTyPR9x3kNeZnZvSSwYD3c0zRE9ew+hfvNUd0cPbfm+Zcv2LMOOZAX7weZAlhhUSN049MrlOAiOcxl2NLE502Pp7RIS4t0= 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 1648719129804496.104690044073; Thu, 31 Mar 2022 02:32:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.296814.505370 (Exim 4.92) (envelope-from ) id 1nZr9e-0001B6-Ex; Thu, 31 Mar 2022 09:31:46 +0000 Received: by outflank-mailman (output) from mailman id 296814.505370; Thu, 31 Mar 2022 09:31:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nZr9e-0001Az-Bn; Thu, 31 Mar 2022 09:31:46 +0000 Received: by outflank-mailman (input) for mailman id 296814; Thu, 31 Mar 2022 09:31:45 +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 1nZr9c-00013U-SO for xen-devel@lists.xenproject.org; Thu, 31 Mar 2022 09:31:44 +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 60d82a1f-b0d5-11ec-8fbc-03012f2f19d4; Thu, 31 Mar 2022 11:31:44 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2051.outbound.protection.outlook.com [104.47.6.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-44fwi6iCPzqeDl45Hw4PAQ-1; Thu, 31 Mar 2022 11:31:41 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by AM0PR04MB4785.eurprd04.prod.outlook.com (2603:10a6:208:c2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Thu, 31 Mar 2022 09:31:40 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.021; Thu, 31 Mar 2022 09:31:40 +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: 60d82a1f-b0d5-11ec-8fbc-03012f2f19d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648719103; 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=jBAjZm98iC0F+YOWTsR9A+UOqJAYXH4F89jCY3IBJtM=; b=kE3FC8q3m5VsNYu9ZPsK45C1XyC0i42v8vSGSyvz10mg0h0eS2PmhahRBt3baQqH5nfQzg gdN0wzpsGh1NOJOr/vVyE0EkuhL/KB/8A4NcDL///zwZTOv/GEC2nmumovwccEv9C4W4x0 NIUtuF8RSOAg+1Rf7MaZjHhhe6JWSY0= X-MC-Unique: 44fwi6iCPzqeDl45Hw4PAQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWSzYQcP5ZqG3Qi3jahptgK2O58ET3PmQl1yPJyoFoe+vleYXO34scJlHOaTGLnWXl6zAhLIbAVBMVvwB4ToGGYC8ImvLNxGcfqBFxe6RKjaPpKjtrmnibAK5V5AMW/bGVat3mASL8BLKaTqdUAR6r7uQi8oMwkJmUdIJVGxIypWsGwHbzkeYi+aopnQ3VmzxD+GhcDvh5WvXMWDLh1/NXxQ6tyy3UPZ2t6nDfzhfVnuTkXdHOOrrN7CPRvsEwOSWr7QdJOmK8EhWg4CEnwHrwaQ0fTFl0hs8ZosvqEoGUivEPiqCeQcwHeeXkRVpdfImV2EXwKFQUDnvnX57Sgw7Q== 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=jBAjZm98iC0F+YOWTsR9A+UOqJAYXH4F89jCY3IBJtM=; b=bHjVanWlzBfP53Td+x0yDE0dnh1+aPixi3xC0EZxcWIFgzD7K6ZzgAWkZFECB8fsctseuzVavRXqil7gGvHhpvm0V4XXXPR6FnAhvjfzgIt9d9FT4Qh2Irgd0Vc6BcxozA9F3uEB71WAqLw55KM1ocV3GicQTCHbtvWXLxiGQjIsThwwrX21rrCCG0S9S0hwpjtXAlQ/Q8oxGsYklaBzxKiWGbZlTrr6bxHhooacrp9f3nwuTDnuf2qo0FxKppXPca6YwRl2/LFCsqpKxmJ/hbHZ3w0obtjbfcOQzTiB9syjsHn1pW1y7i4zaf6/LwPqHoppKBL++EMu/H6pPWbX4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 31 Mar 2022 11:31:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH v4 4/4] x86/time: use fake read_tsc() 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: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> In-Reply-To: <6e540bc9-c536-84ac-fb1c-8271e7731b3e@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P195CA0103.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::44) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0446f779-4413-4d46-3a53-08da12f942b0 X-MS-TrafficTypeDiagnostic: AM0PR04MB4785:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7s5WXmuCuH1k52f7osJEVgijIzkREF+2IO6Y0ycz6azJ5UnACsmWqPvaRI7eUZE4Y+KPHOQl1whNVZd0YFGSUeSuqAZb2ufHE4AIjSStfAsXrwGwqNDI+wuM4S9xIP29CSsRNen3maPaVemZ7d7biAfSEG9QuyQGNZwobb0BzEL2MWsluuZEjLo1akOI0XxAAASR0QmNiW6ka/o5C9p/Z/H//jFrlS6O3MDG8cwkheHOFFExPkyZnLmstvNTy3gE4lCuhUcT4q+9K3DOFSGAOn5BNzmiB0dH848W9GWZCBMwjxg7QCoopIZZUiY+ec0/1iAtmJAh1DPfppX5v6RSR1wIoQU7bdKgFIzkhQWOJp9J6M2BScXvbENHx/7qYYAkzTGLKtLxjh8gq5ZSG20m6OMPQnUkCvjvL90V9JZNPmW3h2Ip4tEKrMfhSUG1Dtpx12ZhfhlC3mTiEGNOjzTu792PVrQoJ70Mm0kCx9Kyu49Y85JD8ZH8WeZjqU2Z/O2WHD36+aWtkZclsno+3CapwFkFBNTcAh51CjOmOGspxwlJxDQ7BMgtVWKSomXvKH2zhjPVGR96Tdl8hKo/vhkTYPaWCdAfaTaeAslZgAZM58pIT5j0ctIjJudmZKbO9JfRyxEhnZBpdVeyfNA0nXAyM4DrIfV0fbn2Yt6xtOL3mFWMD7JbSoKjI9iD7VQx2JFUze+nE4myxU0ZyBl3qGgJizNy5gK06JDulgh+K6Ps+tQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(86362001)(186003)(6512007)(6506007)(2616005)(31696002)(26005)(38100700002)(83380400001)(2906002)(4326008)(36756003)(8936002)(31686004)(66556008)(66946007)(66476007)(5660300002)(8676002)(6486002)(6916009)(54906003)(508600001)(316002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R0l4bEZHSUlMQUUxbW83TlVxa0lXTFBkdjM3QThnOGJ4azBqUTQ0REdURG5W?= =?utf-8?B?dHIvZUVlV3JkSkxSSGZXTFF0R1FNMjRGOGNiSzNmTmNObVRnakNUZmlnMG9n?= =?utf-8?B?Ti8rU0JUdy94UnkycXBSTnVRN0IrSXM0R3NrRXA2ZlNnb1JrMTI4d1RxajlD?= =?utf-8?B?LzdqK04wQ3poemdKWElydTRBemRMclBjQ2V4OGhBVEhPNTVpZ1JKNXA3Qzht?= =?utf-8?B?cktpN0k0Sm1BZ0RoZWxwVUZRTGFBZ2VmcmlOYVovNG15OG50Q01KaFlLMU1H?= =?utf-8?B?Q052YkdPQkRWQmR2ekRvRnZPMFcwQ2FsRzhoWE5CMktLQk10Qkpxci9hdkkx?= =?utf-8?B?MkowQkNkaFV3cTlUSndFN05SUmdnNkZnQWNXNnpsSXQ1d1BvWEFSQlYwa0px?= =?utf-8?B?cU1lSU1hNFdZMXB2SFdxZTFTU3pNNTB5dVRITmcvYm00ei8zdDNMeFY4eVM2?= =?utf-8?B?Um14UkJOZzRnRHlya2lURVJtZmUyUGdzMU53UmViRG1KV3Y0aHlGaTZMdENN?= =?utf-8?B?NFgyeFRZSzl3eExxdHdyT1ZzRWw0OHhPdEw3aHY0Rkx1TGJ5U1FFcGdPbVYr?= =?utf-8?B?cTFhWllxc1BYYjVKdlpCM2d4cTZWcDNUZ2JwRTZOQUNZTVNSMXAvVGh2U0pV?= =?utf-8?B?bUFRcFg5NEF6Ly80OXJONmhqU1BTWHUrVXJIZmM1YkprRlBqV3Fpd01GaXZj?= =?utf-8?B?c21sOTRjSllQQlUxZ3JRLy81ZDN2ZGRWWUluQmdKUzA4SEJKMzRpemFqZ0x4?= =?utf-8?B?RmJ4MlFNS21LY3c5Q1N3aWlGU005REYyd2VHNUVvMVJtVkZ5TWxLbytyOHVV?= =?utf-8?B?aU4wZWoyS1ZHbjVpUWo3Z0pOVnBtY0dBWjhXM1V2a2dwa28zdnRpSm1IN21B?= =?utf-8?B?OXRYaGVFblF5Yk50S2VLaGlZS3NUS0FpdWZnU2NQV2I3SkpMdG96bU1vU2VJ?= =?utf-8?B?MHBkQzVCdmxsaG1GZ1NJa2RHdGhLc0M3dGdEUzk5R1BiN3V3ZGR3MEtuRVZq?= =?utf-8?B?RUdkSG5RTitCQm1tTk8vaFUwU294dUFVczVmU2FueG5VRXUwVFV4ZXhRTG50?= =?utf-8?B?MWZsenFwN3d1VjAvWkRlUTFtWEtSNFhaK3FFTjh2K2lTTjE4NUxYRmw5TE5l?= =?utf-8?B?SFBWUGZVTTNjelFZK0dnZ29LckoxdWprdmJEWURuU3JtY28vSmdqRzcvd1Bt?= =?utf-8?B?N3hrY1hqSThlNGRFdnFZVTVPQUdwSzYvTWRIZDdUbzgwTU5qWlB3R1JiUC9t?= =?utf-8?B?L3B5R0JPM1lSSURvK1J2S1R0Z04yWXk2eUg3NUJFTWZvRDVaVitXV3EvRkRE?= =?utf-8?B?RzJCQ0NTRTVpYU12V2JWSjVjNFFRQU5FeUtveS9weTVYZzBTQWlDdU8rQ1RJ?= =?utf-8?B?bWUvQVBnN2diMG9HSjdCZzFEd3o5NE9yZC9EMnJoMW5BWkNGNEQ4YlpidkRT?= =?utf-8?B?K1B1aEY3YmpUUnBTM1N5TDBOcFl2OHVKWTlOT1p6eWxpd0pSTnFFUTlLbjQx?= =?utf-8?B?VXYvWWdJSlNpZDFvVCt6U3NPNUNWUHFLN0tzMWd3NWZXUGRhbGtCZjY3YnBo?= =?utf-8?B?SlQ3bnpXNzdtcjVIVkZLVHppOC9zSWRxZVREUmY5UFVkeFNHd1dpd2QzaFJK?= =?utf-8?B?VVo4WkFSLzM5bHV6WU9lS1dJMFdiVlNCTjZYRGVtSWRMaEhiVEpHKzhjSUpw?= =?utf-8?B?RkVwcGxpMUpXVFlqNWR5OHJTYUJmcWVFYUFyRVdVcGlzcnFEeTA3ck5Wakdo?= =?utf-8?B?N0N2RFBEWk84MGlkRE9EQXBiRG5jaFVPZGxUYU93SU5TeHVIeEc2UW5vZUhG?= =?utf-8?B?UC94dXZuWFl3NVlZZUpWYUk1NU14Tlk0Rk1MemUyb0YzaTA2TEFNVHFQRzkr?= =?utf-8?B?SUZrc1FyRjFHRjNpM0ZsUnYyUmlUOHlEeFQyS2lKVHJId0l3cGd1L2hiaDl1?= =?utf-8?B?Y2Z2TFc5RU5XYmpOYzNVUjlXZFljSU9DZUxzaWZ5MU5wa25BRlpSaDdkWDho?= =?utf-8?B?NE9mS3dib2ZQMzdKV25wNkFZcm4rY24xWlFrNGdwYyt4MkU1c092MHFaZGQ0?= =?utf-8?B?R2d2VzhzYXY2QWx2MG5RR0RDOW9sYmhZQUZVTHVUZFVPMXNNbHZXYWJSeUZy?= =?utf-8?B?Tk1PbjZIenNLMDZLUmg0eHdvSnNiR25jOVd0WWU2RURzOFNJMXZpVTYvQWtQ?= =?utf-8?B?OEtDWldXRUtSNjRzN3dPSlRpVVJTc3puZDlmUlo4dmNFTEtURkJMTXJQZTJi?= =?utf-8?B?M1d3VmlaZlVYVlFNZWZXZk1lejB1aUhIQk9iNDRSaGQzV2EvcWQ0SGVvanUr?= =?utf-8?B?RklDa0tWTXNmSjA0ZUNUMnJHaXJQQVFjMi8rRkZaVDlqU3E4K3FIZz09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0446f779-4413-4d46-3a53-08da12f942b0 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:31:40.6047 (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: 5pJUU8K1n3ZWoN9DYd9ZTpFlnnkdLXvGJ3md7w+6azy/wFkwuU5JwdxE71jXbr7KxcK51QDiT+a3EDJW5SSRhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4785 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1648719131382100001 Content-Type: text/plain; charset="utf-8" Go a step further than bed9ae54df44 ("x86/time: switch platform timer hooks to altcall") did and eliminate the "real" read_tsc() altogether: It's not used except in pointer comparisons, and hence it looks overall more safe to simply poison plt_tsc's read_counter hook. Signed-off-by: Jan Beulich --- I wasn't really sure whether it would be better to use simply void * for the type of the expression, resulting in an undesirable data -> function pointer conversion, but making it impossible to mistakenly try and call the (fake) function directly. --- v2: Comment wording. --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -607,10 +607,12 @@ static s64 __init cf_check init_tsc(stru return ret; } =20 -static uint64_t __init cf_check read_tsc(void) -{ - return rdtsc_ordered(); -} +/* + * plt_tsc's read_counter hook is not (and should not be) invoked via the + * struct field. To avoid carrying an unused, indirectly reachable functio= n, + * poison the field with an easily identifiable non-canonical pointer. + */ +#define read_tsc ((uint64_t(*)(void))0x75C75C75C75C75C0ul) =20 static struct platform_timesource __initdata_cf_clobber plt_tsc =3D {