Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: [PATCH v2 1/9] xen/x86: prevent PVH type from getting clobbered
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <roger.pau@citrix.com>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
References: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Message-ID: <d301677b-6f22-5ae6-bd36-458e1f323d0b@suse.com>
Date:   Thu, 30 Sep 2021 14:16:15 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <9a26d4ff-80a1-e0c1-f528-31a8568d41f7@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VS9aNDQ1SENwbGU5YjVqdkY0VUtORitRNUZ5bUx6NTl2WUZhb3NNcXhoamg5?=
 =?utf-8?B?b25mMjdIdTU4dzZaN3JBUGZHK3hibHphRUl0OHJJVjZwalZlMXFmQWNxYW1t?=
 =?utf-8?B?eVVOK2YxTDhsdFdWSTV5dDZoS1I3TkZNVzN3aitPVGtBTVcvQTN1b2F4bk9C?=
 =?utf-8?B?bjJRVWNsdWhJY3ZCN0VxRGs5bzlvRlV3RElNcUFRYnY5MnB0WlZVSldLM2Z5?=
 =?utf-8?B?TWFESVg0aWhFdGNYT2NhZzVnUlVoN0xFYWlLdGhzUmFiKzA1L0VURGJEdWlT?=
 =?utf-8?B?dkphNmtPWWRZTDcrV21ab0ZTWGQ0enlPckx3RUFSQzhibUYzL1Fhd3E1TERI?=
 =?utf-8?B?MzlzZHg5UkJpaHV3bWs5Vk9zcVBScFJIdEVyS3hTOWZtYkltTVkvVDFhV3pn?=
 =?utf-8?B?L2NTai94QzlDZlpLUWxSZFVnM1VwcElKYWx6MDJuYlBqcmtsclNicmdoNFVm?=
 =?utf-8?B?WTFoTkRxOFpLWXBxeEZ3QTdkQ1ZUekppckhMZGNuTmczd2xrcXh6Um5iZVFT?=
 =?utf-8?B?UnFOaVlmcnc5ZVYySm1scnY4aHBMTktReXNLeFBhTmpXZStvQlQ2MFBXRGFW?=
 =?utf-8?B?dWh1V1F5L2JLKzFWVStyZ1NtYW8vdUkrWjF6OHhVQ1ltc1FvM2pBUlA3dzRN?=
 =?utf-8?B?MnBHcUtsdEhJZUJHUUk2bnltNVFhcHQvY2t0RVljRWFQZ1pkL0paSFBYQ1RJ?=
 =?utf-8?B?b2pTSFNBMFNiaGhyMlp6VUtlalBZRElnU3BlMFJ5Z2tOTWRVMitlOWlNbWlH?=
 =?utf-8?B?b1ZoYkVDUlVDTFZ1YTlIMlBEWEFiZDNDV0lROHViYmNsSDB5RUNqeTZwMURL?=
 =?utf-8?B?M3VzYWNsaDBRVjIwTmZ2K2JIcnZnejdZNHVZZFlITEFVdVRNZWZuUWsyNXYy?=
 =?utf-8?B?YXlPNUxYamswc2x0UkVITzhQbzVLbCtpdnhoME1iWVdpSzJKeXB2aFdESDRj?=
 =?utf-8?B?N1ptcnZ2dGNHOUhNT0ZiYU9XYklqbUZhV3NFakY1aWR6KzZRVGw2YXhZVkZE?=
 =?utf-8?B?bmpYWWYyV1BRQUFHUktaVlJVK3JCenFSekZoSDhvekpsbWdINDRLNnpGS0ty?=
 =?utf-8?B?eG9TNDdVb3RLRlQrQTlOVlpyeWhZb0hSMks3STVIZlo4UjdrMklNY0o0NytB?=
 =?utf-8?B?UEFnNUxVSGNEckpzM3c3YmU3UlV5VGZlVzhaenl6dGJMRnpKTWZ1TlEyTVRG?=
 =?utf-8?B?eEQ4YWR0UmFmZUttVVQ0aEV3Qy9MbEFxVzVZUEdYa1UzTTliVjVKWnlnVHQ1?=
 =?utf-8?B?RExYWjV4YXlOMUdaUm5VOGxhRGxWa2JlNjNxajhBdWpyaWo5RjFvMEVCVDla?=
 =?utf-8?B?M0YxRld2YmlXUGpkelZaVEIzWTZLS1dqUm83RDMvQXlDU3VmdFVJbHhmOVJ4?=
 =?utf-8?B?UlowQXlXUGtmeXZzYmF5Tnd6cVdWaElJQW9kbGREN0ovbEdPMk95aTM3Vlk3?=
 =?utf-8?B?R2ExMlJRdm1XcFY5OTRpQklnbWF3WnBlei9nS1F1TWQ1TlNBdkdqdnp4RXdE?=
 =?utf-8?B?TUdtMFNRZnZnSG1KVCtoYWxCVm5DUEl3K3VDRXZhb0JuVjNxaDk1TWVuL2Vm?=
 =?utf-8?B?YUQweU5TRHJ1OFhzd2JrbENQZ1ZiT3dOYUlwUUk2RWczcUhnRlB6ZHdyY1ox?=
 =?utf-8?B?VjhiNzRMMk5HOEJkQjhwRDlRRFJJWHBCKzFiRU9lazBlTmpCOGNwNGNycmE1?=
 =?utf-8?B?ZjA0N281TEpZL3ViRUVVeElBOC83R3paeDJYZmNLZ2dXRFE0VEtlRnRGWlBT?=
 =?utf-8?Q?ZL6VEO5J2BXu6nic87ZIgc8FtkGFhamJSH3xaIt?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1da47a57-0b3c-46b1-7b3f-08d9840c1ae2
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 12:16:17.6349
 (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: t5NwW851KivOKa8DdKBD43rjsoLPincopUC+WfLp12/qLeT+T3xABojJXm3sgBVrIHWQMupYp99ajz8Bao9zkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6382
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Like xen_start_flags, xen_domain_type gets set before .bss gets cleared.
Hence this variable also needs to be prevented from getting put in .bss,
which is possible because XEN_NATIVE is an enumerator evaluating to
zero. Any use prior to init_hvm_pv_info() setting the variable again
would lead to wrong decisions; one such case is xenboot_console_setup()
when called as a result of "earlyprintk=xen".

Use __ro_after_init as more applicable than either __section(".data") or
__read_mostly.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>

--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -52,9 +52,6 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcp
 DEFINE_PER_CPU(uint32_t, xen_vcpu_id);
 EXPORT_PER_CPU_SYMBOL(xen_vcpu_id);
 
-enum xen_domain_type xen_domain_type = XEN_NATIVE;
-EXPORT_SYMBOL_GPL(xen_domain_type);
-
 unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START;
 EXPORT_SYMBOL(machine_to_phys_mapping);
 unsigned long  machine_to_phys_nr;
@@ -69,9 +66,11 @@ __read_mostly int xen_have_vector_callba
 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
 
 /*
- * NB: needs to live in .data because it's used by xen_prepare_pvh which runs
- * before clearing the bss.
+ * NB: These need to live in .data or alike because they're used by
+ * xen_prepare_pvh() which runs before clearing the bss.
  */
+enum xen_domain_type __ro_after_init xen_domain_type = XEN_NATIVE;
+EXPORT_SYMBOL_GPL(xen_domain_type);
 uint32_t xen_start_flags __section(".data") = 0;
 EXPORT_SYMBOL(xen_start_flags);