From: Claire Chang <tientzu@chromium.org>
To: Will Deacon <will@kernel.org>
Cc: "list@263.net:IOMMU DRIVERS <iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,"
<iommu@lists.linux-foundation.org>,
lkml <linux-kernel@vger.kernel.org>,
Guenter Roeck <linux@roeck-us.net>,
Christoph Hellwig <hch@lst.de>,
Robin Murphy <robin.murphy@arm.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Nathan Chancellor <nathan@kernel.org>
Subject: Re: [PATCH 3/5] swiotlb: Remove io_tlb_default_mem indirection
Date: Tue, 20 Jul 2021 11:35:52 +0800 [thread overview]
Message-ID: <CALiNf28WYFs9ayvWp4XsK8YFL_=sy7Djb5_Mpj-egYjfRh4BEw@mail.gmail.com> (raw)
In-Reply-To: <20210719123054.6844-4-will@kernel.org>
On Mon, Jul 19, 2021 at 8:31 PM Will Deacon <will@kernel.org> wrote:
>
> The indirection from the global 'io_tlb_default_mem' pointer to the
> static '_io_tlb_default_mem' structure is ugly and unnecessary.
>
> Convert all users to reference the static structure directly, using the
> 'nslabs' field to determine whether swiotlb has been initialised.
>
> Cc: Claire Chang <tientzu@chromium.org>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Claire Chang <tientzu@chromium.org>
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
> drivers/base/core.c | 2 +-
> drivers/xen/swiotlb-xen.c | 4 ++--
> include/linux/swiotlb.h | 2 +-
> kernel/dma/swiotlb.c | 38 ++++++++++++++++++--------------------
> 4 files changed, 22 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index ea5b85354526..b49824001cfa 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -2848,7 +2848,7 @@ void device_initialize(struct device *dev)
> dev->dma_coherent = dma_default_coherent;
> #endif
> #ifdef CONFIG_SWIOTLB
> - dev->dma_io_tlb_mem = io_tlb_default_mem;
> + dev->dma_io_tlb_mem = &io_tlb_default_mem;
> #endif
> }
> EXPORT_SYMBOL_GPL(device_initialize);
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index 785ec7e8be01..f06d9b4f1e0f 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -164,7 +164,7 @@ int __ref xen_swiotlb_init(void)
> int rc = -ENOMEM;
> char *start;
>
> - if (io_tlb_default_mem != NULL) {
> + if (io_tlb_default_mem.nslabs) {
> pr_warn("swiotlb buffer already initialized\n");
> return -EEXIST;
> }
> @@ -547,7 +547,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,
> static int
> xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)
> {
> - return xen_phys_to_dma(hwdev, io_tlb_default_mem->end - 1) <= mask;
> + return xen_phys_to_dma(hwdev, io_tlb_default_mem.end - 1) <= mask;
> }
>
> const struct dma_map_ops xen_swiotlb_dma_ops = {
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index d3b617c19045..b0cb2a9973f4 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -105,7 +105,7 @@ struct io_tlb_mem {
> unsigned int list;
> } *slots;
> };
> -extern struct io_tlb_mem *io_tlb_default_mem;
> +extern struct io_tlb_mem io_tlb_default_mem;
>
> static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
> {
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index 992d73cdc944..7948f274f9bb 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -70,8 +70,7 @@
>
> enum swiotlb_force swiotlb_force;
>
> -struct io_tlb_mem *io_tlb_default_mem;
> -static struct io_tlb_mem _io_tlb_default_mem;
> +struct io_tlb_mem io_tlb_default_mem;
>
> /*
> * Max segment that we can provide which (if pages are contingous) will
> @@ -102,7 +101,7 @@ early_param("swiotlb", setup_io_tlb_npages);
>
> unsigned int swiotlb_max_segment(void)
> {
> - return io_tlb_default_mem ? max_segment : 0;
> + return io_tlb_default_mem.nslabs ? max_segment : 0;
> }
> EXPORT_SYMBOL_GPL(swiotlb_max_segment);
>
> @@ -135,9 +134,9 @@ void __init swiotlb_adjust_size(unsigned long size)
>
> void swiotlb_print_info(void)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
>
> - if (!mem) {
> + if (!mem->nslabs) {
> pr_warn("No low mem\n");
> return;
> }
> @@ -164,11 +163,11 @@ static inline unsigned long nr_slots(u64 val)
> */
> void __init swiotlb_update_mem_attributes(void)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
> void *vaddr;
> unsigned long bytes;
>
> - if (!mem || mem->late_alloc)
> + if (!mem->nslabs || mem->late_alloc)
> return;
> vaddr = phys_to_virt(mem->start);
> bytes = PAGE_ALIGN(mem->nslabs << IO_TLB_SHIFT);
> @@ -202,14 +201,14 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start,
>
> int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
> {
> - struct io_tlb_mem *mem = &_io_tlb_default_mem;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
> size_t alloc_size;
>
> if (swiotlb_force == SWIOTLB_NO_FORCE)
> return 0;
>
> /* protect against double initialization */
> - if (WARN_ON_ONCE(io_tlb_default_mem))
> + if (WARN_ON_ONCE(mem->nslabs))
> return -ENOMEM;
>
> alloc_size = PAGE_ALIGN(array_size(sizeof(*mem->slots), nslabs));
> @@ -220,7 +219,6 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
>
> swiotlb_init_io_tlb_mem(mem, __pa(tlb), nslabs, false);
>
> - io_tlb_default_mem = mem;
> if (verbose)
> swiotlb_print_info();
> swiotlb_set_max_segment(mem->nslabs << IO_TLB_SHIFT);
> @@ -305,14 +303,14 @@ swiotlb_late_init_with_default_size(size_t default_size)
> int
> swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
> {
> - struct io_tlb_mem *mem = &_io_tlb_default_mem;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
> unsigned long bytes = nslabs << IO_TLB_SHIFT;
>
> if (swiotlb_force == SWIOTLB_NO_FORCE)
> return 0;
>
> /* protect against double initialization */
> - if (WARN_ON_ONCE(io_tlb_default_mem))
> + if (WARN_ON_ONCE(mem->nslabs))
> return -ENOMEM;
>
> mem->slots = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
> @@ -323,7 +321,6 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
> set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT);
> swiotlb_init_io_tlb_mem(mem, virt_to_phys(tlb), nslabs, true);
>
> - io_tlb_default_mem = mem;
> swiotlb_print_info();
> swiotlb_set_max_segment(mem->nslabs << IO_TLB_SHIFT);
> return 0;
> @@ -331,10 +328,10 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
>
> void __init swiotlb_exit(void)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> size_t size;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
>
> - if (!mem)
> + if (!mem->nslabs)
> return;
>
> size = array_size(sizeof(*mem->slots), mem->nslabs);
> @@ -342,7 +339,6 @@ void __init swiotlb_exit(void)
> free_pages((unsigned long)mem->slots, get_order(size));
> else
> memblock_free_late(__pa(mem->slots), PAGE_ALIGN(size));
> - io_tlb_default_mem = NULL;
> memset(mem, 0, sizeof(*mem));
> }
>
> @@ -697,7 +693,9 @@ size_t swiotlb_max_mapping_size(struct device *dev)
>
> bool is_swiotlb_active(struct device *dev)
> {
> - return dev->dma_io_tlb_mem != NULL;
> + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
> +
> + return mem && mem->nslabs;
> }
> EXPORT_SYMBOL_GPL(is_swiotlb_active);
>
> @@ -712,10 +710,10 @@ static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem)
>
> static int __init swiotlb_create_default_debugfs(void)
> {
> - struct io_tlb_mem *mem = io_tlb_default_mem;
> + struct io_tlb_mem *mem = &io_tlb_default_mem;
>
> debugfs_dir = debugfs_create_dir("swiotlb", NULL);
> - if (mem) {
> + if (mem->nslabs) {
> mem->debugfs = debugfs_dir;
> swiotlb_create_debugfs_files(mem);
> }
> @@ -814,7 +812,7 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem,
> static void rmem_swiotlb_device_release(struct reserved_mem *rmem,
> struct device *dev)
> {
> - dev->dma_io_tlb_mem = io_tlb_default_mem;
> + dev->dma_io_tlb_mem = &io_tlb_default_mem;
> }
>
> static const struct reserved_mem_ops rmem_swiotlb_ops = {
> --
> 2.32.0.402.g57bb445576-goog
>
next prev parent reply other threads:[~2021-07-20 3:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 12:30 [PATCH 0/5] Fix restricted DMA vs swiotlb_exit() Will Deacon
2021-07-19 12:30 ` [PATCH 1/5] of: Return success from of_dma_set_restricted_buffer() when !OF_ADDRESS Will Deacon
2021-07-20 3:35 ` Claire Chang
2021-07-19 12:30 ` [PATCH 2/5] swiotlb: Point io_default_tlb_mem at static allocation Will Deacon
2021-07-20 3:35 ` Claire Chang
2021-07-20 7:51 ` Christoph Hellwig
2021-07-20 8:49 ` Will Deacon
2021-07-19 12:30 ` [PATCH 3/5] swiotlb: Remove io_tlb_default_mem indirection Will Deacon
2021-07-20 3:35 ` Claire Chang [this message]
2021-07-19 12:30 ` [PATCH 4/5] swiotlb: Emit diagnostic in swiotlb_exit() Will Deacon
2021-07-20 3:36 ` Claire Chang
2021-07-19 12:30 ` [PATCH 5/5] swiotlb: Free tbl memory " Will Deacon
2021-07-20 3:36 ` Claire Chang
2021-07-20 8:35 ` Will Deacon
2021-07-20 7:51 ` [PATCH 0/5] Fix restricted DMA vs swiotlb_exit() Christoph Hellwig
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='CALiNf28WYFs9ayvWp4XsK8YFL_=sy7Djb5_Mpj-egYjfRh4BEw@mail.gmail.com' \
--to=tientzu@chromium.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=nathan@kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@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).