Commit fd9145fd authored by Juergen Gross's avatar Juergen Gross
Browse files

x86/xen: use capabilities instead of fake cpuid values for aperf 



When running as pv domain xen_cpuid() is being used instead of
native_cpuid(). In xen_cpuid() the aperf/mperf feature is indicated
as not being present by special casing the related cpuid leaf.

Instead of delivering fake cpuid values clear the cpu capability bit
for aperf/mperf instead.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 3ee99df3

arch/x86/xen/enlighten_pv.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -165,9 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor) 
	return false;

	return false;

}

}





#define CPUID_THERM_POWER_LEAF 6

#define APERFMPERF_PRESENT 0



static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;

static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;

static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;

static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
@@ -201,11 +198,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, 
		*dx = cpuid_leaf5_edx_val;

		*dx = cpuid_leaf5_edx_val;

		return;

		return;





	case CPUID_THERM_POWER_LEAF:

		/* Disabling APERFMPERF for kernel usage */

		maskecx = ~(1 << APERFMPERF_PRESENT);

		break;



	case 0xb:

	case 0xb:

		/* Suppress extended topology stuff */

		/* Suppress extended topology stuff */

		maskebx = 0;

		maskebx = 0;
@@ -332,6 +324,7 @@ static void __init xen_init_capabilities(void) 
	setup_clear_cpu_cap(X86_BUG_SYSRET_SS_ATTRS);

	setup_clear_cpu_cap(X86_BUG_SYSRET_SS_ATTRS);

	setup_force_cpu_cap(X86_FEATURE_XENPV);

	setup_force_cpu_cap(X86_FEATURE_XENPV);

	setup_clear_cpu_cap(X86_FEATURE_DCA);

	setup_clear_cpu_cap(X86_FEATURE_DCA);

	setup_clear_cpu_cap(X86_FEATURE_APERFMPERF);

}

}





static void xen_set_debugreg(int reg, unsigned long val)

static void xen_set_debugreg(int reg, unsigned long val)

CRA Git | Maintained and supported by SUSTech CRA and CCSE