From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
peterz@infradead.org
Subject: Re: [RFC][PATCH 1/2] x86: remove duplicate TSC DEADLINE MSR definitions
Date: Fri, 12 Feb 2021 18:37:34 -0300 [thread overview]
Message-ID: <20210212213734.GN1398414@kernel.org> (raw)
In-Reply-To: <20210205093105.GA17488@zn.tnic>
Em Fri, Feb 05, 2021 at 10:31:05AM +0100, Borislav Petkov escreveu:
> On Thu, Mar 05, 2020 at 09:47:06AM -0800, Dave Hansen wrote:
> >
> > 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.
> >
> > Cc: x86@kernel.org
> > Cc: Peter Zijlstra <peterz@infradead.org>
> >
> > ---
> >
> > b/arch/x86/include/asm/msr-index.h | 2 --
> > b/arch/x86/kvm/x86.c | 6 +++---
> > b/tools/arch/x86/include/asm/msr-index.h | 2 --
> > b/tools/perf/trace/beauty/tracepoints/x86_msr.sh | 2 +-
> > b/tools/testing/selftests/kvm/include/x86_64/processor.h | 2 --
>
> acme, ACK to take the perf bits through tip?
Sure
> Leaving in the rest.
>
> > 5 files changed, 4 insertions(+), 10 deletions(-)
> >
> > diff -puN arch/x86/include/asm/msr-index.h~kill-dup-MSR_IA32_TSCDEADLINE arch/x86/include/asm/msr-index.h
> > --- a/arch/x86/include/asm/msr-index.h~kill-dup-MSR_IA32_TSCDEADLINE 2020-03-05 09:42:37.049901042 -0800
> > +++ b/arch/x86/include/asm/msr-index.h 2020-03-05 09:42:37.062901042 -0800
> > @@ -576,8 +576,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
> >
> > diff -puN arch/x86/kvm/x86.c~kill-dup-MSR_IA32_TSCDEADLINE arch/x86/kvm/x86.c
> > --- a/arch/x86/kvm/x86.c~kill-dup-MSR_IA32_TSCDEADLINE 2020-03-05 09:42:37.051901042 -0800
> > +++ b/arch/x86/kvm/x86.c 2020-03-05 09:42:37.065901042 -0800
> > @@ -1200,7 +1200,7 @@ static const u32 emulated_msrs_all[] = {
> > MSR_KVM_PV_EOI_EN,
> >
> > MSR_IA32_TSC_ADJUST,
> > - MSR_IA32_TSCDEADLINE,
> > + MSR_IA32_TSC_DEADLINE,
> > MSR_IA32_ARCH_CAPABILITIES,
> > MSR_IA32_MISC_ENABLE,
> > MSR_IA32_MCG_STATUS,
> > @@ -2688,7 +2688,7 @@ int kvm_set_msr_common(struct kvm_vcpu *
> > return kvm_set_apic_base(vcpu, msr_info);
> > case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff:
> > 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:
> > @@ -3009,7 +3009,7 @@ int kvm_get_msr_common(struct kvm_vcpu *
> > case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff:
> > return kvm_x2apic_msr_read(vcpu, msr_info->index, &msr_info->data);
> > break;
> > - case MSR_IA32_TSCDEADLINE:
> > + case MSR_IA32_TSC_DEADLINE:
> > msr_info->data = kvm_get_lapic_tscdeadline_msr(vcpu);
> > break;
> > case MSR_IA32_TSC_ADJUST:
> > diff -puN tools/arch/x86/include/asm/msr-index.h~kill-dup-MSR_IA32_TSCDEADLINE tools/arch/x86/include/asm/msr-index.h
> > --- a/tools/arch/x86/include/asm/msr-index.h~kill-dup-MSR_IA32_TSCDEADLINE 2020-03-05 09:42:37.055901042 -0800
> > +++ b/tools/arch/x86/include/asm/msr-index.h 2020-03-05 09:42:37.066901042 -0800
> > @@ -576,8 +576,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
> >
> > diff -puN tools/perf/trace/beauty/tracepoints/x86_msr.sh~kill-dup-MSR_IA32_TSCDEADLINE tools/perf/trace/beauty/tracepoints/x86_msr.sh
> > --- a/tools/perf/trace/beauty/tracepoints/x86_msr.sh~kill-dup-MSR_IA32_TSCDEADLINE 2020-03-05 09:42:37.057901042 -0800
> > +++ b/tools/perf/trace/beauty/tracepoints/x86_msr.sh 2020-03-05 09:42:37.066901042 -0800
> > @@ -15,7 +15,7 @@ x86_msr_index=${arch_x86_header_dir}/msr
> >
> > 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]|AMD64|IA32_TSCDEADLINE|IDT_FCR4)' | \
> > +egrep $regex ${x86_msr_index} | egrep -v 'MSR_(ATOM|P[46]|AMD64|IA32_TSC_DEADLINE|IDT_FCR4)' | \
> > sed -r "s/$regex/\2 \1/g" | sort -n | \
> > xargs printf "\t[%s] = \"%s\",\n"
> > printf "};\n\n"
> > diff -puN tools/testing/selftests/kvm/include/x86_64/processor.h~kill-dup-MSR_IA32_TSCDEADLINE tools/testing/selftests/kvm/include/x86_64/processor.h
> > --- a/tools/testing/selftests/kvm/include/x86_64/processor.h~kill-dup-MSR_IA32_TSCDEADLINE 2020-03-05 09:42:37.058901042 -0800
> > +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h 2020-03-05 09:42:37.067901042 -0800
> > @@ -813,8 +813,6 @@ void kvm_get_cpu_address_width(unsigned
> > #define APIC_VECTOR_MASK 0x000FF
> > #define APIC_ICR2 0x310
> >
> > -#define MSR_IA32_TSCDEADLINE 0x000006e0
> > -
> > #define MSR_IA32_UCODE_WRITE 0x00000079
> > #define MSR_IA32_UCODE_REV 0x0000008b
> >
> > _
>
> --
> Regards/Gruss,
> Boris.
>
> https://people.kernel.org/tglx/notes-about-netiquette
--
- Arnaldo
next prev parent reply other threads:[~2021-02-12 21:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 17:47 [RFC][PATCH 1/2] x86: remove duplicate TSC DEADLINE MSR definitions Dave Hansen
2020-03-05 17:47 ` [RFC][PATCH 2/2] x86: add extra serialization for non-serializing MSRs Dave Hansen
2021-02-04 16:37 ` Dave Hansen
2021-02-04 19:37 ` [tip: x86/urgent] x86/apic: Add " tip-bot2 for Dave Hansen
2021-02-04 23:37 ` [RFC][PATCH 2/2] x86: add " Andrew Cooper
2021-02-05 0:11 ` Andy Lutomirski
2021-02-05 10:02 ` Peter Zijlstra
2021-02-05 12:08 ` Andrew Cooper
2021-02-05 12:21 ` Peter Zijlstra
2021-09-01 13:07 ` x86/apic: Add " Corey Minyard
2020-03-09 23:50 ` [RFC][PATCH 1/2] x86: remove duplicate TSC DEADLINE MSR definitions Sean Christopherson
2021-02-05 9:31 ` Borislav Petkov
2021-02-12 21:37 ` Arnaldo Carvalho de Melo [this message]
2021-03-07 1:29 ` Dave Hansen
2021-03-08 11:46 ` [tip: x86/cleanups] x86: Remove " tip-bot2 for Dave Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210212213734.GN1398414@kernel.org \
--to=acme@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.