From patchwork Mon Nov 23 14:05:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 62191 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nANEDa9o019106 for ; Mon, 23 Nov 2009 14:13:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754888AbZKWOMZ (ORCPT ); Mon, 23 Nov 2009 09:12:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753604AbZKWOMX (ORCPT ); Mon, 23 Nov 2009 09:12:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46157 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753644AbZKWOJQ (ORCPT ); Mon, 23 Nov 2009 09:09:16 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nANE7slC023234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 Nov 2009 09:07:54 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nANE68p3030357; Mon, 23 Nov 2009 09:07:53 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 0836E18D46D; Mon, 23 Nov 2009 16:06:08 +0200 (IST) From: Gleb Natapov 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 Subject: [PATCH v2 03/12] Add async PF initialization to PV guest. Date: Mon, 23 Nov 2009 16:05:58 +0200 Message-Id: <1258985167-29178-4-git-send-email-gleb@redhat.com> In-Reply-To: <1258985167-29178-1-git-send-email-gleb@redhat.com> References: <1258985167-29178-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index 222d5fd..d7d7079 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -49,6 +49,11 @@ struct kvm_mmu_op_release_pt { __u64 pt_phys; }; +struct kvm_vcpu_pv_apf_data { + __u32 reason; + __u32 enabled; +}; + #ifdef __KERNEL__ #include diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index e6db179..fdd0b95 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -27,7 +27,10 @@ #include #include #include +#include +#include #include +#include #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 (!per_cpu(apf_reason, smp_processor_id()).enabled) + return; + + wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); + per_cpu(apf_reason, smp_processor_id()).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(&per_cpu(apf_reason, smp_processor_id())); + + if (native_write_msr_safe(MSR_KVM_ASYNC_PF_EN, + pa | 1, pa >> 32)) + return; + per_cpu(apf_reason, smp_processor_id()).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 565ebc6..5599098 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -65,6 +65,7 @@ #include #include #include +#include #include @@ -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)