From patchwork Fri Sep 22 03:02:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9965609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C284600C5 for ; Fri, 22 Sep 2017 09:12:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06B0E28757 for ; Fri, 22 Sep 2017 09:12:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF92C2891D; Fri, 22 Sep 2017 09:12:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C4C6B28757 for ; Fri, 22 Sep 2017 09:12:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJz8-00051H-2t; Fri, 22 Sep 2017 09:10:58 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJz7-0004zK-5b for xen-devel@lists.xen.org; Fri, 22 Sep 2017 09:10:57 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 78/21-17770-0A3D4C95; Fri, 22 Sep 2017 09:10:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsXS1taRojvn8pF Igw9SFks+LmZxYPQ4uvs3UwBjFGtmXlJ+RQJrxp1tv5kKvupVHOu6xtTAeFCxi5GTQ0igQmLl 26usILaEAK/EkWUzoGx/iWf39gDZXEA1HYwSP37OZwRJsAmoS5xYPBHMFhGQlrj2+TIjSBGzw GYmiVXzzrKAJIQFoiV+P3vIDmKzCKhKrJk+lwnE5hVwlejccpUFYoOCxJSH75lBbE6g+K++7U wQF7lItC7dzzSBkXcBI8MqRo3i1KKy1CJdQ3O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK 95PzcTYzAcGAAgh2MtzcGHGKU5GBSEuV9f/5IpBBfUn5KZUZicUZ8UWlOavEhRhkODiUJXr9L QDnBotT01Iq0zBxgYMKkJTh4lER41UDSvMUFibnFmekQqVOMuhwdN+/+YRJiycvPS5US59UDK RIAKcoozYMbAYuSS4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBLm/XgRaApPZl4J3KZXQEcwAR 1RvhrsiJJEhJRUA6PjImU3qb0qO82bq9pE7h6aJFHotdDC7/ot11SN83+2fzpWuFLyk05Yyak z5nUfRDRSGs+2v0hLlPdcdKbrDW/M0/eb8nR9jmSqLri8lNNRffuVqu8pzRoTDt7/6XN6uXDa h+2qMu/OL09qtIv9cr853yTprOc1n1Nbc+VMP8VtvvDycah9sbMSS3FGoqEWc1FxIgDqcFfGj QIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1506071449!72137072!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43802 invoked from network); 22 Sep 2017 09:10:51 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Sep 2017 09:10:51 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP; 22 Sep 2017 02:10:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,427,1500966000"; d="scan'208";a="152151141" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2017 02:10:46 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 21 Sep 2017 23:02:04 -0400 Message-Id: <1506049330-11196-24-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> References: <1506049330-11196-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, jbeulich@suse.com, roger.pau@citrix.com, Chao Gao Subject: [Xen-devel] [PATCH V3 23/29] passthrough: move some fields of hvm_gmsi_info to a sub-structure X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chao Gao No functional change. It is a preparation for introducing new fields in hvm_gmsi_info to manage remapping format msi bound to a physical msi. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- xen/arch/x86/hvm/vmsi.c | 4 ++-- xen/drivers/passthrough/io.c | 34 ++++++++++++++++++---------------- xen/include/asm-x86/hvm/irq.h | 8 ++++++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 9b35e9b..7f21853 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -101,8 +101,8 @@ int vmsi_deliver( void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci) { - uint32_t flags = pirq_dpci->gmsi.gflags; - int vector = pirq_dpci->gmsi.gvec; + uint32_t flags = pirq_dpci->gmsi.legacy.gflags; + int vector = pirq_dpci->gmsi.legacy.gvec; uint8_t dest = (uint8_t)flags; bool dest_mode = flags & XEN_DOMCTL_VMSI_X86_DM_MASK; uint8_t delivery_mode = MASK_EXTR(flags, XEN_DOMCTL_VMSI_X86_DELIV_MASK); diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index ec9f41a..fb44223 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -350,8 +350,8 @@ int pt_irq_create_bind( { pirq_dpci->flags = HVM_IRQ_DPCI_MAPPED | HVM_IRQ_DPCI_MACH_MSI | HVM_IRQ_DPCI_GUEST_MSI; - pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; - pirq_dpci->gmsi.gflags = gflags; + pirq_dpci->gmsi.legacy.gvec = pt_irq_bind->u.msi.gvec; + pirq_dpci->gmsi.legacy.gflags = gflags; /* * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. * The 'pirq_cleanup_check' which would free the structure is only @@ -383,8 +383,8 @@ int pt_irq_create_bind( } if ( unlikely(rc) ) { - pirq_dpci->gmsi.gflags = 0; - pirq_dpci->gmsi.gvec = 0; + pirq_dpci->gmsi.legacy.gflags = 0; + pirq_dpci->gmsi.legacy.gvec = 0; pirq_dpci->dom = NULL; pirq_dpci->flags = 0; pirq_cleanup_check(info, d); @@ -403,21 +403,22 @@ int pt_irq_create_bind( } /* If pirq is already mapped as vmsi, update guest data/addr. */ - if ( pirq_dpci->gmsi.gvec != pt_irq_bind->u.msi.gvec || - pirq_dpci->gmsi.gflags != gflags ) + if ( pirq_dpci->gmsi.legacy.gvec != pt_irq_bind->u.msi.gvec || + pirq_dpci->gmsi.legacy.gflags != gflags ) { /* Directly clear pending EOIs before enabling new MSI info. */ pirq_guest_eoi(info); - pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; - pirq_dpci->gmsi.gflags = gflags; + } + pirq_dpci->gmsi.legacy.gvec = pt_irq_bind->u.msi.gvec; + pirq_dpci->gmsi.legacy.gflags = gflags; } } /* Calculate dest_vcpu_id for MSI-type pirq migration. */ - dest = MASK_EXTR(pirq_dpci->gmsi.gflags, + dest = MASK_EXTR(pirq_dpci->gmsi.legacy.gflags, XEN_DOMCTL_VMSI_X86_DEST_ID_MASK); - dest_mode = pirq_dpci->gmsi.gflags & XEN_DOMCTL_VMSI_X86_DM_MASK; - delivery_mode = MASK_EXTR(pirq_dpci->gmsi.gflags, + dest_mode = pirq_dpci->gmsi.legacy.gflags & XEN_DOMCTL_VMSI_X86_DM_MASK; + delivery_mode = MASK_EXTR(pirq_dpci->gmsi.legacy.gflags, XEN_DOMCTL_VMSI_X86_DELIV_MASK); dest_vcpu_id = hvm_girq_dest_2_vcpu_id(d, dest, dest_mode); @@ -430,7 +431,7 @@ int pt_irq_create_bind( { if ( delivery_mode == dest_LowestPrio ) vcpu = vector_hashing_dest(d, dest, dest_mode, - pirq_dpci->gmsi.gvec); + pirq_dpci->gmsi.legacy.gvec); if ( vcpu ) pirq_dpci->gmsi.posted = true; } @@ -440,7 +441,7 @@ int pt_irq_create_bind( /* Use interrupt posting if it is supported. */ if ( iommu_intpost ) pi_update_irte(vcpu ? &vcpu->arch.hvm_vmx.pi_desc : NULL, - info, pirq_dpci->gmsi.gvec); + info, pirq_dpci->gmsi.legacy.gvec); if ( pt_irq_bind->u.msi.gflags & XEN_DOMCTL_VMSI_X86_UNMASKED ) { @@ -835,11 +836,12 @@ static int _hvm_dpci_msi_eoi(struct domain *d, int vector = (long)arg; if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MACH_MSI) && - (pirq_dpci->gmsi.gvec == vector) ) + (pirq_dpci->gmsi.legacy.gvec == vector) ) { - unsigned int dest = MASK_EXTR(pirq_dpci->gmsi.gflags, + unsigned int dest = MASK_EXTR(pirq_dpci->gmsi.legacy.gflags, XEN_DOMCTL_VMSI_X86_DEST_ID_MASK); - bool dest_mode = pirq_dpci->gmsi.gflags & XEN_DOMCTL_VMSI_X86_DM_MASK; + bool dest_mode = pirq_dpci->gmsi.legacy.gflags & + XEN_DOMCTL_VMSI_X86_DM_MASK; if ( vlapic_match_dest(vcpu_vlapic(current), NULL, 0, dest, dest_mode) ) diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 3b6b4bd..bd8a918 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -132,8 +132,12 @@ struct dev_intx_gsi_link { #define HVM_IRQ_DPCI_TRANSLATE (1u << _HVM_IRQ_DPCI_TRANSLATE_SHIFT) struct hvm_gmsi_info { - uint32_t gvec; - uint32_t gflags; + union { + struct { + uint32_t gvec; + uint32_t gflags; + } legacy; + }; int dest_vcpu_id; /* -1 :multi-dest, non-negative: dest_vcpu_id */ bool posted; /* directly deliver to guest via VT-d PI? */ };