Commit 09141ec0 authored by Dave Hansen's avatar Dave Hansen Committed by Borislav Petkov
Browse files

x86: Remove duplicate TSC DEADLINE MSR definitions 



There are two definitions for the TSC deadline MSR in msr-index.h,
one with an underscore and one without.  Axe one of them and move
all the references over to the other one.

 [ bp: Fixup the MSR define in handle_fastpath_set_msr_irqoff() too. ]

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200305174706.0D6B8EE4@viggo.jf.intel.com
parent a38fd874

arch/x86/include/asm/msr-index.h

+0 −2
Original line number Diff line number Diff line
@@ -628,8 +628,6 @@ 
#define MSR_IA32_APICBASE_ENABLE	(1<<11)

#define MSR_IA32_APICBASE_BASE		(0xfffff<<12)



#define MSR_IA32_TSCDEADLINE		0x000006e0



#define MSR_IA32_UCODE_WRITE		0x00000079

#define MSR_IA32_UCODE_REV		0x0000008b

arch/x86/kvm/x86.c

+4 −4
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ static const u32 emulated_msrs_all[] = { 
	MSR_KVM_PV_EOI_EN, MSR_KVM_ASYNC_PF_INT, MSR_KVM_ASYNC_PF_ACK,



	MSR_IA32_TSC_ADJUST,

	MSR_IA32_TSCDEADLINE,

	MSR_IA32_TSC_DEADLINE,

	MSR_IA32_ARCH_CAPABILITIES,

	MSR_IA32_PERF_CAPABILITIES,

	MSR_IA32_MISC_ENABLE,
@@ -1841,7 +1841,7 @@ fastpath_t handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vcpu) 
			ret = EXIT_FASTPATH_EXIT_HANDLED;

		}

		break;

	case MSR_IA32_TSCDEADLINE:

	case MSR_IA32_TSC_DEADLINE:

		data = kvm_read_edx_eax(vcpu);

		if (!handle_fastpath_set_tscdeadline(vcpu, data)) {

			kvm_skip_emulated_instruction(vcpu);
@@ -3075,7 +3075,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		return kvm_set_apic_base(vcpu, msr_info);

	case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:

		return kvm_x2apic_msr_write(vcpu, msr, data);

	case MSR_IA32_TSCDEADLINE:

	case MSR_IA32_TSC_DEADLINE:

		kvm_set_lapic_tscdeadline_msr(vcpu, data);

		break;

	case MSR_IA32_TSC_ADJUST:
@@ -3437,7 +3437,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		break;

	case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:

		return kvm_x2apic_msr_read(vcpu, msr_info->index, &msr_info->data);

	case MSR_IA32_TSCDEADLINE:

	case MSR_IA32_TSC_DEADLINE:

		msr_info->data = kvm_get_lapic_tscdeadline_msr(vcpu);

		break;

	case MSR_IA32_TSC_ADJUST:

tools/arch/x86/include/asm/msr-index.h

+0 −2
Original line number Diff line number Diff line
@@ -628,8 +628,6 @@ 
#define MSR_IA32_APICBASE_ENABLE	(1<<11)

#define MSR_IA32_APICBASE_BASE		(0xfffff<<12)



#define MSR_IA32_TSCDEADLINE		0x000006e0



#define MSR_IA32_UCODE_WRITE		0x00000079

#define MSR_IA32_UCODE_REV		0x0000008b

tools/perf/trace/beauty/tracepoints/x86_msr.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ x86_msr_index=${arch_x86_header_dir}/msr-index.h 


printf "static const char *x86_MSRs[] = {\n"

regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+MSR_([[:alnum:]][[:alnum:]_]+)[[:space:]]+(0x00000[[:xdigit:]]+)[[:space:]]*.*'

egrep $regex ${x86_msr_index} | egrep -v 'MSR_(ATOM|P[46]|IA32_(TSCDEADLINE|UCODE_REV)|IDT_FCR4)' | \

egrep $regex ${x86_msr_index} | egrep -v 'MSR_(ATOM|P[46]|IA32_(TSC_DEADLINE|UCODE_REV)|IDT_FCR4)' | \

	sed -r "s/$regex/\2 \1/g" | sort -n | \

	xargs printf "\t[%s] = \"%s\",\n"

printf "};\n\n"