Commit 079c4baa authored by Jan Beulich's avatar Jan Beulich Committed by Juergen Gross
Browse files

xen/x86: hook up xen_banner() also for PVH 



This was effectively lost while dropping PVHv1 code. Move the function
and arrange for it to be called the same way as done in PV mode. Clearly
this then needs re-introducing the XENFEAT_mmu_pt_update_preserve_ad
check that was recently removed, as that's a PV-only feature.

Since the string pointed at by pv_info.name describes the mode, drop
"paravirtualized" from the log message while moving the code.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/de03054d-a20d-2114-bb86-eec28e17b3b8@suse.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 4d1ab432

arch/x86/xen/enlighten.c

+14 −0
Original line number Diff line number Diff line
@@ -261,6 +261,20 @@ int xen_vcpu_setup(int cpu) 
	return ((per_cpu(xen_vcpu, cpu) == NULL) ? -ENODEV : 0);

}



void __init xen_banner(void)

{

	unsigned version = HYPERVISOR_xen_version(XENVER_version, NULL);

	struct xen_extraversion extra;



	HYPERVISOR_xen_version(XENVER_extraversion, &extra);



	pr_info("Booting kernel on %s\n", pv_info.name);

	pr_info("Xen version: %u.%u%s%s\n",

		version >> 16, version & 0xffff, extra.extraversion,

		xen_feature(XENFEAT_mmu_pt_update_preserve_ad)

		? " (preserve-AD)" : "");

}



/* Check if running on Xen version (major, minor) or later */

bool xen_running_on_version_or_later(unsigned int major, unsigned int minor)

{

arch/x86/xen/enlighten_pv.c

+0 −11
Original line number Diff line number Diff line
@@ -108,17 +108,6 @@ struct tls_descs { 
 */

static DEFINE_PER_CPU(struct tls_descs, shadow_tls_desc);



static void __init xen_banner(void)

{

	unsigned version = HYPERVISOR_xen_version(XENVER_version, NULL);

	struct xen_extraversion extra;

	HYPERVISOR_xen_version(XENVER_extraversion, &extra);



	pr_info("Booting paravirtualized kernel on %s\n", pv_info.name);

	pr_info("Xen version: %d.%d%s (preserve-AD)\n",

		version >> 16, version & 0xffff, extra.extraversion);

}



static void __init xen_pv_init_platform(void)

{

	populate_extra_pte(fix_to_virt(FIX_PARAVIRT_BOOTMAP));

arch/x86/xen/enlighten_pvh.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ void __init xen_pvh_init(struct boot_params *boot_params) 


	if (xen_initial_domain())

		x86_init.oem.arch_setup = xen_add_preferred_consoles;

	x86_init.oem.banner = xen_banner;



	xen_efi_init(boot_params);

}

arch/x86/xen/xen-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ void __init xen_remap_memory(void); 
phys_addr_t __init xen_find_free_area(phys_addr_t size);

char * __init xen_memory_setup(void);

void __init xen_arch_setup(void);

void xen_banner(void);

void xen_enable_sysenter(void);

void xen_enable_syscall(void);

void xen_vcpu_restore(void);