[rh7] Revert "ve/kvm: Allow scheduler throttling in __vcpu_run()"

Submitted by Konstantin Khorenko on Feb. 10, 2020, 3:57 p.m.

Details

Message ID 20200210155707.10663-1-khorenko@virtuozzo.com
State New
Series "Revert "ve/sched: introduce cond_resched_may_throttle""
Headers show

Commit Message

Konstantin Khorenko Feb. 10, 2020, 3:57 p.m.
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);
 		}
 	}

Comments

Andrey Ryabinin Feb. 10, 2020, 4:22 p.m.
On 2/10/20 6:57 PM, Konstantin Khorenko wrote:
> 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>

Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>


> ---
>  arch/x86/kvm/x86.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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);
>  		}
>  	}
>