From: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
To: Claire Chang <tientzu@chromium•org>
Cc: heikki.krogerus@linux•intel.com,
thomas.hellstrom@linux•intel.com, peterz@infradead•org,
joonas.lahtinen@linux•intel.com, dri-devel@lists•freedesktop.org,
chris@chris-wilson•co.uk, grant.likely@arm•com, paulus@samba•org,
Frank Rowand <frowand.list@gmail•com>,
mingo@kernel•org, Marek Szyprowski <m.szyprowski@samsung•com>,
sstabellini@kernel•org, Saravana Kannan <saravanak@google•com>,
Joerg Roedel <joro@8bytes•org>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel•com>,
Christoph Hellwig <hch@lst•de>,
Bartosz Golaszewski <bgolaszewski@baylibre•com>,
bskeggs@redhat•com, linux-pci@vger•kernel.org,
xen-devel@lists•xenproject.org,
Thierry Reding <treding@nvidia•com>,
intel-gfx@lists•freedesktop.org, matthew.auld@intel•com,
linux-devicetree <devicetree@vger•kernel.org>,
jxgao@google•com, daniel@ffwll•ch, Will Deacon <will@kernel•org>,
maarten.lankhorst@linux•intel.com, airlied@linux•ie,
Dan Williams <dan.j.williams@intel•com>,
linuxppc-dev@lists•ozlabs.org, jani.nikula@linux•intel.com,
Rob Herring <robh+dt@kernel•org>,
rodrigo.vivi@intel•com, bhelgaas@google•com,
boris.ostrovsky@oracle•com,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
jgross@suse•com, Nicolas Boichat <drinkcat@chromium•org>,
Greg KH <gregkh@linuxfoundation•org>,
Randy Dunlap <rdunlap@infradead•org>,
lkml <linux-kernel@vger•kernel.org>,
tfiga@chromium•org,
"list@263•net:IOMMU DRIVERS" <iommu@lists•linux-foundation.org>,
Jim Quinlan <james.quinlan@broadcom•com>,
xypron.glpk@gmx•de, Robin Murphy <robin.murphy@arm•com>,
bauerman@linux•ibm.com
Subject: Re: [PATCH v10 03/12] swiotlb: Set dev->dma_io_tlb_mem to the swiotlb pool used
Date: Tue, 15 Jun 2021 18:21:41 -0400 [thread overview]
Message-ID: <YMkn9YIJqKxelVRI@char.us.oracle.com> (raw)
In-Reply-To: <20210615132711.553451-4-tientzu@chromium.org>
On Tue, Jun 15, 2021 at 09:27:02PM +0800, Claire Chang wrote:
> Always have the pointer to the swiotlb pool used in struct device. This
> could help simplify the code for other pools.
Applying: swiotlb: Set dev->dma_io_tlb_mem to the swiotlb pool used
error: patch failed: kernel/dma/swiotlb.c:339
error: kernel/dma/swiotlb.c: patch does not apply
..
Would you be OK rebasing this against devel/for-linus-5.14 please?
(And please send out with the Reviewed-by from Christopher)
Thank you!
>
> Signed-off-by: Claire Chang <tientzu@chromium•org>
> ---
> drivers/base/core.c | 4 ++++
> include/linux/device.h | 4 ++++
> kernel/dma/swiotlb.c | 8 ++++----
> 3 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index b8a8c96dca58..eeb2d49d3aa3 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -27,6 +27,7 @@
> #include <linux/netdevice.h>
> #include <linux/sched/signal.h>
> #include <linux/sched/mm.h>
> +#include <linux/swiotlb.h>
> #include <linux/sysfs.h>
> #include <linux/dma-map-ops.h> /* for dma_default_coherent */
>
> @@ -2846,6 +2847,9 @@ void device_initialize(struct device *dev)
> defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
> dev->dma_coherent = dma_default_coherent;
> #endif
> +#ifdef CONFIG_SWIOTLB
> + dev->dma_io_tlb_mem = io_tlb_default_mem;
> +#endif
> }
> EXPORT_SYMBOL_GPL(device_initialize);
>
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 4443e12238a0..2e9a378c9100 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -432,6 +432,7 @@ struct dev_links_info {
> * @dma_pools: Dma pools (if dma'ble device).
> * @dma_mem: Internal for coherent mem override.
> * @cma_area: Contiguous memory area for dma allocations
> + * @dma_io_tlb_mem: Pointer to the swiotlb pool used. Not for driver use.
> * @archdata: For arch-specific additions.
> * @of_node: Associated device tree node.
> * @fwnode: Associated device node supplied by platform firmware.
> @@ -540,6 +541,9 @@ struct device {
> #ifdef CONFIG_DMA_CMA
> struct cma *cma_area; /* contiguous memory area for dma
> allocations */
> +#endif
> +#ifdef CONFIG_SWIOTLB
> + struct io_tlb_mem *dma_io_tlb_mem;
> #endif
> /* arch specific additions */
> struct dev_archdata archdata;
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index 97c6ad50fdc2..949a6bb21343 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -339,7 +339,7 @@ void __init swiotlb_exit(void)
> static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size,
> enum dma_data_direction dir)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
> int index = (tlb_addr - mem->start) >> IO_TLB_SHIFT;
> phys_addr_t orig_addr = mem->slots[index].orig_addr;
> size_t alloc_size = mem->slots[index].alloc_size;
> @@ -421,7 +421,7 @@ static unsigned int wrap_index(struct io_tlb_mem *mem, unsigned int index)
> static int find_slots(struct device *dev, phys_addr_t orig_addr,
> size_t alloc_size)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
> unsigned long boundary_mask = dma_get_seg_boundary(dev);
> dma_addr_t tbl_dma_addr =
> phys_to_dma_unencrypted(dev, mem->start) & boundary_mask;
> @@ -498,7 +498,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
> size_t mapping_size, size_t alloc_size,
> enum dma_data_direction dir, unsigned long attrs)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
> unsigned int offset = swiotlb_align_offset(dev, orig_addr);
> unsigned int i;
> int index;
> @@ -549,7 +549,7 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
> size_t mapping_size, enum dma_data_direction dir,
> unsigned long attrs)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = hwdev->dma_io_tlb_mem;
> unsigned long flags;
> unsigned int offset = swiotlb_align_offset(hwdev, tlb_addr);
> int index = (tlb_addr - offset - mem->start) >> IO_TLB_SHIFT;
> --
> 2.32.0.272.g935e593368-goog
>
next prev parent reply other threads:[~2021-06-15 22:23 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 13:26 [PATCH v10 00/12] Restricted DMA Claire Chang
2021-06-15 13:27 ` [PATCH v10 01/12] swiotlb: Refactor swiotlb init functions Claire Chang
2021-06-15 13:37 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 02/12] swiotlb: Refactor swiotlb_create_debugfs Claire Chang
2021-06-15 13:38 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 03/12] swiotlb: Set dev->dma_io_tlb_mem to the swiotlb pool used Claire Chang
2021-06-15 13:38 ` Christoph Hellwig
2021-06-15 22:21 ` Konrad Rzeszutek Wilk [this message]
2021-06-15 13:27 ` [PATCH v10 04/12] swiotlb: Update is_swiotlb_buffer to add a struct device argument Claire Chang
2021-06-15 13:38 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 05/12] swiotlb: Update is_swiotlb_active " Claire Chang
2021-06-15 13:39 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 06/12] swiotlb: Use is_dev_swiotlb_force for swiotlb data bouncing Claire Chang
2021-06-15 13:39 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 07/12] swiotlb: Move alloc_size to swiotlb_find_slots Claire Chang
2021-06-15 13:39 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 08/12] swiotlb: Refactor swiotlb_tbl_unmap_single Claire Chang
2021-06-15 13:40 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 09/12] swiotlb: Add restricted DMA pool initialization Claire Chang
2021-06-15 13:40 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 10/12] swiotlb: Add restricted DMA alloc/free support Claire Chang
2021-06-15 13:42 ` Christoph Hellwig
2021-06-15 13:27 ` [PATCH v10 11/12] dt-bindings: of: Add restricted DMA pool Claire Chang
2021-06-15 13:27 ` [PATCH v10 12/12] of: Add plumbing for " Claire Chang
2021-06-16 3:55 ` [PATCH v10 00/12] Restricted DMA Claire Chang
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=YMkn9YIJqKxelVRI@char.us.oracle.com \
--to=konrad.wilk@oracle$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=bauerman@linux$(echo .)ibm.com \
--cc=bgolaszewski@baylibre$(echo .)com \
--cc=bhelgaas@google$(echo .)com \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=bskeggs@redhat$(echo .)com \
--cc=chris@chris-wilson$(echo .)co.uk \
--cc=dan.j.williams@intel$(echo .)com \
--cc=daniel@ffwll$(echo .)ch \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=drinkcat@chromium$(echo .)org \
--cc=frowand.list@gmail$(echo .)com \
--cc=grant.likely@arm$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=heikki.krogerus@linux$(echo .)intel.com \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=iommu@lists$(echo .)linux-foundation.org \
--cc=james.quinlan@broadcom$(echo .)com \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=jgross@suse$(echo .)com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=joro@8bytes$(echo .)org \
--cc=jxgao@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-pci@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
--cc=matthew.auld@intel$(echo .)com \
--cc=mingo@kernel$(echo .)org \
--cc=paulus@samba$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=rdunlap@infradead$(echo .)org \
--cc=robh+dt@kernel$(echo .)org \
--cc=robin.murphy@arm$(echo .)com \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=saravanak@google$(echo .)com \
--cc=sstabellini@kernel$(echo .)org \
--cc=tfiga@chromium$(echo .)org \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
--cc=tientzu@chromium$(echo .)org \
--cc=treding@nvidia$(echo .)com \
--cc=will@kernel$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
--cc=xypron.glpk@gmx$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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