From: Wanpeng Li <kernellwp@gmail.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Vitaly Kuznetsov" <vkuznets@redhat.com>
Subject: [PATCH v3 3/6] KVM: X86: Fallback to original apic hooks when bad happens
Date: Tue, 3 Jul 2018 14:21:28 +0800 [thread overview]
Message-ID: <1530598891-21370-4-git-send-email-wanpengli@tencent.com> (raw)
In-Reply-To: <1530598891-21370-1-git-send-email-wanpengli@tencent.com>
From: Wanpeng Li <wanpengli@tencent.com>
Fallback to original apic hooks when apic id is sparse and larger
than 128 or kvm fails to add the pending IRQ to lapic.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
arch/x86/kernel/kvm.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 2fe1420..81be75b 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -47,6 +47,7 @@
#include <asm/hypervisor.h>
#include <asm/kvm_guest.h>
+static struct apic orig_apic;
static int kvmapf = 1;
static int __init parse_no_kvmapf(char *arg)
@@ -456,13 +457,13 @@ static void __init sev_map_percpu_data(void)
#ifdef CONFIG_SMP
#ifdef CONFIG_X86_64
-static void __send_ipi_mask(const struct cpumask *mask, int vector)
+static int __send_ipi_mask(const struct cpumask *mask, int vector)
{
unsigned long flags, ipi_bitmap_low = 0, ipi_bitmap_high = 0;
- int cpu, apic_id;
+ int cpu, apic_id, ret = 0;
if (cpumask_empty(mask))
- return;
+ return 0;
local_irq_save(flags);
@@ -472,16 +473,23 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector)
__set_bit(apic_id, &ipi_bitmap_low);
else if (apic_id < 2 * BITS_PER_LONG)
__set_bit(apic_id - BITS_PER_LONG, &ipi_bitmap_high);
+ else {
+ ret = -EFAULT;
+ goto irq_restore_exit;
+ }
}
- kvm_hypercall3(KVM_HC_SEND_IPI, ipi_bitmap_low, ipi_bitmap_high, vector);
+ ret = kvm_hypercall3(KVM_HC_SEND_IPI, ipi_bitmap_low, ipi_bitmap_high, vector);
+irq_restore_exit:
local_irq_restore(flags);
+ return ret;
}
static void kvm_send_ipi_mask(const struct cpumask *mask, int vector)
{
- __send_ipi_mask(mask, vector);
+ if (__send_ipi_mask(mask, vector))
+ orig_apic.send_IPI_mask(mask, vector);
}
static void kvm_send_ipi_mask_allbutself(const struct cpumask *mask, int vector)
@@ -493,7 +501,8 @@ static void kvm_send_ipi_mask_allbutself(const struct cpumask *mask, int vector)
cpumask_copy(&new_mask, mask);
cpumask_clear_cpu(this_cpu, &new_mask);
local_mask = &new_mask;
- __send_ipi_mask(local_mask, vector);
+ if (__send_ipi_mask(local_mask, vector))
+ orig_apic.send_IPI_mask_allbutself(mask, vector);
}
static void kvm_send_ipi_allbutself(int vector)
@@ -503,7 +512,8 @@ static void kvm_send_ipi_allbutself(int vector)
static void kvm_send_ipi_all(int vector)
{
- __send_ipi_mask(cpu_online_mask, vector);
+ if (__send_ipi_mask(cpu_online_mask, vector))
+ orig_apic.send_IPI_all(vector);
}
/*
@@ -511,6 +521,8 @@ static void kvm_send_ipi_all(int vector)
*/
static void kvm_setup_pv_ipi(void)
{
+ orig_apic = *apic;
+
apic->send_IPI_mask = kvm_send_ipi_mask;
apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
apic->send_IPI_allbutself = kvm_send_ipi_allbutself;
--
2.7.4
next prev parent reply other threads:[~2018-07-03 6:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 6:21 [PATCH v3 0/6] KVM: X86: Implement PV IPIs support Wanpeng Li
2018-07-03 6:21 ` [PATCH v3 1/6] KVM: X86: Add kvm hypervisor init time platform setup callback Wanpeng Li
2018-07-03 6:21 ` [PATCH v3 2/6] KVM: X86: Implement PV IPIs in linux guest Wanpeng Li
2018-07-19 16:28 ` Radim Krčmář
2018-07-19 16:47 ` Paolo Bonzini
2018-07-19 17:22 ` Radim Krčmář
2018-07-20 3:35 ` Wanpeng Li
2018-07-20 5:58 ` Wanpeng Li
2018-07-20 8:06 ` Paolo Bonzini
2018-07-20 3:33 ` Wanpeng Li
2018-07-20 9:51 ` Radim Krcmar
2018-07-20 10:17 ` Wanpeng Li
2018-07-19 23:05 ` David Matlack
2018-07-20 3:45 ` Wanpeng Li
2018-07-20 13:12 ` Radim Krcmar
2018-07-03 6:21 ` Wanpeng Li [this message]
2018-07-03 6:21 ` [PATCH v3 4/6] KVM: X86: Implement PV IPIs send hypercall Wanpeng Li
2018-07-19 16:47 ` Paolo Bonzini
2018-07-20 3:49 ` Wanpeng Li
2018-07-03 6:21 ` [PATCH v3 5/6] KVM: X86: Add NMI support to PV IPIs Wanpeng Li
2018-07-19 16:31 ` Radim Krčmář
2018-07-20 3:53 ` Wanpeng Li
2018-07-20 8:04 ` Paolo Bonzini
2018-07-20 13:26 ` Radim Krcmar
2018-07-23 0:52 ` Wanpeng Li
2018-07-03 6:21 ` [PATCH v3 6/6] KVM: X86: Expose PV_SEND_IPI CPUID feature bit to guest Wanpeng Li
2018-07-18 3:00 ` [PATCH v3 0/6] KVM: X86: Implement PV IPIs support Wanpeng Li
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=1530598891-21370-4-git-send-email-wanpengli@tencent.com \
--to=kernellwp@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=vkuznets@redhat.com \
/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).