From ad4d566baf9a825f41240ce1785096028fdacd45 Mon Sep 17 00:00:00 2001 From: Oleksandr Natalenko Date: Thu, 21 Aug 2014 11:37:00 +0300 Subject: [PATCH] ck-3.16: revert KVM workaround due to proper cond_resched() fix --- arch/ia64/kvm/kvm-ia64.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/x86/kvm/x86.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: linux-3.17.2-bfsdev/arch/ia64/kvm/kvm-ia64.c =================================================================== --- linux-3.17.2-bfsdev.orig/arch/ia64/kvm/kvm-ia64.c 2014-11-11 11:14:39.368940244 +1100 +++ linux-3.17.2-bfsdev/arch/ia64/kvm/kvm-ia64.c 2014-11-11 11:14:39.365940244 +1100 @@ -703,7 +703,7 @@ again: out: srcu_read_unlock(&vcpu->kvm->srcu, idx); if (r > 0) { - schedule(); + cond_resched(); idx = srcu_read_lock(&vcpu->kvm->srcu); goto again; } Index: linux-3.17.2-bfsdev/arch/powerpc/kvm/book3s_hv.c =================================================================== --- linux-3.17.2-bfsdev.orig/arch/powerpc/kvm/book3s_hv.c 2014-11-11 11:14:39.368940244 +1100 +++ linux-3.17.2-bfsdev/arch/powerpc/kvm/book3s_hv.c 2014-11-11 11:14:39.366940244 +1100 @@ -1734,7 +1734,7 @@ static void kvmppc_run_core(struct kvmpp kvm_guest_exit(); preempt_enable(); - schedule(); + cond_resched(); spin_lock(&vc->lock); now = get_tb(); Index: linux-3.17.2-bfsdev/arch/x86/kvm/x86.c =================================================================== --- linux-3.17.2-bfsdev.orig/arch/x86/kvm/x86.c 2014-11-11 11:14:39.368940244 +1100 +++ linux-3.17.2-bfsdev/arch/x86/kvm/x86.c 2014-11-11 11:14:39.366940244 +1100 @@ -6263,7 +6263,7 @@ static int __vcpu_run(struct kvm_vcpu *v } if (need_resched()) { srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx); - schedule(); + cond_resched(); vcpu->srcu_idx = srcu_read_lock(&kvm->srcu); } }