Prefer capitalizing KVM in the shortlog, if only because I'm lazy with grep :-) On Thu, May 06, 2021, Venkatesh Srinivas wrote: > From: David Matlack <dmatlack@xxxxxxxxxx> > > When growing halt-polling, there is no check that the poll time exceeds > the per-VM limit. It's possible for vcpu->halt_poll_ns to grow past > kvm->max_halt_poll_ns and stay there until a halt which takes longer > than kvm->halt_poll_ns. > Fixes: acd05785e48c ("kvm: add capability for halt polling") and probably Cc: stable@ too. > Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx> > Signed-off-by: Venkatesh Srinivas <venkateshs@xxxxxxxxxxxx> > --- > virt/kvm/kvm_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 2799c6660cce..120817c5f271 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2893,8 +2893,8 @@ static void grow_halt_poll_ns(struct kvm_vcpu *vcpu) > if (val < grow_start) > val = grow_start; > > - if (val > halt_poll_ns) > - val = halt_poll_ns; > + if (val > vcpu->kvm->max_halt_poll_ns) > + val = vcpu->kvm->max_halt_poll_ns; Hmm, I would argue that the introduction of the capability broke halt_poll_ns. The halt_poll_ns module param is writable after KVM is loaded. Prior to the capability, that meant the admin could adjust the param on the fly and all vCPUs would honor the new value as it was changed. By snapshotting the module param at VM creation, those semantics were lost. That's not necessarily wrong/bad, but I don't see anything in the changelog for the capability that suggests killing the old behavior was intentional/desirable. > > vcpu->halt_poll_ns = val; > out: > -- > 2.31.1.607.g51e8a6a459-goog >