From: Jiang Liu <jiang.liu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>,
David Woodhouse <dwmw2@infradead.org>,
Yinghai Lu <yinghai@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Dan Williams <dan.j.williams@intel.com>,
Vinod Koul <vinod.koul@intel.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Jiang Liu <jiang.liu@linux.intel.com>
Cc: Ashok Raj <ashok.raj@intel.com>,
Yijing Wang <wangyijing@huawei.com>,
Tony Luck <tony.luck@intel.com>,
iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org,
linux-hotplug@vger.kernel.org, linux-kernel@vger.kernel.org,
dmaengine@vger.kernel.org
Subject: [Patch Part3 V3 12/21] iommu/vt-d: introduce helper function iova_size() to improve code readability
Date: Wed, 25 Jun 2014 17:02:38 +0800 [thread overview]
Message-ID: <1403686967-10887-13-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1403686967-10887-1-git-send-email-jiang.liu@linux.intel.com>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/iommu/intel-iommu.c | 7 +++----
include/linux/iova.h | 5 +++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0d34f33bea34..d94468ae2947 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3117,10 +3117,10 @@ static void flush_unmaps(void)
/* On real hardware multiple invalidations are expensive */
if (cap_caching_mode(iommu->cap))
iommu_flush_iotlb_psi(iommu, domain->id,
- iova->pfn_lo, iova->pfn_hi - iova->pfn_lo + 1,
+ iova->pfn_lo, iova_size(iova),
!deferred_flush[i].freelist[j], 0);
else {
- mask = ilog2(mm_to_dma_pfn(iova->pfn_hi - iova->pfn_lo + 1));
+ mask = ilog2(mm_to_dma_pfn(iova_size(iova)));
iommu_flush_dev_iotlb(deferred_flush[i].domain[j],
(uint64_t)iova->pfn_lo << PAGE_SHIFT, mask);
}
@@ -3921,8 +3921,7 @@ static int intel_iommu_memory_notifier(struct notifier_block *nb,
rcu_read_lock();
for_each_active_iommu(iommu, drhd)
iommu_flush_iotlb_psi(iommu, si_domain->id,
- iova->pfn_lo,
- iova->pfn_hi - iova->pfn_lo + 1,
+ iova->pfn_lo, iova_size(iova),
!freelist, 0);
rcu_read_unlock();
dma_free_pagelist(freelist);
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 3277f4711349..19e81d5ccb6d 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -34,6 +34,11 @@ struct iova_domain {
unsigned long dma_32bit_pfn;
};
+static inline unsigned long iova_size(struct iova *iova)
+{
+ return iova->pfn_hi - iova->pfn_lo + 1;
+}
+
struct iova *alloc_iova_mem(void);
void free_iova_mem(struct iova *iova);
void free_iova(struct iova_domain *iovad, unsigned long pfn);
--
1.7.10.4
next prev parent reply other threads:[~2014-06-25 9:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-25 9:02 [Patch Part3 V3 00/21] Enable support of Intel DMAR device hotplug Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 01/21] iommu/vt-d: match segment number when searching for dev_iotlb capable devices Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 02/21] iommu/vt-d: use correct domain id to flush virtual machine domains Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 03/21] iommu/vt-d: introduce helper functions to improve code readability Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 04/21] iommu/vt-d: introduce helper functions to make code symmetric for readability Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 05/21] iommu/vt-d: only dynamically allocate domain id for virtual domains Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 06/21] iommu/vt-d: fix possible invalid memory access caused by free_dmar_iommu() Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 07/21] iommu/vt-d: avoid freeing virtual machine domain in free_dmar_iommu() Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 08/21] iommu/VT-d: simplify include/linux/dmar.h Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 09/21] iommu/vt-d: change iommu_enable/disable_translation to return void Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 10/21] iommu/vt-d: simplify intel_unmap_sg() and kill duplicated code Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 11/21] iommu/vt-d: introduce helper domain_pfn_within_range() to simplify code Jiang Liu
2014-06-25 9:02 ` Jiang Liu [this message]
2014-06-25 9:02 ` [Patch Part3 V3 13/21] iommu/vt-d: fix bug in computing domain's iommu_snooping flag Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 14/21] IOMMU/vt-d: introduce helper function dmar_walk_resources() Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 15/21] iommu/vt-d: dynamically allocate and free seq_id for DMAR units Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 16/21] iommu/vt-d: implement DMAR unit hotplug framework Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 17/21] iommu/vt-d: search _DSM method for DMAR hotplug Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 18/21] iommu/vt-d: enhance intel_irq_remapping driver to support DMAR unit hotplug Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 19/21] iommu/vt-d: enhance error recovery in function intel_enable_irq_remapping() Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 20/21] iommu/vt-d: enhance intel-iommu driver to support DMAR unit hotplug Jiang Liu
2014-06-25 9:02 ` [Patch Part3 V3 21/21] pci, ACPI, iommu: enhance pci_root to support DMAR device hotplug Jiang Liu
2014-06-25 18:00 ` [Patch Part3 V3 00/21] Enable support of Intel " Bjorn Helgaas
2014-06-26 13:59 ` Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403686967-10887-13-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-hotplug@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tony.luck@intel.com \
--cc=vinod.koul@intel.com \
--cc=wangyijing@huawei.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).