hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: i8254: tone down WARN_ON pit.state_lock 

If the guest could hit this, it would hang the host kernel, bacause of
sheer number of those reports.  Internal callers have to be sensible
anyway, so we now only check for it in an API function.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Radim Krčmář 2016-03-02 22:56:42 +01:00 committed by Paolo Bonzini
parent ddf54503e2
commit b69d920f68
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kvm/i8254.c
View File

@ -76,8 +76,6 @@ static void pit_set_gate(struct kvm *kvm, int channel, u32 val)
struct kvm_kpit_channel_state *c = struct kvm_kpit_channel_state *c =
&kvm->arch.vpit->pit_state.channels[channel]; &kvm->arch.vpit->pit_state.channels[channel];
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
switch (c->mode) { switch (c->mode) {
default: default:
case 0: case 0:
@ -99,8 +97,6 @@ static void pit_set_gate(struct kvm *kvm, int channel, u32 val)
static int pit_get_gate(struct kvm *kvm, int channel) static int pit_get_gate(struct kvm *kvm, int channel)
{ {
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
return kvm->arch.vpit->pit_state.channels[channel].gate; return kvm->arch.vpit->pit_state.channels[channel].gate;
} }
@ -144,8 +140,6 @@ static int pit_get_count(struct kvm *kvm, int channel)
s64 d, t; s64 d, t;
int counter; int counter;
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
t = kpit_elapsed(kvm, c, channel); t = kpit_elapsed(kvm, c, channel);
d = muldiv64(t, KVM_PIT_FREQ, NSEC_PER_SEC); d = muldiv64(t, KVM_PIT_FREQ, NSEC_PER_SEC);
@ -174,8 +168,6 @@ static int pit_get_out(struct kvm *kvm, int channel)
s64 d, t; s64 d, t;
int out; int out;
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
t = kpit_elapsed(kvm, c, channel); t = kpit_elapsed(kvm, c, channel);
d = muldiv64(t, KVM_PIT_FREQ, NSEC_PER_SEC); d = muldiv64(t, KVM_PIT_FREQ, NSEC_PER_SEC);
@ -207,8 +199,6 @@ static void pit_latch_count(struct kvm *kvm, int channel)
struct kvm_kpit_channel_state *c = struct kvm_kpit_channel_state *c =
&kvm->arch.vpit->pit_state.channels[channel]; &kvm->arch.vpit->pit_state.channels[channel];
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
if (!c->count_latched) { if (!c->count_latched) {
c->latched_count = pit_get_count(kvm, channel); c->latched_count = pit_get_count(kvm, channel);
c->count_latched = c->rw_mode; c->count_latched = c->rw_mode;
@ -220,8 +210,6 @@ static void pit_latch_status(struct kvm *kvm, int channel)
struct kvm_kpit_channel_state *c = struct kvm_kpit_channel_state *c =
&kvm->arch.vpit->pit_state.channels[channel]; &kvm->arch.vpit->pit_state.channels[channel];
WARN_ON(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
if (!c->status_latched) { if (!c->status_latched) {
/* TODO: Return NULL COUNT (bit 6). */ /* TODO: Return NULL COUNT (bit 6). */
c->status = ((pit_get_out(kvm, channel) << 7) | c->status = ((pit_get_out(kvm, channel) << 7) |
@ -367,8 +355,6 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
{ {
struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state; struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state;
WARN_ON(!mutex_is_locked(&ps->lock));
pr_debug("load_count val is %d, channel is %d\n", val, channel); pr_debug("load_count val is %d, channel is %d\n", val, channel);
/* /*
@ -406,6 +392,9 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val, int hpet_legacy_start) void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val, int hpet_legacy_start)
{ {
u8 saved_mode; u8 saved_mode;
WARN_ON_ONCE(!mutex_is_locked(&kvm->arch.vpit->pit_state.lock));
if (hpet_legacy_start) { if (hpet_legacy_start) {
/* save existing mode for later reenablement */ /* save existing mode for later reenablement */
WARN_ON(channel != 0); WARN_ON(channel != 0);