| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190327063506.32564-6-baolu.lu@linux.intel.com>
Date: Wed, 27 Mar 2019 14:35:01 +0800
From: Lu Baolu <baolu.lu@...ux.intel.com>
To: David Woodhouse <dwmw2@...radead.org>,
Joerg Roedel <joro@...tes.org>, ashok.raj@...el.com,
jacob.jun.pan@...el.com, alan.cox@...el.com, kevin.tian@...el.com,
mika.westerberg@...ux.intel.com, pengfei.xu@...el.com
Cc: iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org,
Lu Baolu <baolu.lu@...ux.intel.com>,
Jacob Pan <jacob.jun.pan@...ux.intel.com>
Subject: [PATCH v2 05/10] iommu/vt-d: Add bounce buffer API for map/unmap
This adds the APIs for bounce buffer specified domain
map() and unmap(). The start and end partial pages will
be mapped with bounce buffered pages instead. This will
enhance the security of DMA buffer by isolating the DMA
attacks from malicious devices.
Cc: Ashok Raj <ashok.raj@...el.com>
Cc: Jacob Pan <jacob.jun.pan@...ux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@...ux.intel.com>
Tested-by: Xu Pengfei <pengfei.xu@...el.com>
Tested-by: Mika Westerberg <mika.westerberg@...el.com>
---
drivers/iommu/intel-iommu.c | 3 +
drivers/iommu/intel-pgtable.c | 275 +++++++++++++++++++++++++++++++++-
include/linux/intel-iommu.h | 7 +
3 files changed, 284 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 6e4e72cd16ca..3bfec944b0b8 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1727,6 +1727,7 @@ static struct dmar_domain *alloc_domain(int flags)
domain->flags = flags;
domain->has_iotlb_device = false;
INIT_LIST_HEAD(&domain->devices);
+ idr_init(&domain->bounce_idr);
return domain;
}
@@ -1922,6 +1923,8 @@ static void domain_exit(struct dmar_domain *domain)
dma_free_pagelist(freelist);
+ idr_destroy(&domain->bounce_idr);
+
free_domain_mem(domain);
}
diff --git a/drivers/iommu/intel-pgtable.c b/drivers/iommu/intel-pgtable.c
index fd170157325a..1e56ea07f755 100644
--- a/drivers/iommu/intel-pgtable.c
+++ b/drivers/iommu/intel-pgtable.c
@@ -23,6 +23,8 @@
#include <linux/vmalloc.h>
#include <trace/events/intel_iommu.h>
+#define MAX_BOUNCE_LIST_ENTRIES 32
+
struct addr_walk {
int (*low)(struct device *dev, struct dmar_domain *domain,
dma_addr_t addr, phys_addr_t paddr,
@@ -38,6 +40,13 @@ struct addr_walk {
unsigned long attrs, void *data);
};
+struct bounce_cookie {
+ struct page *bounce_page;
+ phys_addr_t original_phys;
+ phys_addr_t bounce_phys;
+ struct list_head list;
+};
+
/*
* Bounce buffer support for external devices:
*
@@ -53,6 +62,14 @@ static inline unsigned long domain_page_size(struct dmar_domain *domain)
return VTD_PAGE_SIZE;
}
+/*
+ * Bounce buffer cookie lazy allocation. A list to keep the unused
+ * bounce buffer cookies with a spin lock to protect the access.
+ */
+static LIST_HEAD(bounce_list);
+static DEFINE_SPINLOCK(bounce_lock);
+static int bounce_list_entries;
+
/* Calculate how many pages does a range of [addr, addr + size) cross. */
static inline unsigned long
range_nrpages(dma_addr_t addr, size_t size, unsigned long page_size)
@@ -62,7 +79,243 @@ range_nrpages(dma_addr_t addr, size_t size, unsigned long page_size)
return ALIGN((addr & offset) + size, page_size) >> __ffs(page_size);
}
-int
+static int nobounce_map(struct device *dev, struct dmar_domain *domain,
+ dma_addr_t addr, phys_addr_t paddr, size_t size,
+ enum dma_data_direction dir, unsigned long attrs,
+ void *data)
+{
+ struct intel_iommu *iommu;
+ int prot;
+
+ iommu = domain_get_iommu(domain);
+ if (WARN_ON(!iommu))
+ return -ENODEV;
+
+ prot = dir_to_prot(iommu, dir);
+
+ return domain_iomap_range(domain, addr, paddr, size, prot);
+}
+
+static int nobounce_unmap(struct device *dev, struct dmar_domain *domain,
+ dma_addr_t addr, phys_addr_t paddr, size_t size,
+ enum dma_data_direction dir, unsigned long attrs,
+ void *data)
+{
+ struct page **freelist = data, *new;
+
+ new = domain_iounmap_range(domain, addr, size);
+ if (new) {
+ new->freelist = *freelist;
+ *freelist = new;
+ }
+
+ return 0;
+}
+
+static inline void free_bounce_cookie(struct bounce_cookie *cookie)
+{
+ if (!cookie)
+ return;
+
+ free_page((unsigned long)page_address(cookie->bounce_page));
+ kfree(cookie);
+}
+
+static struct bounce_cookie *
+domain_get_bounce_buffer(struct dmar_domain *domain, unsigned long iova_pfn)
+{
+ struct bounce_cookie *cookie;
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&bounce_lock, flags);
+ cookie = idr_find(&domain->bounce_idr, iova_pfn);
+ if (WARN_ON(cookie)) {
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ pr_warn("bounce cookie for iova_pfn 0x%lx exists\n", iova_pfn);
+
+ return NULL;
+ }
+
+ /* Check the bounce list. */
+ cookie = list_first_entry_or_null(&bounce_list,
+ struct bounce_cookie, list);
+ if (cookie) {
+ list_del_init(&cookie->list);
+ bounce_list_entries--;
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ goto skip_alloc;
+ }
+ spin_unlock_irqrestore(&bounce_lock, flags);
+
+ /* We have to allocate a new cookie. */
+ cookie = kzalloc(sizeof(*cookie), GFP_ATOMIC);
+ if (!cookie)
+ return NULL;
+
+ cookie->bounce_page = alloc_pages_node(domain->nid,
+ GFP_ATOMIC | __GFP_ZERO, 0);
+ if (!cookie->bounce_page) {
+ kfree(cookie);
+ return NULL;
+ }
+
+skip_alloc:
+ /* Map the cookie with the iova pfn. */
+ spin_lock_irqsave(&bounce_lock, flags);
+ ret = idr_alloc(&domain->bounce_idr, cookie, iova_pfn,
+ iova_pfn + 1, GFP_ATOMIC);
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ if (ret < 0) {
+ free_bounce_cookie(cookie);
+ pr_warn("failed to reserve idr for iova_pfn 0x%lx\n", iova_pfn);
+
+ return NULL;
+ }
+
+ return cookie;
+}
+
+static void
+domain_put_bounce_buffer(struct dmar_domain *domain, unsigned long iova_pfn)
+{
+ struct bounce_cookie *cookie;
+ unsigned long flags;
+
+ spin_lock_irqsave(&bounce_lock, flags);
+ cookie = idr_remove(&domain->bounce_idr, iova_pfn);
+ if (!cookie) {
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ pr_warn("no idr for iova_pfn 0x%lx\n", iova_pfn);
+
+ return;
+ }
+
+ if (bounce_list_entries >= MAX_BOUNCE_LIST_ENTRIES) {
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ free_bounce_cookie(cookie);
+
+ return;
+ }
+ list_add_tail(&cookie->list, &bounce_list);
+ bounce_list_entries++;
+ spin_unlock_irqrestore(&bounce_lock, flags);
+}
+
+static int
+bounce_sync(phys_addr_t orig_addr, phys_addr_t bounce_addr,
+ size_t size, enum dma_data_direction dir)
+{
+ unsigned long pfn = PFN_DOWN(orig_addr);
+ unsigned char *vaddr = phys_to_virt(bounce_addr);
+
+ if (PageHighMem(pfn_to_page(pfn))) {
+ /* The buffer does not have a mapping. Map it in and copy */
+ unsigned int offset = offset_in_page(orig_addr);
+ unsigned int sz = 0;
+ unsigned long flags;
+ char *buffer;
+
+ while (size) {
+ sz = min_t(size_t, PAGE_SIZE - offset, size);
+
+ local_irq_save(flags);
+ buffer = kmap_atomic(pfn_to_page(pfn));
+ if (dir == DMA_TO_DEVICE)
+ memcpy(vaddr, buffer + offset, sz);
+ else
+ memcpy(buffer + offset, vaddr, sz);
+ kunmap_atomic(buffer);
+ local_irq_restore(flags);
+
+ size -= sz;
+ pfn++;
+ vaddr += sz;
+ offset = 0;
+ }
+ } else if (dir == DMA_TO_DEVICE) {
+ memcpy(vaddr, phys_to_virt(orig_addr), size);
+ } else {
+ memcpy(phys_to_virt(orig_addr), vaddr, size);
+ }
+
+ return 0;
+}
+
+static int bounce_map(struct device *dev, struct dmar_domain *domain,
+ dma_addr_t addr, phys_addr_t paddr, size_t size,
+ enum dma_data_direction dir, unsigned long attrs,
+ void *data)
+{
+ unsigned long page_size = domain_page_size(domain);
+ struct bounce_cookie *cookie;
+ struct intel_iommu *iommu;
+ phys_addr_t bounce_addr;
+ unsigned long offset;
+ int prot;
+
+ iommu = domain_get_iommu(domain);
+ if (WARN_ON(!iommu))
+ return -ENODEV;
+
+ prot = dir_to_prot(iommu, dir);
+ offset = addr & (page_size - 1);
+ cookie = domain_get_bounce_buffer(domain, addr >> PAGE_SHIFT);
+ if (!cookie)
+ return -ENOMEM;
+
+ bounce_addr = page_to_phys(cookie->bounce_page) + offset;
+ cookie->original_phys = paddr;
+ cookie->bounce_phys = bounce_addr;
+ if (dir == DMA_BIDIRECTIONAL || dir == DMA_TO_DEVICE)
+ bounce_sync(paddr, bounce_addr, size, DMA_TO_DEVICE);
+
+ return domain_iomap_range(domain, addr, bounce_addr, size, prot);
+}
+
+static const struct addr_walk walk_bounce_map = {
+ .low = bounce_map,
+ .middle = nobounce_map,
+ .high = bounce_map,
+};
+
+static int bounce_unmap(struct device *dev, struct dmar_domain *domain,
+ dma_addr_t addr, phys_addr_t paddr, size_t size,
+ enum dma_data_direction dir, unsigned long attrs,
+ void *data)
+{
+ struct page **freelist = data, *new;
+ struct bounce_cookie *cookie;
+ unsigned long flags;
+
+ spin_lock_irqsave(&bounce_lock, flags);
+ cookie = idr_find(&domain->bounce_idr, addr >> PAGE_SHIFT);
+ spin_unlock_irqrestore(&bounce_lock, flags);
+ if (WARN_ON(!cookie))
+ return -ENODEV;
+
+ new = domain_iounmap_range(domain, addr, size);
+ if (new) {
+ new->freelist = *freelist;
+ *freelist = new;
+ }
+
+ if (dir == DMA_BIDIRECTIONAL || dir == DMA_FROM_DEVICE)
+ bounce_sync(cookie->original_phys, cookie->bounce_phys,
+ size, DMA_FROM_DEVICE);
+
+ domain_put_bounce_buffer(domain, addr >> PAGE_SHIFT);
+
+ return 0;
+}
+
+static const struct addr_walk walk_bounce_unmap = {
+ .low = bounce_unmap,
+ .middle = nobounce_unmap,
+ .high = bounce_unmap,
+};
+
+static int
domain_walk_addr_range(const struct addr_walk *walk, struct device *dev,
struct dmar_domain *domain, dma_addr_t addr,
phys_addr_t paddr, size_t size,
@@ -128,3 +381,23 @@ domain_walk_addr_range(const struct addr_walk *walk, struct device *dev,
return 0;
}
+
+int domain_bounce_map(struct device *dev, dma_addr_t addr, phys_addr_t paddr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs, void *data)
+{
+ struct dmar_domain *domain = get_valid_domain_for_dev(dev);
+
+ return domain_walk_addr_range(&walk_bounce_map, dev, domain,
+ addr, paddr, size, dir, attrs, data);
+}
+
+int domain_bounce_unmap(struct device *dev, dma_addr_t addr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs, void *data)
+{
+ struct dmar_domain *domain = get_valid_domain_for_dev(dev);
+
+ return domain_walk_addr_range(&walk_bounce_unmap, dev, domain,
+ addr, 0, size, dir, attrs, data);
+}
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 0fbefdf645a5..8fd1768f8729 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -498,6 +498,7 @@ struct dmar_domain {
struct dma_pte *pgd; /* virtual address */
int gaw; /* max guest address width */
+ struct idr bounce_idr; /* IDR for iova_pfn to bounce page */
/* adjusted guest address width, 0 is level 2 30-bit */
int agaw;
@@ -688,6 +689,12 @@ int domain_iomap_range(struct dmar_domain *domain, unsigned long addr,
struct page *domain_iounmap_range(struct dmar_domain *domain,
unsigned long addr, size_t size);
+int domain_bounce_map(struct device *dev, dma_addr_t addr, phys_addr_t paddr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs, void *data);
+int domain_bounce_unmap(struct device *dev, dma_addr_t addr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs, void *data);
#ifdef CONFIG_INTEL_IOMMU_SVM
int intel_svm_init(struct intel_iommu *iommu);
extern int intel_svm_enable_prq(struct intel_iommu *iommu);
--
2.17.1
Powered by blists - more mailing lists