From patchwork Wed Feb 15 11:33:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13141558 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7137C6379F for ; Wed, 15 Feb 2023 11:33:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495879.766320 (Exim 4.92) (envelope-from ) id 1pSG2c-0006jM-W2; Wed, 15 Feb 2023 11:33:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495879.766320; Wed, 15 Feb 2023 11:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSG2c-0006jF-T8; Wed, 15 Feb 2023 11:33:38 +0000 Received: by outflank-mailman (input) for mailman id 495879; Wed, 15 Feb 2023 11:33:37 +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 1pSG2b-0006j9-CH for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 11:33:37 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on062a.outbound.protection.outlook.com [2a01:111:f400:fe0c::62a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 94acb731-ad24-11ed-933c-83870f6b2ba8; Wed, 15 Feb 2023 12:33:36 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM9PR04MB7523.eurprd04.prod.outlook.com (2603:10a6:20b:2d6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Wed, 15 Feb 2023 11:33:32 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6086.026; Wed, 15 Feb 2023 11:33:32 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 94acb731-ad24-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ev7ac47h2W1zrCO3SMqfSTI9BvTdy/NFZkQgqGBr+31BHEhaeHoNXqRcW5DH3XcnaxaiSf/kd2R4BmcMuuWjQVQYBeBrNIgKjUqim9hdsXLDc0xArHLd9M8z3lht6MHWY/FR7D703MSrZzdW/XK5CKQvEyAqXwQ5ec1NceOghFH6tiY6/Gcy6KEAposcT+M2PWFUrDy+b/fvtsjtZrAOLaQhvOLqe9HUTej3MA/VGv24ammDI6/opKYr0yKXw5DtqcHbDaLR0k46xJPZMxUNpeFk7jWWSMx+n8Hlje8IQ8ZN/Ch699VbdwHX08I9rkCEuh/kxs1CPs8f960LUG6Ytw== 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=ir2XACLlXoYPNEU1byd6Ec5CzhHU+/fEwvRtqRixVnw=; b=k5oiRSs688fnToot2w08UhbtnEtrGzMfoz/BMuTolBleGBhpGapPy61GVmuAQ4Vwnfy/kgk8JrqhrU6Hwu9AYrDtilgjdyvnq5eG9kvftckhjPpWY+cceAZto3W6agm5YrCrSAkY9FiyXidKJUV0fu4ru3Nt3918GUcb0kwTOoYEcD7BPI7grKsdwZe107uqBUavA25AiWwlc1w03ktWRtZv4NLhApsAxrckZKa9iWpRPm+FLPHU1bi5/YS0VkDmebEJZl13o8Edp85SInVASX34mki3TYOzf3yZM8OJ8d7lKwkkqFElLosxAo0UlV8pHmPeGwqR7fr1AboLXfu6OA== 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=ir2XACLlXoYPNEU1byd6Ec5CzhHU+/fEwvRtqRixVnw=; b=TQ6Fq+Qd2phg1GXdZMmMrjjz2DTQj8A404q1PEe6j8FQfhEsKBIsx8B9+m1PZikW2UcgKYpo1WZ8GhXu6fSfco8n1lDTCn9aXzSumZmak7hj82510dsLI5C/VN49G9FTjYJKkkUTe/yNBJnVAA01gcxjG3jhgX8VAhqsQT74I89ep5pchIDr1ej6pENOvbm2YGWjF0GpQp484dpql+UQRHEfDfnOOKWlGaMioX7ByKVgt/SNdINJ8PkK4ro9lZnEA0Wvs20SS+pj5awd8p3Q/DHMP8JDEhOZUn+hX6WTVnnfr3JyPfSrLaj4dD7GrbQRMYQsU5Eql3efSFIoD8WQ/Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Wed, 15 Feb 2023 12:33:30 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Juergen Gross , Boris Ostrovsky , the arch/x86 maintainers , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen From: Jan Beulich Subject: [PATCH] x86/Xen: tidy xen-head.S X-ClientProxiedBy: FRYP281CA0007.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::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_|AM9PR04MB7523:EE_ X-MS-Office365-Filtering-Correlation-Id: 658d4215-c68b-44f7-b46a-08db0f4877d6 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: mcYNAxc93uvMGghRZJeNt/82X4fO5n7yWjNj8m+xl6HYJUkvLzZ7utG/XmPjoXgTh7ShN/ESiHYZhEar50s8C6WsLfVqSl9XrLIIrmMRW9cJ6ALLR7RaokJrhenufk9cM+Msevnm0QIL4eDGSpZrNZkbpvP1ODtOCMl/TqX4j6/d/aauwekmSoMG6iTv3ne55h2RjwUmLmZMpOiDYg7foxKPd2SvaJtu1qqjNrIOyjKBtbmEmrB5DtqzEZjye6+bGb+EsHkwCw7WGLG6/M1gTE+DedPJ84TFj4MaKhMWxCVPBXAKDwjS8BnVBgYcVHSu5SfmRDwQr/RDYjBdw5YEmhYQQEsguH5zJ+ttbUv/eeTktURSY9pSjfHYqIvYP3JPaeoCVpbBZkQHnAcTfHyLrlS9Q0W/30PPXZjhGbLT2tvlMwQcTyeF4RErdK28TFjcUFXVmgKmJik5CFmrAM1gUYJ/pPiS89baf/zJU6yMlkXN4hwF6WfWX0QsDAmntUlzQD4IgDEqGjY7m4mbbbs29aNq14zSlsAU3aZYSgXoIcBUB0+ZobvQtk+/NgHi5O5V3DibcCS7T0rccI8TeErF8XIaTSEQqAMg0Ief7Sd3Dr5QcyKKBDlwt2q3iShrVTs7XsIw1VgSHTmXwGjSrhY3RGi4Cf6h/e/62lHwtSswiUfYZkP2daVbB7ncm3oaOas4LOAl7281yEfGHYz5rlboF4bzlg8/8GFtTn7xgHBPTVs= 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)(376002)(366004)(396003)(346002)(136003)(39860400002)(451199018)(2616005)(36756003)(31696002)(38100700002)(83380400001)(86362001)(31686004)(54906003)(316002)(41300700001)(8936002)(5660300002)(2906002)(66476007)(8676002)(6916009)(66946007)(66556008)(4326008)(186003)(6506007)(26005)(6486002)(6512007)(478600001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?7ns19ECWxPgE0hR0MZ9Zd9KZWaXY?= =?utf-8?q?DC71qRjb5wODiOyAGRvKvP9kBPJfBceBO2JhwDfw1tEmoyLSYhnMXcIq0vdrXW7gi?= =?utf-8?q?FTL0tpbNKQJyCdB+RIM31tJv07AXy4Bn15Kemo3fr/5RmbU/Rl0i8O6PjRuMHmJwL?= =?utf-8?q?aO1F/jSJ8v8FoBUCYaEmuj69QgQeorNovApV5W4DATzQd6SCGCXsweEZgnFBhb/UN?= =?utf-8?q?JCKPXi1xIYwuGQFqG8/OJgXKa0tVtE4lveTkBsNkCgPsvwgwOgSNDDYS09ut9qX0x?= =?utf-8?q?nRIy6dFMg9wHOWYpNS+oGHvsxKUbdJBQbqxKpMnlq49ui8fg8lw9RPPzimAHOIctY?= =?utf-8?q?zWQg477xTeWwq82EwfouwGOkYl/mNCOKWbJH2CexuzSrCen9NQecqkt/yfUUz15f5?= =?utf-8?q?Sa/4fbEWg6FNnpbVKP61DiVTt/ftiT3VZZpcCd+cIxM8VW4nM4wjXRflvuuf+icz7?= =?utf-8?q?d3E8Aq77BmFmgKsO9QeE2ypSbXP9HABj5rwk/0XxcFMZGAp9r7mmvGuyVOHDvjqWi?= =?utf-8?q?xCmxgadmvI49pm8XGBXD16HD0Ncl8stl6eXoYCkT+lT4HQxl4MtgFyVMXoyegWiW8?= =?utf-8?q?pgZZaKugr0YFUf/a5PEi8iN2wJi3bdRZn1vkn2QE+unz17nIBFJlG9H8mq8dkLDys?= =?utf-8?q?Xk9icOp1XTYfDfeSpS944o/FgESfc/Wy6ucDt1r6Mg+iTq0IBkdpI/Go9vOs407+d?= =?utf-8?q?sLeHbQ1364O7dRg9IMA5/oXTYdmu0GHNjRjjJTqRXdh8MhfIDOdKEj82eW3h6RCRe?= =?utf-8?q?a5UaQsaxeCZcHPu991n+eNSUIhJJVSqmMwkKSDBE0eiHkxJb/VjQvsSg33xuMJpN/?= =?utf-8?q?gQjZItbS1k+iw9loLMtfZ8eGSp7Ueas98hl1KJYQm+1HFe1jqT/9XEct0vahqPUSv?= =?utf-8?q?D/ORYJYcghBphLRRypYUTtvgow4eZyejxIgOyi+u+MRpy6mIp3f87JwK9kS9NHs0D?= =?utf-8?q?bKaMlPAANENlbNeeP843EQ6J9Yik+6wfnMOc5SQdEJIWIHZ4vkrn3fgfEcmt3aRXh?= =?utf-8?q?TgUDyWrUw8UW0vmkZcNm5nLiGvAaIDaAwezoTbsyjC+Ee9h21/h4W8hcEG+/PvWC3?= =?utf-8?q?BAn/rFEtVfgcfP5D+de7bd+yEhZB9hGVQ2RmU6xv/Ttx538a7ZcWK3pd3cq5fQT4/?= =?utf-8?q?CQuC/NA6PXt5eUNRHZPfk7zCPKd0cCI5zqryZuM7wqYtpXverVg5eWFlEaCW5xCV4?= =?utf-8?q?4xI58KIR6mFKBbQHQUcybdYuAd1m/69rcLuTpW+HTUj8irxgzbpi3E24+6qGIMaD4?= =?utf-8?q?lKI3/jggByGpcGe4llPNh6ARboG9ooJBConz1hk+6h6SiieAwVKSqPLVprsRSf0nz?= =?utf-8?q?Xx4C7lBqNrx7JhSZ3CNDD+qiwDbm8BHgF3fIM9cWHc1Emu0a4U+3ZbC1bE2ia60e6?= =?utf-8?q?N3uhjzt8d5MFj3GBqnC4LIcKYSRFRBh52OlGQep6W4olABpYRYKhvRm3ZDP5JOUad?= =?utf-8?q?Y73lczK+j4tmR6jQTcXqWC07byc0yTgFb+gr0v7JpcNdy8ZjevSpe0liiFR4yYqe/?= =?utf-8?q?2qHkychdhHfa?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 658d4215-c68b-44f7-b46a-08db0f4877d6 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2023 11:33:32.6928 (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: O+37LuIkflROcOt7nzssRe2cKnyEC4QEYaj0NRWnyUiv0QTa6xkAVXJi5fXWTLJfvPhGz5FolHwrBUnrT/6kuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7523 First of all drop 32-bit leftovers, including the inclusion of the file from head_32.S. Then further move PV-only ELF notes inside the XEN_PV conditional. Finally have the "supported features" note actually report reality: All three of the features are supported and/or applicable only in certain cases. Signed-off-by: Jan Beulich --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -524,8 +524,6 @@ __INITRODATA int_msg: .asciz "Unknown interrupt or fault at: %p %p %p\n" -#include "../../x86/xen/xen-head.S" - /* * The IDT and GDT 'descriptors' are a strange 48-bit object * only used by the lidt and lgdt instructions. They are not --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -83,27 +83,33 @@ SYM_CODE_END(asm_cpu_bringup_and_idle) ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") -#ifdef CONFIG_X86_32 - ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __PAGE_OFFSET) -#else ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __START_KERNEL_map) /* Map the p2m table to a 512GB-aligned user address. */ ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad (PUD_SIZE * PTRS_PER_PUD)) -#endif #ifdef CONFIG_XEN_PV ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen) + ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "!writable_page_tables") + ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") + ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, + .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) +# define FEATURES_PV (1 << XENFEAT_writable_page_tables) +#else +# define FEATURES_PV 0 +#endif +#ifdef CONFIG_XEN_PVH +# define FEATURES_PVH (1 << XENFEAT_linux_rsdp_unrestricted) +#else +# define FEATURES_PVH 0 +#endif +#ifdef CONFIG_XEN_DOM0 +# define FEATURES_DOM0 (1 << XENFEAT_dom0) +#else +# define FEATURES_DOM0 0 #endif ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page) - ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, - .ascii "!writable_page_tables|pae_pgdir_above_4gb") ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES, - .long (1 << XENFEAT_writable_page_tables) | \ - (1 << XENFEAT_dom0) | \ - (1 << XENFEAT_linux_rsdp_unrestricted)) - ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") + .long FEATURES_PV | FEATURES_PVH | FEATURES_DOM0) ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") - ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, - .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1) ELFNOTE(Xen, XEN_ELFNOTE_MOD_START_PFN, .long 1) ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, _ASM_PTR __HYPERVISOR_VIRT_START)