From patchwork Tue May 31 13:57:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quan Xu X-Patchwork-Id: 9144909 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 025D4607D6 for ; Tue, 31 May 2016 14:05:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8B011FF27 for ; Tue, 31 May 2016 14:05:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCE0C2796F; Tue, 31 May 2016 14:05:29 +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.2 required=2.0 tests=BAYES_00, 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 A10C6272D8 for ; Tue, 31 May 2016 14:05:27 +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 1b7kGU-0000sE-AB; Tue, 31 May 2016 14:03:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b7kGT-0000pk-6T for xen-devel@lists.xen.org; Tue, 31 May 2016 14:03:25 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id E5/A6-25102-CA99D475; Tue, 31 May 2016 14:03:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhobtmpm+ 4Qc8lJoslHxezODB6HN39mymAMYo1My8pvyKBNWPDoseMBXOdKrb0rWVvYPyt08XIySEkUCnR t7uPBcSWEOCVOLJsBiuE7S8x99ZRJoiaGonrbxeA1bAJqEjMaH7HDmKLCEhLXPt8mbGLkYuDW WA+o8TLR3fBEsICCRIPLt1hBLFZBFQlfq3rYAaxeQUcJZ6e3MsIsUBBYtmXtWBxTqD4hf5zUM scJB5++ck0gZF3ASPDKkb14tSistQiXWO9pKLM9IyS3MTMHF1DQxO93NTi4sT01JzEpGK95Pz cTYzAYGAAgh2Md/ucDzFKcjApifI+zPYNF+JLyk+pzEgszogvKs1JLT7EKMPBoSTBe3IGUE6w KDU9tSItMwcYljBpCQ4eJRHeeyBp3uKCxNzizHSI1ClGRSlx3iSQhABIIqM0D64NFguXGGWlh HkZgQ4R4ilILcrNLEGVf8UozsGoJMx7FGQKT2ZeCdz0V0CLmYAWx2f4gCwuSURISTUwyqUf/2 69+nHYpiVvDj+epLhb8mG9pOnJfU0M75j+HP8RO3Wm5JmfTRWhu7h2ngqXLzvSsV5XZ1PFFfe a0xrTfDnv/az9KlNn0lktbv3ULeDyBPH9CnLrP+s3myx98ObCvIvt5hkXN3B1Vkxsyr4paP+r fErLjMt+ue9Cqj/G5f7fW8lSoc31SomlOCPRUIu5qDgRAMHs67WAAgAA X-Env-Sender: quan.xu@intel.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1464703401!44933192!2 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32237 invoked from network); 31 May 2016 14:03:23 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-7.tower-27.messagelabs.com with SMTP; 31 May 2016 14:03:23 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP; 31 May 2016 07:02:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,395,1459839600"; d="scan'208";a="113440223" Received: from xen-commits.sh.intel.com ([10.239.82.178]) by fmsmga004.fm.intel.com with ESMTP; 31 May 2016 07:02:05 -0700 From: "Xu, Quan" To: xen-devel@lists.xen.org Date: Tue, 31 May 2016 21:57:36 +0800 Message-Id: <1464703056-4741-12-git-send-email-quan.xu@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1464703056-4741-1-git-send-email-quan.xu@intel.com> References: <1464703056-4741-1-git-send-email-quan.xu@intel.com> Cc: Kevin Tian , dario.faggioli@citrix.com, Feng Wu , Jan Beulich , Quan Xu Subject: [Xen-devel] [Patch v6 11/11] vt-d: add __must_check annotation to IOMMU flush pointers and handlers 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: Quan Xu Signed-off-by: Quan Xu CC: Jan Beulich CC: Kevin Tian CC: Feng Wu Reviewed-by: Jan Beulich --- xen/drivers/passthrough/vtd/iommu.c | 40 ++++++++++++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 11 ++++++---- xen/drivers/passthrough/vtd/qinval.c | 14 ++++++------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2cc2c93..32202b6 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -335,10 +335,9 @@ static void iommu_flush_write_buffer(struct iommu *iommu) } /* return value determine if we need a write buffer flush */ -static int flush_context_reg( - void *_iommu, - u16 did, u16 source_id, u8 function_mask, u64 type, - int flush_non_present_entry) +static int __must_check flush_context_reg(void *_iommu, u16 did, u16 source_id, + u8 function_mask, u64 type, + bool_t flush_non_present_entry) { struct iommu *iommu = (struct iommu *) _iommu; u64 val = 0; @@ -389,7 +388,7 @@ static int flush_context_reg( } static int __must_check iommu_flush_context_global(struct iommu *iommu, - int flush_non_present_entry) + bool_t flush_non_present_entry) { struct iommu_flush *flush = iommu_get_flush(iommu); return flush->context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL, @@ -399,7 +398,7 @@ static int __must_check iommu_flush_context_global(struct iommu *iommu, static int __must_check iommu_flush_context_device(struct iommu *iommu, u16 did, u16 source_id, u8 function_mask, - int flush_non_present_entry) + bool_t flush_non_present_entry) { struct iommu_flush *flush = iommu_get_flush(iommu); return flush->context(iommu, did, source_id, function_mask, @@ -408,9 +407,10 @@ static int __must_check iommu_flush_context_device(struct iommu *iommu, } /* return value determine if we need a write buffer flush */ -static int flush_iotlb_reg(void *_iommu, u16 did, - u64 addr, unsigned int size_order, u64 type, - int flush_non_present_entry, int flush_dev_iotlb) +static int __must_check flush_iotlb_reg(void *_iommu, u16 did, u64 addr, + unsigned int size_order, u64 type, + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb) { struct iommu *iommu = (struct iommu *) _iommu; int tlb_offset = ecap_iotlb_offset(iommu->ecap); @@ -475,8 +475,8 @@ static int flush_iotlb_reg(void *_iommu, u16 did, } static int __must_check iommu_flush_iotlb_global(struct iommu *iommu, - int flush_non_present_entry, - int flush_dev_iotlb) + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb) { struct iommu_flush *flush = iommu_get_flush(iommu); int status; @@ -494,8 +494,8 @@ static int __must_check iommu_flush_iotlb_global(struct iommu *iommu, } static int __must_check iommu_flush_iotlb_dsi(struct iommu *iommu, u16 did, - int flush_non_present_entry, - int flush_dev_iotlb) + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb) { struct iommu_flush *flush = iommu_get_flush(iommu); int status; @@ -514,8 +514,8 @@ static int __must_check iommu_flush_iotlb_dsi(struct iommu *iommu, u16 did, static int __must_check iommu_flush_iotlb_psi(struct iommu *iommu, u16 did, u64 addr, unsigned int order, - int flush_non_present_entry, - int flush_dev_iotlb) + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb) { struct iommu_flush *flush = iommu_get_flush(iommu); int status; @@ -549,7 +549,7 @@ static int __must_check iommu_flush_all(void) { struct acpi_drhd_unit *drhd; struct iommu *iommu; - int flush_dev_iotlb; + bool_t flush_dev_iotlb; int rc = 0; flush_all_cache(); @@ -597,7 +597,7 @@ static int __must_check iommu_flush_iotlb(struct domain *d, struct domain_iommu *hd = dom_iommu(d); struct acpi_drhd_unit *drhd; struct iommu *iommu; - int flush_dev_iotlb; + bool_t flush_dev_iotlb; int iommu_domid; int rc = 0; @@ -1455,7 +1455,7 @@ int domain_context_mapping_one( */ if ( rc <= 0 ) { - int flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + bool_t flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; int ret; ret = iommu_flush_iotlb_dsi(iommu, 0, 1, flush_dev_iotlb); @@ -1618,7 +1618,7 @@ int domain_context_unmap_one( */ if ( rc <= 0 ) { - int flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + bool_t flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; int ret; ret = iommu_flush_iotlb_dsi(iommu, iommu_domid, 0, flush_dev_iotlb); @@ -1850,7 +1850,7 @@ int iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, struct acpi_drhd_unit *drhd; struct iommu *iommu = NULL; struct domain_iommu *hd = dom_iommu(d); - int flush_dev_iotlb; + bool_t flush_dev_iotlb; int iommu_domid; int rc = 0; diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c55ee08..e6cf738 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -514,10 +514,13 @@ struct ir_ctrl { }; struct iommu_flush { - int (*context)(void *iommu, u16 did, u16 source_id, - u8 function_mask, u64 type, int non_present_entry_flush); - int (*iotlb)(void *iommu, u16 did, u64 addr, unsigned int size_order, - u64 type, int flush_non_present_entry, int flush_dev_iotlb); + int __must_check (*context)(void *iommu, u16 did, u16 source_id, + u8 function_mask, u64 type, + bool_t non_present_entry_flush); + int __must_check (*iotlb)(void *iommu, u16 did, u64 addr, + unsigned int size_order, u64 type, + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb); }; struct intel_iommu { diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index b81b0bd..aa7841a 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -274,9 +274,9 @@ int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx) return __iommu_flush_iec(iommu, IEC_INDEX_INVL, im, iidx); } -static int flush_context_qi( - void *_iommu, u16 did, u16 sid, u8 fm, u64 type, - int flush_non_present_entry) +static int __must_check flush_context_qi(void *_iommu, u16 did, + u16 sid, u8 fm, u64 type, + bool_t flush_non_present_entry) { int ret = 0; struct iommu *iommu = (struct iommu *)_iommu; @@ -305,10 +305,10 @@ static int flush_context_qi( return ret; } -static int flush_iotlb_qi( - void *_iommu, u16 did, - u64 addr, unsigned int size_order, u64 type, - int flush_non_present_entry, int flush_dev_iotlb) +static int __must_check flush_iotlb_qi(void *_iommu, u16 did, u64 addr, + unsigned int size_order, u64 type, + bool_t flush_non_present_entry, + bool_t flush_dev_iotlb) { u8 dr = 0, dw = 0; int ret = 0;