[RHEL7,COMMIT] Revert "ve/kvm: Allow scheduler throttling in __vcpu_run()"

Submitted by Konstantin Khorenko on Feb. 11, 2020, 9:40 a.m.

Details

Message ID 202002110940.01B9e4RV005502@finist-ce7.sw.ru
State New
Series "Revert "ve/sched: introduce cond_resched_may_throttle""
Headers show

Commit Message

Konstantin Khorenko Feb. 11, 2020, 9:40 a.m.
The commit is pushed to "branch-rh7-3.10.0-1062.12.1.vz7.131.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.12.1.vz7.131.1
------>
commit 0cb04a9bf6a3a77b5316a5dd64570f7f7e8d9328
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Mon Feb 10 18:54:12 2020 +0300

    Revert "ve/kvm: Allow scheduler throttling in __vcpu_run()"
    
    This reverts commit a8cfae4187efe2756d4152febf6472de4d5ac2f9.
    
    We've reverted boosting mechanism by commits:
      28a9251d7129c ("Revert "ve/sched: port boosting hacks against prio
                      inversion"")
      3ad70f5be8a36 ("Revert "sched: add WARN_ON's to debug task boosting"")
    
    So remove its users as well.
    
    https://jira.sw.ru/browse/PSBM-100188
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 arch/x86/kvm/x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6fe747e2c9250..4573af18358c0 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7355,7 +7355,7 @@  static int vcpu_run(struct kvm_vcpu *vcpu)
 		}
 		if (need_resched()) {
 			srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);
-			cond_resched_may_throttle();
+			cond_resched();
 			vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);
 		}
 	}