From patchwork Thu Aug 13 10:35:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 11712401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 508CC913 for ; Thu, 13 Aug 2020 10:37:25 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C37A206A4 for ; Thu, 13 Aug 2020 10:37:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="UP5R6mtu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C37A206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6AaU-0002xV-EZ; Thu, 13 Aug 2020 10:35:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6AaT-0002ws-Nf for xen-devel@lists.xenproject.org; Thu, 13 Aug 2020 10:35:57 +0000 X-Inumbo-ID: c3cfa848-05c5-40c3-abe2-b574304f0c53 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c3cfa848-05c5-40c3-abe2-b574304f0c53; Thu, 13 Aug 2020 10:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version: Message-Id:Date:Subject:Cc:To:From; bh=50p6OzRTuSBM3up5x9LmYqhFMZcT1lwZSCCGTtAVrnE=; b=UP5R6mtuJrHCD9Cb6JEMHA7efh kB1l28EJQmsOtIC7PwGylPLR+UG0ppVUTF/Cxov9WTLVx+uwIPSKBJ6TQIDpLHS/bmYctxq9dibe/ quLjmQYooKGludhElRuZpnUuFatXXJR7i4pjGyXBiPBW7nLPD31wOFS2GuZPmqXuYifM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6AaR-0006Ya-Im; Thu, 13 Aug 2020 10:35:55 +0000 Received: from host86-143-223-30.range86-143.btcentralplus.com ([86.143.223.30] helo=u2f063a87eabd5f.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k6AaR-0007eh-82; Thu, 13 Aug 2020 10:35:55 +0000 From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , Jan Beulich , Andrew Cooper Subject: [PATCH v2] x86 / viridian: remove the viridian_vcpu msg_pending bit mask Date: Thu, 13 Aug 2020 11:35:53 +0100 Message-Id: <20200813103553.29177-1-paul@xen.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Paul Durrant The mask does not actually serve a useful purpose as we only use the SynIC for timer messages. Dropping the mask means that the EOM MSR handler essentially becomes a no-op. This means we can avoid setting 'message_pending' for timer messages and hence avoid a VMEXIT for the EOM. Signed-off-by: Paul Durrant Reviewed-by: "Roger Pau Monné" Acked-by: Wei Liu --- Cc: Wei Liu Cc: Jan Beulich Cc: Andrew Cooper v2: - Clean up now extraneous comment noticed by Roger This should hopefully simplify Roger's "x86/vlapic: implement EOI callbacks" series a little. --- xen/arch/x86/hvm/viridian/synic.c | 24 +----------------------- xen/arch/x86/hvm/vlapic.c | 4 ---- xen/include/asm-x86/hvm/viridian.h | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c index 94a2b88733..22e2df27e5 100644 --- a/xen/arch/x86/hvm/viridian/synic.c +++ b/xen/arch/x86/hvm/viridian/synic.c @@ -137,7 +137,6 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) if ( !(viridian_feature_mask(d) & HVMPV_synic) ) return X86EMUL_EXCEPTION; - vv->msg_pending = 0; break; case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: @@ -168,9 +167,6 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) printk(XENLOG_G_INFO "%pv: VIRIDIAN SINT%u: vector: %x\n", v, sintx, vector); - if ( new.polling ) - __clear_bit(sintx, &vv->msg_pending); - *vs = new; break; } @@ -334,9 +330,6 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, .DeliveryTime = delivery, }; - if ( test_bit(sintx, &vv->msg_pending) ) - return false; - /* * To avoid using an atomic test-and-set, and barrier before calling * vlapic_set_irq(), this function must be called in context of the @@ -346,12 +339,9 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, msg += sintx; + /* There is no need to set message_pending as we do not require an EOM */ if ( msg->header.message_type != HVMSG_NONE ) - { - msg->header.message_flags.msg_pending = 1; - __set_bit(sintx, &vv->msg_pending); return false; - } msg->header.message_type = HVMSG_TIMER_EXPIRED; msg->header.message_flags.msg_pending = 0; @@ -380,18 +370,6 @@ bool viridian_synic_is_auto_eoi_sint(const struct vcpu *v, return vs->auto_eoi; } -void viridian_synic_ack_sint(const struct vcpu *v, unsigned int vector) -{ - struct viridian_vcpu *vv = v->arch.hvm.viridian; - unsigned int sintx = vv->vector_to_sintx[vector]; - - ASSERT(v == current); - - if ( sintx < ARRAY_SIZE(vv->sint) ) - __clear_bit(array_index_nospec(sintx, ARRAY_SIZE(vv->sint)), - &vv->msg_pending); -} - void viridian_synic_save_vcpu_ctxt(const struct vcpu *v, struct hvm_viridian_vcpu_context *ctxt) { diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 7b5c633033..4e3861eb7d 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -462,12 +462,8 @@ void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector) struct vcpu *v = vlapic_vcpu(vlapic); struct domain *d = v->domain; - /* All synic SINTx vectors are edge triggered */ - if ( vlapic_test_vector(vector, &vlapic->regs->data[APIC_TMR]) ) vioapic_update_EOI(d, vector); - else if ( has_viridian_synic(d) ) - viridian_synic_ack_sint(v, vector); hvm_dpci_msi_eoi(d, vector); } diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index 844e56b38f..cbf77d9c76 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -31,7 +31,6 @@ struct viridian_vcpu struct viridian_page vp_assist; bool apic_assist_pending; bool polled; - unsigned int msg_pending; uint64_t scontrol; uint64_t siefp; struct viridian_page simp; @@ -89,7 +88,6 @@ void viridian_apic_assist_clear(const struct vcpu *v); void viridian_synic_poll(struct vcpu *v); bool viridian_synic_is_auto_eoi_sint(const struct vcpu *v, unsigned int vector); -void viridian_synic_ack_sint(const struct vcpu *v, unsigned int vector); #endif /* __ASM_X86_HVM_VIRIDIAN_H__ */