Let's move it to the outer loop, in case we ever run again into long
loops, trying to map the prefix. While at it, convert it to cond_resched().
Signed-off-by: David Hildenbrand <[email protected]>
---
arch/s390/kvm/vsie.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 4f6c22d72072..ef05b4e167fb 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -1000,8 +1000,6 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
handle_last_fault(vcpu, vsie_page);
- if (need_resched())
- schedule();
if (test_cpu_flag(CIF_MCCK_PENDING))
s390_handle_mcck();
@@ -1185,6 +1183,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
kvm_s390_vcpu_has_irq(vcpu, 0) ||
kvm_s390_vcpu_sie_inhibited(vcpu))
break;
+ cond_resched();
}
if (rc == -EFAULT) {
--
2.25.1
On 03.04.20 17:30, David Hildenbrand wrote:
> Let's move it to the outer loop, in case we ever run again into long
> loops, trying to map the prefix. While at it, convert it to cond_resched().
>
> Signed-off-by: David Hildenbrand <[email protected]>
Reviewed-by: Christian Borntraeger <[email protected]>
> ---
> arch/s390/kvm/vsie.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
> index 4f6c22d72072..ef05b4e167fb 100644
> --- a/arch/s390/kvm/vsie.c
> +++ b/arch/s390/kvm/vsie.c
> @@ -1000,8 +1000,6 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
>
> handle_last_fault(vcpu, vsie_page);
>
> - if (need_resched())
> - schedule();
> if (test_cpu_flag(CIF_MCCK_PENDING))
> s390_handle_mcck();
>
> @@ -1185,6 +1183,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
> kvm_s390_vcpu_has_irq(vcpu, 0) ||
> kvm_s390_vcpu_sie_inhibited(vcpu))
> break;
> + cond_resched();
> }
>
> if (rc == -EFAULT) {
>
On Fri, 3 Apr 2020 17:30:49 +0200
David Hildenbrand <[email protected]> wrote:
> Let's move it to the outer loop, in case we ever run again into long
> loops, trying to map the prefix. While at it, convert it to
> cond_resched().
>
> Signed-off-by: David Hildenbrand <[email protected]>
> ---
> arch/s390/kvm/vsie.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
> index 4f6c22d72072..ef05b4e167fb 100644
> --- a/arch/s390/kvm/vsie.c
> +++ b/arch/s390/kvm/vsie.c
> @@ -1000,8 +1000,6 @@ static int do_vsie_run(struct kvm_vcpu *vcpu,
> struct vsie_page *vsie_page)
> handle_last_fault(vcpu, vsie_page);
>
> - if (need_resched())
> - schedule();
> if (test_cpu_flag(CIF_MCCK_PENDING))
> s390_handle_mcck();
>
> @@ -1185,6 +1183,7 @@ static int vsie_run(struct kvm_vcpu *vcpu,
> struct vsie_page *vsie_page) kvm_s390_vcpu_has_irq(vcpu, 0) ||
> kvm_s390_vcpu_sie_inhibited(vcpu))
> break;
> + cond_resched();
> }
>
> if (rc == -EFAULT) {
Reviewed-by: Claudio Imbrenda <[email protected]>