From: Darren Kenny <darren.kenny@oracle.com>
To: Borislav Petkov <bp@alien8.de>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
kvm@vger.kernel.org
Subject: Re: [PATCH] x86/MSR: Move native_* variants to msr.h
Date: Fri, 2 Mar 2018 12:01:31 +0000 [thread overview]
Message-ID: <20180302120131.5lehicnrwp3zy5p2@starbug-vm.ie.oracle.com> (raw)
In-Reply-To: <20180301151336.12948-1-bp@alien8.de>
On Thu, Mar 01, 2018 at 04:13:36PM +0100, Borislav Petkov wrote:
>From: Borislav Petkov <bp@suse.de>
>
>... where they belong.
>
>No functionality change.
>
>Signed-off-by: Borislav Petkov <bp@suse.de>
>Cc: kvm@vger.kernel.org
Seems like the right place to put them.
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
>---
> arch/x86/include/asm/microcode.h | 14 --------------
> arch/x86/include/asm/msr.h | 14 ++++++++++++++
> arch/x86/kvm/svm.c | 1 -
> arch/x86/kvm/vmx.c | 1 -
> 4 files changed, 14 insertions(+), 16 deletions(-)
>
>diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
>index 7fb1047d61c7..871714e2e4c6 100644
>--- a/arch/x86/include/asm/microcode.h
>+++ b/arch/x86/include/asm/microcode.h
>@@ -6,20 +6,6 @@
> #include <linux/earlycpio.h>
> #include <linux/initrd.h>
>
>-#define native_rdmsr(msr, val1, val2) \
>-do { \
>- u64 __val = __rdmsr((msr)); \
>- (void)((val1) = (u32)__val); \
>- (void)((val2) = (u32)(__val >> 32)); \
>-} while (0)
>-
>-#define native_wrmsr(msr, low, high) \
>- __wrmsr(msr, low, high)
>-
>-#define native_wrmsrl(msr, val) \
>- __wrmsr((msr), (u32)((u64)(val)), \
>- (u32)((u64)(val) >> 32))
>-
> struct ucode_patch {
> struct list_head plist;
> void *data; /* Intel uses only this one */
>diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
>index 30df295f6d94..77254c9c8f61 100644
>--- a/arch/x86/include/asm/msr.h
>+++ b/arch/x86/include/asm/msr.h
>@@ -108,6 +108,20 @@ static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high)
> : : "c" (msr), "a"(low), "d" (high) : "memory");
> }
>
>+#define native_rdmsr(msr, val1, val2) \
>+do { \
>+ u64 __val = __rdmsr((msr)); \
>+ (void)((val1) = (u32)__val); \
>+ (void)((val2) = (u32)(__val >> 32)); \
>+} while (0)
>+
>+#define native_wrmsr(msr, low, high) \
>+ __wrmsr(msr, low, high)
>+
>+#define native_wrmsrl(msr, val) \
>+ __wrmsr((msr), (u32)((u64)(val)), \
>+ (u32)((u64)(val) >> 32))
>+
> static inline unsigned long long native_read_msr(unsigned int msr)
> {
> unsigned long long val;
>diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
>index cbd7ab74952e..c6dde6f1d848 100644
>--- a/arch/x86/kvm/svm.c
>+++ b/arch/x86/kvm/svm.c
>@@ -49,7 +49,6 @@
> #include <asm/debugreg.h>
> #include <asm/kvm_para.h>
> #include <asm/irq_remapping.h>
>-#include <asm/microcode.h>
> #include <asm/nospec-branch.h>
>
> #include <asm/virtext.h>
>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
>index cab6ea1f8be5..5f708478b66e 100644
>--- a/arch/x86/kvm/vmx.c
>+++ b/arch/x86/kvm/vmx.c
>@@ -51,7 +51,6 @@
> #include <asm/apic.h>
> #include <asm/irq_remapping.h>
> #include <asm/mmu_context.h>
>-#include <asm/microcode.h>
> #include <asm/nospec-branch.h>
>
> #include "trace.h"
>--
>2.13.0
>
next prev parent reply other threads:[~2018-03-02 12:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 15:13 Borislav Petkov
2018-03-02 12:01 ` Darren Kenny [this message]
2018-03-08 9:30 ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
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=20180302120131.5lehicnrwp3zy5p2@starbug-vm.ie.oracle.com \
--to=darren.kenny@oracle.com \
--cc=bp@alien8.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®