From patchwork Thu Mar 31 09:31:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12796946 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2573C433F5 for ; Thu, 31 Mar 2022 09:31:58 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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> 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?q?GIxlFGIILAE1mo7NUqkIWLPdv37A?= =?utf-8?q?8g8bxk0jQ44DGTDnVtr/eEeWrdJLRHfWLQtGQM24F8cbK3fNcNmTgjCTfig0ogN/+?= =?utf-8?q?SBTw/xRy2qpRNuQ7B+Is4GskEp6fSgoRk128wTqj9C/7j+N0CzhzgJXIru4AzdLrP?= =?utf-8?q?cCex8hATHO55igRJ5p7C8mrKi7I4JmAgDhelpUFQLaAgefriNaZ/4my8ntCMJhYK1?= =?utf-8?q?MGCNvbGOBDVBdvzDoFvO0W0CalG8hXNB2KKBMtBJqr/avI12J0BCdhUwq9TJwE7NR?= =?utf-8?q?Rgg6FgAcW6zlIt5wPoXARBV0kJqqMeIMa4WY1pvHWqe1SSzM50yuTHNg/bm4z/3t3?= =?utf-8?q?LxV8yS6RmxRBNg4gDyrkiTERmfe2Pgs1NwRebDmJWv4hyFi6LtCM4X2xTYK9wxLqt?= =?utf-8?q?wrOVsEl48xOtL7hv4FLuLbySQEpgOmV+q1aZYqsPXb5JvZB3gxq6Vp3TgbpE6NACY?= =?utf-8?q?MSR1p/ThvSJUmAQpX94Az//49rN6hjSPSXu+UrHfc5bJkFPjWqiwMFivcsml94cJY?= =?utf-8?q?PBU1grQ//5d3vddVYInBgJS08HBJ34izajgLxFbx2QMKmKcw9CSwiiFSM9DF2weG5?= =?utf-8?q?Eo1RmVFyMlKo+r8uUiN0ej2KVGn5iQj7gJNVpmcGAZ8W3Uvkgpko3vtiJmH7mA9tX?= =?utf-8?q?heEnQybNtKeKhiYKsTKAiufgScPWb7JJLtozmMoSeI0pdC5BvllhmFgSIkdGthKsC?= =?utf-8?q?7tgDS99GPb7uwddw0KnEVjEGdHnQN+BBmmNO/hU0SoxuAUs5fSanxnUEu0TUxexQL?= =?utf-8?q?nt1flzqp7wuV0/ZDeQ1mXKR4XZ+qEN8v+iSN185LXFl9LNeHPVPfUM3czQY+GggoK?= =?utf-8?q?rJ1ujkvbDYDnSrmco/JgjG7/wPm7xkcXjI8e4dEvqYU5OAGpK6/MdHd7To80MNjZP?= =?utf-8?q?wGRbP/m/pyGBO3YRIDo+RvKTtgN2Yy6yH75BEMfoD5ZV+WWq/FDDG2BCCSE5iaMvW?= =?utf-8?q?bVJ5c4QQANEyKoy/py5Xg0SAiCuO+CTIme/APg7gb0oGJ7Bg1Dwz94Ord/D2rh1nA?= =?utf-8?q?ZCF4D8bZbvDS+PuhF7bjTRpS3SyL0NpYv8uJY9NOZzyliwJRNqEQ9Kn41Uv/YgIJS?= =?utf-8?q?id1oT+zSsO5CVPqK7Ks1gw5fWPdalkBf67bphJT7nzW77mr5HVFKTzi8/sIdqeTDR?= =?utf-8?q?f9PUdxSGwWiwd3hRJUZ8ZAR/39luzYOeKWI0WbVSBN6XDemIdLhHbTJG+8cIJpFEp?= =?utf-8?q?pli1JWTYj5dy8rSaBfqeEaArEWUpisrqDy07rNVjGh7CvDPDZO80idDODApbDnchU?= =?utf-8?q?OdlTaOwINSxuHxG6QnoeHFP/xuvnXYw5YYeJVaI55MxNY4FMLze2oF3i06LAMTqPG?= =?utf-8?q?9+IFksQrF1GF3i3FlRv2RiT8yDxT2KiJTrHwIwpgu/hbh9ucfvLW9ENWbjNc3UR9W?= =?utf-8?q?dYcIOCeLsify1NpknAFZRh7dX8h4OfKwbofP37JWnp6AYrn+cn1ZQk4gpc+x2E5sO?= =?utf-8?q?v0qZdd4GgvW8sav6Alv0nQGDC9olbhYAFULuTdUO1sMlvWabRyFrNMOn6HzsK06KR?= =?utf-8?q?h4xwoJsbGnc9WtYe6EDs8SI1viU6/AkP8KCZWWEKR64s7wOJTiURSsznd9fRZ8vcE?= =?utf-8?q?LKTFBLMrPe2b3WwViZfUXVQMefWfMez0uiHHBOb44Rhd3Wa/qd4Heoju+FICkKVMs?= =?utf-8?q?fJ04eCT2rGirPAQc2/+FFZT9jSq8+qHg=3D=3D?= 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 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 Reviewed-by: Roger Pau Monné --- 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; } -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 function, + * poison the field with an easily identifiable non-canonical pointer. + */ +#define read_tsc ((uint64_t(*)(void))0x75C75C75C75C75C0ul) static struct platform_timesource __initdata_cf_clobber plt_tsc = {