Skip to contentSkip to conversation

x86/platform changes for v5.2

GIT PULL Merged Ingo Molnar 2 participants 2 messages May 6, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-platform-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus

# HEAD: 14e581c381b942ce5463a7e61326d8ce1c843be7 x86/kvm: Make steal_time visible

Smaller update for Hyper-V to support EOI assist, plus LTO fixes.

Thanks,

Ingo

------------------>
Andi Kleen (2):
x86/hyperv: Make hv_vcpu_is_preempted() visible x86/kvm: Make steal_time visible

Vitaly Kuznetsov (1):
x86/hyper-v: Implement EOI assist

 arch/x86/hyperv/hv_apic.c     | 5 +++++
 arch/x86/hyperv/hv_spinlock.c | 2 +-
 arch/x86/kernel/kvm.c         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/hyperv/hv_apic.c +5 -0
index 8eb6fbee8e13..5c056b8aebef 100644
@@ -86,6 +86,11 @@ static void hv_apic_write(u32 reg, u32 val)
 
 static void hv_apic_eoi_write(u32 reg, u32 val)
 {
+	struct hv_vp_assist_page *hvp = hv_vp_assist_page[smp_processor_id()];
+
+	if (hvp && (xchg(&hvp->apic_assist, 0) & 0x1))
+		return;
+
 	wrmsr(HV_X64_MSR_EOI, val, 0);
 }
 
arch/x86/hyperv/hv_spinlock.c +1 -1
index a861b0456b1a..07f21a06392f 100644
@@ -56,7 +56,7 @@ static void hv_qlock_wait(u8 *byte, u8 val)
 /*
  * Hyper-V does not support this so far.
  */
-bool hv_vcpu_is_preempted(int vcpu)
+__visible bool hv_vcpu_is_preempted(int vcpu)
 {
 	return false;
 }
arch/x86/kernel/kvm.c +1 -1
index 5c93a65ee1e5..3f0cc828cc36 100644
@@ -67,7 +67,7 @@ static int __init parse_no_stealacc(char *arg)
 early_param("no-steal-acc", parse_no_stealacc);
 
 static DEFINE_PER_CPU_DECRYPTED(struct kvm_vcpu_pv_apf_data, apf_reason) __aligned(64);
-static DEFINE_PER_CPU_DECRYPTED(struct kvm_steal_time, steal_time) __aligned(64);
+DEFINE_PER_CPU_DECRYPTED(struct kvm_steal_time, steal_time) __aligned(64) __visible;
 static int has_steal_clock = 0;
 
 /*
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 6 May 2019 12:44:23 +0200:

The pull request you sent on Mon, 6 May 2019 12:44:23 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ba3934de557a2074b89d67e29e5ce119f042d057

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker