From nobody Sat May 18 17:34:42 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=1670336967; cv=pass; d=zohomail.com; s=zohoarc; b=DbzxtNcfAUSDoqxkXeRVoC7f8DAH0wELZRKU9Yad9aH/SrNOxxVIV6MsyEB7JWvuA42nWMExKc2qWh6GHUdjy+uh6ioU+zX3bYDpg1ubyx0y867F2RhaB1+jwL8y2gY3wv0sHj/kN8M/xfRx0UBRjDmX8EjTXI/ylcAEurbFaqY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670336967; 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=DyqpzDT7ddgLuTyJ8LCdvZqSXAQOB28REr3pHpSd2aU=; b=NwMuB30fSRKR6JpDe1QlQAXPRA9O0ETUrVFaGsJNW29YA+Ht82//Q36kP+QjuIwrMfVdp/pvjQF4BZypBDy1+qSc59sWNEjekud2/Eake6YrRNWxzn9sbvoKTsuNJMV3hdELSwgflt6BsYWCPpQmPNOsHbbnS4WT8DjPqiuZNak= 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 167033696734351.8775115367672; Tue, 6 Dec 2022 06:29:27 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.454981.712580 (Exim 4.92) (envelope-from ) id 1p2YwV-0007qa-0Z; Tue, 06 Dec 2022 14:29:07 +0000 Received: by outflank-mailman (output) from mailman id 454981.712580; Tue, 06 Dec 2022 14:29:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p2YwU-0007qT-TT; Tue, 06 Dec 2022 14:29:06 +0000 Received: by outflank-mailman (input) for mailman id 454981; Tue, 06 Dec 2022 14:29:05 +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 1p2YwT-0007cz-HW for xen-devel@lists.xenproject.org; Tue, 06 Dec 2022 14:29:05 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20618.outbound.protection.outlook.com [2a01:111:f400:7e1b::618]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 55717727-7572-11ed-91b6-6bf2151ebd3b; Tue, 06 Dec 2022 15:29:04 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Tue, 6 Dec 2022 14:29:02 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5880.014; Tue, 6 Dec 2022 14:29:02 +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: 55717727-7572-11ed-91b6-6bf2151ebd3b ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IXbDsqyibzf+D08ZyLRop+Cex6nSYvHOEYkGjyMzXHffdpo1oSA5D6IxQlNynHHtfShRMaJVvcww0SbW23/j8oNeviGVoT3UQhMLFLRxz7EYslI9yzMd7tr8eXHXUf4EFz+//eckqbRuR2YcEmWIh/DhWmKihxGcaJPDqDPjhJMm9Z7f5dZmdg6NzcdY9nbXw8EjTCwjZ1qr0thupkPBoeT+oSb5quP0QdhtkusASc7KRvErOJEEtie4ThsZEa7LvrztTruufCezn/DWyiMyHaJTIYNCdsnouk8ALTRxi+VKB3oDE5HAVBOzFzMZy/t7ND8QohNWJD3F/aL7HkN8Yg== 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=DyqpzDT7ddgLuTyJ8LCdvZqSXAQOB28REr3pHpSd2aU=; b=Gosa4eAIQ/Sl5f7uzo6ibfbsk8mdvWaDoBQCTouUYtSpnnnlZ6MbUURh7MVzJ0rloQ3OI9r+z0zdA1c18k1FZ7PkmCGFruMOovJMoWV5Ua4jupQB3IUORZVngE/bJio+85HWtHHycmNV+Iurv2YlcBJQaS4za0+ZXceUD6eFjxIbEFwMwtUK3jkTDgFDNNjDIK0zpK0lfhtWBWKf48MVsQwCVpJPwtCedGzH4+mPMB2g1zPr8dnbMe3BhuWFwWZYlRz3b85OVA/S8yflRppz6H7qmLH1vVofKAu47vMCDTrZnVDofG3Vq1fW+TFCiUfeKTX6JDgb363eqnj1nAB0qA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DyqpzDT7ddgLuTyJ8LCdvZqSXAQOB28REr3pHpSd2aU=; b=hT0GXen303QdnAVFEanKWuaHNWCrQAUHvhorutlDtdi5LOBttP5EkgopxkFciX6vg8xTx6cVdKinn5JFiNUKBGgVIJBJFIjCad+5cl1AZbxssWwIr/SRYdcrtN84ZbFqNrjGg+9MSfE+BnlpbpbGguiTmn4pXCk5G20lL0IldbFb0XCXsDwEviuW5rbjzri5il8d6mLigRJrmEOBY+bB0/VEwXwFnSxHYrgsUG6HRAKtvujod38J3jq+3N/pYdFyieFCBEIggKKgOHQcGp/U4Cmgckmh57CRCaDQvV1c+IkbdM9ocqMsPOV1Bp94c6ISE70m6eESB9GQZVNW+VcYvw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 6 Dec 2022 15:29:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [PATCH 1/3] common: reduce PV shim footprint Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Dario Faggioli , "Daniel P. Smith" References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0186.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::20) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: a146b696-144b-4f3c-7fa4-08dad79638c0 X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T+qmPSPE0jJmXC1QFB8+mC7bHE0pvSEtjoq2H1Fil0Lk1LNwCsaAg6zro7VGI2l/oAOTV9hgo6aBYy6LDMc4QRhNVYk95VBmH9Z/bLfirjCIeVe/akjAGIYthg0vqeZq56Wt2dLNZrfpRQQ+jtSkOIbjfPk/CL5ysCMj0LOO9bnhuwGO2d1TbDUB2QXLIZ+KtpPFeXU9nmiKBWFgZsHVjowWRCHsCGSvA+skXie+aDD/rqnBoZegt1isOIOkpPW2FL5ay1UgX6hlkQh/nIzgJ+Mh4VAIV4k57P0zxVlzZnwnykNpQ3n4RypP4dmtvKoNkUHPj6bGFaTgSKE9cXMMDGuoZqSR4ceDx31cQ1UlC0yxv/FFUoKTU3/LiQm6GDJ3OqL277GR4bRnZ4kZj054y5rm6kQ9svSNoOFi0QoQo29pzHSdcpfWFh0PBhHA+NiYwaQnszEagIkgtYFIvrbMzWn91vd3KHFRLPN9a+Cxg21VxFVC5XYgZgq2mrh6NNS9wlPajB051eGiUS15rXRvQzqYAUVW1Ik0M8adE1tL19oyYBx1xnUJzphmHAI/uNZx7eZSUUPzgQrUwbJQqAZ8L/wfDMfJGg//4hW+upXDkL0nU90TWwjeL9jB2g/TrWqRgQWzy9+qNN9Lpbg+S2/tCNa0FMiw5gnbGl5UJu5c8PZ5uTi8T/81DonScKzITOgHKiVKjZaW30bBcYNFUuRNEK+IbP2Dxhcp+//bHO4ujLQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(6512007)(6916009)(26005)(6506007)(36756003)(6486002)(83380400001)(2616005)(54906003)(86362001)(38100700002)(186003)(31696002)(66556008)(4326008)(8676002)(66946007)(5660300002)(66476007)(8936002)(41300700001)(316002)(31686004)(478600001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?alIxMm5NWm5OdjA5dzdDbDN4V3M3azRiYnlQRCsvTGo2aXdndVVkeCtyQUlj?= =?utf-8?B?cTIxeDVHZEdqRUp6ejNFcEtTWWRmTXZQUmZXQ3RuVGN6UTR3QTViRWIwNWds?= =?utf-8?B?RnJvZXU4VHYyazd4R3NVWnE5b3JXYjJZc2RhZCtHMVpNRGdJUGV6S0ZxMUxB?= =?utf-8?B?NkhNY3AzYmZiaFpPZEVkVXd6eGN6bEVzWU5FMEovRjE1eVFkeDBkSFQwRE5S?= =?utf-8?B?YlBjZURMNlBuTDVVbFFqdGhrK3RjN0w1UlJjUXNOTUJvVGo2eENKOXAydzFl?= =?utf-8?B?TFV6OUREemsvdHc4a1IydW5DUlB5cWpHRWhBL0wvSlNWQkM4V0VLNVpJRy9E?= =?utf-8?B?SzVKUDdPTnc2cWtsZnUvNUtKMmhzNTB3NENNeUVObjJJd1AwMkxqUExYdTRJ?= =?utf-8?B?SThrUEFaN2gyYjBMRmtBeDJCdFV2SVlTemNsdkRXN1ZTbVlkYjFTeTE3aUhv?= =?utf-8?B?d0IzcGhxaVIvQUNockFEVEh0Y3MrYWNOdUVXUXpuTXUzYU9CVVBCd2I0RURZ?= =?utf-8?B?QjhNL2V3U3lzYjJMcnBuZktSb01Qd0g1RldxV2J5N2xVaElYMVZuRHBHKzhK?= =?utf-8?B?N0t1a3o0dnQ1WCtiVFhaZ3VmOUIweG5xOFNwTW80NU93cWxwZ3hvbkxzVHlw?= =?utf-8?B?WS9xeFZKdGFaZGtmbTdkNzFITDBsU3pUcEJPM3B2MEljcnNHazI4RUVwTisw?= =?utf-8?B?UlpsSkpNM05nZFpLWmVhYlVzNkovNm8vMzNKaFcrNGsyL1FLTCtJU1lvQ1hN?= =?utf-8?B?VmgzTm01U0V2djNxdDJ4bTJvcDhwYW84WEN2cDN0REZOd2RqWGIxUVRZb1Zy?= =?utf-8?B?NXQxZE85disxMEJlWGpPRXc1YjNVNFF4d2NSNXlDbTJwN1Z4MnNDa2pHdUt3?= =?utf-8?B?dU5LL1RDMzRqQVRxdVFmQ2NEL0RoYzNQY0ZYaVI1KzVpbzdCVjJLUmU5YzJG?= =?utf-8?B?MVJjazZrMTlmc2ozZzFleWhJUUM0UjhNZ1NKK21HR08zWDl4QWpWNVpBMzNH?= =?utf-8?B?WklxeXA4dTRUVGJVTjBlYys4RzdjcjBIVVJoRlNXVEpReWk2UW5ocmVXblVV?= =?utf-8?B?Y0t1eUkxcE1WOEhFcVlPMjFrdHBhNUNCbEpVNUVuZzF5ZjB6RlhibzFGeFJs?= =?utf-8?B?b0oyMUh5Q3d0eFNxdFZ1UTVxU3Q4cUdXSVdLOTRtaUJ0M1V6dC8zNVc3NEtQ?= =?utf-8?B?dTJZV0k2S2x1Nkc0bzJORGN0SDhBbjFLdXRvZnJhUDQrUnFmZVNvcjRPVlN2?= =?utf-8?B?MVo1RmpMbVN0aklHMWlNaVg3T0pkNkRBRlhXYlBGZmNyVE1oYWJ2MzJzTFVj?= =?utf-8?B?YVJCQm1YQ0o4QWNYM2FrQVRLVC81RitvKzdMUFUvVmc0YjNGYTc0eG9Tem1k?= =?utf-8?B?b1E4SGFmWWl4aHhBbEYrVTJrMjlOcm5xQ3pDS0ZxZHRzbTUva09nMGV4QVFj?= =?utf-8?B?OUhDQ1ZGZngvbnVmRTR6Mnc5UUF3dXVkVEt3R2VVaEY2U1ZMVGVvU0tPeDZt?= =?utf-8?B?eHBQSFVUS1ZQTlA4S2dhWWsyN2dva0UvenBIK0VvZTRCS2M5UENYSEo1NXpr?= =?utf-8?B?eW51M0k0N2FHMVVpVDE1cWtxY3diVEVLcXpoMnBCZ0pqTDdORVI2REREQWpz?= =?utf-8?B?dkR2ZFZaR00wS3c3YklpZ0Z6LzlwNTltTzFONlh2Rld2YWZvME81Ylhwd2Rp?= =?utf-8?B?NjBYZEcyeXF6RHp6NW5NenhPMFBubmM3d04wOWd0OFVWbTB0MmM1bTY3Wmh0?= =?utf-8?B?Wlp4TStkUHY1WVhxSE5CY2RIbEt1YittQnZnUGNCcjdSckUxQnFwODdJZmxJ?= =?utf-8?B?aUNmVXZYZ21YZXppTitCeVBkcHhzWVJjME1uT1Y1MHNEa3pNZkFUVERDbVhF?= =?utf-8?B?RHBaTU43bXY1N0R4UHlON3BUVU0xUGtYQWc4UnY1MUJ5VGdRbDNVaXFDbXBa?= =?utf-8?B?dHc2eFlTYTVlRVRhSy9kcFdpdk1DeU5iVWdINXFGeGM4WER4RnFIT09BbUtx?= =?utf-8?B?MklqNkgrUnl4YmJyRXo1aGxZWEJqRG54LzhmMjBneTFtcjVPWnJFMWR3NzJV?= =?utf-8?B?QlY2VGN2cTZwbkFSTVlxMUpDNVVoTm5SUENKSDBiUzRpMitwOUh0VGpERjRl?= =?utf-8?Q?Bxv3nAAgcrGLgN8jjPaNIm3Mw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a146b696-144b-4f3c-7fa4-08dad79638c0 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2022 14:29:02.4958 (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: EDVAdnYpij4tZs2o1ZWWO0xPoORB5c/nWIL4EjxR96zKCu8OqIjervTe0H4JPu7MiJe4RwcY80i04EoEqC1WoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670336967996100001 Content-Type: text/plain; charset="utf-8" Having CONFIG_PV_SHIM conditionals in common code isn't really nice. Utilize that we're no longer invoking hypercall handlers via indirect calls through a table of function vectors. With the use of direct calls from the macros defined by hypercall-defs.h, we can simply define overriding macros for event channel and grant table ops handling. All this requires is arrangement for careful double inclusion of asm/hypercall.h out of xen/hypercall.h. Such double inclusion is required because hypercall-defs.h expects certain definitions to be in place, while the new handling (placed in pv/shim.h, which is now included from asm/hypercall.h despite the apparent cyclic dependency) requires prototypes from hypercall-defs.h to be available already. Note that this makes it necessary to further constrain the stubbing of pv_shim from common/sched/core.c, and allows removing the inclusion of asm/guest.h there as well. Since this is actually part of the overall goal, leverage the mechanism to also get rid of the similar construct in xsm/flask/hooks.c, including xen/hypercall.h instead. Note further that kind of as a side effect this fixes grant table handling for 32-bit shim guests when GRANT_TABLE=3Dy, as the non-stub compat_grant_table_op() did not redirect to pv_shim_grant_table_op(). A downside of this is that now do_{event_channel,grant_table}_op() are built in full again when PV_SHIM_EXCLUSIVE=3Dy, despite all the code actually being dead in that case. Signed-off-by: Jan Beulich --- RFC: Sadly I had to restore the two "#define pv_shim false", for Arm to continue to build. Originally I was hoping to get rid of that #ifdef-ary altogether. Would it be acceptable to put a single, central #define in e.g. xen/sched.h or xen/hypercall.h? --- a/xen/arch/x86/include/asm/hypercall.h +++ b/xen/arch/x86/include/asm/hypercall.h @@ -6,14 +6,23 @@ #error "asm/hypercall.h should not be included directly - include xen/hype= rcall.h instead" #endif =20 -#ifndef __ASM_X86_HYPERCALL_H__ -#define __ASM_X86_HYPERCALL_H__ - #include +#include #include -#include #include /* for do_mca */ + +#ifdef CONFIG_COMPAT +#include +#include +#include +#endif + +#if !defined(__ASM_X86_HYPERCALL_H__) && \ + (!defined(CONFIG_PV_SHIM) || defined(hypercall_args_pv64)) +#define __ASM_X86_HYPERCALL_H__ + #include +#include =20 #define __HYPERVISOR_paging_domctl_cont __HYPERVISOR_arch_1 =20 @@ -33,10 +42,6 @@ void pv_ring3_init_hypercall_page(void * =20 #ifdef CONFIG_COMPAT =20 -#include -#include -#include - extern int compat_common_vcpu_op( int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); --- a/xen/arch/x86/include/asm/pv/shim.h +++ b/xen/arch/x86/include/asm/pv/shim.h @@ -49,6 +49,22 @@ const struct platform_bad_page *pv_shim_ typeof(do_event_channel_op) pv_shim_event_channel_op; typeof(do_grant_table_op) pv_shim_grant_table_op; =20 +#ifdef CONFIG_PV_SHIM_EXCLUSIVE +#define REVECTOR(pfx, op, args...) pv_shim_ ## op(args) +#else +#define REVECTOR(pfx, op, args...) ({ \ + likely(!pv_shim) \ + ? pfx ## _ ## op(args) \ + : pv_shim_ ## op(args); \ +}) +#endif + +#define do_event_channel_op(args...) REVECTOR(do, event_channel_op, args) +#define do_grant_table_op(args...) REVECTOR(do, grant_table_op, args) +#ifdef CONFIG_COMPAT +#define compat_grant_table_op(args...) REVECTOR(compat, grant_table_op, ar= gs) +#endif + #else =20 static inline void pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4sta= rt, --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -822,9 +822,9 @@ long pv_shim_grant_table_op(unsigned int return rc; } =20 -#ifndef CONFIG_GRANT_TABLE +#if !defined(CONFIG_GRANT_TABLE) && !defined(CONFIG_PV_SHIM_EXCLUSIVE) /* Thin wrapper(s) needed. */ -long do_grant_table_op( +long (do_grant_table_op)( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) { if ( !pv_shim ) @@ -834,7 +834,7 @@ long do_grant_table_op( } =20 #ifdef CONFIG_PV32 -int compat_grant_table_op( +int (compat_grant_table_op)( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) { if ( !pv_shim ) --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -56,7 +56,7 @@ CHECK_gnttab_swap_grant_ref; CHECK_gnttab_cache_flush; #undef xen_gnttab_cache_flush =20 -int compat_grant_table_op( +int (compat_grant_table_op)( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) cmp_uop, unsigned int c= ount) { int rc =3D 0; --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -32,10 +32,6 @@ #include #include =20 -#ifdef CONFIG_PV_SHIM -#include -#endif - #define ERROR_EXIT(_errno) \ do { \ gdprintk(XENLOG_WARNING, \ @@ -1222,15 +1218,10 @@ static int evtchn_set_priority(const str return ret; } =20 -long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) +long (do_event_channel_op)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int rc; =20 -#ifdef CONFIG_PV_SHIM - if ( unlikely(pv_shim) ) - return pv_shim_event_channel_op(cmd, arg); -#endif - switch ( cmd ) { case EVTCHNOP_alloc_unbound: { --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -45,10 +45,6 @@ #include #include =20 -#ifdef CONFIG_PV_SHIM -#include -#endif - /* Per-domain grant information. */ struct grant_table { /* @@ -3563,17 +3559,12 @@ gnttab_cache_flush(XEN_GUEST_HANDLE_PARA return 0; } =20 -long do_grant_table_op( +long (do_grant_table_op)( unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) uop, unsigned int count) { long rc; unsigned int opaque_in =3D cmd & GNTTABOP_ARG_MASK, opaque_out =3D 0; =20 -#ifdef CONFIG_PV_SHIM - if ( unlikely(pv_shim) ) - return pv_shim_grant_table_op(cmd, uop, count); -#endif - if ( (int)count < 0 ) return -EINVAL; =20 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -40,9 +40,7 @@ =20 #include "private.h" =20 -#ifdef CONFIG_XEN_GUEST -#include -#else +#ifndef CONFIG_X86 #define pv_shim false #endif =20 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -24,6 +24,9 @@ /* Needs to be after asm/hypercall.h. */ #include =20 +/* Include a 2nd time, for x86'es PV shim. */ +#include + extern long arch_do_domctl( struct xen_domctl *domctl, struct domain *d, --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_HAS_PCI_MSI @@ -38,9 +39,7 @@ #include #include "private.h" =20 -#ifdef CONFIG_X86 -#include -#else +#ifndef CONFIG_X86 #define pv_shim false #endif From nobody Sat May 18 17:34:42 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=1670337045; cv=pass; d=zohomail.com; s=zohoarc; b=ceKnRyL6OPrUP+s5WGWMV0AZigU141P5bMpNFbvIpCHNLGEonGupyQO7W06S2YcrtqxywNF9k80AiYZkhGDW8Vq/yz96kpIk0kxcYNiO1fyyWrIaMOZi9rbdEKeVSTDRKQgqOO1o4DlWY4tRdXNN/oPrGIfXKNJ4GcKjv4x3FOE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670337045; 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=jyu2+YfJV0EpE2YDnKXKJULDV8ySfKA8696Hu52AWbs=; b=SdLBROqxdMVMVbPAp6iB4YgWVuug9J7wlN5rplUpyYs+NDWoGzNtGZqw0YBHaGon1wF8ldUUJBGsceHN/6Fp+wlLdGxKheY6pJv/gsWbTJ+acE7GljuHK7TzZTbGbq1uqqY5FKlZfuQbflSgz0Mt+kpIipyZ3DABo5lr0xDXgbg= 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 167033704528585.24565913406218; Tue, 6 Dec 2022 06:30:45 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.454989.712591 (Exim 4.92) (envelope-from ) id 1p2Yxl-0001D5-Dq; Tue, 06 Dec 2022 14:30:25 +0000 Received: by outflank-mailman (output) from mailman id 454989.712591; Tue, 06 Dec 2022 14:30:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p2Yxl-0001Cy-AX; Tue, 06 Dec 2022 14:30:25 +0000 Received: by outflank-mailman (input) for mailman id 454989; Tue, 06 Dec 2022 14:30:23 +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 1p2Yxj-00018I-Qr for xen-devel@lists.xenproject.org; Tue, 06 Dec 2022 14:30:23 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062d.outbound.protection.outlook.com [2a01:111:f400:7e1b::62d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 843a65fe-7572-11ed-91b6-6bf2151ebd3b; Tue, 06 Dec 2022 15:30:22 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM8PR04MB7777.eurprd04.prod.outlook.com (2603:10a6:20b:236::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.11; Tue, 6 Dec 2022 14:30:21 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5880.014; Tue, 6 Dec 2022 14:30:20 +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: 843a65fe-7572-11ed-91b6-6bf2151ebd3b ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzJCu66DFxBies2HHkP7UAeJ9kVEhYZoWoH936ZfjJZVtuxM5ZH3vlLXxcQav/5TPxB+YHH8Ekfh4wV0MLUbKGLoBdqihYOt9vHq62d07XbSqtUqhqHrce0sn6KITkRUi+yWadsgInkXCTQHvjbLAwl6TnqeFegmldrSGL9kCodBaAzaSLETENtnVz8l6Jg6VN5ebklxqcjLKvN5yfEwH0Ne0xHL1b45zOFcTz1AJj8rE/CUFH69/EHikAB++6MjkjSMsCCJkAKfhnVN+h6eioUwDH67qEE4GnghSRk8bTlgL2xJBrbAuIvi8rYnqJj9wqkRERieC8FP9pDtAzI5DA== 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=jyu2+YfJV0EpE2YDnKXKJULDV8ySfKA8696Hu52AWbs=; b=jBv6GZAo7RzJJTuGA7ErFjLKixWZVHo4HliMRPVXabl6OaIRswCb9bzJgVjAIZKMKFocFW7fcpow4bcuo2E7CtNB9T+EuCPJOIFfI3oK0IlPnCS1r/JhTjX5pVZ2KXEL3aXaarrAgRPxtaBVsy99R1yF30HuannBlEu0ZKj37A3SkuEzUkgbCgIko0w8S54dKJvGodxcvIej1ucaP3jHfZe2qa1GsOFyD4CQwlwQgYac+KOu3eU9oTxtypjpkSmUv4AnGmgrXllc5nz8qC7y0NQ5oovz+48HbB6l1A3Yrw8iY1lNR1Mc9ipK1iZ9gk+msU8MeJ6dtoDWVDmb3X280A== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jyu2+YfJV0EpE2YDnKXKJULDV8ySfKA8696Hu52AWbs=; b=klrcxAHU0CN6eTNPOpUL1f3shx4YMReFhrMbhQUuPGj5VGauIhN1QYLSErBIx8umCIoWVkVKD5GqzzK4yabe40ZL4CHBI0dYq9pn5/H82xbs0rKNq4UDq+agwspLQNUscvhGsxN5NroIlIp2U1+yA7qmTA/IpkDbLBNQz8K4hFtIfjNLohKE5t/ObJKv0uWoL1sCc5NDm6FBnujvQefRG/9NUn8dMhjoObfnnQmS2r607vvoFyDXgY+c1NMjErNV8/pCcrYnStOhZ9pBTHR7TukdFsDExy+aI8Ij/1QKmjTKFHBkCNi+a7P+KTccUX3/k1yDa9IhMpumpISpQeM0mw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <5fd43248-225e-99c0-7bbb-65e7cf7f08d1@suse.com> Date: Tue, 6 Dec 2022 15:30:19 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [PATCH 2/3] x86/pv-shim: don't even allow enabling GRANT_TABLE Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0130.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::17) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM8PR04MB7777:EE_ X-MS-Office365-Filtering-Correlation-Id: 8391832f-4087-47ef-5a6e-08dad7966780 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XyiAPu/vDqTg0Zd22S+hqA+KQ+Clf5KfpQKrQo41TuCc6O+/9vdKzPDmZ4OkKbWn+ZV/lpwcITaA6vA/gGhsTu2W0XyUuyKpq1VwoldRMMsMZYEnvb/Lie4s+LoQy+f8+HNy7NNIr1BV9agXKtWJcdy4mn44ZDtYO0dE6x12C+8f4U0cSq1O/rMU/2yqjDoRTauE0xy/vbgak5PbsjVpmd90NeMu15Mp5jhif+IdIFMHKt5rQOXi5o0YdokWB6xY1BO1zGyBdjfztZGi5tcQrb/4lpiDZWNG9YfvGjtkDZ9XLVuWD1VIPDq2VvBvT3qyfMuRUr6PmNJHZ1owv3/DTe8OupM+fKRjLt6fPFfBzMBU894MamWZirRQr77Yf2S31nzuBqF/VdlWEymvr6gUY7vm3GD3tBhyyCKjB1VvlCupYXjoJ7fgJagzoIzgw5ZjRPHA7LAMD84g0gNuySl+HshFk3aFo3VbOuKPzrLN2ssakQL0WS6xRyVDmPmUark9e3ExqMSQDCVrzvvOcHZ6q37SGEYMR8Dh1TO7NnDM9wBRJosa5CvP3zUmXNbWWiCqjs9l7OM0ocOzo2y8WVFpSIiKJYe2PcF/Wgl9aN83b5uVLXD7Vf8F6pn/i8ELrEFjdLOSvjRVbKu7fU3rujDsMGG81XU8vK5x+pCXrxyzdQmV7UjrJqH6GH3G/e3A6S2EndqmoZ88Eu0A8u2bOIFt8cgl8eRUSYLWi4YYvKipf9s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(8936002)(41300700001)(38100700002)(5660300002)(31686004)(4744005)(66946007)(4326008)(66556008)(8676002)(66476007)(186003)(6486002)(2616005)(36756003)(2906002)(26005)(31696002)(6512007)(6506007)(316002)(478600001)(6916009)(86362001)(54906003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QjluSXlBU0tCRDNqNVpFbDZtMXhVRUREbXl6SnIxZnBxQXI4bGVVS0NqTFRG?= =?utf-8?B?V3loQlJlUE00YThiL3oxaWlnQ2xyT1FOajdNYlhGcXNMMitqOGFRcmRuY3VL?= =?utf-8?B?VXBtcnNrbXUxTERGN05KSXpmODlPNDZIeGlpbGJySlhYMkJySVV6dHVxZEl2?= =?utf-8?B?b2NRdFlzTlRIRHZCTHJ0ei9VWG0yckhrYkxuZ3Q1TnU4bCtQSG1hZG1GZ3NL?= =?utf-8?B?V0FKd0twTENmc1IrRkVmUm85bFozcjFLR1dHMjBXUlV4dlhQWEhrdzdrN1Ji?= =?utf-8?B?ZXpES2ZIQTZaYXlaUXdyREZhUDhiUjFEckhKdWViQXFlVkRvVXpqYVQ4TnNN?= =?utf-8?B?bUxTSGd6OGlOZ2duUlhVcVFGenFsaDhVTWxEN0N5aG0yR0xMdUU2a2QzaEYw?= =?utf-8?B?ZGRRWGV2VWViaENFRUhmL3VLbVNtK3d1YWJwNjlaaXUwS29Rd2V3RXpuejY2?= =?utf-8?B?YkhDd0QvSm81ejdSbGJPNDAvYlZsWXhsQmNyeVlQV0liU2pZL29tNkFoRVdx?= =?utf-8?B?Zkt2eXZubyt0VTRTSHlzeU5hUnN3d042R2c5UHVudngzcjJFZ2UvT1QxSkFW?= =?utf-8?B?dTNaeS9tdkJwSFJoNHZFaDdxK25ZQVdja21MUDNIRGJ1eko1cmFhLy8vOUlr?= =?utf-8?B?K01BaUhtcHZncDd3Ty83bE1jb1dJdVBkWUF0R3liUi9oK3hJOUJZNmhoSDJH?= =?utf-8?B?WXA0RTE2U1FIVWVvSm00c295R09HYVhBTFVpWEdwOWtmVWF6dFErY0JpUmtp?= =?utf-8?B?MmhKMmdHcXVhbnNaVDBmU2pCcDBsNmtpS3NSb0NpbitpcW1hSHYyYVJuMEtm?= =?utf-8?B?bWYvVVRSclNPOUZGdzBwcTVBMjBMUWN0MkVHVmh1cVoxWXdRTFNsdnpRdmVr?= =?utf-8?B?VDE2TkdhQXNHSXRDZlFkektlRnpmYzJMVWsyN3hqVk5wK0lsZTlkaGFqcGFp?= =?utf-8?B?dVBVVjhxWStkb1ZuRllTaHhRTC8wZ2podkM2TTMvdEJrS2U3VjBLa2NVNnFY?= =?utf-8?B?MFREMGhUdHZ6R0k2NUZDbjRWWm5Scks2QkpvU2cwbVg4bTU2T3JlbzR0QUcx?= =?utf-8?B?bXdBMmZ2NG1BS0xnWUIrQWRTWkJRSm40dEJpYit6dDNGTkpPYTBSdDJrRER6?= =?utf-8?B?VjVkZkJMS3VhWm9hbEJhcHV1RVUyL2lvZmJWUkRtWVp4MGFvclpFcjR5WU5Q?= =?utf-8?B?M3lRaU1JbGN0YUtlcjY3blV1aHFOSGtoYmdPUXBhZkNWeUt6OTAxdHV2ZExO?= =?utf-8?B?UGJ5RVg2b05IOUFIVytHZkFibzF2ejQ3UjBFL0Nkc29JaEdwZm5GNEdBRFJI?= =?utf-8?B?NVZSQTI1MEVqMkJzejNDSE5DbU9QNHN1WUtlL2t6OGpOVFRZOFcvSjBCMnlm?= =?utf-8?B?V3N0M2lsMWdjbEhYZ2xLbUtOUkd1QnZIZCs3UWlPNmt0UW94bmJ6Y1lML0V0?= =?utf-8?B?OEdldU03R2x5Qmp5S2VWTW1xajdibEN6Um9kL1hJaTlRZlAzZW5RdlQ1N29j?= =?utf-8?B?a3lVOTFkaVFQMUxLckFHaW0rd1R0T3ovMjR2ZkU2RjBZdkdmbFFBc1R2Qm9Y?= =?utf-8?B?N1hnQStpTlNWc1djdnBTRm11eHZ6MmFVak1FblRHU2dFd2RNaXZCU2VKMDZm?= =?utf-8?B?Zk15YnBsaXZwRWlnL1dvNGh6VGFrSnpXU2VjRS9UQ05BdHlmQ0U5YkorRDBx?= =?utf-8?B?Y3RGUEZrYUpST1hKZkl3bGpNanRoUXlsK1UvZmdEWG1tV09MNnRmR3ZPVStC?= =?utf-8?B?YkdsVW5OU2tXK3QxUTBJSXNlOUQ0R1BQWWh1NjE1Z0hQQU5UZE1KNlMzcElr?= =?utf-8?B?MEdJK2crSUJJWTVLc3FBZnhIWWd0TEFSYThiQzNHbm53UWRqSHovNTRjYzNz?= =?utf-8?B?UUtWaHozb1NON3d5WnVCeXN1VW1na2pBWVpxQnV2dnpTejB3NXp4WGJnajZF?= =?utf-8?B?R3ovSkVrcUo1bEo4SE1oLzcxNTZXOG42Q2tqcEwxcGhmcHo5S3ZabUtCV0Fm?= =?utf-8?B?TzdrdGJQdnJHd3RHOHNtRkp5VUM2cUQ5Q0M5a3o3MFVsUlFhOGE5MW5hcXFK?= =?utf-8?B?ZEIwUVZjYk5SemRWTGwybWhEWlFHR0V6SGJpV0NNRWdJSFBMdVVkeW1nZHFR?= =?utf-8?Q?6+v1+LFmwo6kQ+jSeQA5euWDr?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8391832f-4087-47ef-5a6e-08dad7966780 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2022 14:30:20.9127 (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: I36oY7F6mmFurbhEZ8IaI1OPCKU7fEyzjsHA3ZPb4mO4UO2QNQv7ObfPSmN69Qse1PEPPzfZm/+iNWsi/MS1rA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7777 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670337046460100001 Content-Type: text/plain; charset="utf-8" Grant table code is unused in shim mode, so there's no point in building it in the first place for shim-exclusive mode. Signed-off-by: Jan Beulich --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -9,7 +9,6 @@ CONFIG_EXPERT=3Dy # Disable features not used by the PV shim # CONFIG_XEN_SHSTK is not set # CONFIG_XEN_IBT is not set -# CONFIG_GRANT_TABLE is not set # CONFIG_HYPFS is not set # CONFIG_BIGMEM is not set # CONFIG_KEXEC is not set --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -14,6 +14,7 @@ config CORE_PARKING config GRANT_TABLE bool "Grant table support" if EXPERT default y + depends on !PV_SHIM_EXCLUSIVE ---help--- Grant table provides a generic mechanism to memory sharing between domains. This shared memory interface underpins the From nobody Sat May 18 17:34:42 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=1670337083; cv=pass; d=zohomail.com; s=zohoarc; b=lAWfe43Oy6z8vTUtHLAaIa0BCeJtPCGeCxbsSKJqIq/6Fk46zXgmlDR2WZ3eSfkGTcRi/2MD2FhLF8q01v7DddqK5o7cbZu1sI9wc42+MCWVJAEBNRW6H9jxc0fRkqBLNe4dcYFoLAHjR8cagV9grmQ92gwWQ4M46/9za7EI4DQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670337083; 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=eQ0cKDf1wQu9lbiq2UBIF0gkVWSNaxD+TG1S5rB1UXU=; b=OJKp5P30YAQ/7hqvSE9W2A+ccap/hrKRuJ3jJWo+fQ18qQG0184lUD9ePi8KOhIaGo7/KJIUAluDzOuOtpkZ//FAfn+EACPbpPRTGdqvUG2ab1+8Rcu5WtbVyajW51fmMAoAW8Y2N5VRCPsB/qyvmywqkJSKbnPe5ALMMDpS9TA= 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 1670337083626557.4869265230494; Tue, 6 Dec 2022 06:31:23 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.454994.712601 (Exim 4.92) (envelope-from ) id 1p2YyL-0001iw-Nj; Tue, 06 Dec 2022 14:31:01 +0000 Received: by outflank-mailman (output) from mailman id 454994.712601; Tue, 06 Dec 2022 14:31:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p2YyL-0001ip-KU; Tue, 06 Dec 2022 14:31:01 +0000 Received: by outflank-mailman (input) for mailman id 454994; Tue, 06 Dec 2022 14:31:00 +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 1p2YyK-0001UP-9C for xen-devel@lists.xenproject.org; Tue, 06 Dec 2022 14:31:00 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20617.outbound.protection.outlook.com [2a01:111:f400:7e1b::617]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9a3d264c-7572-11ed-8fd2-01056ac49cbb; Tue, 06 Dec 2022 15:30:59 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM8PR04MB7777.eurprd04.prod.outlook.com (2603:10a6:20b:236::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.11; Tue, 6 Dec 2022 14:30:58 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5880.014; Tue, 6 Dec 2022 14:30:58 +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: 9a3d264c-7572-11ed-8fd2-01056ac49cbb ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JeUB6TRMxLE1kqMmMMiGHWEtfugNz5w9KjGusNNijIZJDr5NzsO7S9wTwU9WpXWDtD4opSSGn/OYI3sqcszLq8R+Kqp2B1Yws3pY2iX7upt3GKiNBkj43tuHCMuDX+6UXoE32HyOBvHl5UM87Bvev+zE46bkj4efleU08grJ5ll48Hc6lCPrDV/DmsHVTrrsqcu7dRFe7ZaLsprJqFeYBclm30xriMvje+ScEZz5xdx4UbyeZ2PTb3SqCysTyaR7L5cPQdRtmQwAB04NC7erGMcliWNzqal9oCebEwfr64WAfJ03MsiCdunZNltBxPnsJJoyuPaAaNdPFoMj+fZRpg== 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=eQ0cKDf1wQu9lbiq2UBIF0gkVWSNaxD+TG1S5rB1UXU=; b=AMIx2dgtP1NRreexgM2LfFssu0O3+36f2sX3YAd/iZw+g4A0MHgXdwR7V2QCTuotK4AUX/wC2fKQHPj0WexbS/1ZA58jKn918oAodVmec6qc6m2LAliJbqpDIsZdNFyIyxDXYYC5QGSjwR93y7GgWJVGqCiS9DQSawlxnwG6UH54REQMCeOO98uno0B9e5o2W5CqBisbcrT8KcJnlay3r9tN8tVoCXRqmLL1+F2PFgkXl6HiinzIZ1VyQ7JRBZMn2QOwrxjn8HQVTrMSbgs/Ngfz19+Ib7tmTldUS6byjs8W563WpwKQoXfAWJJKEw7enxbfcksIZaxhzS1HzIQOQA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eQ0cKDf1wQu9lbiq2UBIF0gkVWSNaxD+TG1S5rB1UXU=; b=eq9MdmrupY/+wctkyBni/S2A5h+KN6PCzYYdeeFk5DPeZqvDBnxsLS2dFIx1S2B/NZan5T5dpT9ck672D6MX1FWa1qqbFCDCa9dp//LSenxOeY6XV0QkrzfiSvOSrk2f1DpsBixPkSlSJuacIgIFjmCSdJKQaEW14OviDjLTJqgqphv7xKpm2UKjtr7kXTNnyl4HbtWl38SatKMte3wz5c43GEalZreHyXhSvCJ/czunbLEKBJRkj+uAZA3qCd/XttUbFt3qohy0GhoJD6pOTCav2oJW12jnvbJRrXjcXCaD3D53S8zW9Vrm6ev/NklM1twNY7IXouP92JF9HAQCDA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <958b3fc2-705b-ac93-9a3a-ab1bdeecf752@suse.com> Date: Tue, 6 Dec 2022 15:30:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [PATCH 3/3] x86/pv-shim: suppress core-parking logic 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?= , George Dunlap References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0131.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::16) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM8PR04MB7777:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ff10567-edd9-4614-f6d5-08dad7967dc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xVc2xtXrbY6p40IsJtFB2gdfy84rd82FGKeNnIdDug8HoUmuVCQg7OHDvVVWYr8sD7JsLhINJ5Gn5xcUnwAzmfVoXu64l7XQqbsX/xLF3E2htbqF4K3X/I8ki5smn0DxyTM1fG0KmFQ80Wy/sAOUe9nNyiRHcUj6JakHqpTMoywaF5JhlwuOkfo18JDBqCHCbXTwJGiDnT+CNrrAsFXXmsCRD1wnVchDRpCMwFAkNFT3sD3tGHXNYmROdj3IEnlNQoX7GJvhvWb9HA91ZyzA2lVrVkU8v7H4JDwrTU9f1k8SpFXCRialT+QMK+R+sy/nJ+uYSoTT1eXYoIzS8TMYJ9BtsDbNkyCa0oXdAmbHCkHoo0peFJw3prv0MPyOsSQv0JHi6idfluBGdEgGZT0YgZpL6lFSKRmne2Qo19ZuiNA0FhLKjN3sST6m+NIlg78RPTQ7G0aLtVfCAyyCO2XWKmc6VKugO75AK55TO1SoKvQzPLzsRs5lI9/4PIJzpyUqzF7gqxCtmg+pkQ1bBXeqR9dAAAP9woR8O2Zr4SIOedre+jYJElYrQZ1h9yZM1DUKTbpKsF+nCmZadakbV3ysfenwNHDnaSblJ4ZwhSODkvFOIEppEJ19gjNGZlG0CtdulYJtRyps5p6pK7HTBMkbpN7uy4voAKvvHL1a8ltHL6BbMf/uKyW3WYktLR5sY1AnRviS/5tkoW7UEBX31qj0Tcf4GY/wEeNdXeUIkmUbn6U= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(8936002)(41300700001)(38100700002)(5660300002)(31686004)(4744005)(66946007)(4326008)(66556008)(8676002)(66476007)(186003)(6486002)(2616005)(36756003)(2906002)(26005)(31696002)(6512007)(6506007)(316002)(478600001)(6916009)(86362001)(54906003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K1pBTzJiWC91dk1WbEFMRTUzYUEveGxJV3JMTUlVRW9sTzVSUHhyMklXYThY?= =?utf-8?B?SllyWWNKQU5HYVIzTXhNU21TWEs0TjhTa1lTQXhiMUcxRG9BakUrazRsT2lE?= =?utf-8?B?ekZlVnBsVzRyamduY1k0MmgxQVRzTUM0NkJia1Q1cjFWWlI2SHhEbDJXbGVE?= =?utf-8?B?aTY2NCswWGlxeEticDVSRzhIZC9PN1BKZ2pxQXQrRldlQUw4NUtISjZhMEdB?= =?utf-8?B?ZlJHRm5VaUlLT2c3eXg1MkJmd1Y2SWpaOGZnbDNqUUxUUWhUd3h4OGlSeW1v?= =?utf-8?B?dW5iYWkwRFhueVJIWndXdEFBS3NpV3V1dk9YMllhWk1KYm5CVkMyZnBGUExt?= =?utf-8?B?ZGtGc2NOV29yckhNaUVZZFNxcW5jbUFRcCtGVEU5Z0xldS9DRXI1OGhFOFRF?= =?utf-8?B?RG9kajJ3QlhRYWdUQVBuZDd5c3dhd09JZ1NSWDR5eHFodnpaT09HV0JoTThn?= =?utf-8?B?YUh2NnVEVDZRdkJud1FhTWNtTXRoTldEbzIwSGdMT05jWjErWDlOQnJsRGdU?= =?utf-8?B?LzlkeXRGUXJwTVZsT2c3Z0t1eWZwVFF6NkFiMkQzRVk2RmFRTlQvbmc5bGlU?= =?utf-8?B?VjVINmN2N0FCSHNwWGpPNEhzdy9HRThYQ3FmRzc0NjhpdGtDNDNySW5LSDMx?= =?utf-8?B?VnNCVy9vSDhjRG93SFBSKzAvYUFCdHkrMXpuQW9RbkwzU3JmcW9xTEc5SWFR?= =?utf-8?B?M2huWE04WDJtT0NNTnNQSityMVRtRFFEbVBEVHc1UmxMNjZIVmtaT3pXYTNU?= =?utf-8?B?TFN2VEpNSEc2aDFCWmR5UExuNnh3VFBJeWZFaVNiVU0zRjBnMGQ3TGJkSzdo?= =?utf-8?B?MlZ6UU44ZnE3YzZQYUxkYVZqaFljciszM3YxU3NUNHk5K2lJTVNSb0luZGRM?= =?utf-8?B?aTFIQ1dnWVRTalpuNnVWelpSTkJtdlRUWXEyVVhlL3lkU1J5VUY3YmJxcnBm?= =?utf-8?B?a1d6a2FIUXJaditkUnI5SkpQNjNJRU1yZWdaWTR4WTIwWnFObDBJeWt3cUdY?= =?utf-8?B?bi9RUmNhQmo3OWxTTWd2SXljZkN4bHA0ZXNrakpwcjhqbFdXNWJmNlZObXZX?= =?utf-8?B?RndmbmFVeExkWUtPc3d3dFVMU0p5ZENrbS92Q21xTUdES2hsRFJxZ2FOd25r?= =?utf-8?B?VlRhVFdnYytXc0ZkbUNwU2ZmbExROVM3Wk9SOHZDaWNHNTlpVExKY09wSk9G?= =?utf-8?B?MElldmpheTBQT2o5SCtoNGoyNHFwTkFReDdkYVBaK2xnTVNlbXBKc09vekZF?= =?utf-8?B?ZG5IYnFmRTBGVHRPOVJ1dDZLc3BQbSt0WUJaQ3BhbXhscEZ2emtXa0hFa3pC?= =?utf-8?B?RHdVVjZ2Y3lQejdsYm9QdnNscGQxTk83SEJ5aUtSOGJQR2JVZC9jZ1dLaTlz?= =?utf-8?B?Q08zWllIcFRUTHJhSmllaGQvUzdjazN6bVdKc1czYmNNbUNKdVdLdTl2V1ZG?= =?utf-8?B?ZVlYaEk0ZEpaOE1ZMUFlb05sdGt5VVBmaUdxMXhKSHVPRGU5a3VRZjBvSm54?= =?utf-8?B?WU5TcTh1dDFaUk13aWExaUdONk13ZDIrdy9PVGIycmNkMlFjM1dieHJlLzhY?= =?utf-8?B?djFRcitxM3VyTW9qK0hLaVZNZGN2RkVrUEVTNFo1N3JtZXBLRWpmY0VwRDYy?= =?utf-8?B?RmU0UVBGaEtabWJRSzJXTnpPZVN5Nk9ldUU5WjFnbXlWMDJidUJ1Q2NkV2dh?= =?utf-8?B?M1ZhZkY0TlNNb29DWTVzUlJpK1IwYmlVV2tIeXdTdHFZMm9CWGVYN2FpN0FP?= =?utf-8?B?cjM3cjI2TEZmNkptZktXSGVYbW9ONXo0dHY0REhNRy9kelRtSFphS2J3VW1C?= =?utf-8?B?QmU4bXlyUjg0dEcwV0J3MDRXMGxFRnZkdEk0cy8xaGRZK2plOWZvdlc3S0N3?= =?utf-8?B?Q1B2SnlBZkhybzNVcGE3MklQUjJzTVV5YzZmK2doK24xMkd0Z0JyWnpTbkN0?= =?utf-8?B?S0p0UDFUM1FoSVZqeWpPYTZvM2hmRGJhcXYzbzBFYTM1WnR0VHZRL2NwdjEw?= =?utf-8?B?UmgwL1M1M2w4aDFBT2tCZHBqUWs3QngvTGVDMzQ4c3RFclllVmczVkNDMHhq?= =?utf-8?B?Y2VyVytDb1pGaUcwQ2FPZlNhOU5vT2lnMWJjOUZ6cCtVUE0wekR1eXdZUGx2?= =?utf-8?Q?6zoW46RfRvcd/QJ33gxT3MW2L?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ff10567-edd9-4614-f6d5-08dad7967dc6 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2022 14:30:58.3166 (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: sGD/m3FaPbyhiB5IT41RqeQOOX210ApIsFZ9csvmn/GO0c4sQL6y3V3TcK8bIZS8SrTOol3t7Lwxm3kRMJnDNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7777 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670337084917100001 Content-Type: text/plain; charset="utf-8" This is all dead code in shim-exclusive mode, so there's no point in building it. Signed-off-by: Jan Beulich --- Contextually depends on "core-parking: fix build with gcc12 and NR_CPUS=3D1" --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -10,7 +10,7 @@ config X86 select ALTERNATIVE_CALL select ARCH_MAP_DOMAIN_PAGE select ARCH_SUPPORTS_INT128 - select CORE_PARKING if NR_CPUS > 1 + select CORE_PARKING if NR_CPUS > 1 && !PV_SHIM_EXCLUSIVE select HAS_ALTERNATIVE select HAS_COMPAT select HAS_CPUFREQ