Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3407169rwa; Tue, 23 Aug 2022 04:22:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5HPkED0jjuhV4bq4D/t2v+Ezj5Ek56ZOu08RbmeK7TsmXZoQ/NJXIenJe1dRZtzqN7ebjV X-Received: by 2002:a65:49c8:0:b0:415:e89d:ea1a with SMTP id t8-20020a6549c8000000b00415e89dea1amr20242580pgs.266.1661253774734; Tue, 23 Aug 2022 04:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253774; cv=none; d=google.com; s=arc-20160816; b=rDpVHbVi4b1T4HMPen1T9qIqG871ciXlyvG9WZg4Q5mN+l7Muqr5w0RX5TN0ar4maE qbU1kHRPTKDuFv1dNvDuGVhNpxXcwBdbyIwLzSfAVie6IVNPH4Mph2iSz43N/o2N+EwM Rnh5pfUgMMAeIvXqbE0ySyNZ7Slif2R6kMShEYCwEDfsbbcd+zX2FeK+Kn1UILd2YMUr hRNTbd1dw68g3xyIxczHQtWXz5MBYe2ZRg2DQws2jGGZwQPpcFDbQeq5UEIkDNQob+3F I0pttWIzF5FaubepCdhsxFFeUkQw5zeIbPuBgTDbwott9Hbo9P/xdlbD+16cwL0GPg9W v52g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pzGUE4dNfWBVS50MKFkUntmtbu6YH222yIMGYlRnXnk=; b=MxmumNsjAwknGHVICoNMq9GwN9yahXZfycnWG7v0THoTODpaO+X5lGrJOQbYOphEBH uhdMYZo40h6UzqYiL1yJZICoV8qdvBwqctSjtm8d4R+C9e7ReyraF7JAwOAVMusHN+R3 p7JKrgxVgZFxBLIXX4bKSYvVq7OCRbe18jAOT2DZpB30g+4aSJ613zsWqqzZxSDhQBgx wDtmLPzqxJ21jZwTktFE7rNP1JDDaegJ4eo+iOgX5TDGJUy6FkFqecG5mXxzer9nHEma ULjh4lgOW0E+y+ydzMRV07hNOVydP7cpzpmxBEr7RcAphPJ/kfw1UYcGBTRhSRY/94SD eLlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="h/r1+BeJ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020a65438b000000b0041d3e033ab4si15613364pgp.847.2022.08.23.04.22.43; Tue, 23 Aug 2022 04:22:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="h/r1+BeJ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350842AbiHWJcu (ORCPT + 99 others); Tue, 23 Aug 2022 05:32:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350274AbiHWJ3M (ORCPT ); Tue, 23 Aug 2022 05:29:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2DD791D3B; Tue, 23 Aug 2022 01:37:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A0E8E61517; Tue, 23 Aug 2022 08:36:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9D4AC433C1; Tue, 23 Aug 2022 08:36:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243776; bh=+6p6i+rNtRJweP0roXLoLTkhcZV/0hxAM7C3fBVXD18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h/r1+BeJTcR+x2aCTXy/D9IMSvtvfbVYsoIwDQXZFim4GnpdgORhgCedpkvl98tmZ qM0nSqpQnhIuGjHFdc90j1P54bzLXq8OaBvPOU8Wz46+DRu7IY4a3E18wqkmNse+r4 +rlop/JgD3gD5ZubtaTLBa3wku7ELEqXnWb40wnQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Christopherson , "Maciej S. Szmigiero" , Paolo Bonzini Subject: [PATCH 4.14 018/229] KVM: SVM: Dont BUG if userspace injects an interrupt with GIF=0 Date: Tue, 23 Aug 2022 10:22:59 +0200 Message-Id: <20220823080054.084215205@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080053.202747790@linuxfoundation.org> References: <20220823080053.202747790@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maciej S. Szmigiero commit f17c31c48e5cde9895a491d91c424eeeada3e134 upstream. Don't BUG/WARN on interrupt injection due to GIF being cleared, since it's trivial for userspace to force the situation via KVM_SET_VCPU_EVENTS (even if having at least a WARN there would be correct for KVM internally generated injections). kernel BUG at arch/x86/kvm/svm/svm.c:3386! invalid opcode: 0000 [#1] SMP CPU: 15 PID: 926 Comm: smm_test Not tainted 5.17.0-rc3+ #264 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:svm_inject_irq+0xab/0xb0 [kvm_amd] Code: <0f> 0b 0f 1f 00 0f 1f 44 00 00 80 3d ac b3 01 00 00 55 48 89 f5 53 RSP: 0018:ffffc90000b37d88 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff88810a234ac0 RCX: 0000000000000006 RDX: 0000000000000000 RSI: ffffc90000b37df7 RDI: ffff88810a234ac0 RBP: ffffc90000b37df7 R08: ffff88810a1fa410 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: ffff888109571000 R14: ffff88810a234ac0 R15: 0000000000000000 FS: 0000000001821380(0000) GS:ffff88846fdc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f74fc550008 CR3: 000000010a6fe000 CR4: 0000000000350ea0 Call Trace: inject_pending_event+0x2f7/0x4c0 [kvm] kvm_arch_vcpu_ioctl_run+0x791/0x17a0 [kvm] kvm_vcpu_ioctl+0x26d/0x650 [kvm] __x64_sys_ioctl+0x82/0xb0 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae Fixes: 219b65dcf6c0 ("KVM: SVM: Improve nested interrupt injection") Cc: stable@vger.kernel.org Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Signed-off-by: Maciej S. Szmigiero Message-Id: <35426af6e123cbe91ec7ce5132ce72521f02b1b5.1651440202.git.maciej.szmigiero@oracle.com> Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm.c | 2 -- 1 file changed, 2 deletions(-) --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4611,8 +4611,6 @@ static void svm_set_irq(struct kvm_vcpu { struct vcpu_svm *svm = to_svm(vcpu); - BUG_ON(!(gif_set(svm))); - trace_kvm_inj_virq(vcpu->arch.interrupt.nr); ++vcpu->stat.irq_injections;