From: Borislav Petkov <bp@alien8.de>
To: Andy Lutomirski <luto@kernel.org>
Cc: KVM list <kvm@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
X86 ML <x86@kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
xen-devel <Xen-devel@lists.xen.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: [PATCH v4 1/5] x86/paravirt: Add _safe to the read_msr and write_msr PV hooks
Date: Mon, 14 Mar 2016 12:57:29 +0100 [thread overview]
Message-ID: <20160314115729.GC15800__19045.1830196709$1457956857$gmane$org@pd.tnic> (raw)
In-Reply-To: <7e72cd6ce08b946872a462fad13eca1810b8671d.1457805972.git.luto@kernel.org>
On Sat, Mar 12, 2016 at 10:08:48AM -0800, Andy Lutomirski wrote:
> These hooks match the _safe variants, so name them accordingly.
> This will make room for unsafe PV hooks.
>
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> ---
> arch/x86/include/asm/paravirt.h | 33 +++++++++++++++++----------------
> arch/x86/include/asm/paravirt_types.h | 8 ++++----
> arch/x86/kernel/paravirt.c | 4 ++--
> arch/x86/xen/enlighten.c | 4 ++--
> 4 files changed, 25 insertions(+), 24 deletions(-)
>
> diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
> index f6192502149e..2e49228ed9a3 100644
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -129,34 +129,35 @@ static inline void wbinvd(void)
>
> #define get_kernel_rpl() (pv_info.kernel_rpl)
>
> -static inline u64 paravirt_read_msr(unsigned msr, int *err)
> +static inline u64 paravirt_read_msr_safe(unsigned msr, int *err)
> {
> - return PVOP_CALL2(u64, pv_cpu_ops.read_msr, msr, err);
> + return PVOP_CALL2(u64, pv_cpu_ops.read_msr_safe, msr, err);
> }
>
> -static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)
> +static inline int paravirt_write_msr_safe(unsigned msr,
> + unsigned low, unsigned high)
> {
> - return PVOP_CALL3(int, pv_cpu_ops.write_msr, msr, low, high);
> + return PVOP_CALL3(int, pv_cpu_ops.write_msr_safe, msr, low, high);
> }
>
> /* These should all do BUG_ON(_err), but our headers are too tangled. */
> #define rdmsr(msr, val1, val2) \
> do { \
> int _err; \
> - u64 _l = paravirt_read_msr(msr, &_err); \
> + u64 _l = paravirt_read_msr_safe(msr, &_err); \
> val1 = (u32)_l; \
> val2 = _l >> 32; \
> } while (0)
>
> #define wrmsr(msr, val1, val2) \
> do { \
> - paravirt_write_msr(msr, val1, val2); \
> + paravirt_write_msr_safe(msr, val1, val2); \
> } while (0)
>
> #define rdmsrl(msr, val) \
> do { \
> int _err; \
> - val = paravirt_read_msr(msr, &_err); \
> + val = paravirt_read_msr_safe(msr, &_err); \
> } while (0)
>
> static inline void wrmsrl(unsigned msr, u64 val)
> @@ -164,23 +165,23 @@ static inline void wrmsrl(unsigned msr, u64 val)
> wrmsr(msr, (u32)val, (u32)(val>>32));
> }
>
> -#define wrmsr_safe(msr, a, b) paravirt_write_msr(msr, a, b)
> +#define wrmsr_safe(msr, a, b) paravirt_write_msr_safe(msr, a, b)
>
> /* rdmsr with exception handling */
> -#define rdmsr_safe(msr, a, b) \
> -({ \
> - int _err; \
> - u64 _l = paravirt_read_msr(msr, &_err); \
> - (*a) = (u32)_l; \
> - (*b) = _l >> 32; \
> - _err; \
> +#define rdmsr_safe(msr, a, b) \
> +({ \
> + int _err; \
> + u64 _l = paravirt_read_msr_safe(msr, &_err); \
> + (*a) = (u32)_l; \
> + (*b) = _l >> 32; \
> + _err; \
> })
>
> static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
> {
> int err;
>
> - *p = paravirt_read_msr(msr, &err);
> + *p = paravirt_read_msr_safe(msr, &err);
> return err;
> }
>
> diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
> index 77db5616a473..5a06cccd36f0 100644
> --- a/arch/x86/include/asm/paravirt_types.h
> +++ b/arch/x86/include/asm/paravirt_types.h
> @@ -155,10 +155,10 @@ struct pv_cpu_ops {
> void (*cpuid)(unsigned int *eax, unsigned int *ebx,
> unsigned int *ecx, unsigned int *edx);
>
> - /* MSR, PMC and TSR operations.
> - err = 0/-EFAULT. wrmsr returns 0/-EFAULT. */
> - u64 (*read_msr)(unsigned int msr, int *err);
> - int (*write_msr)(unsigned int msr, unsigned low, unsigned high);
> + /* MSR operations.
> + err = 0/-EIO. wrmsr returns 0/-EIO. */
Please fix the comment format while you're touching this :
/*
* A sentence.
* Another sentence.
*/
Other than that:
Acked-by: Borislav Petkov <bp@suse.de>
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-14 11:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1457805972.git.luto@kernel.org>
2016-03-12 18:08 ` [PATCH v4 1/5] x86/paravirt: Add _safe to the read_msr and write_msr PV hooks Andy Lutomirski
2016-03-12 18:08 ` [PATCH v4 2/5] x86/msr: Carry on after a non-"safe" MSR access fails without !panic_on_oops Andy Lutomirski
2016-03-12 18:08 ` [PATCH v4 3/5] x86/paravirt: Add paravirt_{read, write}_msr Andy Lutomirski
2016-03-12 18:08 ` [PATCH v4 4/5] x86/paravirt: Make "unsafe" MSR accesses unsafe even if PARAVIRT=y Andy Lutomirski
2016-03-12 18:08 ` [PATCH v4 5/5] x86/msr: Set the return value to zero when native_rdmsr_safe fails Andy Lutomirski
[not found] ` <7e72cd6ce08b946872a462fad13eca1810b8671d.1457805972.git.luto@kernel.org>
2016-03-14 11:57 ` Borislav Petkov [this message]
[not found] ` <20160314115729.GC15800@pd.tnic>
2016-03-14 17:07 ` [PATCH v4 1/5] x86/paravirt: Add _safe to the read_msr and write_msr PV hooks Andy Lutomirski
[not found] ` <a3b871a4eb533340d04255409dfecc94f88c647d.1457805972.git.luto@kernel.org>
2016-03-14 12:02 ` [PATCH v4 2/5] x86/msr: Carry on after a non-"safe" MSR access fails without !panic_on_oops Borislav Petkov
[not found] ` <20160314120202.GD15800@pd.tnic>
2016-03-14 17:05 ` Andy Lutomirski
[not found] ` <CALCETrW6E0Nz6gSmRKTvHbQDhnHVpuhzmgZB1nZ3m-DL-Bt=tQ@mail.gmail.com>
2016-03-14 17:11 ` Linus Torvalds
2016-03-14 17:17 ` Andy Lutomirski
[not found] ` <CALCETrXhXPj_b6rUMn=SR0QwE92rL=k5DCFraZwBj9FpUgadYw@mail.gmail.com>
2016-03-14 18:04 ` Linus Torvalds
[not found] ` <CA+55aFwr80aZ3-1H4VPB5=jeU_Yt=hYFfFvZC5-cNXzgXxGf3A@mail.gmail.com>
2016-03-14 18:10 ` Andy Lutomirski
2016-03-14 18:10 ` Linus Torvalds
[not found] ` <CALCETrV16vh5U0TRzdroSTBR_QHDX1C78t0DDW9qtKjOmV+2sQ@mail.gmail.com>
2016-03-14 18:15 ` Linus Torvalds
[not found] ` <CA+55aFz=PdvMWSsXExrpQC2UV6aLS+=+VOo+K4=njQoU5B9hgA@mail.gmail.com>
2016-03-14 18:24 ` Andy Lutomirski
[not found] ` <CALCETrXAAOcGP7DK+7aKn=2pu=SQ0n_PhG9bV4DcoYcv9epn4A@mail.gmail.com>
2016-03-14 18:40 ` Linus Torvalds
[not found] ` <CA+55aFy2dNgBJwjd+fRUYQf9OxqGkkcjUEarv+o3QSFTJ6+gJQ@mail.gmail.com>
2016-03-14 18:48 ` Andy Lutomirski
[not found] ` <CALCETrWxSBwwFTFsRoR_9AVBoC0iJ1pdWwOq_cnFf3NHUpG4QA@mail.gmail.com>
2016-03-15 10:22 ` Ingo Molnar
[not found] ` <20160315102230.GB23406@gmail.com>
2016-03-15 10:26 ` Ingo Molnar
2016-03-14 20:18 ` Peter Zijlstra
2016-03-15 10:21 ` Ingo Molnar
2016-03-14 14:32 ` [PATCH v4 0/5] [PATCH v3 0/5] Improve non-"safe" MSR access failure handling Boris Ostrovsky
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='20160314115729.GC15800__19045.1830196709$1457956857$gmane$org@pd.tnic' \
--to=bp@alien8.de \
--cc=Xen-devel@lists.xen.org \
--cc=akpm@linux-foundation.org \
--cc=arjan@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).