Commit 9900400e authored by Sean Christopherson's avatar Sean Christopherson
Browse files

x86/virt/tdx: Tag a pile of functions as __init, and globals as __ro_after_init 



Now that TDX-Module initialization is done during subsys init, tag all
related functions as __init, and relevant data as __ro_after_init.

Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarChao Gao <chao.gao@intel.com>
Tested-by: default avatarChao Gao <chao.gao@intel.com>
Tested-by: default avatarSagi Shahar <sagis@google.com>
Link: https://patch.msgid.link/20260214012702.2368778-13-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 165e7735

arch/x86/virt/vmx/tdx/tdx.c

+61 −58
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static struct tdmr_info_list tdx_tdmr_list; 
/* All TDX-usable memory regions.  Protected by mem_hotplug_lock. */

static LIST_HEAD(tdx_memlist);



static struct tdx_sys_info tdx_sysinfo;

static bool tdx_module_initialized;

static struct tdx_sys_info tdx_sysinfo __ro_after_init;

static bool tdx_module_initialized __ro_after_init;



typedef void (*sc_err_func_t)(u64 fn, u64 err, struct tdx_module_args *args);
@@ -226,7 +226,8 @@ static struct syscore tdx_syscore = { 
 * all memory regions are added in address ascending order and don't

 * overlap.

 */

static int add_tdx_memblock(struct list_head *tmb_list, unsigned long start_pfn,

static __init int add_tdx_memblock(struct list_head *tmb_list,

				   unsigned long start_pfn,

				   unsigned long end_pfn, int nid)

{

	struct tdx_memblock *tmb;
@@ -245,7 +246,7 @@ static int add_tdx_memblock(struct list_head *tmb_list, unsigned long start_pfn, 
	return 0;

}



static void free_tdx_memlist(struct list_head *tmb_list)

static __init void free_tdx_memlist(struct list_head *tmb_list)

{

	/* @tmb_list is protected by mem_hotplug_lock */

	while (!list_empty(tmb_list)) {
@@ -263,7 +264,7 @@ static void free_tdx_memlist(struct list_head *tmb_list) 
 * ranges off in a secondary structure because memblock is modified

 * in memory hotplug while TDX memory regions are fixed.

 */

static int build_tdx_memlist(struct list_head *tmb_list)

static __init int build_tdx_memlist(struct list_head *tmb_list)

{

	unsigned long start_pfn, end_pfn;

	int i, nid, ret;
@@ -295,7 +296,7 @@ static int build_tdx_memlist(struct list_head *tmb_list) 
	return ret;

}



static int read_sys_metadata_field(u64 field_id, u64 *data)

static __init int read_sys_metadata_field(u64 field_id, u64 *data)

{

	struct tdx_module_args args = {};

	int ret;
@@ -317,7 +318,7 @@ static int read_sys_metadata_field(u64 field_id, u64 *data) 


#include "tdx_global_metadata.c"



static int check_features(struct tdx_sys_info *sysinfo)

static __init int check_features(struct tdx_sys_info *sysinfo)

{

	u64 tdx_features0 = sysinfo->features.tdx_features0;
@@ -330,7 +331,7 @@ static int check_features(struct tdx_sys_info *sysinfo) 
}



/* Calculate the actual TDMR size */

static int tdmr_size_single(u16 max_reserved_per_tdmr)

static __init int tdmr_size_single(u16 max_reserved_per_tdmr)

{

	int tdmr_sz;
@@ -344,7 +345,7 @@ static int tdmr_size_single(u16 max_reserved_per_tdmr) 
	return ALIGN(tdmr_sz, TDMR_INFO_ALIGNMENT);

}



static int alloc_tdmr_list(struct tdmr_info_list *tdmr_list,

static __init int alloc_tdmr_list(struct tdmr_info_list *tdmr_list,

				  struct tdx_sys_info_tdmr *sysinfo_tdmr)

{

	size_t tdmr_sz, tdmr_array_sz;
@@ -376,7 +377,7 @@ static int alloc_tdmr_list(struct tdmr_info_list *tdmr_list, 
	return 0;

}



static void free_tdmr_list(struct tdmr_info_list *tdmr_list)

static __init void free_tdmr_list(struct tdmr_info_list *tdmr_list)

{

	free_pages_exact(tdmr_list->tdmrs,

			tdmr_list->max_tdmrs * tdmr_list->tdmr_sz);
@@ -405,7 +406,7 @@ static inline u64 tdmr_end(struct tdmr_info *tdmr) 
 * preallocated @tdmr_list, following all the special alignment

 * and size rules for TDMR.

 */

static int fill_out_tdmrs(struct list_head *tmb_list,

static __init int fill_out_tdmrs(struct list_head *tmb_list,

				 struct tdmr_info_list *tdmr_list)

{

	struct tdx_memblock *tmb;
@@ -482,7 +483,7 @@ static int fill_out_tdmrs(struct list_head *tmb_list, 
 * Calculate PAMT size given a TDMR and a page size.  The returned

 * PAMT size is always aligned up to 4K page boundary.

 */

static unsigned long tdmr_get_pamt_sz(struct tdmr_info *tdmr, int pgsz,

static __init unsigned long tdmr_get_pamt_sz(struct tdmr_info *tdmr, int pgsz,

					     u16 pamt_entry_size)

{

	unsigned long pamt_sz, nr_pamt_entries;
@@ -514,7 +515,7 @@ static unsigned long tdmr_get_pamt_sz(struct tdmr_info *tdmr, int pgsz, 
 * PAMT.  This node will have some memory covered by the TDMR.  The

 * relative amount of memory covered is not considered.

 */

static int tdmr_get_nid(struct tdmr_info *tdmr, struct list_head *tmb_list)

static __init int tdmr_get_nid(struct tdmr_info *tdmr, struct list_head *tmb_list)

{

	struct tdx_memblock *tmb;
@@ -543,7 +544,7 @@ static int tdmr_get_nid(struct tdmr_info *tdmr, struct list_head *tmb_list) 
 * Allocate PAMTs from the local NUMA node of some memory in @tmb_list

 * within @tdmr, and set up PAMTs for @tdmr.

 */

static int tdmr_set_up_pamt(struct tdmr_info *tdmr,

static __init int tdmr_set_up_pamt(struct tdmr_info *tdmr,

				   struct list_head *tmb_list,

				   u16 pamt_entry_size[])

{
@@ -615,7 +616,7 @@ static void tdmr_get_pamt(struct tdmr_info *tdmr, unsigned long *pamt_base, 
	*pamt_size = pamt_sz;

}



static void tdmr_do_pamt_func(struct tdmr_info *tdmr,

static __init void tdmr_do_pamt_func(struct tdmr_info *tdmr,

		void (*pamt_func)(unsigned long base, unsigned long size))

{

	unsigned long pamt_base, pamt_size;
@@ -632,17 +633,17 @@ static void tdmr_do_pamt_func(struct tdmr_info *tdmr, 
	pamt_func(pamt_base, pamt_size);

}



static void free_pamt(unsigned long pamt_base, unsigned long pamt_size)

static __init void free_pamt(unsigned long pamt_base, unsigned long pamt_size)

{

	free_contig_range(pamt_base >> PAGE_SHIFT, pamt_size >> PAGE_SHIFT);

}



static void tdmr_free_pamt(struct tdmr_info *tdmr)

static __init void tdmr_free_pamt(struct tdmr_info *tdmr)

{

	tdmr_do_pamt_func(tdmr, free_pamt);

}



static void tdmrs_free_pamt_all(struct tdmr_info_list *tdmr_list)

static __init void tdmrs_free_pamt_all(struct tdmr_info_list *tdmr_list)

{

	int i;
@@ -651,7 +652,7 @@ static void tdmrs_free_pamt_all(struct tdmr_info_list *tdmr_list) 
}



/* Allocate and set up PAMTs for all TDMRs */

static int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,

static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,

					struct list_head *tmb_list,

					u16 pamt_entry_size[])

{
@@ -702,12 +703,13 @@ void tdx_quirk_reset_page(struct page *page) 
}

EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_page);



static void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)

static __init void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)



{

	tdmr_do_pamt_func(tdmr, tdx_quirk_reset_paddr);

}



static void tdmrs_quirk_reset_pamt_all(struct tdmr_info_list *tdmr_list)

static __init void tdmrs_quirk_reset_pamt_all(struct tdmr_info_list *tdmr_list)

{

	int i;
@@ -715,7 +717,7 @@ static void tdmrs_quirk_reset_pamt_all(struct tdmr_info_list *tdmr_list) 
		tdmr_quirk_reset_pamt(tdmr_entry(tdmr_list, i));

}



static unsigned long tdmrs_count_pamt_kb(struct tdmr_info_list *tdmr_list)

static __init unsigned long tdmrs_count_pamt_kb(struct tdmr_info_list *tdmr_list)

{

	unsigned long pamt_size = 0;

	int i;
@@ -730,8 +732,8 @@ static unsigned long tdmrs_count_pamt_kb(struct tdmr_info_list *tdmr_list) 
	return pamt_size / 1024;

}



static int tdmr_add_rsvd_area(struct tdmr_info *tdmr, int *p_idx, u64 addr,

			      u64 size, u16 max_reserved_per_tdmr)

static __init int tdmr_add_rsvd_area(struct tdmr_info *tdmr, int *p_idx,

				     u64 addr, u64 size, u16 max_reserved_per_tdmr)

{

	struct tdmr_reserved_area *rsvd_areas = tdmr->reserved_areas;

	int idx = *p_idx;
@@ -764,7 +766,7 @@ static int tdmr_add_rsvd_area(struct tdmr_info *tdmr, int *p_idx, u64 addr, 
 * those holes fall within @tdmr, set up a TDMR reserved area to cover

 * the hole.

 */

static int tdmr_populate_rsvd_holes(struct list_head *tmb_list,

static __init int tdmr_populate_rsvd_holes(struct list_head *tmb_list,

					   struct tdmr_info *tdmr,

					   int *rsvd_idx,

					   u16 max_reserved_per_tdmr)
@@ -828,7 +830,7 @@ static int tdmr_populate_rsvd_holes(struct list_head *tmb_list, 
 * overlaps with @tdmr, set up a TDMR reserved area to cover the

 * overlapping part.

 */

static int tdmr_populate_rsvd_pamts(struct tdmr_info_list *tdmr_list,

static __init int tdmr_populate_rsvd_pamts(struct tdmr_info_list *tdmr_list,

					   struct tdmr_info *tdmr,

					   int *rsvd_idx,

					   u16 max_reserved_per_tdmr)
@@ -866,7 +868,7 @@ static int tdmr_populate_rsvd_pamts(struct tdmr_info_list *tdmr_list, 
}



/* Compare function called by sort() for TDMR reserved areas */

static int rsvd_area_cmp_func(const void *a, const void *b)

static __init int rsvd_area_cmp_func(const void *a, const void *b)

{

	struct tdmr_reserved_area *r1 = (struct tdmr_reserved_area *)a;

	struct tdmr_reserved_area *r2 = (struct tdmr_reserved_area *)b;
@@ -885,7 +887,7 @@ static int rsvd_area_cmp_func(const void *a, const void *b) 
 * Populate reserved areas for the given @tdmr, including memory holes

 * (via @tmb_list) and PAMTs (via @tdmr_list).

 */

static int tdmr_populate_rsvd_areas(struct tdmr_info *tdmr,

static __init int tdmr_populate_rsvd_areas(struct tdmr_info *tdmr,

					   struct list_head *tmb_list,

					   struct tdmr_info_list *tdmr_list,

					   u16 max_reserved_per_tdmr)
@@ -913,7 +915,7 @@ static int tdmr_populate_rsvd_areas(struct tdmr_info *tdmr, 
 * Populate reserved areas for all TDMRs in @tdmr_list, including memory

 * holes (via @tmb_list) and PAMTs.

 */

static int tdmrs_populate_rsvd_areas_all(struct tdmr_info_list *tdmr_list,

static __init int tdmrs_populate_rsvd_areas_all(struct tdmr_info_list *tdmr_list,

						struct list_head *tmb_list,

						u16 max_reserved_per_tdmr)

{
@@ -936,7 +938,7 @@ static int tdmrs_populate_rsvd_areas_all(struct tdmr_info_list *tdmr_list, 
 * to cover all TDX memory regions in @tmb_list based on the TDX module

 * TDMR global information in @sysinfo_tdmr.

 */

static int construct_tdmrs(struct list_head *tmb_list,

static __init int construct_tdmrs(struct list_head *tmb_list,

				  struct tdmr_info_list *tdmr_list,

				  struct tdx_sys_info_tdmr *sysinfo_tdmr)

{
@@ -970,7 +972,8 @@ static int construct_tdmrs(struct list_head *tmb_list, 
	return ret;

}



static int config_tdx_module(struct tdmr_info_list *tdmr_list, u64 global_keyid)

static __init int config_tdx_module(struct tdmr_info_list *tdmr_list,

				    u64 global_keyid)

{

	struct tdx_module_args args = {};

	u64 *tdmr_pa_array;
@@ -1005,7 +1008,7 @@ static int config_tdx_module(struct tdmr_info_list *tdmr_list, u64 global_keyid) 
	return ret;

}



static int do_global_key_config(void *unused)

static __init int do_global_key_config(void *unused)

{

	struct tdx_module_args args = {};
@@ -1023,7 +1026,7 @@ static int do_global_key_config(void *unused) 
 * KVM) can ensure success by ensuring sufficient CPUs are online and

 * can run SEAMCALLs.

 */

static int config_global_keyid(void)

static __init int config_global_keyid(void)

{

	cpumask_var_t packages;

	int cpu, ret = -EINVAL;
@@ -1063,7 +1066,7 @@ static int config_global_keyid(void) 
	return ret;

}



static int init_tdmr(struct tdmr_info *tdmr)

static __init int init_tdmr(struct tdmr_info *tdmr)

{

	u64 next;
@@ -1094,7 +1097,7 @@ static int init_tdmr(struct tdmr_info *tdmr) 
	return 0;

}



static int init_tdmrs(struct tdmr_info_list *tdmr_list)

static __init int init_tdmrs(struct tdmr_info_list *tdmr_list)

{

	int i;
@@ -1113,7 +1116,7 @@ static int init_tdmrs(struct tdmr_info_list *tdmr_list) 
	return 0;

}



static int init_tdx_module(void)

static __init int init_tdx_module(void)

{

	int ret;
@@ -1194,7 +1197,7 @@ static int init_tdx_module(void) 
	goto out_put_tdxmem;

}



static int tdx_enable(void)

static __init int tdx_enable(void)

{

	enum cpuhp_state state;

	int ret;

arch/x86/virt/vmx/tdx/tdx_global_metadata.c

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Include this file to other C file instead.

 */



static int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_features)

static __init int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_features)

{

	int ret = 0;

	u64 val;
@@ -18,7 +18,7 @@ static int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_featu 
	return ret;

}



static int get_tdx_sys_info_tdmr(struct tdx_sys_info_tdmr *sysinfo_tdmr)

static __init int get_tdx_sys_info_tdmr(struct tdx_sys_info_tdmr *sysinfo_tdmr)

{

	int ret = 0;

	u64 val;
@@ -37,7 +37,7 @@ static int get_tdx_sys_info_tdmr(struct tdx_sys_info_tdmr *sysinfo_tdmr) 
	return ret;

}



static int get_tdx_sys_info_td_ctrl(struct tdx_sys_info_td_ctrl *sysinfo_td_ctrl)

static __init int get_tdx_sys_info_td_ctrl(struct tdx_sys_info_td_ctrl *sysinfo_td_ctrl)

{

	int ret = 0;

	u64 val;
@@ -52,7 +52,7 @@ static int get_tdx_sys_info_td_ctrl(struct tdx_sys_info_td_ctrl *sysinfo_td_ctrl 
	return ret;

}



static int get_tdx_sys_info_td_conf(struct tdx_sys_info_td_conf *sysinfo_td_conf)

static __init int get_tdx_sys_info_td_conf(struct tdx_sys_info_td_conf *sysinfo_td_conf)

{

	int ret = 0;

	u64 val;
@@ -85,7 +85,7 @@ static int get_tdx_sys_info_td_conf(struct tdx_sys_info_td_conf *sysinfo_td_conf 
	return ret;

}



static int get_tdx_sys_info(struct tdx_sys_info *sysinfo)

static __init int get_tdx_sys_info(struct tdx_sys_info *sysinfo)

{

	int ret = 0;