From patchwork Thu Jul 7 12:50:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Guangju X-Patchwork-Id: 12909500 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 C4910C43334 for ; Thu, 7 Jul 2022 12:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235428AbiGGMuv (ORCPT ); Thu, 7 Jul 2022 08:50:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235395AbiGGMuu (ORCPT ); Thu, 7 Jul 2022 08:50:50 -0400 Received: from baidu.com (mx20.baidu.com [111.202.115.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B8D3A2A412; Thu, 7 Jul 2022 05:50:48 -0700 (PDT) Received: from BC-Mail-Ex25.internal.baidu.com (unknown [172.31.51.19]) by Forcepoint Email with ESMTPS id 2C54BBFB4ECE8D2ED1DD; Thu, 7 Jul 2022 20:50:46 +0800 (CST) Received: from FB9D8C53FFFC188.internal.baidu.com (172.31.62.14) by BC-Mail-Ex25.internal.baidu.com (172.31.51.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Thu, 7 Jul 2022 20:50:47 +0800 From: Wang Guangju To: , , , , , , , , , , , CC: , Subject: [PATCH] KVM: x86: Add EOI_INDUCED_EXIT handlers for Hyper-V SynIC vectors Date: Thu, 7 Jul 2022 20:50:34 +0800 Message-ID: <20220707125034.197-1-wangguangju@baidu.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [172.31.62.14] X-ClientProxiedBy: BC-Mail-Ex13.internal.baidu.com (172.31.51.53) To BC-Mail-Ex25.internal.baidu.com (172.31.51.19) Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: wangguangju When EOI virtualization is performed on VMX, kvm_apic_set_eoi_accelerated() is called upon EXIT_REASON_EOI_INDUCED but unlike its non-accelerated apic_set_eoi() sibling, Hyper-V SINT vectors are left unhandled. This patch fix it, and add a new helper function to handle both IOAPIC and Hyper-V SINT vectors. Suggested-by: Vitaly Kuznetsov Signed-off-by: wangguangju --- arch/x86/kvm/lapic.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index f03facc..e046afe 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1269,6 +1269,16 @@ static void kvm_ioapic_send_eoi(struct kvm_lapic *apic, int vector) kvm_ioapic_update_eoi(apic->vcpu, vector, trigger_mode); } +static inline void apic_set_eoi_vector(struct kvm_lapic *apic, int vector) +{ + if (to_hv_vcpu(apic->vcpu) && + test_bit(vector, to_hv_synic(apic->vcpu)->vec_bitmap)) + kvm_hv_synic_send_eoi(apic->vcpu, vector); + + kvm_ioapic_send_eoi(apic, vector); + kvm_make_request(KVM_REQ_EVENT, apic->vcpu); +} + static int apic_set_eoi(struct kvm_lapic *apic) { int vector = apic_find_highest_isr(apic); @@ -1285,12 +1295,8 @@ static int apic_set_eoi(struct kvm_lapic *apic) apic_clear_isr(vector, apic); apic_update_ppr(apic); - if (to_hv_vcpu(apic->vcpu) && - test_bit(vector, to_hv_synic(apic->vcpu)->vec_bitmap)) - kvm_hv_synic_send_eoi(apic->vcpu, vector); + apic_set_eoi_vector(apic, vector); - kvm_ioapic_send_eoi(apic, vector); - kvm_make_request(KVM_REQ_EVENT, apic->vcpu); return vector; } @@ -1304,8 +1310,7 @@ void kvm_apic_set_eoi_accelerated(struct kvm_vcpu *vcpu, int vector) trace_kvm_eoi(apic, vector); - kvm_ioapic_send_eoi(apic, vector); - kvm_make_request(KVM_REQ_EVENT, apic->vcpu); + apic_set_eoi_vector(apic, vector); } EXPORT_SYMBOL_GPL(kvm_apic_set_eoi_accelerated);