From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17E64C4332F for ; Tue, 1 Mar 2022 17:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236390AbiCARLI (ORCPT ); Tue, 1 Mar 2022 12:11:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234865AbiCARLC (ORCPT ); Tue, 1 Mar 2022 12:11:02 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6949938BC3 for ; Tue, 1 Mar 2022 09:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646154620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hw768rDeNokjNS2ztSnOtNJE+1C5X3ieaCdhvugFp+Q=; b=ESfpElxFTXQ7V7PSnTGeDbeJpZvSA95aDwXTNss3PIsK/3Xuk5c3wJ0H15UogvwRhc943B 06KnZ38VnAtbwuA+O2dRZSve/REW6JbmirYZdudEVTdObY+ZKk7hju4BWMPSgkdc2G3iw3 zaVUQAmXjvRHVYzTSNFcYqKQZuyvpiY= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-182-e6nrlJtFMoGUraQbPqtQpw-1; Tue, 01 Mar 2022 12:10:18 -0500 X-MC-Unique: e6nrlJtFMoGUraQbPqtQpw-1 Received: by mail-wr1-f72.google.com with SMTP id x15-20020a5d6b4f000000b001ee6c0aa287so3557475wrw.9 for ; Tue, 01 Mar 2022 09:10:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=Hw768rDeNokjNS2ztSnOtNJE+1C5X3ieaCdhvugFp+Q=; b=DyBVepYh7nDbr2kAfKOv9+ORti/xXotZm07RLoUbhGPArYey2/vPyn31L/J9BmyiyQ O9PF+9c2r8Zm77fLJ9WA5r97JFkCb0M+tYyx5pGn0jXTM6inzNIArhSmrnzrMOqZpCPg xLH74UsLnBO/FFWIxP1/PTXjhAAPGHt4YgiWb86pII4Lm53ILvMjhZUX1EBoY69YqQfS xMgVQm83J1kRM3crSprbxA+a2MqZvK3e9pPDpsl6pAt38oWvAeFwVuzEy2RSQ4I7zFMb ixC65GstMPfEL3Pich47cgcrrT+rJ+ZPXCGm1L9hUMwd3cFyXw6mYr7Uy+/cPruvu4Wk i9zw== X-Gm-Message-State: AOAM532brrjNE7ZoOU9jPaXC1as7ZxC126BWpFNE+xCiPVqAjQ09GIyZ Mu+s0OkSvbA27pEOa6rmmS588DhR/mzkWyPCuhPvAOjXNihcBSEG0lk1Wi9XQvQsMB/Nf2PJ6wo fJMXqsKUznx8HR4rTthfRMR02 X-Received: by 2002:adf:fbc4:0:b0:1e7:2060:d65 with SMTP id d4-20020adffbc4000000b001e720600d65mr19981566wrs.583.1646154617055; Tue, 01 Mar 2022 09:10:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcW8kTPiZjyEQosAULzH9LNNi5qcAy9XoIyi/XnZf3u7/MFJ8aAGzGVLozZ3XC7489ddNLZw== X-Received: by 2002:adf:fbc4:0:b0:1e7:2060:d65 with SMTP id d4-20020adffbc4000000b001e720600d65mr19981536wrs.583.1646154616784; Tue, 01 Mar 2022 09:10:16 -0800 (PST) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.googlemail.com with ESMTPSA id o22-20020a05600c4fd600b0038133076dcesm3830827wmq.16.2022.03.01.09.10.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Mar 2022 09:10:16 -0800 (PST) Message-ID: <4665e220-2efe-0040-8dda-cf17f0d8e342@redhat.com> Date: Tue, 1 Mar 2022 18:10:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH MANUALSEL 5.16 2/2] KVM: x86: nSVM: deal with L1 hypervisor that intercepts interrupts but lets L2 control them Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxim Levitsky , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, kvm@vger.kernel.org References: <20220222140522.211548-1-sashal@kernel.org> <20220222140522.211548-2-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20220222140522.211548-2-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/22/22 15:05, Sasha Levin wrote: > From: Maxim Levitsky > > [ Upstream commit 2b0ecccb55310a4b8ad5d59c703cf8c821be6260 ] > > Fix a corner case in which the L1 hypervisor intercepts > interrupts (INTERCEPT_INTR) and either doesn't set > virtual interrupt masking (V_INTR_MASKING) or enters a > nested guest with EFLAGS.IF disabled prior to the entry. > > In this case, despite the fact that L1 intercepts the interrupts, > KVM still needs to set up an interrupt window to wait before > injecting the INTR vmexit. > > Currently the KVM instead enters an endless loop of 'req_immediate_exit'. > > Exactly the same issue also happens for SMIs and NMI. > Fix this as well. > > Note that on VMX, this case is impossible as there is only > 'vmexit on external interrupts' execution control which either set, > in which case both host and guest's EFLAGS.IF > are ignored, or not set, in which case no VMexits are delivered. > > Signed-off-by: Maxim Levitsky > Message-Id: <20220207155447.840194-8-mlevitsk@redhat.com> > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/kvm/svm/svm.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index d6a4acaa65742..2503c99cfde3f 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -3548,11 +3548,13 @@ static int svm_nmi_allowed(struct kvm_vcpu *vcpu, bool for_injection) > if (svm->nested.nested_run_pending) > return -EBUSY; > > + if (svm_nmi_blocked(vcpu)) > + return 0; > + > /* An NMI must not be injected into L2 if it's supposed to VM-Exit. */ > if (for_injection && is_guest_mode(vcpu) && nested_exit_on_nmi(svm)) > return -EBUSY; > - > - return !svm_nmi_blocked(vcpu); > + return 1; > } > > static bool svm_get_nmi_mask(struct kvm_vcpu *vcpu) > @@ -3604,9 +3606,13 @@ bool svm_interrupt_blocked(struct kvm_vcpu *vcpu) > static int svm_interrupt_allowed(struct kvm_vcpu *vcpu, bool for_injection) > { > struct vcpu_svm *svm = to_svm(vcpu); > + > if (svm->nested.nested_run_pending) > return -EBUSY; > > + if (svm_interrupt_blocked(vcpu)) > + return 0; > + > /* > * An IRQ must not be injected into L2 if it's supposed to VM-Exit, > * e.g. if the IRQ arrived asynchronously after checking nested events. > @@ -3614,7 +3620,7 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu, bool for_injection) > if (for_injection && is_guest_mode(vcpu) && nested_exit_on_intr(svm)) > return -EBUSY; > > - return !svm_interrupt_blocked(vcpu); > + return 1; > } > > static void svm_enable_irq_window(struct kvm_vcpu *vcpu) > @@ -4343,11 +4349,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) > if (svm->nested.nested_run_pending) > return -EBUSY; > > + if (svm_smi_blocked(vcpu)) > + return 0; > + > /* An SMI must not be injected into L2 if it's supposed to VM-Exit. */ > if (for_injection && is_guest_mode(vcpu) && nested_exit_on_smi(svm)) > return -EBUSY; > > - return !svm_smi_blocked(vcpu); > + return 1; > } > > static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate) Acked-by: Paolo Bonzini Paolo