diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-03 23:08:05 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-03 23:08:05 -0400 |
| commit | 1308dd148e61f3617b6169ab8d6ae15bcaa1612f (patch) | |
| tree | 9a30c710311660a183da62677cdfa96a3ffc660d | |
| parent | 0c11d8a3b0bd3f6736508342f30918d64157d7b7 (diff) | |
| download | 4.12-rt-patches-1308dd148e61f3617b6169ab8d6ae15bcaa1612f.tar.gz | |
refresh KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch for whitespacert-v4.11-11014-g2d3e4866dea9
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/patches/KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch b/patches/KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch index 192e4c6b3f350b..376f8bcffdfa49 100644 --- a/patches/KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch +++ b/patches/KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch @@ -1,6 +1,8 @@ +From b2362d211fd42017016d052853748b5fdb62f9a9 Mon Sep 17 00:00:00 2001 From: Josh Cartwright <joshc@ni.com> Date: Thu, 11 Feb 2016 11:54:01 -0600 -Subject: KVM: arm/arm64: downgrade preempt_disable()d region to migrate_disable() +Subject: [PATCH] KVM: arm/arm64: downgrade preempt_disable()d region to + migrate_disable() 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 @@ -16,22 +18,21 @@ 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> ---- - arch/arm/kvm/arm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) +diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c +index 8a31906bdc9b..21af11e13b92 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c -@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v +@@ -628,7 +628,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); - kvm_timer_flush_hwstate(vcpu); - kvm_vgic_flush_hwstate(vcpu); -@@ -653,7 +653,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v + +@@ -656,7 +656,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_pmu_sync_hwstate(vcpu); kvm_timer_sync_hwstate(vcpu); kvm_vgic_sync_hwstate(vcpu); @@ -40,7 +41,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> continue; } -@@ -709,7 +709,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v +@@ -712,7 +712,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_vgic_sync_hwstate(vcpu); @@ -49,3 +50,6 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ret = handle_exit(vcpu, run, ret); } +-- +2.1.4 + |