From patchwork Thu Sep 14 04:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 139489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp250293vqi; Thu, 14 Sep 2023 03:34:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHgZwxdbuuoUl4pETT4TJo13Nwfe3V/ksPPBPO0467NzB1+ddHZ1EQUqhs0VRjWgI5FJPw X-Received: by 2002:a17:90a:d98d:b0:26b:c3f:1503 with SMTP id d13-20020a17090ad98d00b0026b0c3f1503mr5024244pjv.17.1694687675889; Thu, 14 Sep 2023 03:34:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694687675; cv=none; d=google.com; s=arc-20160816; b=ClTQ6tmom0eNfqi2hZptmYsPMnObdoA8BElEDhSLKjug9HP4DplB1gFeULHE+3KI3o o9qrdGis9vWKY0aT8RnxynuiHl/D2fJtFimDeH5/4unjUccjOALNH+a1FIyTRoVp0DgY oI2LTD/NqedN08GUsLTctjHpWW9c4d80+/2yf12lmcepmZNb+xicFq4QiiTsQfgC0fSb hnt42V12tSMTgOVz9ZSVctnJyVwQBmz3VaU7k9lR3QfRGrmcINTn08IM/zyu4qtGRSKu SKAP0E0Koa2UtF7sfd/vjo45+EHGgfjZHiEwNgZFMWYKMW7jGWQRBlUTBoWwlsCaPhVC JgQA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YDLLXkL8tjkx68e6PkWUidUg0Mtxnrk5zHN8F2t22jk=; fh=jqCbnajAXgJ+s7A1aA7DOHJD13/+EpD442pw8d+Ofss=; b=DO7ZeQnTOmMFg8f8jmjgZoH0Ai3eLfvVpvUFKabASh6CX2cVyv+Khi4rT83aKhF5UB Evqjtc7p2cv/4fkRVkJp5ijIqASKGSrK7tvR5sM5qmvaNEBdsvbfXDDBjGYWGJAP8fGY 8bUBof/+BscbD9CKQCiCuXxfxUkntPBCsHkxvgkNhmiBHg1AxFCuM3hP5cCqHZS28izs FkBxP921Xb1fAMbICX6ohtfB2ILravNjhmmuR5tr2svW/x6EwCBZWHv79i3BxMhWL1t0 1WzosBG+iV2sA2eYT/D52h07mKFEvFV45vW1OqEh/zbcVDAhs1uHUOqSaLAeywR+JAtx h8EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h0h99R6O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id ip6-20020a17090b314600b00263bf1c6dc0si3917335pjb.102.2023.09.14.03.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 03:34:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h0h99R6O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 26960824632D; Wed, 13 Sep 2023 22:21:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235596AbjINFU5 (ORCPT + 35 others); Thu, 14 Sep 2023 01:20:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235199AbjINFUC (ORCPT ); Thu, 14 Sep 2023 01:20:02 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 530E12122; Wed, 13 Sep 2023 22:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694668766; x=1726204766; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T0jTyejyJ8JvDYansScu0V1dL1MHLI4ucPruSc2ZVaA=; b=h0h99R6OY5/nOSiEIXvynNt43Y4BJHh6hoxNoYCgOCp24tPeHsnB9KjE iT9l5pGI3OWBVbUBbcirR9tb6Ra3j79x4OzXkwJJJ7ojocxN/QFHZ49Vc YVrytypL6blQbjGGUZPjsNwgeqOEd7pKyt5oVqAwWfiS60DqvKBy2YLEm gAxZYJp6wlpBm/e0DWg0DOp4kPVtnZxP3m1s/NkiQ1Rk9bxq22wMvDnmp m91A/li/977op/1/zgjFpmAl8fKlOVyHopwk5/2QFR3wiF1+pX1+212cw K6B9I3hDxp8fdm4kfcrilLpIhL//IR2gKzuUCXHumSV1WkBHa3vgXaNre Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="382661510" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="382661510" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 22:17:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="779488841" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="779488841" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga001.jf.intel.com with ESMTP; 13 Sep 2023 22:17:46 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com Subject: [PATCH v10 34/38] KVM: VMX: Call fred_entry_from_kvm() for IRQ/NMI handling Date: Wed, 13 Sep 2023 21:48:01 -0700 Message-Id: <20230914044805.301390-35-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914044805.301390-1-xin3.li@intel.com> References: <20230914044805.301390-1-xin3.li@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 22:21:59 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777008823918447438 X-GMAIL-MSGID: 1777008823918447438 When FRED is enabled, call fred_entry_from_kvm() to handle IRQ/NMI in IRQ/NMI induced VM exits. Tested-by: Shan Kang Signed-off-by: Xin Li Acked-by: Paolo Bonzini --- arch/x86/kvm/vmx/vmx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 72e3943f3693..db55b8418fa3 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -6962,14 +6963,16 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu) { u32 intr_info = vmx_get_intr_info(vcpu); unsigned int vector = intr_info & INTR_INFO_VECTOR_MASK; - gate_desc *desc = (gate_desc *)host_idt_base + vector; if (KVM_BUG(!is_external_intr(intr_info), vcpu->kvm, "unexpected VM-Exit interrupt info: 0x%x", intr_info)) return; kvm_before_interrupt(vcpu, KVM_HANDLING_IRQ); - vmx_do_interrupt_irqoff(gate_offset(desc)); + if (cpu_feature_enabled(X86_FEATURE_FRED)) + fred_entry_from_kvm(EVENT_TYPE_EXTINT, vector); + else + vmx_do_interrupt_irqoff(gate_offset((gate_desc *)host_idt_base + vector)); kvm_after_interrupt(vcpu); vcpu->arch.at_instruction_boundary = true; @@ -7262,7 +7265,10 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, if ((u16)vmx->exit_reason.basic == EXIT_REASON_EXCEPTION_NMI && is_nmi(vmx_get_intr_info(vcpu))) { kvm_before_interrupt(vcpu, KVM_HANDLING_NMI); - vmx_do_nmi_irqoff(); + if (cpu_feature_enabled(X86_FEATURE_FRED)) + fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR); + else + vmx_do_nmi_irqoff(); kvm_after_interrupt(vcpu); }