From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH] KVM: VMX: Fix repeatly calling alloc_apic_access_page() Date: Fri, 2 Nov 2007 13:13:42 +0800 Message-ID: <200711021313.43013.sheng.yang@intel.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_HIrKHCEL8fbiuAN" To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org --Boundary-00=_HIrKHCEL8fbiuAN Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline =46rom 00a52112d813af983dd4d34cb7dc701f6fe88829 Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Fri, 2 Nov 2007 11:56:17 +0800 Subject: [PATCH] KVM: VMX: Fix repeatly calling alloc_apic_access_page() =46or SMP guest, alloc_apic_access_page() would be called more than once. S= o=20 only the last vcpu's vmcs get correct apic access address, causing SMP gues= t=20 can't benifit from FlexPriority. This patch fixed this issue. Signed-off-by: Sheng Yang =2D-- drivers/kvm/kvm_main.c | 1 + drivers/kvm/vmx.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 34a681d..519626d 100644 =2D-- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -245,6 +245,7 @@ static struct kvm *kvm_create_vm(void) spin_lock(&kvm_lock); list_add(&kvm->vm_list, &vm_list); spin_unlock(&kvm_lock); + kvm->apic_access_page =3D NULL; return kvm; } =20 diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 42e7fad..89007b2 100644 =2D-- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -1466,6 +1466,8 @@ static int alloc_apic_access_page(struct kvm *kvm) int r; =20 r =3D -EFAULT; + if (kvm->apic_access_page) + return 0; kvm_userspace_mem.slot =3D APIC_ACCESS_PAGE_PRIVATE_MEMSLOT; kvm_userspace_mem.flags =3D 0; kvm_userspace_mem.guest_phys_addr =3D 0xfee00000ULL; @@ -1584,7 +1586,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL); vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK); =20 =2D if (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm)) + if ((vmx->vcpu.vcpu_id =3D=3D 0) && + (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm))) if (alloc_apic_access_page(vmx->vcpu.kvm) !=3D 0) return -ENOMEM; =20 =2D-=20 1.5.2 --Boundary-00=_HIrKHCEL8fbiuAN Content-Type: text/x-diff; charset="utf-8"; name="0001-KVM-VMX-Fix-repeatly-allocate-of-apic-access-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-KVM-VMX-Fix-repeatly-allocate-of-apic-access-page.patch" =46rom 00a52112d813af983dd4d34cb7dc701f6fe88829 Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Fri, 2 Nov 2007 11:56:17 +0800 Subject: [PATCH] KVM: VMX: Fix repeatly allocate of apic access page =46or SMP guest, alloc_apic_access_page() would be called more than once. So only the last one works, causing SMP guest can't benifit from FlexPriori= ty. This patch fixed this issue. Signed-off-by: Sheng Yang =2D-- drivers/kvm/kvm_main.c | 1 + drivers/kvm/vmx.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 34a681d..519626d 100644 =2D-- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -245,6 +245,7 @@ static struct kvm *kvm_create_vm(void) spin_lock(&kvm_lock); list_add(&kvm->vm_list, &vm_list); spin_unlock(&kvm_lock); + kvm->apic_access_page =3D NULL; return kvm; } =20 diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 42e7fad..89007b2 100644 =2D-- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -1466,6 +1466,8 @@ static int alloc_apic_access_page(struct kvm *kvm) int r; =20 r =3D -EFAULT; + if (kvm->apic_access_page) + return 0; kvm_userspace_mem.slot =3D APIC_ACCESS_PAGE_PRIVATE_MEMSLOT; kvm_userspace_mem.flags =3D 0; kvm_userspace_mem.guest_phys_addr =3D 0xfee00000ULL; @@ -1584,7 +1586,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) vmcs_writel(CR0_GUEST_HOST_MASK, ~0UL); vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK); =20 =2D if (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm)) + if ((vmx->vcpu.vcpu_id =3D=3D 0) && + (vm_need_virtualize_apic_accesses(vmx->vcpu.kvm))) if (alloc_apic_access_page(vmx->vcpu.kvm) !=3D 0) return -ENOMEM; =20 =2D-=20 1.5.2 --Boundary-00=_HIrKHCEL8fbiuAN Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ --Boundary-00=_HIrKHCEL8fbiuAN Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/kvm-devel --Boundary-00=_HIrKHCEL8fbiuAN--