From nobody Fri May 17 11:29:01 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=1646132786; cv=pass; d=zohomail.com; s=zohoarc; b=aRphJ6YG6C0e+7uexJsbdj+VV8s7yWO/QwYYUj0Lo7mk9PmPQT1UGW0Oa5YMZ+weDbu/Lq24PGIcOEkHEb0saMu6CWfEZnBweWWZIOzrwMTNl4pLqeo2LVisWp8978GTFvdjYYGIkhkUeNlncHjmQb9UZs1nDPsGhUZBi33qHb8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646132786; 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=yVhh9raFqY1k1mmmz8RZiJfkzqL7jHEKprsJSfJ+qW8=; b=STOg1lL0vZMXavoIuw9XqI0ZS7EGkQn5sqy07BRWjWeYgDThTjY6fiFYBI2ct2rmcmn3m0CYACf8Ty/CgRz6u8ScqTrXg8gfmenVurZtkfZwWEVzprA6ve5S7ZqXqqWf/IUmt39qnmVVgV4McOcB6IJPov6xym/0gacSf7mEblE= 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 1646132786241308.6401380822317; Tue, 1 Mar 2022 03:06:26 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.281245.479491 (Exim 4.92) (envelope-from ) id 1nP0KH-0005sA-Pq; Tue, 01 Mar 2022 11:05:53 +0000 Received: by outflank-mailman (output) from mailman id 281245.479491; Tue, 01 Mar 2022 11:05:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nP0KH-0005s3-MR; Tue, 01 Mar 2022 11:05:53 +0000 Received: by outflank-mailman (input) for mailman id 281245; Tue, 01 Mar 2022 11:05:52 +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 1nP0KG-0005rB-DZ for xen-devel@lists.xenproject.org; Tue, 01 Mar 2022 11:05:52 +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 8e601d69-994f-11ec-8539-5f4723681683; Tue, 01 Mar 2022 12:05:51 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2059.outbound.protection.outlook.com [104.47.4.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-bIPFnNKYN3uSy7cJjYTBhA-2; Tue, 01 Mar 2022 12:05:49 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by PAXPR04MB8095.eurprd04.prod.outlook.com (2603:10a6:102:1c6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Tue, 1 Mar 2022 11:05:49 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5017.027; Tue, 1 Mar 2022 11:05:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8e601d69-994f-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646132751; 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=yVhh9raFqY1k1mmmz8RZiJfkzqL7jHEKprsJSfJ+qW8=; b=HLdOUkx+gebQi2TvLwqlywxBsKktvMc9Hv5XBYqScvWGUQ1Xxg8LlJ6feFTdd9yfucTuLL 7u0r93VUqP88e9Mfwtm8nX08mjHoIxgM1KVEUeZThtDP5gpRnC75NLjWfQfX814LE6XCln pL3JUez3K6cCvowuK+9IxH71toaBa+M= X-MC-Unique: bIPFnNKYN3uSy7cJjYTBhA-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRdmnOnjSJ2Uvo98Tm4jPYGnspuBqOptTwVzWy63A5oEvqHELWgEHrrBuhhH26TOBO5dYNO56E6XVoW1n+l4Ovkp93471Y7WgMtI2vlYfySZOk2oZiQSZtohFjNMvxZYUhXiTaGI9AeZ5EqQeowoAzhX5TAm8/eax3C0pq3QRPGULmBS2okUxcZD0/pFZjjCPUK54HnMkNF0ABwMqYsA4Gizai7yPoACVHYE2VpyCpwpsZXsAmlZn43Tg2EDeXgXhasKFQUl4x0J+HsKvSHLWHCpIuQC0HpTVdBf/Cu6cvubKZxMPEds8hlSWBbLmhIRWU5HsvUpJV8ULfQlsTwVDQ== 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=yVhh9raFqY1k1mmmz8RZiJfkzqL7jHEKprsJSfJ+qW8=; b=jWCBziFs9DYO4cOpBFWd56R5GdRyQDRW0Ktv1A7qpK25XnhBlHOPKPbo6GKtL0giyHF6jjVmKngksQnWxvS+mOY1ocbO7j39TKlihvpQDs23SKJkW3RAFAW/gJORS4iW4umlQ+MDLF5yEjBvGOYWks+VoOEhIODaOJTPCssLnIqt8WZP3p/2q+/PLG8wnnnDZa84KvMwk7CDmTN3WfAehU7b72mZorgSxwAN8RZb9WsqDj2CRxydXwx7y3Bsrp4tjx3xc+z8Bafkc43K5oj5tbvxMs41pKid5EN/Sdf2iPQ2ZGuGTHwIZEssPeBrJicOg46O7yaDlCOeIbbMS1dNSw== 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: Tue, 1 Mar 2022 12:05:47 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH 1/2] 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: <77675e7f-2a7e-f517-4aba-e20774c8bfe5@suse.com> In-Reply-To: <77675e7f-2a7e-f517-4aba-e20774c8bfe5@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0272.eurprd06.prod.outlook.com (2603:10a6:20b:45a::10) 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: 69dc9f71-5cd7-4d6d-2022-08d9fb73710f X-MS-TrafficTypeDiagnostic: PAXPR04MB8095: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: Uh62QAnIYPkzL7Nagz1kpvhoFB1YtFwNl/H03ifJNkxRi54G5YE+Z/Lz4UQSAAdg3qmemxbPx8QtScuMlB0fo0TVbCYw53JzrmDDnuVT2syHUvpRfEhYZ2zRWaYc4UmUgQfdChk2ZH/ZLxKO3ibbs11lKacIRSeI8cGR4aWnQxe4GaH10eT32tKqeIC1g7Zs46uD7oVLnz6aQI5FrcmOzDAG/xy4KzqKkCqZltDUWwhVvDbsmhTwz2Ha0sEza/TCa9l1OhpQd3rwl+cjUuNOCYqTdLdGdghsGbxfuLvNDV6dHy/v9b530EMP93CuvzXLoZla1DkViBpyDkTTZbQQbCY5rWpsEqHf5+6TdIAlyKgHV9kpKm/B2tPHA5/QXwaGrAv3ZysNMfTeiR5t8B0tr52RTOQ/UXbLNqgTlH65GAP9g5EErJAfhhcSaO1C+cAw2L9syWFOLWaP9OQxEwe/e76jo4NZIYS9FLqXV6S0/4ggPLqS0EVh6SU/O8A6LGAdTtLYNSt5SqJkovkPxIsOO5ZjHsAizp7u/7IavC0xs2XoI75OcOUXE/pUYNnFuGm28Roiyv3s0l/GoUvVkfX/KLVxYFwR6JW7ecP6WCexyybPtfSWY/Km9rj/ZuU8h6YVbZgUA5mWPMo4kGkDMEkTneRmTUfKlRtvz9sX/KwL7mID+nqpftaRvNnvcFAag9EPT2gswAJRKOE4U40D3uXJYjrYbBbiBoDGGpMeWiTT/Xk= 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:(13230001)(366004)(5660300002)(31696002)(86362001)(6512007)(66476007)(66556008)(8936002)(83380400001)(316002)(38100700002)(4326008)(6916009)(54906003)(66946007)(508600001)(6486002)(8676002)(2906002)(2616005)(186003)(31686004)(26005)(6506007)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OWk0WXdoV1pSdi9vNFFKNjF0a2xDYVFXKzVNQ1N2T0xWeDJIOWRVN0hPcXI2?= =?utf-8?B?OVBGWk96NnZ0cEQxS3k4K3ovb1Yxd3JrSDZnSWQrS2hQVFlydklXanAyNDdl?= =?utf-8?B?RVJkdDd3RHJKTmpiQ29jRlp0ZEdKeTF5M2RoTDlXU2IwRG54ZVNLazFMdkkr?= =?utf-8?B?NWZ6OVYrcUQyZjgvVmFFU1FRN3FMZFViVURiZC9rZkFEeGN4OXNBL2s2L1B0?= =?utf-8?B?VFlaYWp0YTN6aFhPdW5xQVBNRWZiWkxHOE1CMEpoUGE1RFJPeHIyN0RKSjZz?= =?utf-8?B?bGhrdjQrZmV6WThtcHQ2VHVGS2F3OHdrZ1gwYy9ZbGZkS2dXdmlQckFyWWlZ?= =?utf-8?B?SFNjNDFsMElhSTI0clZkRXdXSWJBdStTcjlFdWpKQ2hHRXg1WngyeVNNOFc4?= =?utf-8?B?ZVgxZjlaVkhQU3luUnp5R1VSWjN2eXFnQjhoMk9UL01odmF5eW1nRWl6N004?= =?utf-8?B?N296d3o5bFpXZWc2R0FNa1NrWVhMNThrNU5Vcnl3Y1JzOFg1a3ZMM2YzZlhJ?= =?utf-8?B?TU9zZVpGS1VMZUJlVWZFeHRPUjJDckMwaFBnMlplOXVCaFdkOGI1RjJ5SkZZ?= =?utf-8?B?U090MTlWdTNlSHpFNGg1ZmY5SDk0YTVFYXhkWUNCaXhTeWpmdWdwSjJsRy9p?= =?utf-8?B?S3M2c2UvV2FUeUk3V3RZMmc0eUkrSHdaQzZGaEcrTDNDNUo0QnJ1UXRibXV6?= =?utf-8?B?UE4rd1NyR3A2amNuZUxON3Z1dHJtUjZMY1A5dytjVkxVcC9zRzZwVmMxbmRt?= =?utf-8?B?ZG1LV3U1VHp1dDVQbnhjRFhJMHVaWFBrYTdCZG5TK01XcTZMTWxZdDJUUnBW?= =?utf-8?B?aTBySFhrS0tPWTNqZ0hTTHJsTWJsQ01iUERHYldjVFcwekpiM0ovcU1uOExv?= =?utf-8?B?ZGlOQm5OYVo3LzJIM05LeWtGN2ltMFhaL2hpVnFUVDlHQ1pkYW9TNVplWGhI?= =?utf-8?B?Q09RVWttUHdUckRTNlRQNXRJTzZldHBxbFIyNWRvZngyYkQ3MG1Yd2RzVjBB?= =?utf-8?B?M2ZsZ2l6TXVoR2pWR2cwUS9hcEtqSjR1MFlHSWpaMFQwNTNGVElJbVdhbEov?= =?utf-8?B?ZStHUWRGeHB0emRvUTNKRTU1dnhRNm9ZRHc5UFFMTDEyZnNJNDV3c3Yyc2F1?= =?utf-8?B?dTJJaWY0d2dXUCt5eGNSMi8vcDVjYmo1TFZic0ZJNElaWmpSMTlvTHRjZXFK?= =?utf-8?B?akdKM3l6eGMveDNrbVd3b2dvUzR4eExSNDhjaUlSbnBIUjV1elR0KzhaSnVB?= =?utf-8?B?U05JNWUvYjJPUDQ0OW8wRC83alZWb01QN1VMa1BTenh3M3A2S3Zsb1VURjZv?= =?utf-8?B?YlYySUlqMmk3ME93S21jU1M0SDVYNDdIaHR0eXdNejRzbkxGcndFeTBKZm9M?= =?utf-8?B?UnM4WTZBbFNYOExqV1BtV20vUVA0NnBxV3hYTGRicjhWUTZDR1BYZGZJWTU3?= =?utf-8?B?clJzQTdpOWtUcUJSaXZzU09ObHhRSVdWV2QrWTU1R2Izd1EycFFQZFJjeHda?= =?utf-8?B?TUR4cS9hdlBSelgzWmJXczNoS0p3bDc0TGZHV0ppVmFRR2JjYUJGNU9idGsy?= =?utf-8?B?a1NtaEFxZlRJaTBCM0FxSU0vOHhjSkNnTlpFY3Ezcll1cEV4M2ZMMTBhU3c0?= =?utf-8?B?dFZ3Vjdrd2Q2eUQ3cmpRaGl6TGhLSnBCQ1hCcHNWbnJydnNEb0kzY1pBV0xI?= =?utf-8?B?dHF0UWYvL0hQdngrU2QrWGlwRWp3RUNqc04xWFFvV25GUDdsQmpOTnV3b1JU?= =?utf-8?B?cmh5Um02NTFoVFN2Nisrbi9iRWJ4alYwdUpEWVZIWFVzRzcrRmlkSHc3Ympy?= =?utf-8?B?cmV3R3RybTl0ZmhjenRCckFpYmY4dCtYQllXckk3ZE03NnR2VXgybjdTQXdx?= =?utf-8?B?cmxpUWtEeUJUbkdoNm96d29lYVZjdkRveDVIVFJyNCt1QVBLTy92Sk1UN0lX?= =?utf-8?B?cXBGVWtrZWNMRGJxanhKbGVFY3Uxb2JxNXJnakNqWTNWcmw0MGFnaGUyYzZL?= =?utf-8?B?OVROM0Z0THNJa0ZxNUJBZEp4MVQ0d3U2MzNFNTZoanUvSGl1eFdKb2p6MExW?= =?utf-8?B?K2ptZkJZY2pRMFZpaXZpNXlGcituQTBoNTZSYU12UWtGZ1d0V3pCK0tyRUhw?= =?utf-8?B?VVJlZG5DR09oUUUwaDJsQzRVV1p2bFk2LzVWN2szVThBakdpd2NNOVdBKy9q?= =?utf-8?Q?97Bp5H8YQ2tStU3oeKBZw4U=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69dc9f71-5cd7-4d6d-2022-08d9fb73710f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 11:05:48.7825 (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: CeUt1EXn8FJ9jcllL9zZFAqp9084DVoxGU2H/9W4iefjzdD4KnNnVp7T6BAKFeWZivSD9auPMGQE+xkmUzP0CA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8095 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646132788601100001 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. --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -585,10 +585,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 (and should not be) invoked via the stru= ct + * field. To avoid carrying an unused, indirectly reachable function, pois= on + * the field with an easily identifiable non-canonical pointer. + */ +#define read_tsc ((uint64_t(*)(void))0x75C75C75C75C75C0ul) =20 static struct platform_timesource __initdata plt_tsc =3D { From nobody Fri May 17 11:29:01 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=1646132820; cv=pass; d=zohomail.com; s=zohoarc; b=JHDOBFDw5MSWK75PBIZQrrEl+V/gtuAWsrqRuX/vEVaSNic+8ZYvfnGQqYnh6IgPKSbDvHM7FpNyVdU/Fp2NJgoNSLZpEbaQFYaF1hwfKbBkbe67h+L2yICIbUWni0XN2uzpf+B+9JarwX4MVT9OGcc7fr+OX6tdeFsFbHCQMDI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646132820; 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=7Hcjv5yq81hzSD4vfgXUo4NPyGvjN63yGcHqxJqVJiY=; b=Od3HjjtgtltIUdmt4r/zEaXhwuxpzxHHWcuR2GZiJfLBrLFCj/aqKq4iMQQ08ABXl6elbtagWEYKTRX08Xr6UDsvFJ2Ww74cLs4OaQgkP8/A0jgNqK5pMaSK5vq5Tb8Xz30+bEIs749iLqrPJyqYVGloLfw+SPBgYmDowyv7E+k= 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 16461328209711013.1803498685301; Tue, 1 Mar 2022 03:07:00 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.281253.479502 (Exim 4.92) (envelope-from ) id 1nP0L1-0006dG-3g; Tue, 01 Mar 2022 11:06:39 +0000 Received: by outflank-mailman (output) from mailman id 281253.479502; Tue, 01 Mar 2022 11:06:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nP0L1-0006d5-0T; Tue, 01 Mar 2022 11:06:39 +0000 Received: by outflank-mailman (input) for mailman id 281253; Tue, 01 Mar 2022 11:06:38 +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 1nP0L0-0006HM-4A for xen-devel@lists.xenproject.org; Tue, 01 Mar 2022 11:06:38 +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 a9c78dd7-994f-11ec-8eba-a37418f5ba1a; Tue, 01 Mar 2022 12:06:37 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-64P3WOMhN2WodCFz9b4a_g-1; Tue, 01 Mar 2022 12:06:36 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by PAXPR04MB8095.eurprd04.prod.outlook.com (2603:10a6:102:1c6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Tue, 1 Mar 2022 11:06:35 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5017.027; Tue, 1 Mar 2022 11:06:35 +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: a9c78dd7-994f-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646132797; 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=7Hcjv5yq81hzSD4vfgXUo4NPyGvjN63yGcHqxJqVJiY=; b=BbRJWy+XxuD5k03LhPXhyTru08aIU04K7RjO8+8nvvgy6Z0NhqeYaxFLsJbh2jKYvKYH10 +wATSF3+Omb6Lgg80+WME0Y7YcOB8CVquf5XdItemWVwWNNFBVS4tIg2Dg//LHcPs0N5Hx M/t/5/O/EpzazG1Wgu9AXYje52sQr0w= X-MC-Unique: 64P3WOMhN2WodCFz9b4a_g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XoYDXQIh6HdPVxe+FEDuGpz8xMLiqZzSV6fkP+UPJ+Ok1/PTKfjN/ocImxVrNI9eImI0iPYxYfqs6V244N1FuhLmKvtBNjyfuFkBj+h5RzS9xl8tLwzyy5B6S+7PK3re+0aHd7zEayMDKbfLJr52h01abo1B7znC7bX0ZmASA4lD4aNGkC5IsLkUfhFcVhQokxVC1wQRkwUFzCEoWSQ1odXON4CbCjQ+W75FEC2fmDwMhgdSx9XajGOsddfWCyBs8d7yzCn6H8iZ/hl2f1DGk315+XoqQak7HmLfjCM2MKXesEdHEUq5R7Bba1XBUjaEgTSOW7Z64XvKstzP+cHUBA== 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=7Hcjv5yq81hzSD4vfgXUo4NPyGvjN63yGcHqxJqVJiY=; b=fuRvz87fIqhfNko060phsYx6S1OJVgl4BX08S8RPneS2gvQYhT+kGwL4C7RccNxdpYLfAqx9Xmpq3JjXMYmm5Zsm+svkIrnMlTDomYBOOoHu/Z1kgvav52AzenfHQXqf5MJpGtqIh0V8dryHw21PU7nVZiZn+9YydadRTJbvvVQoPJwyUD9+ss0h4nmp/DVxcXOlHv2Wa9hB0RmuUBIGbaPfZi2CxpkoCYdwaSoMh2k9Tb3+T1mWD3nFF6iVnMENCKVwkc6NIgNTpG2uy/K+SZIBxCs+qo3T7IhsPpdqLYzdX6edu50VxCJA/9J6JOEMrmf6hWMtpI0ZvOuxwbwGyQ== 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: <61bbf544-74ac-b698-425a-d1db80acab43@suse.com> Date: Tue, 1 Mar 2022 12:06:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH 2/2] x86/time: add CF-clobber annotations 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: <77675e7f-2a7e-f517-4aba-e20774c8bfe5@suse.com> In-Reply-To: <77675e7f-2a7e-f517-4aba-e20774c8bfe5@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P194CA0024.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::37) 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: a595ae01-3f95-4936-90b3-08d9fb738cb0 X-MS-TrafficTypeDiagnostic: PAXPR04MB8095: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: 8bIr4f7BfXW8zS8WBQy9sw8bXKYzfv8zssvTh0yvT1fgJGd1E3Cup7RGVvXw7AbT+08WrthkGvPM1wFep+aUVrHLxsIvl7chNRB0VoP9cwVULDsh85O0kp0AXndLANayqgAj8l/O2R2PBgDDOg748SI+v8faBjkeGScduc/5npIY/T76Z/vXcxGSDFXj/Ok9oEmVNQXxTgMIWDHAM/9u95hOuauU5VmJE8NsI72MYb+ZZCneJWMoEiUhsnuaNqYnuuiZNHbDYf2OylwwDY5XFFBsxu49I2oY84jmx5hWdAO5Mez3q8eYVl218nTKOO2ZsZOvupd4DbyR/z8iWQn/b6q+JDBz17TOVrcD7gZB76ERIoSGrZGKCkq/gr7hFoub1AKatECC1gYXi0hSNZ1feOHA+0JUSyirkRpPbMKWxCO1C/E1hYsAztDO9QDG2uhAr7nvHKjXZ1gX7GNDyT4hAcr1Xy2CqSmZPVotuToo93kW5hk9+w3WA6hn2SGticOQSgMWwLV59GwVqgwzdjyvregSelagmH34ohEu6JhXM9tKKHW3zNeDeo6IhkE0NkUMvvntJxPlNsA54u8d6/pjOKJGOL9q09Gkeq9tnAJ8gbLVjpheNMq5zgQ2rNX337u6n/pzEXWV/RmaFzhFJiVtOqmvvuskY5naREh0Fy0+53sJk/jki4vqC/9aq7S9g3msUUpR8uefJkE7WH6s15dCGfbiGL+yFrs9kbGZnXifyWR7LJquD2XPtJjatkCekgwW 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:(13230001)(366004)(5660300002)(31696002)(86362001)(6512007)(66476007)(66556008)(8936002)(83380400001)(316002)(38100700002)(4326008)(6916009)(54906003)(66946007)(508600001)(6486002)(8676002)(2906002)(2616005)(186003)(31686004)(26005)(6506007)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a2ZpcEIyWDR0Q3cyNVFqRUFnN2VtdVAyb2xLOG92a1hEVnI1SGpRYWhZK3pV?= =?utf-8?B?QUlwQTYvOWgwZkt1aktxZTU5U0JYVUpObUltUnRlSDJPaEkvWnh6bCtnUFVu?= =?utf-8?B?WCs1Nkd5TU9EeC9MSFJCY09DODBUNE03OTg0ZHZvTGZiODNDNnJwV3NKMytv?= =?utf-8?B?MGNxOUsrWlJ0bFRhTGN3ZTRudVJiSHhoVERtZ0paVGRuOGZPekZyaS80ajl1?= =?utf-8?B?akFTOFNwOUtldTg3bEJmZnVubk5aVE5LV0R5UEFDVzZMc2Vsc1cvM1pkN1Z6?= =?utf-8?B?blZMOTVsRVQ5Z2pLYlFlNFVXaXo2emJwSVhIVUEwOTdpODdhMHJDWk9qT082?= =?utf-8?B?bFVibDdPVVlSeVBSUUkyYnlvWDdybzRVRzNpRk1vajNRekRrNUlDdjlKc01y?= =?utf-8?B?bTJDT1FVTWxYa0huMVBFTHBJMnkwZ2liajlnVFR3T2ZHNzd5MjZpMVZDSTJP?= =?utf-8?B?SlJtN2xXREd1OENxVG9UeTFSL3I1SVhxWEFiakduZHFyMlhoUnZnQytSeG9v?= =?utf-8?B?RVdMN0ZxTXdZTzJWU2tXTW1pRjJLcnR1UEs2ZjFLVUE5V0oxVzBGYzdJMHFi?= =?utf-8?B?UWhYbko2T1U2NkJyMHRQamJrV0lsckRFcFZXNm1TMzRtSnVKOHg0ZE5DOWJM?= =?utf-8?B?Z0VoS1UzU3lORW5MMG80ZGNqQ0FGelhRUGVhWHBKaDF5ZEFOaXZ0T1lKOTA0?= =?utf-8?B?SkFmRERlQ0l1blFiYmRnVTJxUlJMSVVRWk93eGsxVU5ZZGRUbksxQTBXYmtj?= =?utf-8?B?UENJRndNM2pYVEg2OVl5NkRRc01PeFNlc1pNTll5ZXZSckVJWHpMRXAwckRL?= =?utf-8?B?cmV0c2J0cTFVZzl5WVo3MTU0WjdNKzNkdlUwWkltYlFVNm5HVVVzbEpFTkUy?= =?utf-8?B?Ull0NnV3eWNCYWxBS3ZYMURVL3VBTzYxUklFL2J3N2RrOWY2KzdVUHNIaXho?= =?utf-8?B?aWNxMkh2Q0J2MG1KNDVnVGtqSlZ6YzdsRlFvU3UrbXg1alZZSndLUnVMcUNi?= =?utf-8?B?THlVVk04Vk1Pa1d1NWhZc2lKTFZiNFNId09jRmEvOXMwL3VORzlvcVJQK2Zy?= =?utf-8?B?cnpjWHI5TGJiWWVNNzRIdFlGL1psME1GM1VHTXBPeTczZE9hZXVLREdJTEpn?= =?utf-8?B?V3hHbFlSaFNnWHQwQkVIeFdzRFZ3V0JpeDh3OEZIL0ZpNUV6SHVPeHJMaXVr?= =?utf-8?B?SzdBSGp1U1kxdUZ1dTBKVTRTTlRlR0RuUzhZU3hiNlNtdUVNb09lQk1KdDRh?= =?utf-8?B?ZGh6a212TUtQdmFyZlpwallsRUUrTHNBdUptSXV3eit6ZFB3Z0Z1dkhvN1Vp?= =?utf-8?B?SngxTHFmVHlMNWV2eDQ4clFTVlFOREdLWFJScTBSejdpQUtRYWFiYVMxckZE?= =?utf-8?B?QlVPMm0yeVd3U085am1oT1RhZ2VXeSt6Rld2TjA1enI3ZXB1a2xzaXRYYThH?= =?utf-8?B?OFl2VDM2VVQrNXk2aTdsZXlCdE9TcTdXTlkvREh5cDIrc2V1aXl0dUtwcUxq?= =?utf-8?B?SGFzN3dKT2F5ZDQxQlg4TzFEYjllamZKVWZrZDMrdnBOeEtRa3d1Z0ZjcVhm?= =?utf-8?B?QnAwOUk4WjNTUlVIWHhZVmRTU2ZpSjRJVlcxT3lFU25aR2p4Sk1ZYzFqcXJH?= =?utf-8?B?a0lnZ2VWTzdHT2Q4R0dvdkNWa1FKNWhmenZzZlI2akRONXFlMzNFSkFmVzFm?= =?utf-8?B?bzVoWjdobzgwK1RiK25TY1VxZDY0dmtpeU9iMTg2VjhER3NraUpXYUFJZHRO?= =?utf-8?B?Y05xSTBuNHlka0Q5OGMzTVhYYXVNTUtuTXFWWUxiWCs0dEt0b2RWOUdIby9p?= =?utf-8?B?UHVDVFlGZXcwZUJ5Mk1xMit1UlYvcS9jU1ZzdFFlM2pieVZtK2RpaDF1aEJr?= =?utf-8?B?UFQwUDhvcDBmQ0o0V3pLSTJleUF6SThrdWRPbXZ1ZWlBMmZNZ0NHSTJ3bjVC?= =?utf-8?B?ZERTc2pjZm1mNUZJeEtQdDBFeFJ1SzdtWXJXMStBeTZBTzlURXhWYWdKazJa?= =?utf-8?B?bVlKUGJ3RE1qODhsYUJESllKeFJPa2pvdzBNRWtpMmZVTzQzWU5ZY1p5OGhN?= =?utf-8?B?VGg0OXRPWXI0dE54Y00xQXB6N0RqMXV3ektYdUw2Q0JNcWkwWFVHQWk2Y25t?= =?utf-8?B?THdKUkNSek00em9GRmt0OUQwRjhwd2RxNlhtZGpaNGxENi9aTXVESWlxd1U2?= =?utf-8?Q?uQmSpnVlc+8M/FT9lw2Gy5Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a595ae01-3f95-4936-90b3-08d9fb738cb0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 11:06:35.1078 (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: pyRoRVU43jPHoeLfyRyqCSiFmtTG2dwJ+cSbAKveiE8YqwI7GAdfN7rTyp4qou2AcwMkYVpRdTlqDgtPtUdFbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8095 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646132821677100001 Content-Type: text/plain; charset="utf-8" With bed9ae54df44 ("x86/time: switch platform timer hooks to altcall") in place we can further arrange for ENDBR removal from the functions no longer subject to indirect calls. Note that plt_tsc is left untouched, for not holding any pointer eligible for ENDBR removal. Signed-off-by: Jan Beulich --- I did consider converting most of the plt_* to const (plt_hpet and plt_pmtimer cannot be converted), but this would entail quite a few further changes. --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -375,7 +375,7 @@ static void cf_check resume_pit(struct p outb(0, PIT_CH2); /* MSB of count */ } =20 -static struct platform_timesource __initdata plt_pit =3D +static struct platform_timesource __initdata_cf_clobber plt_pit =3D { .id =3D "pit", .name =3D "PIT", @@ -483,7 +483,7 @@ static void cf_check resume_hpet(struct hpet_resume(NULL); } =20 -static struct platform_timesource __initdata plt_hpet =3D +static struct platform_timesource __initdata_cf_clobber plt_hpet =3D { .id =3D "hpet", .name =3D "HPET", @@ -528,7 +528,7 @@ static s64 __init cf_check init_pmtimer( return adjust_elapsed(rdtsc_ordered() - start, elapsed, target); } =20 -static struct platform_timesource __initdata plt_pmtimer =3D +static struct platform_timesource __initdata_cf_clobber plt_pmtimer =3D { .id =3D "acpi", .name =3D "ACPI PM Timer", @@ -683,7 +683,7 @@ static void cf_check resume_xen_timer(st write_atomic(&xen_timer_last, 0); } =20 -static struct platform_timesource __initdata plt_xen_timer =3D +static struct platform_timesource __initdata_cf_clobber plt_xen_timer =3D { .id =3D "xen", .name =3D "XEN PV CLOCK", @@ -780,7 +780,7 @@ static uint64_t cf_check read_hyperv_tim return hv_scale_tsc(tsc, scale, offset); } =20 -static struct platform_timesource __initdata plt_hyperv_timer =3D +static struct platform_timesource __initdata_cf_clobber plt_hyperv_timer = =3D { .id =3D "hyperv", .name =3D "HYPER-V REFERENCE TSC",