From patchwork Fri Nov 24 08:40:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13467172 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 C01D1C61DF4 for ; Fri, 24 Nov 2023 08:40:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.640238.998203 (Exim 4.92) (envelope-from ) id 1r6Rjg-0000VA-4O; Fri, 24 Nov 2023 08:40:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 640238.998203; Fri, 24 Nov 2023 08:40:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r6Rjg-0000V3-0X; Fri, 24 Nov 2023 08:40:28 +0000 Received: by outflank-mailman (input) for mailman id 640238; Fri, 24 Nov 2023 08:40:27 +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 1r6Rjf-0000Uv-F1 for xen-devel@lists.xenproject.org; Fri, 24 Nov 2023 08:40:27 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2051.outbound.protection.outlook.com [40.107.7.51]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1cfaae34-8aa5-11ee-9b0e-b553b5be7939; Fri, 24 Nov 2023 09:40:25 +0100 (CET) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8326.eurprd04.prod.outlook.com (2603:10a6:20b:3ff::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.14; Fri, 24 Nov 2023 08:40:23 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44%3]) with mapi id 15.20.7046.012; Fri, 24 Nov 2023 08:40:23 +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: 1cfaae34-8aa5-11ee-9b0e-b553b5be7939 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GCbQt8YD4kLRYV2b1fvrTRyGw3yEUz7UM9XrWXr+YxgsKf50eWO7O1cefwvgUuE7uVN34df9uAXJtgVoVOv8u9r3PVupSydTgmBorRFrR1W/9GaGngssdH5mgE54Din5QkBK3SBFqGtn3Y/f6+sArhuGmugLfzp2Z8bT4+bmUY7MHdt56ESCBOtKfXN5rnFmYSfdrB+m6ljv12Ll35W07sCK6t5jEq7AasglqrWh5QjPGwL7OrgKGASYda5ad7PddesLpPDxivfCfY3v1Sgd3WeZ0d6dSJmgFi0c6KIFrCEkWkj5mSl/t0mN6mqJt8zKozE+bCcB6qzwTkEMNO7vQg== 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=hmgDzGpnv27TMPDRUUUgHZCoJLepTwX1fsKTTH4fuI8=; b=INaOEflZF0t6MWnlrqqTGoL34JiUFbFvEA9InrhhvKNmBjs3Sfc+eSKpzQpu+3xGZPPhsLkziA/thKoF8qL/2eH+gIluIvOBLr2ksXYC6fkgOJz8BeUdi4GcA5PORGhm5/yStdyceQ42Beob3o/+WqCsMytyYB4wlOvermO3E+xZ+6Qt8beDhQtuwzPbNP5/aiwR49JMlixFmEUCfY6OeENMtxDq5QS//TSC1iwgHBylFq5qtXwKFgljmBI6qo8FHrIZO4NsCAM0YaSAB2tny/XgftLMmb2Ta1Gql4a1fQt8zBw0MqW5VeT6ElnzTgD3ZeOXBvYpu6rj/hI4iVP+TQ== 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=hmgDzGpnv27TMPDRUUUgHZCoJLepTwX1fsKTTH4fuI8=; b=YqTk41wMkza+SR9DXqOyhOAobkJqr27kf0hh+bKoKLAN7rtlU7+HKMBl0a7cVz0SaYfwMDWokseJtBj5jbDO4M0rkvYPxF3MVqHGRfMErxWn68fgx01e8o2LsW6OrCaTUeXMgXOKcYOWjo4vrLjLVU8DYXb/bQXPtyKLe+sNbTfqxcbHSoVZc9QYCQUWzi60fKvS5pRmHm+UbyAzNF0aSbL53RUcjN6DYd6tb8znBdagXxWvN2muzkTmCF373TnL3HZA/lQm+nAg1sQvcYHj7BqkWWI+at2kEchr9K1FVqA+m59mDuluOdFbC+q+a48OhUsN9ibfHnvtlipvbX3/UA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <5ec88d40-6295-4f1b-932c-4890f7f9cd66@suse.com> Date: Fri, 24 Nov 2023 09:40:23 +0100 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 07/15] VMX: drop vmcs_revision_id 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?= , Kevin Tian , Jun Nakajima References: Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: X-ClientProxiedBy: FR4P281CA0408.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::6) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB8326:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bf2084a-ebcd-48f5-99ec-08dbecc9000c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QVSXW+hLWQFy2oM3GhWKMwd5MDDegwfR3ocUYkc2JB0po/U+b9vcb1xekZPXMxf5vHw56IzCn5NHbLsC7cqiyG16FQM/6hgO3KqC0brluWbygB8WSTKhjJe0UWYT6LhLpbKySdZ/Vm0qBcz4eiLomB35vrRjQ+BkAlD5N+zkE902jjhrnLAPTf2ZUP1+56RDIkt6LTSvTs1icoHxuslBuHd/iliA89eSZfjPHmubYSxGTS51zEDS0h2XoJ5oMArs/VVd5PSyaKr7IK68wi6iDLcm71YOPGE3zBGQIBjtTFIooBYlRmlyFzkdJH5R9ygTwr2Hd0DQxsPF7xTgjFf2fO/UOrZ9MGS7ABdYr255ZqFnQdOGGHL0uHJTyTx2taECKtll2WuLQe4HzEw4FHFiQhwEH6W6tTPmH9/FQDHDooK4urPR1eRkAe0etRGJNcrzbAM4eDVH4TcUPM5K+Oz+5shzwv93LNK5iAe9m64MmPX/0Xw6EIOjUuMpxXiLmS1VUM+9jepB6Y598S8GMlFjrTqi07cAYJ6dFba39YsNozmtt2g8VRBLGuwPdcqD7qemdCJyCr1VvEsCcJ79CxWvcQTI0BzrFwt+4qcE4n0Y+zknlTvAbl0R8Qk640ZoGj0NyNBoYE0KMqvzYrj3fPYttw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(396003)(376002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(31686004)(26005)(66946007)(6916009)(66476007)(66556008)(54906003)(38100700002)(36756003)(31696002)(86362001)(6486002)(2616005)(6512007)(6506007)(478600001)(4326008)(2906002)(316002)(8676002)(8936002)(5660300002)(41300700001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?c/3AE3vIiuBerczUJEm7BvxAR8b1?= =?utf-8?q?9FBZo+tg+oy65SswV0L40HKFNSPOQh7n/9Y/8nwAKKAOyxXxsvyBUoArqmPgQ6bdX?= =?utf-8?q?+9elzb3jNKbZuhvNGkAv1hOivXDo+ERI9kHe5Spdzl2OofNG28LHmc0zLzGwcsNJd?= =?utf-8?q?LpcMwF1e7oehFGlwkf2F9+m0/i6nep7Rk6dmmkfy1ucUZ8V2JfcNTAvMKg3hQR010?= =?utf-8?q?UnG4h6zH0ahGz14/cwb4q3Y21S8XtRlK0wORadNLL8Qd9aB2yZQ3Wc+rGVh4HsWUf?= =?utf-8?q?S7Meicbe+5IF/GPPpxbs7ES36lHHsem4+mgKWCdaocASYAxZOapoBLWL5V4EXLILS?= =?utf-8?q?4m7r7IMQJ8+GawGw2ldOXSJu/yqhbvv1qGo3NLdq4uSCJYNrUfbUF9Bymh3o78HFW?= =?utf-8?q?a1j0ioBV5BTRSQc8PLmChNR2MdDHmMc43Hs8AkmJt5HWHZ2BvofRpV8nwJT4ZSxfk?= =?utf-8?q?rK3yahQPawWrfdZEJTBapbKUvVerSD3g5ARE0SSJXKef/oxCJTzunVYmmXVBXmRBC?= =?utf-8?q?gF9ImvPOdr7gFlNJrZ6TVVQkcU5L7qWyTlYmtduP5QUqW9LVcoTxYfPuEG7tBZYft?= =?utf-8?q?3mt5XuaJtels2MkER59RB8i5Z16fmSqinmQ7bNJTJXqwPRUW69Xh+zr02yBiFareU?= =?utf-8?q?raPy6vMvmphpPbz/t43l0Cs07XF2AQnaWPDkbFocgoZ1AB5rXTuKeSHA20LzX2NB+?= =?utf-8?q?CZBWiI4nL3QS6zJ8XXGX4WGpMF5N8YbN81qUXUuLo7GEczpPF235cG/xcqonEDCjC?= =?utf-8?q?uV4Yww3oTEAgGX2kC7EaekpqhFD2JYEest1uPyC13vdz8oPJYSIfbXK2DJ44y3hpH?= =?utf-8?q?ZYGLD32YDQ+4wUAuR+qr/LTbe38oYNZnT8bbrmSRyhLgPgy5o935HEHJvPeviFNAk?= =?utf-8?q?8oQXc1Tf3PeV42Uj+4LYYLDHoxD2beBr2DtIJ343Ucc2AgHgKUwMCLmIXTnTrDrmv?= =?utf-8?q?roqrPRP/psUcU4OAHUILT4PDRxzGbn9hmqAh/5kibk4y1v6DCjwVq0zkgtgp6VtR9?= =?utf-8?q?+rdduE+Cf30vSjcVVQ74xwLKhYnp6CzxrPHvJOJysm+H6UlODXmeldCxivZlOrSZJ?= =?utf-8?q?0dOCE78To3pi4JMQMelpJ3gVITdxRL3U4Q+If2QGFFbZAOUmVXQrXiDTGshEBiLhy?= =?utf-8?q?E2vN5/ilKrILVhLt+ggonh45vods13pMY+RhrL9HScVLiK7wNdDeo82JOgA6dxpW9?= =?utf-8?q?x2vaSjXUO+tRtva9DETXSDOFqr4/KMI7kpM1hbXS4GRSvcr5rEdsg+8Ukn5KrrwKo?= =?utf-8?q?PqL70Rb1yvq89fqAFSs1UD/wZdltxKb3DUuiKPF0G9CaMsh1HT1wBZAKsp4Uhcrf2?= =?utf-8?q?nNiC33ZzHdGvckSc9URwCXE52j26Xt3nFHeo7K8T4Tq+QxYREFx6rNvkCdxYaJqVP?= =?utf-8?q?mT0zxrx4o3pmTT4s8mVPL+QkNwtyQPTnxZTTXEKJcW2xNVUaceZjDGNWHMZbfjpqt?= =?utf-8?q?Xz/HzTiBgdVtUBi3PPTq165SfJYM3Gzyi+LdET2APgMPlP+fzvGH78CmYHSn8AxpK?= =?utf-8?q?A5M86Me+Do/3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bf2084a-ebcd-48f5-99ec-08dbecc9000c X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2023 08:40:23.7804 (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: tukaQiWBk9axuFaSA+ZgGJYJuHvLJAenXzDKmY9rwKCzcZFrJSX5vyRG6m46ug3qjufMMRoaAcmnFbI/jLd0Mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8326 It's effectively redundant with vmx_basic_msr. For the #define replacement to work, struct vmcs_struct's respective field name also needs to change: Drop the not really meaningful "vmcs_" prefix from it. Signed-off-by: Jan Beulich --- v2: New. --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -174,7 +174,7 @@ static DEFINE_PER_CPU(paddr_t, current_v static DEFINE_PER_CPU(struct list_head, active_vmcs_list); DEFINE_PER_CPU(bool, vmxon); -static u32 vmcs_revision_id __read_mostly; +#define vmcs_revision_id (vmx_basic_msr & VMX_BASIC_REVISION_MASK) u64 __read_mostly vmx_basic_msr; static void __init vmx_display_features(void) @@ -464,7 +464,6 @@ static int vmx_init_vmcs_config(bool bsp if ( !vmx_pin_based_exec_control ) { /* First time through. */ - vmcs_revision_id = vmx_basic_msr_low & VMX_BASIC_REVISION_MASK; vmx_pin_based_exec_control = _vmx_pin_based_exec_control; vmx_cpu_based_exec_control = _vmx_cpu_based_exec_control; vmx_secondary_exec_control = _vmx_secondary_exec_control; @@ -572,7 +571,7 @@ static paddr_t vmx_alloc_vmcs(void) vmcs = __map_domain_page(pg); clear_page(vmcs); - vmcs->vmcs_revision_id = vmcs_revision_id; + vmcs->revision_id = vmcs_revision_id; unmap_domain_page(vmcs); return page_to_maddr(pg); --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1163,7 +1163,7 @@ static void nvmx_set_vmcs_pointer(struct paddr_t vvmcs_maddr = v->arch.hvm.vmx.vmcs_shadow_maddr; __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id |= VMCS_RID_TYPE_MASK; + vvmcs->revision_id |= VMCS_RID_TYPE_MASK; v->arch.hvm.vmx.secondary_exec_control |= SECONDARY_EXEC_ENABLE_VMCS_SHADOWING; __vmwrite(SECONDARY_VM_EXEC_CONTROL, @@ -1178,7 +1178,7 @@ static void nvmx_clear_vmcs_pointer(stru paddr_t vvmcs_maddr = v->arch.hvm.vmx.vmcs_shadow_maddr; __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id &= ~VMCS_RID_TYPE_MASK; + vvmcs->revision_id &= ~VMCS_RID_TYPE_MASK; v->arch.hvm.vmx.secondary_exec_control &= ~SECONDARY_EXEC_ENABLE_VMCS_SHADOWING; __vmwrite(SECONDARY_VM_EXEC_CONTROL, @@ -1794,10 +1794,10 @@ static int nvmx_handle_vmptrld(struct cp { struct vmcs_struct *vvmcs = vvmcx; - if ( ((vvmcs->vmcs_revision_id ^ vmx_basic_msr) & - VMX_BASIC_REVISION_MASK) || + if ( ((vvmcs->revision_id ^ vmx_basic_msr) & + VMX_BASIC_REVISION_MASK) || (!cpu_has_vmx_vmcs_shadowing && - (vvmcs->vmcs_revision_id & ~VMX_BASIC_REVISION_MASK)) ) + (vvmcs->revision_id & ~VMX_BASIC_REVISION_MASK)) ) { hvm_unmap_guest_frame(vvmcx, 1); vmfail(regs, VMX_INSN_VMPTRLD_INCORRECT_VMCS_ID); @@ -2209,7 +2209,7 @@ int nvmx_msr_read_intercept(unsigned int map_domain_page(_mfn(PFN_DOWN(v->arch.hvm.vmx.vmcs_pa))); data = (host_data & (~0ul << 32)) | - (vmcs->vmcs_revision_id & 0x7fffffff); + (vmcs->revision_id & 0x7fffffff); unmap_domain_page(vmcs); if ( !cpu_has_vmx_vmcs_shadowing ) --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -17,7 +17,7 @@ int cf_check vmx_cpu_up(void); void cf_check vmx_cpu_down(void); struct vmcs_struct { - u32 vmcs_revision_id; + uint32_t revision_id; unsigned char data [0]; /* vmcs size is read from MSR */ };