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
| ||
|
Date: Fri, 11 Jun 2021 23:26:55 +0800 From: Claire Chang <tientzu@...omium.org> To: Rob Herring <robh+dt@...nel.org>, mpe@...erman.id.au, Joerg Roedel <joro@...tes.org>, Will Deacon <will@...nel.org>, Frank Rowand <frowand.list@...il.com>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, boris.ostrovsky@...cle.com, jgross@...e.com, Christoph Hellwig <hch@....de>, Marek Szyprowski <m.szyprowski@...sung.com> Cc: benh@...nel.crashing.org, paulus@...ba.org, "list@....net:IOMMU DRIVERS" <iommu@...ts.linux-foundation.org>, sstabellini@...nel.org, Robin Murphy <robin.murphy@....com>, grant.likely@....com, xypron.glpk@....de, Thierry Reding <treding@...dia.com>, mingo@...nel.org, bauerman@...ux.ibm.com, peterz@...radead.org, Greg KH <gregkh@...uxfoundation.org>, Saravana Kannan <saravanak@...gle.com>, "Rafael J . Wysocki" <rafael.j.wysocki@...el.com>, heikki.krogerus@...ux.intel.com, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Randy Dunlap <rdunlap@...radead.org>, Dan Williams <dan.j.williams@...el.com>, Bartosz Golaszewski <bgolaszewski@...libre.com>, linux-devicetree <devicetree@...r.kernel.org>, lkml <linux-kernel@...r.kernel.org>, linuxppc-dev@...ts.ozlabs.org, xen-devel@...ts.xenproject.org, Nicolas Boichat <drinkcat@...omium.org>, Jim Quinlan <james.quinlan@...adcom.com>, tfiga@...omium.org, bskeggs@...hat.com, bhelgaas@...gle.com, chris@...is-wilson.co.uk, tientzu@...omium.org, daniel@...ll.ch, airlied@...ux.ie, dri-devel@...ts.freedesktop.org, intel-gfx@...ts.freedesktop.org, jani.nikula@...ux.intel.com, jxgao@...gle.com, joonas.lahtinen@...ux.intel.com, linux-pci@...r.kernel.org, maarten.lankhorst@...ux.intel.com, matthew.auld@...el.com, rodrigo.vivi@...el.com, thomas.hellstrom@...ux.intel.com Subject: [PATCH v9 10/14] dma-direct: Add a new wrapper __dma_direct_free_pages() Add a new wrapper __dma_direct_free_pages() that will be useful later for swiotlb_free(). Signed-off-by: Claire Chang <tientzu@...omium.org> --- kernel/dma/direct.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 078f7087e466..eb4098323bbc 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -75,6 +75,12 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) min_not_zero(dev->coherent_dma_mask, dev->bus_dma_limit); } +static void __dma_direct_free_pages(struct device *dev, struct page *page, + size_t size) +{ + dma_free_contiguous(dev, page, size); +} + static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size, gfp_t gfp) { @@ -237,7 +243,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, return NULL; } out_free_pages: - dma_free_contiguous(dev, page, size); + __dma_direct_free_pages(dev, page, size); return NULL; } @@ -273,7 +279,7 @@ void dma_direct_free(struct device *dev, size_t size, else if (IS_ENABLED(CONFIG_ARCH_HAS_DMA_CLEAR_UNCACHED)) arch_dma_clear_uncached(cpu_addr, size); - dma_free_contiguous(dev, dma_direct_to_page(dev, dma_addr), size); + __dma_direct_free_pages(dev, dma_direct_to_page(dev, dma_addr), size); } struct page *dma_direct_alloc_pages(struct device *dev, size_t size, @@ -310,7 +316,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); return page; out_free_pages: - dma_free_contiguous(dev, page, size); + __dma_direct_free_pages(dev, page, size); return NULL; } @@ -329,7 +335,7 @@ void dma_direct_free_pages(struct device *dev, size_t size, if (force_dma_unencrypted(dev)) set_memory_encrypted((unsigned long)vaddr, 1 << page_order); - dma_free_contiguous(dev, page, size); + __dma_direct_free_pages(dev, page, size); } #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \ -- 2.32.0.272.g935e593368-goog
Powered by blists - more mailing lists