From patchwork Fri Mar 17 11:27:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9630423 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 8BE6460249 for ; Fri, 17 Mar 2017 11:37:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 722FE28616 for ; Fri, 17 Mar 2017 11:37:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 665942864B; Fri, 17 Mar 2017 11:37:30 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 9A44A284E9 for ; Fri, 17 Mar 2017 11:37:29 +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 1coqAf-0004PI-Jq; Fri, 17 Mar 2017 11:35:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coqAd-0004MQ-Vx for xen-devel@lists.xen.org; Fri, 17 Mar 2017 11:35:48 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 86/BD-05091-31ACBC85; Fri, 17 Mar 2017 11:35:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsXS1tbhqCt06nS EweEXphZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aJ40+ZChp1KnYcfMvcwHhNvouRk4NF4BaT xIffjl2MXBxCAtMYJU4/nssEkpAQ4JU4smwGaxcjB5DtJ/HjlQlETT+jxJLtn1hBatgE1CVOL J7ICGKLCEhLXPt8mRGkiFmgkVGiYW8jG0hCWCBGYmnXBEaIbaoSC7oOgtm8Aq4Sfy90s0AsUJ CYM8kGJMwJFL7b9oAdxBYScJG413WFZQIj3wJGhlWMGsWpRWWpRbpG5npJRZnpGSW5iZk5uoY Gxnq5qcXFiempOYlJxXrJ+bmbGIFhUs/AwLiDsWWv3yFGSQ4mJVFeFcETEUJ8SfkplRmJxRnx RaU5qcWHGGU4OJQkeKcsBMoJFqWmp1akZeYAAxYmLcHBoyTCOxUkzVtckJhbnJkOkTrFqCglz vsIJCEAksgozYNrg0XJJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvNqLgKbwZOaVwE1/Bb SYCWhx4s8jIItLEhFSUg2MHva8PUw8LGJPa7dM0NSL3Plzk7viPa+JL34ceOzIf9DFldX92J6 4WQUM8w9J/t6mPsEm8fbuRM/G7IfcjEpas8UcOCuCy42lffvDL6xbOXmTy88HzsaLb+loTTh/ e1PBw9aNDbPmLRISe7nMkk9E8mDmLsGHLbPEeT7635ZbElfidWfLvnh2JZbijERDLeai4kQAl KxYVY0CAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1489750544!86737664!1 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18976 invoked from network); 17 Mar 2017 11:35:46 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-15.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Mar 2017 11:35:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489750546; x=1521286546; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=m6qBwJRQy3JtZKHwIFZXE+uml8VFolEBjAA4buAuWZI=; b=Qi5LnHQ1P7vXg9nX+qyZGjAphsCSaPKxtu5KYnHNdnkhahSzWXJ5Ix1o YhCSLSi0hmYDbZjC4LeRFzekJOMsbA==; Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Mar 2017 04:35:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,176,1486454400"; d="scan'208";a="61628002" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 17 Mar 2017 04:35:42 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Fri, 17 Mar 2017 19:27:19 +0800 Message-Id: <1489750043-17260-20-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> References: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , andrew.cooper3@citrix.com, kevin.tian@intel.com, jbeulich@suse.com, chao.gao@intel.com Subject: [Xen-devel] [RFC PATCH 19/23] 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. 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/xen/hvm/irq.h | 8 ++++++-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 25f5756..d126498 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; uint8_t dest_mode = !!(flags & VMSI_DM_MASK); uint8_t delivery_mode = (flags & VMSI_DELIV_MASK) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 080183e..90e48f3 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -370,8 +370,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 = pt_irq_bind->u.msi.gflags; + pirq_dpci->gmsi.legacy.gvec = pt_irq_bind->u.msi.gvec; + pirq_dpci->gmsi.legacy.gflags = pt_irq_bind->u.msi.gflags; /* * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. * The 'pirq_cleanup_check' which would free the structure is only @@ -403,8 +403,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); @@ -423,20 +423,20 @@ 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 != pt_irq_bind->u.msi.gflags ) + if ( pirq_dpci->gmsi.legacy.gvec != pt_irq_bind->u.msi.gvec || + pirq_dpci->gmsi.legacy.gflags != pt_irq_bind->u.msi.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 = pt_irq_bind->u.msi.gflags; + pirq_dpci->gmsi.legacy.gvec = pt_irq_bind->u.msi.gvec; + pirq_dpci->gmsi.legacy.gflags = pt_irq_bind->u.msi.gflags; } } /* Calculate dest_vcpu_id for MSI-type pirq migration. */ - dest = pirq_dpci->gmsi.gflags & VMSI_DEST_ID_MASK; - dest_mode = !!(pirq_dpci->gmsi.gflags & VMSI_DM_MASK); - delivery_mode = (pirq_dpci->gmsi.gflags & VMSI_DELIV_MASK) >> + dest = pirq_dpci->gmsi.legacy.gflags & VMSI_DEST_ID_MASK; + dest_mode = !!(pirq_dpci->gmsi.legacy.gflags & VMSI_DM_MASK); + delivery_mode = (pirq_dpci->gmsi.legacy.gflags & VMSI_DELIV_MASK) >> GFLAGS_SHIFT_DELIV_MODE; dest_vcpu_id = hvm_girq_dest_2_vcpu_id(d, dest, dest_mode); @@ -449,14 +449,14 @@ int pt_irq_create_bind( if ( iommu_intpost ) { const struct vcpu *vcpu = pi_find_dest_vcpu(d, dest, dest_mode, - delivery_mode, pirq_dpci->gmsi.gvec); + delivery_mode, pirq_dpci->gmsi.legacy.gvec); if ( vcpu ) - pi_update_irte( vcpu, info, pirq_dpci->gmsi.gvec ); + pi_update_irte(vcpu, info, pirq_dpci->gmsi.legacy.gvec); else dprintk(XENLOG_G_INFO, "%pv: deliver interrupt in remapping mode,gvec:%02x\n", - vcpu, pirq_dpci->gmsi.gvec); + vcpu, pirq_dpci->gmsi.legacy.gvec); } break; @@ -770,10 +770,10 @@ 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) ) { - int dest = pirq_dpci->gmsi.gflags & VMSI_DEST_ID_MASK; - int dest_mode = !!(pirq_dpci->gmsi.gflags & VMSI_DM_MASK); + int dest = pirq_dpci->gmsi.legacy.gflags & VMSI_DEST_ID_MASK; + int dest_mode = !!(pirq_dpci->gmsi.legacy.gflags & VMSI_DM_MASK); if ( vlapic_match_dest(vcpu_vlapic(current), NULL, 0, dest, dest_mode) ) diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index ea332bb..5fd809f 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -60,8 +60,12 @@ struct dev_intx_gsi_link { #define GFLAGS_SHIFT_TRG_MODE 15 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 */ };