From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Hildenbrand <david@redhat.com>
Subject: Re: kvm: WARNING In kvm_apic_accept_events
Date: Wed, 15 Feb 2017 10:26:34 +0100
Message-ID: <04a86494-a032-83d9-b9f2-abd4e0c57f08@redhat.com>
References: <CACT4Y+ZaCMvotLos=e2opNMBwALTHRUEaxzCWDdTGh1Ss7R6sw@mail.gmail.com>
 <CACT4Y+ZWJDUEyMDu31_MR2zr+kTRFku+n5rN82MF425=qBnDtg@mail.gmail.com>
 <1516d642-081c-c5f5-e3ea-083fcd47011a@redhat.com>
 <04b94434-50af-766d-0248-e999bdf80655@redhat.com>
 <CACT4Y+Z1wWiQQik3P13LQZ6_3DC4Do-W50pLK1WDJe5bsr5S2w@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        "x86@kernel.org" <x86@kernel.org>, KVM list <kvm@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Steve Rutherford <srutherford@google.com>,
        syzkaller <syzkaller@googlegroups.com>
To: Dmitry Vyukov <dvyukov@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <CACT4Y+Z1wWiQQik3P13LQZ6_3DC4Do-W50pLK1WDJe5bsr5S2w@mail.gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org


>>> From: David Hildenbrand <david@redhat.com>
>>> Date: Mon, 23 Jan 2017 16:42:23 +0100
>>> Subject: [PATCH] KVM: x86: fix illegal MP_STATE when in/entering SMM
>>>
>>> If we already entered/are about to enter SMM, don't allow
>>> switching to INIT/SIPI_RECEIVED, otherwise the next call to
>>> kvm_apic_accept_events() will report a warning.
>>>
>>> Fixes: cd7764fe9f73 ("KVM: x86: latch INITs while in system management mode")
>>> Reported-by: Dmitry Vyukov <dvyukov@google.com>
>>> Signed-off-by: David Hildenbrand <david@redhat.com>
>>> ---
>>>  arch/x86/kvm/x86.c | 6 ++++++
>>>  1 file changed, 6 insertions(+)
>>>
>>> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>>> index 57d8a85..06ffc91 100644
>>> --- a/arch/x86/kvm/x86.c
>>> +++ b/arch/x86/kvm/x86.c
>>> @@ -7247,6 +7247,12 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
>>>           mp_state->mp_state != KVM_MP_STATE_RUNNABLE)
>>>               return -EINVAL;
>>>
>>> +     /* INITs are latched while in SMM */
>>> +     if ((is_smm(vcpu) || vcpu->arch.smi_pending) &&
>>> +         (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||
>>> +          mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))
>>> +             return -EINVAL;
>>> +
>>>       if (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {
>>>               vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;
>>>               set_bit(KVM_APIC_SIPI, &vcpu->arch.apic->pending_events);
>>>
>>
>> Looks good, thanks for analyzing it.  I'll try making a minimal testcase...
> 
> 
> Any progress with this? Should we commit this as is?
> 

Paolo, should I resend as a proper notcopieddiff mail?

-- 
Thanks,

David