63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From 2c288b2f8e53f55e82d3f3f70338789a828233bf Mon Sep 17 00:00:00 2001
|
|
Message-Id: <2c288b2f8e53f55e82d3f3f70338789a828233bf.1601675152.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Josh Cartwright <joshc@ni.com>
|
|
Date: Thu, 11 Feb 2016 11:54:01 -0600
|
|
Subject: [PATCH 211/333] KVM: arm/arm64: downgrade preempt_disable()d region
|
|
to migrate_disable()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
kvm_arch_vcpu_ioctl_run() disables the use of preemption when updating
|
|
the vgic and timer states to prevent the calling task from migrating to
|
|
another CPU. It does so to prevent the task from writing to the
|
|
incorrect per-CPU GIC distributor registers.
|
|
|
|
On -rt kernels, it's possible to maintain the same guarantee with the
|
|
use of migrate_{disable,enable}(), with the added benefit that the
|
|
migrate-disabled region is preemptible. Update
|
|
kvm_arch_vcpu_ioctl_run() to do so.
|
|
|
|
Cc: Christoffer Dall <christoffer.dall@linaro.org>
|
|
Reported-by: Manish Jaggi <Manish.Jaggi@caviumnetworks.com>
|
|
Signed-off-by: Josh Cartwright <joshc@ni.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
virt/kvm/arm/arm.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
|
|
index d982650deb33..efe2d6c0201c 100644
|
|
--- a/virt/kvm/arm/arm.c
|
|
+++ b/virt/kvm/arm/arm.c
|
|
@@ -723,7 +723,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
* involves poking the GIC, which must be done in a
|
|
* non-preemptible context.
|
|
*/
|
|
- preempt_disable();
|
|
+ migrate_disable();
|
|
|
|
kvm_pmu_flush_hwstate(vcpu);
|
|
|
|
@@ -772,7 +772,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
kvm_timer_sync_hwstate(vcpu);
|
|
kvm_vgic_sync_hwstate(vcpu);
|
|
local_irq_enable();
|
|
- preempt_enable();
|
|
+ migrate_enable();
|
|
continue;
|
|
}
|
|
|
|
@@ -850,7 +850,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
/* Exit types that need handling before we can be preempted */
|
|
handle_exit_early(vcpu, run, ret);
|
|
|
|
- preempt_enable();
|
|
+ migrate_enable();
|
|
|
|
ret = handle_exit(vcpu, run, ret);
|
|
}
|
|
--
|
|
2.17.1
|
|
|