From: Gleb Natapov <gleb@redhat.com> To: kvm@vger.kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, avi@redhat.com, mingo@elte.hu, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com, riel@redhat.com, cl@linux-foundation.org Subject: [PATCH v3 03/12] Add async PF initialization to PV guest. Date: Tue, 5 Jan 2010 16:12:45 +0200 [thread overview] Message-ID: <1262700774-1808-4-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1262700774-1808-1-git-send-email-gleb@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/x86/include/asm/kvm_para.h | 5 ++++ arch/x86/kernel/kvm.c | 49 +++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/smpboot.c | 3 ++ include/linux/kvm_para.h | 2 + 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index f77eed3..56ca41b 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -51,6 +51,11 @@ struct kvm_mmu_op_release_pt { __u64 pt_phys; }; +struct kvm_vcpu_pv_apf_data { + __u32 reason; + __u32 enabled; +}; + #ifdef __KERNEL__ #include <asm/processor.h> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index e6db179..001222c 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -27,7 +27,10 @@ #include <linux/mm.h> #include <linux/highmem.h> #include <linux/hardirq.h> +#include <linux/notifier.h> +#include <linux/reboot.h> #include <asm/timer.h> +#include <asm/cpu.h> #define MMU_QUEUE_SIZE 1024 @@ -37,6 +40,7 @@ struct kvm_para_state { }; static DEFINE_PER_CPU(struct kvm_para_state, para_state); +static DEFINE_PER_CPU_ALIGNED(struct kvm_vcpu_pv_apf_data, apf_reason); static struct kvm_para_state *kvm_para_state(void) { @@ -231,10 +235,35 @@ static void __init paravirt_ops_setup(void) #endif } +static void kvm_pv_disable_apf(void *unused) +{ + if (!__get_cpu_var(apf_reason).enabled) + return; + + wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); + __get_cpu_var(apf_reason).enabled = 0; + + printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", + smp_processor_id()); +} + +static int kvm_pv_reboot_notify(struct notifier_block *nb, + unsigned long code, void *unused) +{ + if (code == SYS_RESTART) + on_each_cpu(kvm_pv_disable_apf, NULL, 1); + return NOTIFY_DONE; +} + +static struct notifier_block kvm_pv_reboot_nb = { + .notifier_call = kvm_pv_reboot_notify, +}; + #ifdef CONFIG_SMP static void __init kvm_smp_prepare_boot_cpu(void) { WARN_ON(kvm_register_clock("primary cpu clock")); + kvm_guest_cpu_init(); native_smp_prepare_boot_cpu(); } #endif @@ -245,7 +274,27 @@ void __init kvm_guest_init(void) return; paravirt_ops_setup(); + register_reboot_notifier(&kvm_pv_reboot_nb); #ifdef CONFIG_SMP smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; +#else + kvm_guest_cpu_init(); #endif } + +void __cpuinit kvm_guest_cpu_init(void) +{ + if (!kvm_para_available()) + return; + + if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF)) { + u64 pa = __pa(&__get_cpu_var(apf_reason)); + + if (native_write_msr_safe(MSR_KVM_ASYNC_PF_EN, + pa | KVM_ASYNC_PF_ENABLED, pa >> 32)) + return; + __get_cpu_var(apf_reason).enabled = 1; + printk(KERN_INFO"Setup pv shared memory for cpu %d\n", + smp_processor_id()); + } +} diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 678d0b8..0a9eef4 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -65,6 +65,7 @@ #include <asm/setup.h> #include <asm/uv/uv.h> #include <linux/mc146818rtc.h> +#include <linux/kvm_para.h> #include <asm/smpboot_hooks.h> @@ -321,6 +322,8 @@ notrace static void __cpuinit start_secondary(void *unused) ipi_call_unlock(); per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; + kvm_guest_cpu_init(); + /* enable local interrupts */ local_irq_enable(); diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h index d731092..4c8a2e6 100644 --- a/include/linux/kvm_para.h +++ b/include/linux/kvm_para.h @@ -26,8 +26,10 @@ #ifdef __KERNEL__ #ifdef CONFIG_KVM_GUEST void __init kvm_guest_init(void); +void __cpuinit kvm_guest_cpu_init(void); #else #define kvm_guest_init() do { } while (0) +#define kvm_guest_cpu_init() do { } while (0) #endif static inline int kvm_para_has_feature(unsigned int feature) -- 1.6.5
WARNING: multiple messages have this Message-ID (diff)
From: Gleb Natapov <gleb@redhat.com> To: kvm@vger.kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, avi@redhat.com, mingo@elte.hu, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com, riel@redhat.com, cl@linux-foundation.org Subject: [PATCH v3 03/12] Add async PF initialization to PV guest. Date: Tue, 5 Jan 2010 16:12:45 +0200 [thread overview] Message-ID: <1262700774-1808-4-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1262700774-1808-1-git-send-email-gleb@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/x86/include/asm/kvm_para.h | 5 ++++ arch/x86/kernel/kvm.c | 49 +++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/smpboot.c | 3 ++ include/linux/kvm_para.h | 2 + 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index f77eed3..56ca41b 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -51,6 +51,11 @@ struct kvm_mmu_op_release_pt { __u64 pt_phys; }; +struct kvm_vcpu_pv_apf_data { + __u32 reason; + __u32 enabled; +}; + #ifdef __KERNEL__ #include <asm/processor.h> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index e6db179..001222c 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -27,7 +27,10 @@ #include <linux/mm.h> #include <linux/highmem.h> #include <linux/hardirq.h> +#include <linux/notifier.h> +#include <linux/reboot.h> #include <asm/timer.h> +#include <asm/cpu.h> #define MMU_QUEUE_SIZE 1024 @@ -37,6 +40,7 @@ struct kvm_para_state { }; static DEFINE_PER_CPU(struct kvm_para_state, para_state); +static DEFINE_PER_CPU_ALIGNED(struct kvm_vcpu_pv_apf_data, apf_reason); static struct kvm_para_state *kvm_para_state(void) { @@ -231,10 +235,35 @@ static void __init paravirt_ops_setup(void) #endif } +static void kvm_pv_disable_apf(void *unused) +{ + if (!__get_cpu_var(apf_reason).enabled) + return; + + wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); + __get_cpu_var(apf_reason).enabled = 0; + + printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", + smp_processor_id()); +} + +static int kvm_pv_reboot_notify(struct notifier_block *nb, + unsigned long code, void *unused) +{ + if (code == SYS_RESTART) + on_each_cpu(kvm_pv_disable_apf, NULL, 1); + return NOTIFY_DONE; +} + +static struct notifier_block kvm_pv_reboot_nb = { + .notifier_call = kvm_pv_reboot_notify, +}; + #ifdef CONFIG_SMP static void __init kvm_smp_prepare_boot_cpu(void) { WARN_ON(kvm_register_clock("primary cpu clock")); + kvm_guest_cpu_init(); native_smp_prepare_boot_cpu(); } #endif @@ -245,7 +274,27 @@ void __init kvm_guest_init(void) return; paravirt_ops_setup(); + register_reboot_notifier(&kvm_pv_reboot_nb); #ifdef CONFIG_SMP smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; +#else + kvm_guest_cpu_init(); #endif } + +void __cpuinit kvm_guest_cpu_init(void) +{ + if (!kvm_para_available()) + return; + + if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF)) { + u64 pa = __pa(&__get_cpu_var(apf_reason)); + + if (native_write_msr_safe(MSR_KVM_ASYNC_PF_EN, + pa | KVM_ASYNC_PF_ENABLED, pa >> 32)) + return; + __get_cpu_var(apf_reason).enabled = 1; + printk(KERN_INFO"Setup pv shared memory for cpu %d\n", + smp_processor_id()); + } +} diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 678d0b8..0a9eef4 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -65,6 +65,7 @@ #include <asm/setup.h> #include <asm/uv/uv.h> #include <linux/mc146818rtc.h> +#include <linux/kvm_para.h> #include <asm/smpboot_hooks.h> @@ -321,6 +322,8 @@ notrace static void __cpuinit start_secondary(void *unused) ipi_call_unlock(); per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; + kvm_guest_cpu_init(); + /* enable local interrupts */ local_irq_enable(); diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h index d731092..4c8a2e6 100644 --- a/include/linux/kvm_para.h +++ b/include/linux/kvm_para.h @@ -26,8 +26,10 @@ #ifdef __KERNEL__ #ifdef CONFIG_KVM_GUEST void __init kvm_guest_init(void); +void __cpuinit kvm_guest_cpu_init(void); #else #define kvm_guest_init() do { } while (0) +#define kvm_guest_cpu_init() do { } while (0) #endif static inline int kvm_para_has_feature(unsigned int feature) -- 1.6.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-01-05 14:13 UTC|newest] Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-01-05 14:12 [PATCH v3 00/12] KVM: Add host swap event notifications for PV guest Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 01/12] Move kvm_smp_prepare_boot_cpu() from kvmclock.c to kvm.c Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 02/12] Add PV MSR to enable asynchronous page faults delivery Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-06 9:57 ` [Qemu-devel] Fw: " Dor Laor 2010-01-06 10:04 ` [Qemu-devel] " Gleb Natapov 2010-01-06 10:28 ` Gerd Hoffmann 2010-01-06 13:20 ` Anthony Liguori 2010-01-05 14:12 ` Gleb Natapov [this message] 2010-01-05 14:12 ` [PATCH v3 03/12] Add async PF initialization to PV guest Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 04/12] Add "handle page fault" PV helper Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-14 17:31 ` Peter Zijlstra 2010-01-14 17:31 ` Peter Zijlstra 2010-01-14 17:31 ` Peter Zijlstra 2010-01-17 14:44 ` Gleb Natapov 2010-01-17 14:44 ` Gleb Natapov 2010-01-17 15:09 ` Peter Zijlstra 2010-01-17 15:09 ` Peter Zijlstra 2010-01-17 15:09 ` Peter Zijlstra 2010-01-17 15:12 ` Gleb Natapov 2010-01-17 15:12 ` Gleb Natapov 2010-01-18 9:53 ` Andi Kleen 2010-01-18 9:53 ` Andi Kleen 2010-01-18 9:53 ` Andi Kleen 2010-01-18 8:34 ` H. Peter Anvin 2010-01-18 8:34 ` H. Peter Anvin 2010-01-18 8:50 ` Gleb Natapov 2010-01-18 8:50 ` Gleb Natapov 2010-01-19 1:53 ` H. Peter Anvin 2010-01-19 1:53 ` H. Peter Anvin 2010-01-19 6:55 ` Gleb Natapov 2010-01-19 6:55 ` Gleb Natapov 2010-01-19 17:03 ` H. Peter Anvin 2010-01-19 17:03 ` H. Peter Anvin 2010-01-19 17:44 ` Gleb Natapov 2010-01-19 17:44 ` Gleb Natapov 2010-01-19 20:10 ` H. Peter Anvin 2010-01-19 20:10 ` H. Peter Anvin 2010-01-20 10:02 ` Gleb Natapov 2010-01-20 10:02 ` Gleb Natapov 2010-01-20 12:00 ` Avi Kivity 2010-01-20 12:00 ` Avi Kivity 2010-01-20 17:18 ` Rik van Riel 2010-01-20 17:18 ` Rik van Riel 2010-01-21 8:56 ` Avi Kivity 2010-01-21 8:56 ` Avi Kivity 2010-01-20 18:45 ` H. Peter Anvin 2010-01-20 18:45 ` H. Peter Anvin 2010-01-21 8:58 ` Avi Kivity 2010-01-21 8:58 ` Avi Kivity 2010-01-20 17:43 ` H. Peter Anvin 2010-01-20 17:43 ` H. Peter Anvin 2010-01-21 9:02 ` Avi Kivity 2010-01-21 9:02 ` Avi Kivity 2010-01-21 9:04 ` Gleb Natapov 2010-01-21 9:04 ` Gleb Natapov 2010-01-21 9:05 ` Avi Kivity 2010-01-21 9:05 ` Avi Kivity 2010-01-21 15:47 ` H. Peter Anvin 2010-01-21 15:47 ` H. Peter Anvin 2010-01-22 7:25 ` Gleb Natapov 2010-01-22 7:25 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 05/12] Export __get_user_pages_fast Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-17 15:46 ` Christoph Hellwig 2010-01-17 15:46 ` Christoph Hellwig 2010-01-05 14:12 ` [PATCH v3 06/12] Add get_user_pages() variant that fails if major fault is required Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-17 15:43 ` Christoph Hellwig 2010-01-17 15:43 ` Christoph Hellwig 2010-01-05 14:12 ` [PATCH v3 07/12] Maintain memslot version number Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 08/12] Inject asynchronous page fault into a guest if page is swapped out Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 09/12] Retry fault before vmentry Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 10/12] Handle async PF in non preemptable context Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 11/12] Let host know whether the guest can handle async PF in non-userspace context Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 14:12 ` [PATCH v3 12/12] Send async PF when guest is not in userspace too Gleb Natapov 2010-01-05 14:12 ` Gleb Natapov 2010-01-05 15:05 ` [PATCH v3 00/12] KVM: Add host swap event notifications for PV guest Jun Koi 2010-01-05 15:05 ` Jun Koi 2010-01-05 15:59 ` Rik van Riel 2010-01-05 15:59 ` Rik van Riel 2010-01-05 16:04 ` Avi Kivity 2010-01-05 16:04 ` Avi Kivity 2010-01-06 10:17 ` Jun Koi 2010-01-06 10:17 ` Jun Koi 2010-01-06 10:21 ` Gleb Natapov 2010-01-06 10:21 ` Gleb Natapov 2010-01-08 16:18 ` Marcelo Tosatti 2010-01-08 16:18 ` Marcelo Tosatti 2010-01-08 16:47 ` Gleb Natapov 2010-01-08 16:47 ` Gleb Natapov 2010-01-08 19:24 ` Rik van Riel 2010-01-08 19:24 ` Rik van Riel 2010-01-08 19:30 ` Bryan Donlan 2010-01-08 19:30 ` Bryan Donlan 2010-01-08 19:55 ` Rik van Riel 2010-01-08 19:55 ` Rik van Riel
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=1262700774-1808-4-git-send-email-gleb@redhat.com \ --to=gleb@redhat.com \ --cc=a.p.zijlstra@chello.nl \ --cc=avi@redhat.com \ --cc=cl@linux-foundation.org \ --cc=hpa@zytor.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mingo@elte.hu \ --cc=riel@redhat.com \ --cc=tglx@linutronix.de \ /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: linkBe 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.