From patchwork Wed Jun 22 07:51:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quan Xu X-Patchwork-Id: 9192127 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 5EC736075C for ; Wed, 22 Jun 2016 07:58:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E688283E5 for ; Wed, 22 Jun 2016 07:58:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42C35283ED; Wed, 22 Jun 2016 07:58:19 +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 97616283E6 for ; Wed, 22 Jun 2016 07:58:18 +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 1bFd0y-0000hY-Uc; Wed, 22 Jun 2016 07:56:00 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFd0x-0000gC-8g for xen-devel@lists.xen.org; Wed, 22 Jun 2016 07:55:59 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id C1/95-09256-F844A675; Wed, 22 Jun 2016 07:55:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXS1tYhotvnkhV usLBRxmLJx8UsDoweR3f/ZgpgjGLNzEvKr0hgzXg08QFbwebAit2XbrM0MG6x6GLk5BASqJS4 87KBHcSWEOCVOLJsBiuE7S+x8NhDVoiaGokl306D1bAJqEjMaH4HZosISEtc+3yZsYuRi4NZY D6jxMtHd8ESwgLxEnvmrAGzWQRUJTZsm8ECYvMKOErcPvYXapmCxLIva5m7GDk4OAWcJM5f94 XY5SjxbP9ipgmMvAsYGVYxqhenFpWlFuka6SUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yX n525iBIYCAxDsYFz21+kQoyQHk5Ior7xyVrgQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV4LZ6Cc YFFqempFWmYOMChh0hIcPEoivMUgad7igsTc4sx0iNQpRkUpcV4PkIQASCKjNA+uDRYJlxhlp YR5GYEOEeIpSC3KzSxBlX/FKM7BqCTMGwwyhSczrwRu+iugxUxAi5f1p4MsLklESEk1MHqxrD /1+bKDanmexDXJo90PLLtVgtWOn0qd/8O93dd+moXVj+9bbj27s//que037/4Xs3va+Vj05MM T7nmSm2WWK1+I/Be3wm8Cyy6rm/8E1YNmuCob1+1c13gqQ45T/Ys09+L1++crB7e8lXe3f3f2 qZSxctCjvffCNsw7FrreNZl97YTQLDYlluKMREMt5qLiRADNmTEjfwIAAA== X-Env-Sender: quan.xu@intel.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1466582153!20125470!4 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65408 invoked from network); 22 Jun 2016 07:55:57 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-8.tower-21.messagelabs.com with SMTP; 22 Jun 2016 07:55:57 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 22 Jun 2016 00:55:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,509,1459839600"; d="scan'208";a="723246493" Received: from xen-commits.sh.intel.com ([10.239.82.178]) by FMSMGA003.fm.intel.com with ESMTP; 22 Jun 2016 00:55:56 -0700 From: "Xu, Quan" To: xen-devel@lists.xen.org Date: Wed, 22 Jun 2016 15:51:10 +0800 Message-Id: <1466581870-53183-4-git-send-email-quan.xu@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1466581870-53183-1-git-send-email-quan.xu@intel.com> References: <1466581870-53183-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 v10 3/3] 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 Acked-by: Kevin Tian Reviewed-by: Jan Beulich CC: Jan Beulich CC: Kevin Tian CC: Feng Wu --- xen/drivers/passthrough/vtd/iommu.c | 50 ++++++++++++++++++------------------ xen/drivers/passthrough/vtd/iommu.h | 11 +++++--- xen/drivers/passthrough/vtd/qinval.c | 14 +++++----- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 3692113..f010612 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(); @@ -559,7 +559,7 @@ static int __must_check iommu_flush_all(void) iommu = drhd->iommu; context_rc = iommu_flush_context_global(iommu, 0); - flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + flush_dev_iotlb = !!find_ats_dev_drhd(iommu); iotlb_rc = iommu_flush_iotlb_global(iommu, 0, flush_dev_iotlb); /* @@ -591,7 +591,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; @@ -606,7 +606,7 @@ static int __must_check iommu_flush_iotlb(struct domain *d, if ( !test_bit(iommu->index, &hd->arch.iommu_bitmap) ) continue; - flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + flush_dev_iotlb = !!find_ats_dev_drhd(iommu); iommu_domid= domain_iommu_domid(d, iommu); if ( iommu_domid == -1 ) continue; @@ -1318,7 +1318,7 @@ int domain_context_mapping_one( u64 maddr, pgd_maddr; u16 seg = iommu->intel->drhd->segment; int agaw, rc, ret; - int flush_dev_iotlb; + bool_t flush_dev_iotlb; ASSERT(pcidevs_locked()); spin_lock(&iommu->lock); @@ -1434,7 +1434,7 @@ int domain_context_mapping_one( /* Context entry was previously non-present (with domid 0). */ rc = iommu_flush_context_device(iommu, 0, PCI_BDF2(bus, devfn), DMA_CCMD_MASK_NOBIT, 1); - flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + flush_dev_iotlb = !!find_ats_dev_drhd(iommu); ret = iommu_flush_iotlb_dsi(iommu, 0, 1, flush_dev_iotlb); /* @@ -1553,7 +1553,7 @@ int domain_context_unmap_one( struct context_entry *context, *context_entries; u64 maddr; int iommu_domid, rc, ret; - int flush_dev_iotlb; + bool_t flush_dev_iotlb; ASSERT(pcidevs_locked()); spin_lock(&iommu->lock); @@ -1585,7 +1585,7 @@ int domain_context_unmap_one( PCI_BDF2(bus, devfn), DMA_CCMD_MASK_NOBIT, 0); - flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + flush_dev_iotlb = !!find_ats_dev_drhd(iommu); ret = iommu_flush_iotlb_dsi(iommu, iommu_domid, 0, flush_dev_iotlb); /* @@ -1820,7 +1820,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; @@ -1832,7 +1832,7 @@ int iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, if ( !test_bit(iommu->index, &hd->arch.iommu_bitmap) ) continue; - flush_dev_iotlb = find_ats_dev_drhd(iommu) ? 1 : 0; + flush_dev_iotlb = !!find_ats_dev_drhd(iommu); iommu_domid= domain_iommu_domid(d, iommu); if ( iommu_domid == -1 ) continue; 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;