From nobody Thu May 16 03:44:05 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=1677680020; cv=pass; d=zohomail.com; s=zohoarc; b=Llfsb2Gfvyh354UPoIDsHo3Z6Sq+EQaWgDIO/kiKsyYrHk3qbZSKsL0oUEYHaSj7XUkzs6q7di5lIhcMFhPrt2nuNmFPnisfnkhissDvI5o2RgMfKTScl1QZ81ERXajeATtbasGh844mkCyAndAGWBTS0LnccjbPuEZbDYsKs6E= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677680020; 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=OjeLmA2eNiOxciM8UGLqrT2OGGZaeyhsIURc9DPTNTE=; b=VDWxhs0x90Llf8FiRZfEgH3ja3AY3gWRSphjgi/vFRu3gyMgfOngtS0KhXoEs8+14a0tS0sc2+pFipFRnRwrUzgTXZZwpZy7AS55uXGOAHYjA9g847839Nf4AofNpzNeI5cM1ILPehvv9+Xy0qLPrnsSwvVqoK7E7VQLZVlZoaM= 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 1677680020464639.4257713847749; Wed, 1 Mar 2023 06:13:40 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.504063.776564 (Exim 4.92) (envelope-from ) id 1pXNCh-00026P-Td; Wed, 01 Mar 2023 14:13:11 +0000 Received: by outflank-mailman (output) from mailman id 504063.776564; Wed, 01 Mar 2023 14:13:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pXNCh-00026I-Qq; Wed, 01 Mar 2023 14:13:11 +0000 Received: by outflank-mailman (input) for mailman id 504063; Wed, 01 Mar 2023 14:13:10 +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 1pXNCg-00026A-Hc for xen-devel@lists.xenproject.org; Wed, 01 Mar 2023 14:13:10 +0000 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2060b.outbound.protection.outlook.com [2a01:111:f400:fe16::60b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 311a9f12-b83b-11ed-a550-8520e6686977; Wed, 01 Mar 2023 15:13:08 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM9PR04MB8382.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.18; Wed, 1 Mar 2023 14:13:06 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%7]) with mapi id 15.20.6134.030; Wed, 1 Mar 2023 14:13:06 +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: 311a9f12-b83b-11ed-a550-8520e6686977 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KCjyCvvYJcOSuqcxk4OLea3ZtJRAxWJwiMrtqfEyapL93EzJfN2XetRzaaEJXd3vCvo1BczgKsbXSfEAtRkypqhxJPn1gIKz9Wtm4oDFY9j/6XpaWtFNK098C3u36YCZQbn9X3z5MWOYT6VEc6Vcl/1trUGQ0OvltcdhDFVyP720ZSSYJ35ChCQORIvDox4Q+ALkne+h2yds09t3jfGNQ67wJYRmKXw4qHsGsgFje1C5/uwBg1JvIPXWMFZfNxjH4aZbQz9RycLAGBJG6tER8ameS+SQJoDGEqXI6y3NOx429agSF1RpujnKgJ0EfzUE6lL8fbshypmoCRd82a5XHg== 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=OjeLmA2eNiOxciM8UGLqrT2OGGZaeyhsIURc9DPTNTE=; b=Y0Zp193yTiCXSiWSX8fB3tE8Dtl6yFaKII5ndPFT52Lw2O4LsnFJa3RpENabWYPI8SgSVi5dUef2V6LAnTSCkasXKmXsbyVc/KtuG470y2MUdx4hd7LI1YZlevT8k5JMqXjdtqQuxAemm4qL8vCH78Lr4Dh9D2H8/BovluhAgipBCwdmyK1erbUp11lzjzv8QexjfS8JUM4Js0eyFkRM/4K3ASSi//na4Ct7gudbnrihf+7lDQMbFcJFSGVfghXcsL3HiUUqyprQgTN531hvbeTN0a7kUCFvTLpirvxvRkJRvpPzJTBW2vN1APl1lpluTzCdPyoyzZ8SCykzO+ZK8g== 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=OjeLmA2eNiOxciM8UGLqrT2OGGZaeyhsIURc9DPTNTE=; b=rsdkYZQke8YlPJcL8PtJqlqhLb7BBz3cZTTG1kGxriR6v0hXjziVjoFAqjjeoDvq7evL99YCli9xfBOwXQdp+YS0Ozcbhm4IyeXUjIlaj9TszLfxQQrCgKSfYqBamf8k4JvbB7XtkHv9K9RsqHRUwA1EuRBGtalJYvNzk03U7CoSb5j1RNnT8ndm6HobPi4U/5aQr+gqS65nQ92+bTCYQ/qPpn9joHzGvHYaKO7imJMZZ4MA1fEXOm2oxrOr36GQ667TJdjbuYtmPhhX9Tr9iXMzSnbivP7fyJRVQqtTEv124RHmEqaSTBmUOfqs6gI8AxgB5P1XccUUTAPAsGmDyA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <617842e1-8ef2-b095-0c52-c2e2e5f1c0a8@suse.com> Date: Wed, 1 Mar 2023 15:13:05 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH v2 1/4] x86: provide an inverted Kconfig control for shim-exclusive mode 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: FR2P281CA0170.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::19) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM9PR04MB8382:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bf0b038-7969-4946-420d-08db1a5f1435 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uaAPw2h7LoJK0qqH4XyqwhvGMoG3XTMaVhFOcTgtyxG5w+Z1nDOtf1WvWT4cgr7w5+fVvNfoCwWxiqHtA/6htyom6c3I1Y/fREmJQygBfYVjHnj4ZAKaFdaUrfPJvuyjbnu5xaAwOQLAf9otnq9HCuvcz5ubSk1B+RWgdLAASO9kvrMz1Ukw9yCz3qc0dBsYIak/5Ot3qxAunK1JMgwuThQkJXY/52vsliNu1z/k+I/SnxPnEzvmxCYWh6kZ/nZ7TgrSwbmTs+LTUudUiNXa3hQ6FjQTrHqkrwghbODj+1TwJobDU+gUaJ5k4rMqsMf/O1jtqE6mxb66mYiNqhII5LyqTN/CFoGD4X+AfobXkyW0wiEHYflgsRDMiFhAINKeweG7ZY6hw2YDAiPeXkSpCceHERnppmlyid1xElvlv9Jwo42yzRqS11awX0GpVzwg4LKvsfXRJvncVVaLWULQdNxxbx9zmlBxUzarwT+zt8jefal1DSild9Tk9fu4q3p6Lcd9DpQSlim7x6vHA5ZOjwUiAL7IWN7iTZxPOIqG/qVTgPa31NNPOBu++WuZx5MNEL+lIGsjSuPKMAQesaFNOIQld9G1rMfOAFaC1GFx9yyzW1E9lQhv2GdK4N8a1U/SJgxjEpkWSrliu3k7yyN3vXZ2iX8lQq7AAbiRKNp0TPDMqCKymQwX9R4HYG/8fwFn9wkZREiV0IfyH4SEzQVfizSbJ83gfvjmAxNPoVa3OA4= 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:(13230025)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199018)(31686004)(36756003)(478600001)(83380400001)(316002)(54906003)(66476007)(4326008)(38100700002)(6916009)(8676002)(6506007)(2616005)(6512007)(186003)(26005)(6486002)(5660300002)(31696002)(66946007)(66556008)(41300700001)(8936002)(2906002)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VkdZWUd1M292RDMyV3EwMzhSbG5YcC9KK3BDMU9EeGVaVFcxdkFnUzlWbzFU?= =?utf-8?B?dGt5YzloTURQQWxFNjFubGJyYkRpQzk2ZCt4NStFampzaGtiWDlWRWRWa3Yr?= =?utf-8?B?bmV4M0hsQTZhMGNkU2RSQlpsdFFSYXhWU2YyTWNKeEJoSk5RWE1uZWVscWpL?= =?utf-8?B?RzRFc05MUEF1WnFEWisxQTBkanVKV2plYVlwTmo3Q3RaUURobEJ1bkF5enUw?= =?utf-8?B?SUhOTlA4bUNtNXBFcXBuWWNRcVArcWtGcDFIRWhKeUs0Nk1rY2xJdUNRYTVp?= =?utf-8?B?OEZsRkVqNXJiN0VBUnYybnphVUhuWG14LzVYOEZXMUt3eHY3MXRxZVdaQXUr?= =?utf-8?B?b0xSVE1QbkxTMVZWOW5sQW94N2hOK3lUakVMMFpXRGE0V3lpamxDbHJjV2VB?= =?utf-8?B?VFczbzVSdW9RVlJ2N2JyTHVNK0I0Ni84Y0Q5eUtxbTVsenBuMDdScnRhaTZ0?= =?utf-8?B?MGpNK0M2dk9aY2JHV1M5T3Mxb3duekxXbWVRaEJLRHhsUjhwM3d1eUxlQTI3?= =?utf-8?B?cERQUFp2d3RZQUU2SmdpaEJpa2t5cGRhUWh0SkI0eDhMYmVmMXdIQWZqSWUx?= =?utf-8?B?VzN3WFd5VXR3ai8vT0hrYkEzQXhZYWxQVmpnU054KzdmazRQWGhLcUF0UzhL?= =?utf-8?B?ZUJPOC9RbElKMkFPdzZ4UDNDVkNyeTIraGFJcCtPT1RPaWZqRzEyM1lDUnVU?= =?utf-8?B?YzhwTldYZ2RTQmZ0RWlXOEpxODJZV1FIU2xKR05wbzhuK1JOSW1nRXZWMlov?= =?utf-8?B?UlBBY0o5TkZnWWlFaVZrMTlsYmw5QmFGR3BoVkw0d3VFNTdZVGU1R1ljTFMz?= =?utf-8?B?SUpHeTRQb3hzbE96cVgvSE5tVlZ2MzJmQW5lTU1GQ0lMNURXU2grcm5TWUVG?= =?utf-8?B?ZVRZR2hvM3ZXU1BqcUYzRHJkMDVuWlVUOTAzdFBOWHh5SkdUVmdKNEFqRFpM?= =?utf-8?B?MG1DMWVnbmZkYTMzT2J1cy83aXE1NGNOdUsvV3NRUXBPTG41NWZLS2VUcXpI?= =?utf-8?B?VTJuUit0bGNaY0lZWUZrcjRvUGpSZHFsRjIwVkQyblgvbXpBb0FtTXdoa3Mz?= =?utf-8?B?VW84aURwdWNRb0F1d3JuUVA2dllaL2xiemZqVW52Z3Z6dmF4L1pJSDhrNGxQ?= =?utf-8?B?Y0NLOWszWStzNjVmQVhuRzRKVFRnTFNURmptbFZIcms4bWY1bDkwZDB4Wkk1?= =?utf-8?B?V2d1cytMeW1aaGRiTlVBcmxndjFiQm5Id3hUamE5bG5pYktsREowRFFteDg3?= =?utf-8?B?QzZldzhTOFJIV0pFeGFja1JROFAzQjVNVG8zYUZOcFFoc21kalVKNDhuR3Jj?= =?utf-8?B?N0lDeHQwZ0Izd2lSMVdDeVJDSEVOMHhPWCtpVjIweVgwY0tGQmVCaWYybnJE?= =?utf-8?B?YjBIMEdnQmxZRk9EVElpaE9CZVRtaEtnYXJsTWE0NEFlQjBNbHk0bWpHM2hl?= =?utf-8?B?N256SktudFh6Z0kwdWFCa0VzdS84b3FoemtLckozVVZVZFhHSGlyWDRsR0Qv?= =?utf-8?B?L1UvcmJHWTVIaG1uQUJNRis1UzFNd1FneVkxRFZicFZvVkZndEo5bWNkUk00?= =?utf-8?B?ZFdkU0NVTzdpUFZ4clMwUWloYTQyTmZkVUhtQ1JLRFZQclBGampjdlorckNa?= =?utf-8?B?azlaY0g0cmwycFFoNVBkczJYY0lhY1h1enpaS3IvU0p3QUJZU1p6TmwwYmcy?= =?utf-8?B?aTQzdHNZZVVnVVBUUjBzOVFmOS9vNHdVVnJiVW9sRHgxUytUVExMK0VGbkJx?= =?utf-8?B?Y2crNkMwZDhKbTRmK1gyZ04yQWFqRE8yd0dPeklCMExqN1U1YW9vckNOTHc4?= =?utf-8?B?RjM4NFg3RGZVVDBweHBqTWJDREVVcXRLSVlqTnZsTy93UE8zZjZPYXBEVkdq?= =?utf-8?B?SU1pMlFaeXlzWGU2RjIwWUxSaUtWV3lydzJTdlVzcGI3dmRhdEVoUzhpbnE5?= =?utf-8?B?VHQvamhHcXd5aWVVYlR4WksyY21wcVBsS0tZZFJTTk1pRURXMEViaFFiUmJy?= =?utf-8?B?dHJXanJzdzloekhYQWV5aE52d1R6eUY5L205bmovNit3K2tZOVYrVXQwaWhZ?= =?utf-8?B?Y2lUSkRiN2h0bWZBWXNQSk1XQW45V2Q4OEplMW9QMkpQaXV4WDV6U1ZlQjRV?= =?utf-8?Q?KRb4uFYIGvSRVPHIsInroEbZd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bf0b038-7969-4946-420d-08db1a5f1435 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 14:13:06.7869 (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: SdxunJJNkmYfEA6inTw+SQEaCT2bE+T6SakAzxT9gtbMurO6aCOL1RGamphVuaDyrAXvj6clXiilcDyDu9FOSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8382 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1677680021996100001 Content-Type: text/plain; charset="utf-8" While we want certain things turned off in shim-exclusive mode, doing so via "depends on !PV_SHIM_EXCLUSIVE" badly affects allyesconfig: Since that will turn on PV_SHIM_EXCLUSIVE, other options will be turned off as a result. Yet allyesconfig wants to enable as much of the functionality as possible. Retain PV_SHIM_EXCLUSIVE as a prompt-less option such that first of all C code using it can remain as is. This isn't just for less code churn, but also because I think that symbol is more logical to use in many (all?) places. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich --- The new Kconfig control's name is up for improvement suggestions, but I think it's already better than the originally thought of FULL_HYPERVISOR. Secondary Kconfig changes could be omitted; in all of the cases I wasn't really sure whether do the adjustments. I think to avoid setting a bad precedent we want to avoid "depends on !..." (and hence also the functionally equivalent "if !..."), but any default settings or prompt controls could also be left as they were (or could be done the other way around in subsequent patches). The Requested-by: isn't for what exactly is done here, but for the underlying principle of avoiding the negative dependencies we've grown. Outside of Arm-specific code we have two more negative "depends on": COVERAGE requires !LIVEPATCH and SUPPRESS_DUPLICATE_SYMBOL_WARNINGS requires !ENFORCE_UNIQUE_SYMBOLS. The latter could apparently be switched to a choice (enforce, warn, don't warn), but then I'm not sure how well choices play with allyesconfig (I guess the default setting is used). --- v2: New. --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -103,7 +103,7 @@ config PV_LINEAR_PT =20 config HVM bool "HVM support" - depends on !PV_SHIM_EXCLUSIVE + depends on UNCONSTRAINED default !PV_SHIM select COMPAT select IOREQ_SERVER @@ -145,7 +145,7 @@ config XEN_IBT =20 config SHADOW_PAGING bool "Shadow Paging" - default !PV_SHIM_EXCLUSIVE + default UNCONSTRAINED depends on PV || HVM ---help--- =20 @@ -196,7 +196,7 @@ config HVM_FEP config TBOOT bool "Xen tboot support (UNSUPPORTED)" depends on UNSUPPORTED - default !PV_SHIM_EXCLUSIVE + default UNCONSTRAINED select CRYPTO ---help--- Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -276,17 +276,19 @@ config PV_SHIM =20 If unsure, say Y. =20 -config PV_SHIM_EXCLUSIVE - bool "PV Shim Exclusive" - depends on PV_SHIM - ---help--- - Build Xen in a way which unconditionally assumes PV_SHIM mode. This - option is only intended for use when building a dedicated PV Shim - firmware, and will not function correctly in other scenarios. +config UNCONSTRAINED + bool "do NOT build a functionality restricted hypervisor" if PV_SHIM + default y + help + Do NOT build Xen in a way which unconditionally assumes PV_SHIM mode. =20 - If unsure, say N. + If unsure, say Y. + +config PV_SHIM_EXCLUSIVE + def_bool y + depends on !UNCONSTRAINED =20 -if !PV_SHIM_EXCLUSIVE +if UNCONSTRAINED =20 config HYPERV_GUEST bool "Hyper-V Guest" --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -3,7 +3,7 @@ CONFIG_PV=3Dy CONFIG_XEN_GUEST=3Dy CONFIG_PVH_GUEST=3Dy CONFIG_PV_SHIM=3Dy -CONFIG_PV_SHIM_EXCLUSIVE=3Dy +# CONFIG_UNCONSTRAINED is not set CONFIG_NR_CPUS=3D32 CONFIG_EXPERT=3Dy # Disable features not used by the PV shim --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -3,10 +3,10 @@ config VIDEO bool =20 config VGA - bool "VGA support" if !PV_SHIM_EXCLUSIVE + bool "VGA support" if UNCONSTRAINED select VIDEO depends on X86 - default y if !PV_SHIM_EXCLUSIVE + default y if UNCONSTRAINED ---help--- Enable VGA output for the Xen hypervisor. From nobody Thu May 16 03:44:05 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=1677680122; cv=pass; d=zohomail.com; s=zohoarc; b=ElKMf4729+aaNfrbRq0U6e+NOYt46T3BeQ3EpRzg84agV8BEVcU2pCtXCW7bCF2VYSJv3dS72DI7hbnaRN6ylPnde1VAqL4wg5HCXUJLnWlLJJTSDoNeu83QMg0vQm6+s8FmrpjfsHKnISQkUE4ZZl37wc9a4XjiR+8HQl97zPI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677680122; 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=F6hscHsn67kN23ZHpCA0zJvEfO4qDNVvmFON9U7hKrc7xxpaubveoUCqPz+Psvc1TgNGJGLGIOIIqNffuRxIW+c2n7Yl6Ct/AKtr3FwBEyhHr9ylaZf1bmJ0oyQdjYEFK0P4P0vBp2zifAUvshNr/f9gY2j0WAhf8el1xYP/CO4= 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 1677680122787725.4342408959718; Wed, 1 Mar 2023 06:15:22 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.504067.776574 (Exim 4.92) (envelope-from ) id 1pXNEH-0002eb-9E; Wed, 01 Mar 2023 14:14:49 +0000 Received: by outflank-mailman (output) from mailman id 504067.776574; Wed, 01 Mar 2023 14:14:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pXNEH-0002eU-6I; Wed, 01 Mar 2023 14:14:49 +0000 Received: by outflank-mailman (input) for mailman id 504067; Wed, 01 Mar 2023 14:14:47 +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 1pXNEF-0002eM-21 for xen-devel@lists.xenproject.org; Wed, 01 Mar 2023 14:14:47 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20615.outbound.protection.outlook.com [2a01:111:f400:fe1a::615]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6ad57354-b83b-11ed-96a6-2f268f93b82a; Wed, 01 Mar 2023 15:14:46 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.17; Wed, 1 Mar 2023 14:14:43 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%7]) with mapi id 15.20.6134.030; Wed, 1 Mar 2023 14:14:43 +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: 6ad57354-b83b-11ed-96a6-2f268f93b82a ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MT4HYdvsoxogJ/GowwguXLde2BnLiQ9eti0nXH8/Yd9sKqET5QB9Rnr0N5gidcYZ2D4fS5xhjn2ubOlLPKrUTV4C+6vs1NddCpiJxw+7cHImlMh54btHJzOrfj0Hj2owAi1cDv0BOrwKlLuObI99SssgHxGxbiD/Ej1xnp49zlTCme5w7iJuMzQmWKqVvco/SuIp+cRkcAceXcV5jlIOz6iibHAZUCWyXurh8zlmvD0xpzPIQamEnR9etHnv5rbM0RW14l31YNQjcVVBH4HY792zSsPMDCzA5gMkBB1D4xOf9n94MxLxYOB+f91xiX+BzITQCc+bkOEsh9aKbuHPtw== 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=P4MuBvvpK1eha9CROFA/TquIX/O1KeEHJpEnBoPQNd1tJtVhsxUIM1+PJX127KHZ1udszJq54hrZiXndoFStSzSTuJr9QMtOaUJGV5vdA9mWXb6ITYIPij81B0x2tphpxZfMBaiA9CYCwrEdQXQWuGgAneCW61wh98kg2OTP7193CoXDZ/6flwZI7tIVIkc9Anum2aDt0rdJ00scOlM6JHjM1utBZ9BdCOn0xyAoU89fqk3NWKOgRXi++1aZtiUaBabtLUQftzdpAI500HSZSKJ9uT2a4vobixDqCP18TtLSt231+7d8ROw1bUepzoGzTNS3LOTEdnXMoC8o5uYYtg== 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=ipvdC9VenclI3pJ7h2epFuswFRz/uh0tM68rNZ/vYmIRpuZF+ecZ3uVav/VqSg4rDnZDjkpicPMsK1bBqu01ojHDdivsL+q0UxosDm3OF+pbPFn5gMTm1dYa5EpM0Iewe//7OQjynOxgMOsUmN+hb5AEB8cxKfdQ+W0b9e6Wy0teKiOEVkDZtnHfL6cRD1ilGJu23kwisy/2Yn78FiQ6TMvHSa6402q7WYETI7L40ePmIZ8yNpyhOrQJT9V6gshYT8Kdx3iI9FCdepEya12SIhbT8Wbs6oD7/Y3qkv53bxQbBjN7BHFL4ok/mT+A5kuqD93qsXV7jusFhk4N84JpdA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Wed, 1 Mar 2023 15:14:41 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH v2 2/4] 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?= , Daniel Smith , Dario Faggioli References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0108.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|VE1PR04MB7472:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a0fad32-c784-4608-97f2-08db1a5f4dc2 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: Ti/N2lUMM0+izW/CaYIOELoQX6GYYuy6akcEOqBdEVYZMcMj+Oon7057st99F5GmVSLAPmnw3ZTWPgPI7Xn8FmlB3TJ+2gW4QPKuLKI+4kdQAoDTNJWktsiHKju495Bf8EnxwiyKF+F63CmvB5qrFjbkBcXqPMB/PuHK+Op1lI/ROzshFDUvX7HLXRUzuPxGChoxGugMHMHI3HlG6k8AdFy40g/pv3tmI27uVvrwNs5TYiLQTusnsd0xTXLwbdWCLTKWSg+31xtCoNfqnA9z+1AEDKPOQBybTJlRMX4MdDfHQhbsvTK5FCH5jwU0TpnYjfl+trkaeNd5isTcp72edb3FxGS5lNQiGYaM1jpcfFteGEQUstUm6Mnj4dbn2G05j8euL5Gfc/rGCECX/pWYZrqK1/+QRDckrCpEw5FvYFSrDZ3DUx9mH9Roa2qD/9y0wka2dxAgCXwotMNH6fNtgJL77mpJlp1SSofJJC78fSDaeTl4zd/iY5+YrM5vJBpQcN7X4GqkjVmoapnvpNMx915O2Z1GLmLIJuh0WfxE6ZVyciO8V3YLZDeXuhtTTNaZOzPdXuunmkdzxuKhEBh6B5p3+R1914AhRJ11Lp5rxSz4dVhO86lDIVgPRQJ9m70GIfzv07i0Vp4Er/n7/gxoA4wjvffpXrL1wHm+ufZEDuAfMa7z9AnWvGnhVN9vzxdq0KSORR0XlggylCkMdKpk7gI1c4EOGsw8WzZIffdyPA4= 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:(13230025)(366004)(136003)(396003)(346002)(39860400002)(376002)(451199018)(38100700002)(36756003)(86362001)(31696002)(2906002)(41300700001)(66946007)(66556008)(66476007)(4326008)(8676002)(6916009)(5660300002)(8936002)(2616005)(6512007)(26005)(6506007)(186003)(83380400001)(54906003)(478600001)(316002)(107886003)(6486002)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L0ZRK2VUSE12NlF2WVdpRkNNSE1Cay8wUU1qaFBraDJneXpLdUtaK1JtWS8x?= =?utf-8?B?ak9EcGZyOWJPUFpRNXc5UjdSMWlCMjNuaEZXc3lJQVlISUV6UG5iMkJlSE53?= =?utf-8?B?WW9lVXlzcU1ldHZmd0FzeHQ0YVB1Sm51azJhUjlSWFdFTHl3M21iODJsL25Y?= =?utf-8?B?ZnZpNXJLMkQxNzU5QkpUeUt6LzNYRVFWeVpZdTVEcnQrOWZBR3VybnY5QUlC?= =?utf-8?B?TUIwTW5Ha1dhSnI0QmY1VWx1a3NSa05UM2hmSnlIT2U2Rzk3SFhrZHhMT0Ez?= =?utf-8?B?N2FTUllkRWdTZHhSVFI5RWZSMXdmdS9uZ2p3ZXBiSmY1dGtQclVYOEI2WWZX?= =?utf-8?B?VHgxVWVDcUtOSUN1RjRiOFRyUDNScnVwS0dVOGVHL1l6eFJiL2lYeEs5Z3Zp?= =?utf-8?B?UjhsVDVTM29ZZWljUlpiREhWaFhqcitFZUdtNXh5WnlrRzlSeHZUaXlOT05h?= =?utf-8?B?TENacVRBT1ZTbVB3a29YUjZGZGExRDVFUjdDdFFqWC85aFgrYjYrRmJsaHIy?= =?utf-8?B?L2JZRVdBS1VsSlhsYVA3NnltOFNUQVgra0c0Y2krcnNVc1d0L2pDL0JLVnNt?= =?utf-8?B?eWVLN1d1L1pVV1pQaTlkenpQMFVPYlJ2N2dYRGdPcHZFZjR2cjlzWEVVQktI?= =?utf-8?B?dWI0ZUg1cStsZWhXbCtGODFhZFQ2TlhkeEV3bmJ4T0VVNFFsYkxNTG5idTZZ?= =?utf-8?B?SlFBd0dOSWRLcS8rajNUMy9nZzBPWVZlamNXaDFXQ1hLVjkxR3ZVbXhSRjJw?= =?utf-8?B?TUV5ODZieGNDeDhkNkFVbVcySFNCVW9IT0ZwUU1tWWVEb05lT3kvMU9Kc25t?= =?utf-8?B?Y0x6dzhKdFBsQ1B1V29ac2l6QUNZTEQyZFdURXRWSHpZd1VqZUY4THpNajZ3?= =?utf-8?B?SUZldkZpYTdpRUlCYlUwOFFqK1hXTzZObC9ocVBtRWozV1BJSGdIOVZvRWZX?= =?utf-8?B?OGZhUWNOMDRDUVBhYUUwQnljNXhiYjgxSU9LOWsxMHFUQU1hMGFkVXJiVURz?= =?utf-8?B?VENrY1dyRkRoL1NUNmFINHVTbURyV0pLeTJ4OSszdjJIKzRjOVllNFAzUEhT?= =?utf-8?B?azNNRlVyUThaYzlZajY1MDAwbFc1YXFaL3ZaWDNqbk9Tc1QzOGwrYk9ZelhD?= =?utf-8?B?R3FsNm5TVEhMSFBQaWRpSFIzQ1BocHlOaTR5Q3B3ZGJ4Rm13YW9MSUdndDlG?= =?utf-8?B?SWZ0bUZockxUNzJmWHdYYTg3aXJOSnExS20xc09zQjdnbUZNejdHZUFRczNE?= =?utf-8?B?bDhJbzZzRUlZSmc3MFlyTk5RQjFxYVdRSGhId1lpdjVrL0hDZUN5UHdBYWhH?= =?utf-8?B?Y2VKWVk2amlFYUkxRUJtYVl6eFh0UmJFUE5XNTdxa3luZWZmQjhsR3R0QjVz?= =?utf-8?B?b3YzZ2UwdDV0aFZ4dWkvc215SG81M2V6dGdrTUNFd2FBL2JYcWRrVWJpOTJI?= =?utf-8?B?V3FLQitBeFpTSDE4MFkzTWM1dzN2QzZkenZrazArRHlzZzRtckFadm1TVDly?= =?utf-8?B?b2c5VEJrb0NuVENLZHI1RzdKcGhxTTNVMnErR29jUUs1a25zbmJSV1JRdThC?= =?utf-8?B?WWtpYkJiekhZVktuNk5GdE1xQks2VWl3ZEc5bytxRUE4ZkIyQUkzL0NvVTFo?= =?utf-8?B?bVo3V1lEVEtFbURod1dXdDBQVEFyRmdmazRRT2tUOHZSRSt5OEM2cUFEZXNn?= =?utf-8?B?SUdmUXBvd2VPck9KZ3JzREpNMXdxOGJ4NllXbWFTSEwwWFdNRjFYSU9uYWE1?= =?utf-8?B?MFNaZEVxSGpvdGt1R1UxZDAyeDJZVkRJQUlyRWZoQitVOEJGdDhEazNSRjZE?= =?utf-8?B?bDVaQ1VmUHBrUWc3Y3FSVEJHSWl6YVVGbUVkKzNTczZLb1dZUk5FbmptNTJp?= =?utf-8?B?RlduVy9lUVZMS0JZNVp6dStZOHpORVFscDFSUUJUQVU0N0RrNzZEMWthZG1E?= =?utf-8?B?cmN6ckNKK1crYTF5N1lFZU55Mi9WSHNlWlppSERpMkZQdUV5WlRxSWd6TVVk?= =?utf-8?B?dVRraGR1UmE2b1FacE5LWWFjWGthYlVtTFNsSWx1LzJoQ2w1T1AvdXBkN3g4?= =?utf-8?B?bmN0R3MzNVZZWlI3NjVNSlhURTludVdyRTdhd1JSMTh4eC9kc0QzYm4wdk1U?= =?utf-8?Q?f9axrODe019/uC3B03dqHRAYf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a0fad32-c784-4608-97f2-08db1a5f4dc2 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 14:14:43.3277 (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: fbCmtVGt8H4kUR+kpF/4cprwVOg2N+Dzec0Mhtd3rhTqxfNFhnKmRCeWlaNz0h+DQTTWqz01FIwDhBDFSpyFjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1677680124805100001 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 Thu May 16 03:44:05 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=1677680156; cv=pass; d=zohomail.com; s=zohoarc; b=cLzcVLOgmIrdPBU91uqcy9Fj7T7Gyk5hvLJlwDVxymHy1nyzKaYHXsKz9Q9uxIweGu61fxLwBCXwU/GsjjOG9IWiUHt1meAzu3e5mU85PoU12gNBSpra3lKYhqne203UvVz9XPnaHXBZcUVP4rhi2KI0Dy0HHjGy4XqESuW5wAg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677680156; 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=728/hgui0RaEJae0P1LzRmUwVm9vJUkWwKZhGA9zlK8=; b=IGnCj4y2nn74YpFUZ4Ye72VMd9pWVYbQVue3M9siWwgQykLu21MZDQoIXVYvAipdnOSGR6yArYWQf2s2IZXdiXIfsAcRESl+zMiK/wEByw8Ugb3BHfyZWwnacGyAQ16Zjf82mFKXTwLZZaBVn7bOG+BPB0jLVGEQ0EJ2cPIeJuI= 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 1677680156904628.4570755017712; Wed, 1 Mar 2023 06:15:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.504075.776584 (Exim 4.92) (envelope-from ) id 1pXNF9-0003FZ-OL; Wed, 01 Mar 2023 14:15:43 +0000 Received: by outflank-mailman (output) from mailman id 504075.776584; Wed, 01 Mar 2023 14:15:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pXNF9-0003FS-K1; Wed, 01 Mar 2023 14:15:43 +0000 Received: by outflank-mailman (input) for mailman id 504075; Wed, 01 Mar 2023 14:15:42 +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 1pXNF8-0003FK-Ih for xen-devel@lists.xenproject.org; Wed, 01 Mar 2023 14:15:42 +0000 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on20617.outbound.protection.outlook.com [2a01:111:f400:fe16::617]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ca4a06a-b83b-11ed-96a6-2f268f93b82a; Wed, 01 Mar 2023 15:15:42 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM9PR04MB8382.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.18; Wed, 1 Mar 2023 14:15:40 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%7]) with mapi id 15.20.6134.030; Wed, 1 Mar 2023 14:15: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: 8ca4a06a-b83b-11ed-96a6-2f268f93b82a ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bWCiyNmQ9iS6K07kyD3IwUjZxxuAhYUUtk8ofF1N1T/qfZBzLGVCdy8qWiKaAV6+QgxDZYh+cElOXI36MwvwnFN3VbNpzygeqOJKSx8574MgTTyU3NELaEaQNl05LIOAHrtNcHvcTuOU6AESvgOyGK5/dOU6pFYcMfU5heakuBupehPm1Iz8o5zwYxogyjTp/EXZfWO94TdGpqEezywIKx8C/WpQ/EkfOzX8kP9wBVDiENo+JPwijOrArvojdwSqtmZtdLydUhNmhMan7Ojhc2XdWsmpHa0h8grpv9F+A+Vg3kmpCqvIq3xXknjkBFLL/7hCqO4SRhGwG5x7VlbDOw== 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=728/hgui0RaEJae0P1LzRmUwVm9vJUkWwKZhGA9zlK8=; b=Tfkn3BG7i2zCXHShr3mKkvET5aWIBRpQ2kV735TrD0SbY+FZRNNG5h4BGdaHLUF04PEVSJIeZzGuzFmVi4VqQVn+samnz96IhMYkapBiGFaRGrl371GCLNKxI2zGnvJWeOY6EhHMSGKrucP07tcTLNzhzAVYHNXX9QSZ/6u8dqsCSDLQRXRwO2LiS3pypqOE4D4RfjXoiYkS+1fOZgaeo66cuoeKd7+zgnkW4i4Kax4CxroIKryZfLyR32Y3b9Hbd+Un5dades30nUz9wCfqaw3xDSm0y1mvozbv6D54ItwdPpkAgNDgoiZtf1JdHqeNRRTowEkWZ+lKSiLou3Mqlg== 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=728/hgui0RaEJae0P1LzRmUwVm9vJUkWwKZhGA9zlK8=; b=QRU6Dt3ezac23RkNbdC7HUyPj1SAkpfP3lHdbWhoATwVfs1bsWZM/FHBXCTDzBE5q31Ply0Au4Qiw8SWX6lDALF8z7+HND/bssjDJyp15bdwrhZmyiJunJ1HPkeeNh/JKkGcuv2j1z0yPfFdr6YB4uAXxIQNs2b/YG6X78KfRLZEKKIbinDllxEDYD66bd6sXDzAU5vIugHIkwpiN7iZ68WPWtA+iZZx9baBhE2tkpd9+vizREKzrjT7enNa8BYWuzx7LaCDW3S/o2ieGBwLCxfY5j0QuUSYexnJ1mmziBtKgHUnXdSv1TzrY1DjjBmEtESMGwQ4DYUnXj9Te07Q6Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <21838915-d33d-7c86-85b5-6d6aa00a2eb0@suse.com> Date: Wed, 1 Mar 2023 15:15:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH v2 3/4] 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: FR0P281CA0115.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::14) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM9PR04MB8382:EE_ X-MS-Office365-Filtering-Correlation-Id: f38ebb1e-4d46-4e79-3f39-08db1a5f6fad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8PNnoF7arbV9SckwllkXyozUmUa/pJxPodY0/8HBzxBzBj38j1FBXYQ421NJQbJIl3oU7mOw8nthqugWAMzgJcIKlRkRkYORCJ//kHGAouILAOGVwdF5vG/HYoDGy6OHwZzyo+ARyJ2vvY1KqmdMxotvDhn93gqwf+lavFdi2Qr9HUSOTOGECRRqRDU7itwFfjpTObOk53BtzzrlYTwyzD8flN/0ufSZQm0AtTa1rlXYIAYgpEetMilTT2PSlYSefzaeSWOkV2JrVoTyvVPv0U7fPtkncR9qGnzExHEGfZFkjaBso/iKpgBKohz0PBs8gU0vJBGOhGrC6KsrfAMWFimlo7R/KHn3tLl5uIijCYda/Qx8STh+VtuE4ElHO5FMAfpJz5HU7IlPVmQM8zKaMiZORsV2W1juFOOsV5KBa7CS2vb1LrGDkLrwlQovsS6WAlbqQsGddtXGAczLBt5dr3ihIN+kZGuinZeNw8Gp0g6vAslFhjhZ5FaPZQyynQJFkHtTvOdlvT7RyU+1YTpRKofEtC+MB2BQQoC5MC3Vdg+1GlL6S2MU9eQ6tHpWx3rsW6DOkhC+SMFKjL5ovyC+1YUrf10VRGQZwjBKqxrEjMEnF20kmPw/MH0wPH5o0Rx5UaVtKkajR/aDaNYgxt4G8tgvGI0JLdn6oJe5TXtJEIZrQbBRY1FOr56MyEc7t0RfQKZSU5P9+mSQUxDQfP6KrsJ59QXain4yIM2vsEWd0Mw= 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:(13230025)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199018)(31686004)(36756003)(478600001)(316002)(54906003)(66476007)(4326008)(38100700002)(6916009)(8676002)(6506007)(2616005)(6512007)(186003)(26005)(6486002)(5660300002)(31696002)(66946007)(66556008)(4744005)(41300700001)(8936002)(2906002)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cVVub1oxYjhvbUYySHFyd2ZtRUNEaHNCVW1qaVhXLzMwWnJPaXhRd2w3a3BB?= =?utf-8?B?aTlpOXdSTi85clQxSkpQcXU1RHpCb1Jpa2x6SGYweHB5TkphRWl1dldvQU9k?= =?utf-8?B?ZUs5dGJoN0RramRVQUlBR29tZFV6TEk0TVB4NGxOd0w4VTZrUHljeXVLNWI5?= =?utf-8?B?L3Z2UWdLVUdRVlpTbXVaVU80aE45U1RZbkZtbDh5RTQxcVg1RkNzdFFQZ0hY?= =?utf-8?B?Szc4RG5nUmRLTGhjdGhvaFVUejF3WkxGcjEwMzAxMVVnWXNXMlZRUk1UTzZo?= =?utf-8?B?a3A3M29rZUljS3hPbFEyN0o1TGpoRVB1azQ0VkZFdU5qSGRpOEdaaGc3SU9I?= =?utf-8?B?YUc2b1ZkVzdjV1BPUE5VcEluOW1BeWRjeVk0cW9uY0dXOXA2TUpGSWJ1bDls?= =?utf-8?B?MVZLM1VGQ2crdjRRUFZoelhNUlAyTm1FUVFjeDhPZTE4QlY2L1hTa3RIVzJZ?= =?utf-8?B?Qm93VmZVTVJ1NFpCTlJHbjduR1ROVjc3WERlUVlqS3FzNy8zMC9WNWUrN3Y3?= =?utf-8?B?bmxlQ1NxaFo3NjBFeTQ4VFNoK09lYmFBL2hoV0xpTjlIRXJhRUt4Nnl2eWZa?= =?utf-8?B?aTMxQTUvTU10NDR0MjFELzcydnpkNTJOeEwxelZJVVpLMmFBbUExS3d6YWx5?= =?utf-8?B?MUN6aGc4ZHEwUWNuQ3NyZk8zRkl2T2FVeDc5aytJWDQ3eU1DUWZ1UWJVa0ND?= =?utf-8?B?T2sxU1BITFRWZjJWN25vVlo2QVJWd1h5UDAxcW90Y2dqQjh2T2hWcWJkaTZU?= =?utf-8?B?ZE5lNlgrWDVSdi8wU3hjWERuOFBHUVMrNStHUW9Fakt3UG9iMEFZdHJmdDFC?= =?utf-8?B?eDNvVXdYMFFTcnowQ3IvaENZMm9QdzFKSjFMMTFJbWNOaTFFSjdLeDJwL0tm?= =?utf-8?B?U3RqMU4wQVdwb3o0VEhaNnVQaXREMXU0TlpoWTRsdlZFM2FBdmwwSXdiYS85?= =?utf-8?B?QjRiVW96OXI5Ym9yWVhiT1hDWWxFTVl1clVTaWRvQXRJcVZJQ3VtSUNNL05H?= =?utf-8?B?QmZXdWVuanFTN2tjbEdvS09Nd1lOcUJHdmttbWJFTGRZQkpYYnpsL3plZ1FG?= =?utf-8?B?TUxSbzZDV0srbUc4TlZITlhwUWlLK2MwY2pNNDEwRDE4UzJXeVZjUURaTDBG?= =?utf-8?B?cFVNWVIwTElwRUJIeDRpZGhkV3MzZWY4OHdSdms0V2U2YndYOHZWTHBtaUdk?= =?utf-8?B?blZEaEJQUzcrZGxleUJrRWZoMmFjTFhSeWdMVElSL2cwVGx3UTlLb1NxRVpO?= =?utf-8?B?a3pzWEkwU1Mwb0dGNisrbm5sWW9BSTZzZGNCUDFUVExVZ3g0MGdHQ3lnTkVR?= =?utf-8?B?Y0tYUklOMm5HcFEwNU54dDZXRk1jK0tWU3o2bUhXNWFKV2MvVmI5YkxsVGtW?= =?utf-8?B?UkNadFFEcG9VWldvbTgxYlBBMU5yUWkycmdLWVRDN3ZHeVcvVnkvU2ZQa3VC?= =?utf-8?B?R01SclQ2MHY0U3JrV3VqbStmUEtsUzFFcUVmclZoS2txQ2FqSjFncHNkQ0FI?= =?utf-8?B?Vm5kQitPMGpIWlJ4UWl1L1BqUnBIdHY2dXBEVVV4WVpWK1BpeDAzUHpZdlVx?= =?utf-8?B?amNON1hnZG9zL3VWb3o4MlhreTlkQUJxZi9Ib2hIVjM1QmQyaERiWHdRbEo5?= =?utf-8?B?cDBScWdVS0pTRHBmTEhxZVZWVllET21sNkJPUURrQU1RbUM1Uk1ZSGVzeHg2?= =?utf-8?B?bEZFdmRGTDIyWS9TaFJnR1F0R00yMDhWdFZFOVhJRVBaTTdRa01xMlVNNFFR?= =?utf-8?B?czg0U0tEK3UvcDE1emxkTXJ0TFNVeGR4aStWdjgrVmlXTjRpZzlPRWJUTm82?= =?utf-8?B?QVZQOHZwL2JNaXdVWWErRnZscEw4a2VlVlNLRVMyaGozWnA3K2VlcmVORzVH?= =?utf-8?B?RlR3TUdJU3NPdFE3ODBUdWE3dEFIcmh0MWlWZkZvemliQ0VCajBmY2sybkRu?= =?utf-8?B?cTdveXhXdGR0czFnM3dGOXJyZUptbEtwZ2dvQ09yVjVJVTdDalhmbVZmTlha?= =?utf-8?B?NlhFVXNyRlUxblZ3T2NUdW5VSWtpdDlDUU5EOFN1VGx2a2xtcFB4d2pnbUVj?= =?utf-8?B?bHc3T2RFaGVxUS96T3dVZ1FDRlEvTWJuNStUalg0WnZoQUtrMUtZRm5waXJB?= =?utf-8?Q?1Ut5jGA6wR8cq9ib8nsmX+vHV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f38ebb1e-4d46-4e79-3f39-08db1a5f6fad X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 14:15:40.2147 (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: P/t91f65QMQNWaLKh4y/EGYqUsA+uF7xHI1Dd39bB79uaQIueWUFw+zleXtDnzYgktDjF7B1R2vJ0viQXJ0DlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8382 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1677680159006100001 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 --- v2: Use UNCONSTRAINED. --- 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 @@ -15,6 +15,7 @@ config CORE_PARKING config GRANT_TABLE bool "Grant table support" if EXPERT default y + depends on UNCONSTRAINED ---help--- Grant table provides a generic mechanism to memory sharing between domains. This shared memory interface underpins the From nobody Thu May 16 03:44:05 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=1677680201; cv=pass; d=zohomail.com; s=zohoarc; b=MqgBLmhgasrh+wO7YP0bo/+4NDa8sJhNbt9b45gwd0ROWvqi7GQW0Yjdms5MeEdpQh4voQERe+wGYNScBZzfUXUNfZa2yincaUabMCsY19ouGIfvHiUw5xe1LuxOyTyGbe5aDIuyfmLVmtjZpIwFvfFRCWwtSxO2IuzegF3jN3o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677680201; 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=iQmpice+5sckSeA5x6akdUtFj8Q7q5+kgi6PYcZXzxg=; b=HkLeg6zXSynR4XJoUPTxxtlIJSGAP3RHjB9mGtHEveiniVCiE3u6K2tfPEe4HxbRc7pVTeKmJ456kPFrZXUYCIkPDZaNHNR094H/hP119Ncc1nvulj2H8PSkEOo4v9PZhT8Vytyd4EDvMCBzmzSwktwFma8N73mnFZWbK9uFJFE= 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 1677680201786223.55243287396672; Wed, 1 Mar 2023 06:16:41 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.504079.776594 (Exim 4.92) (envelope-from ) id 1pXNFn-0003n9-1S; Wed, 01 Mar 2023 14:16:23 +0000 Received: by outflank-mailman (output) from mailman id 504079.776594; Wed, 01 Mar 2023 14:16:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pXNFm-0003n2-Tb; Wed, 01 Mar 2023 14:16:22 +0000 Received: by outflank-mailman (input) for mailman id 504079; Wed, 01 Mar 2023 14:16:21 +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 1pXNFl-0003ms-T4 for xen-devel@lists.xenproject.org; Wed, 01 Mar 2023 14:16:21 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20610.outbound.protection.outlook.com [2a01:111:f400:fe1a::610]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a30ef07d-b83b-11ed-a550-8520e6686977; Wed, 01 Mar 2023 15:16:20 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.17; Wed, 1 Mar 2023 14:16:18 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%7]) with mapi id 15.20.6134.030; Wed, 1 Mar 2023 14:16:18 +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: a30ef07d-b83b-11ed-a550-8520e6686977 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PD2zKouV/2tRNGaGhvUKuCUDUZSB6ly3AevVWsIMllMerlI9yxlcAXVLo/VeNDJUqtmx6bH2YrgDXFhIE44KPYTYQCdUq6/izcF7gXhzhlnKI8KINIduBptafvTyXDv62YBCYzw2ThQBSwxfCsz4CCSV29rEsEkUEsMJ0QKYsgn6C4DUHNZNh3BCPcUzzxjoGb1UudMkj7b8PMApzkGKyJ0CNkiwiAcvjMvroqC2FZYTA1T/Fw8xFMK1VGIcPZsDBiFmAStYXO0w3AMVft/krD1HmFw5Qz+ShTJkEUO/ifulNEoI51DxWi7OaXOvFpTAwYoF7q3X0jn4LyaxurokRw== 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=iQmpice+5sckSeA5x6akdUtFj8Q7q5+kgi6PYcZXzxg=; b=Qa7nF5kG6B32onb9BO9IrHH2xVKvP2eD1Om6hg+kCyCXZbEdT0TUWth9Q5EEMzOnCYyGeKHvBQE9T9rpGU3scuvBUD1k7YDB9BIv7Vpp3BSKwnPbBJ3cEF1lPd7hzcgEbQMEN3R+dc69QKvZF5BkaSD+vqrA2HQxdIE8OrURvhH9Oj14nn6lMo75+9Z4HJpdcy6dcXOGqIlbrIdDyXGArJLvP5nuuSFmn1r7vfGRviKwSm+VA66pehRHlMhc7qsqXiV/7CaiH+JKVHLsnZtxPNyJMkZjYpAxtYFA+pzmaWCf+gtpXCW8o/zQyz0Nfptsj75sy24Qlm4bn6NDnzvXGQ== 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=iQmpice+5sckSeA5x6akdUtFj8Q7q5+kgi6PYcZXzxg=; b=ri5sQCW0pFefj2PMqAfD7B0luPgUM+EjjvNldMa2JnG/3eDAgtk2msTBUcIQXifp5nA4Y5PoUPV8ikJuIawu+ccfM6+KM1IzDZzJxhT1AGfJXGPUJ+3asdnbvdplYSYxipMMs4eVxA7OL+H6WAivfac4O8/YKmTC6NzDNyvQHCQMjSKb0amHnybwieWPGXxey2Ei5+yKKVrb+jlZxloGc0h9my34/hTnTeSwJhkB/MfhKEaTUhiJZLe5TD+weQsp/aztTC/Lynrp4yX3DGn0ylihOyaQqZGgP0kJv4AmSwjzX0PfDy+OBokWwML1AlFWfMGiasuwOxRGoPMcVgZg4w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <763aadc9-e8f1-dbd5-4bab-edaeeb36334c@suse.com> Date: Wed, 1 Mar 2023 15:16:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH v2 4/4] 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: FR3P281CA0190.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|VE1PR04MB7472:EE_ X-MS-Office365-Filtering-Correlation-Id: c6cc50b4-e4a9-4d67-81da-08db1a5f869f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kLKJZfaCsdcyUkAYvLiNbEUAXrVBJ7IwU8GR90LCYtzWziRCga5JNT+olzoxYzeG1S2QKbrsF2Wg+N9GRM+auOzyKwpYC5KdsDiwnB7yjL8Ihu4mtXE/XxONGGqJph90enZjaAHoB669hQWbX+EXJEPK6sQ1t8W92S1yW4dk7S98y3OrYJBbiLrXwR6Uil9aK8dxqtDGbQE4OsA6zcng9xkjm2osKpbCjFh4f0QpTeZuBCA7Z6AY30h3dMrT/iTP+csm+DuLBBdqKzHEsHCsNEXdHF0mzTyo+oFr2FuXXlIdeIYP6Wred/7tp1lyXVbcwpQO3V/uGWjZ/e9yxd4oEH0cr8hE2+9VjZBxYbY9HtZhMwTi6K4XVOlCD3gULr6P5HvdFg0lYIvJFE2K3btO6/cvCXaowpLsRSbuw4nzxQkFgxhQHTAFx54tLP5oo2Sf7qhQu5gB7DqvN3eNm7BacdKDXNkq/U8AJykx8i5H6iZX2QQxWTZoEwp9L4AQE0/2l/Jg31zmWKkMxg40Iq+gbOwMxb9NesgycPMv0GWMnZSAQjwHw2mI+m7FkAG03goIeJ2dwzPoYs9DQvkU/yk00DlYcqgRK89TcmKPhnTmxjrW9aVoiFXYwLjWcnHlWiBHfGJHRFT52VZw3k0bKXD4FffWpw1BQpqmzqc1L9D7r+CM2vVQVKWqXnkipWr4faqs3nZxX2/8uT0o3VXCpttAimuzNnnGIYNkOqN++O+hVK0= 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:(13230025)(366004)(136003)(396003)(346002)(39860400002)(376002)(451199018)(38100700002)(36756003)(86362001)(31696002)(2906002)(4744005)(41300700001)(66946007)(66556008)(66476007)(4326008)(8676002)(6916009)(5660300002)(8936002)(2616005)(6512007)(26005)(6506007)(186003)(54906003)(478600001)(316002)(6486002)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SHRYU0ZDaXJCNTk0Q2M5dnZVMEROR04vd3NFdEUyc3kwbVh5UjNMSlltOTA5?= =?utf-8?B?TVozUzB1ZEFoUVlNdGROdHF1eFcySXM1NDRiS0VvdEpuR0lvMksrQThlV0RO?= =?utf-8?B?RFlERUhjRXJxa280WU9aaUVtazRwaythYUNnazRLdjZVSUYvdkR2aGtqenRz?= =?utf-8?B?Z3ZtQ2xVSkR4WnRDOHlFY3d6WHVlc3lJdmZvWkRGeTY5dGZjeHkrTDUreFNE?= =?utf-8?B?anBjMHBXUnZtMFlMVzZOSEZGZHBxd2Y5NmdFdWZyV3lrQ1BLYmVzbXh0WlBj?= =?utf-8?B?YUNEcmt6dndmUnFyK0t0eGJkMkxQd1hzQ0lhR2N3N2dkTEM5NFRUWXRIZE1B?= =?utf-8?B?bHptVVhBZkFOVjQvT1hUZDJwdExuaVZVTzFsbXBWbm9DMTJIeFVRcm5EbEZJ?= =?utf-8?B?ZElCZDk4U2dXQ3FTY3pPOFM2RG5uWVFsazFaZmdTN1NtRFI1ZkdoRnV2M0VM?= =?utf-8?B?RnhwTmRWSUw3R3ZUYmdlY2s5Tjg0bmN2M1JxblJUdmVaMzNUVmgrbnlZUE5X?= =?utf-8?B?MWtlOGFWV1J0Q1hyUnhCaFBzd2E5Si9QM0NLUE9NTzRLYUVnTUc1QlNlOTQy?= =?utf-8?B?aFh2YjZvc3B0aSs5R2JTb0I2SnBxSVdxbHdaTGFteU5sZ2ZDdzJDbUpxT3JG?= =?utf-8?B?TmFwWGNlYzFrRm5DZ3Z5M2RNdWpXSWlrTWVBZ2I3Vm9ZSWJ4U2p0a3F5WTRC?= =?utf-8?B?ZzVNcFJZSTY3LzJ2VjA4VUl1d3pvOG9NcXRHOVdEUWFIbUtUYXdDekNWa2FQ?= =?utf-8?B?ekFkcmJnYkxKRzJMWEhYRUZNMDdVN3FrNmY2aXBmK1NJOUZzQ29kaHZIOWtS?= =?utf-8?B?L2RZczkrTS9NOXBvSVFiWE0vazU4T05TRUlYRndxdittd2RPUWNoV2YzNHY0?= =?utf-8?B?dlYwZWdKcTVwbGNidTU1MGFOMG9DU1lYMkQ2SFpVZ25sS1lKblVnVG8xbW1q?= =?utf-8?B?UUpwRkI1c3B3WkYyUlpVNjdCSTVaaUV1NjZoK1I0U3BhVGpMQTFjTTFpRVNv?= =?utf-8?B?L1c4NXExaE1LQ0FkZzVEaHpMTlArNGJ2eDZUWUc5L1FPREpqaHNZTExWd2NO?= =?utf-8?B?VUdtVGQxRUZvdFl4NmtWbFpuMFkvaDZzRGU5dHk4QktyeXcrTFg2YlJpQ0lr?= =?utf-8?B?dGxGbnNXS21GUE02NGQ3V1A0YTFwQkhOeTd1YXZka1c1a0YwdE1aWjc1ZVVh?= =?utf-8?B?cG9LQjB1TVVYdDFKMnlxdUNtMjRpNHgvS3A0T3R0QWxYaTZKLzJmcTZRWmJL?= =?utf-8?B?MXJsUWswUWhZMWRseVdrSTdWcmZrSTkrTmpDWnBSZFRDVFlMMzhEdFQvQk9B?= =?utf-8?B?cFZnSTd5Njl2RzZjTWErejVFWU52MUJ2ajhiRE9mc2dWank3K1NWZkN2bTNh?= =?utf-8?B?Tmx3bElod3NGSDg3SVF4SW9KMHBTQ0Nhb2NncFpQSzhZUUIrYXZJbFU5ZXVC?= =?utf-8?B?bEs2dHE3Q0NhekVtKzdGRldjTkFLZjI2K1lwMW41ZjVPdGZDVGU5czg3RHQ2?= =?utf-8?B?MFN0SlVITWxncG5Xay9SeWVyOGZuQkdJSUtVQnAveWNXZXBuR3B0dWR2MStr?= =?utf-8?B?anphUWpFZ25CNkFtQmVDQkY4TUpZSGpGS2xnMVd5N3dsaFNCWHdFTmJkWWxR?= =?utf-8?B?K01Edmh3d3dvV2ZZNm5VeHV1K3RWNUViQnBMcGNKdTB6cDNuYlorckZ3K1VN?= =?utf-8?B?UktGSXJiRSs4RjdNRWJSc0pCL2NzL2VyOGRTSXI2c2s0cFMycEtGQXRmRVcv?= =?utf-8?B?Yzd0bTlUZk9WdzRUem9OR092RkVqMkx2eXRkczNMQVk5T2cyVGloZ3lWMEtX?= =?utf-8?B?VlJoOUhVL2Nwb09nVjlzbkJSMHpyaUlLV1UrSzhLWlVhaHMwMHZxbU9zZmRM?= =?utf-8?B?a1FIR0pqelJqMjRvSlBBbW1WVnVDQVRSUXc0TVd2MlVoTDkzTkU1MGhUNW0w?= =?utf-8?B?VVlYcnlSR2xSMnNKM2hpMU5pcWY5cmd5bWlEaWJUYlRacUpLUDRDZ01haTVY?= =?utf-8?B?QWxjK00yVndSODJubHRjNGhoUS81WHc3bDhvdzBlMnBwNU54MkM1R2ZIZXpO?= =?utf-8?B?VkZpNEVxN0dmczl0ZERxbjAxQ2d3VVI4aVV2UlFCZ00ySEFmSjZ0SlNCeW14?= =?utf-8?Q?NU9+n1Axzl6a/2WrHZ2pQpP+Z?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6cc50b4-e4a9-4d67-81da-08db1a5f869f X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 14:16:18.7747 (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: d4da8k+CM3Iz79A8xnapDVql6kTiW3gVp+lKG5g8cVgoaL+zRidjFUqwlhI2qlTlyOhKc4qLRc/qkThezVludQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1677680204251100001 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 --- Depends on "core-parking: fix build with gcc12 and NR_CPUS=3D1". --- v2: Use UNCONSTRAINED. --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -10,7 +10,7 @@ config COMPAT =20 config CORE_PARKING bool - depends on NR_CPUS > 1 + depends on NR_CPUS > 1 && UNCONSTRAINED =20 config GRANT_TABLE bool "Grant table support" if EXPERT