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 8/9] x86/PVH: adjust function/data placement
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: <3b0bb22e-43f4-e459-c5cb-169f996b5669@suse.com>
Date:   Thu, 30 Sep 2021 14:20:42 +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?blB5NVg1blZyM3oyaVJpWXJ4WTdndklUUUFPSEIrUVVsc1FyV3lsdG4wREZ3?=
 =?utf-8?B?UDQxZENhVTI5RUJadmJLWU1tWlEvZlFEbmdDaFRJZlhDQnUxNE5ZaWgvRTVU?=
 =?utf-8?B?OGF3UFlQamIwM2E3eXNBMFlnUjRzNjFNb3ZoZEhpRnIybjMzR1VUdTZZdVB6?=
 =?utf-8?B?aEtGQUdkbUxNYjcyK1BIOCtReGFjOU9wVEdLaFdJdVRtVWFSTDZjeEZGQUhl?=
 =?utf-8?B?NUJEaGRxUDhLbjlEZXprU21BQzlZb3JMWWZ0VVBWNHE5WDdadDZReWhwTkJG?=
 =?utf-8?B?L2ZWcmtTWnVwZDk5Q0xlVU84eGp6N0YrVXlnRU52MElTR0JHUW15UzU1N0JI?=
 =?utf-8?B?cllHZ3lwNHhNRkk3b05jbGs0bVBqbVpJeVJOeXVjZXNuR3NmSThYaEVwaXNv?=
 =?utf-8?B?L2FRakpJbzhtMVNlbytFaFNidk45eldMdGVCRCtTQlMra3hjRnV1U3NOZFNJ?=
 =?utf-8?B?RW5xZFAvNWZqR2R4VjBLR0FSdVljU0JiNmROUkU5UGhnelo2WGR4eWZKQUVt?=
 =?utf-8?B?OFNFT1BzdWlvVVlEeHhDK1h3NjVXeW9GeWIwa1h0VngrN0tLSlFBYmNZeUFs?=
 =?utf-8?B?VTVKN05TY09UK2FsNjMyamhLVmtRTGtNTnJuOG5BU2NMNFFTWVl3YUpUbHRm?=
 =?utf-8?B?NFZmSHZaY3NVblF5RzZGQXh2WU1DaEhsVlJqNlcxQk9pS083SXppNFZiTFJP?=
 =?utf-8?B?cis4aXkrL0dNaC9ZNmVFd1oyK0Z1bmlYeHFkL1lKY1pWYVZjTkxrcWJweERv?=
 =?utf-8?B?QVpJdGFsdWFsd2xWSm9NSm5QazZTeXZ4Ylg4NUZkaS92NmV4MlAzQ203QUE1?=
 =?utf-8?B?SjliYjVzdlZsVGRoRDRVU0tTclZ2OUdlMENZOUJLZnJ4bUp6SDZuMU1vd09s?=
 =?utf-8?B?RzFHK3luZE41YVJYNTBKRG9Ga2xRSmlvdjQzSEh1YUNjdGNSQ3ZRYmo0SFgv?=
 =?utf-8?B?eHBzZisvZkxZeFk0OU41ZXR6ZlpLODd2M0pyM0tLeWl4c3ZsWStQbHhUd1o1?=
 =?utf-8?B?UGEzWm5ZVS9PYzVvckFjNGROeE5oaldVUWF1NVFZbjdDWnZ1VkY2eEFxbHYx?=
 =?utf-8?B?dzY1amNKaVBpQXg1NDJaS2hKb05Pa2tJZm93NnpPMWdHeHkwR3haOFJscWdx?=
 =?utf-8?B?a3o2Wkg3c1RNQm1TTHdDYUpXdUN2NVhvUnVlWkFOUWVPa3puUmZHKzRMdFlZ?=
 =?utf-8?B?N25BbWxaS1kvODdIemhFWjhSbEdleFJVbjRoQmJlcG5PTVNUZy9sc2NOWW5h?=
 =?utf-8?B?SThmTVlvdUNwcDhyK3loSHdOSVhIb2ZIalVrcEU2ZFhHVmpBTElscFgrUGh5?=
 =?utf-8?B?RlhRV3E5VHlhcVpGbE1DM1dwakR5WVh2UVJUeUdVMTZPQmR1SFRzTWJmRVpk?=
 =?utf-8?B?ODY2RGtDUWU2S2VURXRQcFNEZHVJeHExZmlVZzhVWDNQenBkdENFQzlHejJR?=
 =?utf-8?B?Rjl3cHdZWnVMNzVJcUY4eGN0MDlEdEljZVU4RHc1aGNiQjBEOGxYVm55STly?=
 =?utf-8?B?NzB1c0xjQVh6aUUyRWVtcCtjUDdYQ3JEVlF2NENXVkp3UktRbnNJTXlYS0Mx?=
 =?utf-8?B?RE1JVUZDMHlBTjlUMHFtN0JlQ2YrT2NpT0pPYmNSMjZuUzhMNzZlSGFLRmp4?=
 =?utf-8?B?VDBHdXVQSFdZRXIvc0RtcmhnQ003OEpLN1RSdXk3Wm5ERVV0MWp1Wm5zeHJh?=
 =?utf-8?B?ZFQ3M2ZKUDkvejdSWkw3QWtPa1I3aGRXcXRjcjZWMTRlaUwrVzhKWVlOcDV3?=
 =?utf-8?Q?uAwk3aZIqgE9qRXdNMwAnnsfLOyewp0qIGGwNBe?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2182c689-5b0b-4c06-da13-08d9840cba4a
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:20:45.0786
 (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: ppjs6jifD+dQgrIqxFi9CzgyTJJcyBLRME/y1Xr5CHLUX6DNCQ4KPok4NA/IvKleABQxGHy7f4lZLrZJ2We+3A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7038
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Two of the variables can live in .init.data, allowing the open-coded
placing in .data to go away. Another "variable" is used to communicate a
size value only to very early assembly code, which hence can be both
const and live in .init.*. Additionally two functions were lacking
__init annotations.

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

--- a/arch/x86/platform/pvh/enlighten.c
+++ b/arch/x86/platform/pvh/enlighten.c
@@ -16,15 +16,15 @@
 /*
  * PVH variables.
  *
- * pvh_bootparams and pvh_start_info need to live in the data segment since
+ * pvh_bootparams and pvh_start_info need to live in a data segment since
  * they are used after startup_{32|64}, which clear .bss, are invoked.
  */
-struct boot_params pvh_bootparams __section(".data");
-struct hvm_start_info pvh_start_info __section(".data");
+struct boot_params __initdata pvh_bootparams;
+struct hvm_start_info __initdata pvh_start_info;
 
-unsigned int pvh_start_info_sz = sizeof(pvh_start_info);
+const unsigned int __initconst pvh_start_info_sz = sizeof(pvh_start_info);
 
-static u64 pvh_get_root_pointer(void)
+static u64 __init pvh_get_root_pointer(void)
 {
 	return pvh_start_info.rsdp_paddr;
 }
@@ -107,7 +107,7 @@ void __init __weak xen_pvh_init(struct b
 	BUG();
 }
 
-static void hypervisor_specific_init(bool xen_guest)
+static void __init hypervisor_specific_init(bool xen_guest)
 {
 	if (xen_guest)
 		xen_pvh_init(&pvh_bootparams);