From: Hillf Danton <hdanton@sina.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Hillf Danton <hdanton@sina.com>,
linux-media@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH 4/8] dma-direct: use __GFP_ZERO in dma_direct_alloc_pages
Date: Tue, 6 Oct 2020 15:24:45 +0800 [thread overview]
Message-ID: <20201006072445.8020-1-hdanton@sina.com> (raw)
In-Reply-To: <20200930160917.1234225-5-hch@lst.de>
On Wed, 30 Sep 2020 18:09:13 Christoph Hellwig wrote:
>
> Prepare for supporting the DMA_ATTR_NO_KERNEL_MAPPING flag in
> dma_alloc_pages.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> kernel/dma/direct.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
> index b5f20781d3a96f..b5d56810130b22 100644
> --- a/kernel/dma/direct.c
> +++ b/kernel/dma/direct.c
> @@ -296,9 +296,10 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
> dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp)
> {
> struct page *page;
> - void *ret;
>
> if (dma_should_alloc_from_pool(dev, gfp, 0)) {
> + void *ret;
> +
> page = dma_alloc_from_pool(dev, size, &ret, gfp,
> dma_coherent_ok);
> if (!page)
> @@ -306,7 +307,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
> goto done;
> }
>
> - page = __dma_direct_alloc_pages(dev, size, gfp);
> + page = __dma_direct_alloc_pages(dev, size, gfp | __GFP_ZERO);
> if (!page)
> return NULL;
> if (PageHighMem(page)) {
> @@ -320,13 +321,11 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size,
> goto out_free_pages;
> }
>
> - ret = page_address(page);
> if (force_dma_unencrypted(dev)) {
> - if (set_memory_decrypted((unsigned long)ret,
> + if (set_memory_decrypted((unsigned long)page_address(page),
> 1 << get_order(size)))
> goto out_free_pages;
> }
> - memset(ret, 0, size);
Not sure this works without changes in cma_alloc().
> done:
> *dma_handle = phys_to_dma_direct(dev, page_to_phys(page));
> return page;
> --
> 2.28.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-10-06 7:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 16:09 dma_alloc_pages / dma_alloc_noncoherent fixups Christoph Hellwig
2020-09-30 16:09 ` [PATCH 1/8] dma-mapping: remove the {alloc,free}_noncoherent methods Christoph Hellwig
2020-09-30 16:09 ` [PATCH 2/8] dma-mapping: document dma_{alloc,free}_pages Christoph Hellwig
2020-09-30 16:09 ` [PATCH 3/8] dma-direct check for highmem pages in dma_direct_alloc_pages Christoph Hellwig
2020-09-30 16:09 ` [PATCH 4/8] dma-direct: use __GFP_ZERO " Christoph Hellwig
2020-10-06 7:24 ` Hillf Danton [this message]
2020-09-30 16:09 ` [PATCH 5/8] dma-direct: factor out a dma_direct_alloc_from_pool helper Christoph Hellwig
2020-09-30 16:09 ` [PATCH 6/8] dma-direct: simplify the DMA_ATTR_NO_KERNEL_MAPPING handling Christoph Hellwig
2020-09-30 16:09 ` [PATCH 7/8] dma-iommu: remove __iommu_dma_mmap Christoph Hellwig
2020-09-30 16:09 ` [PATCH 8/8] WIP: add a dma_alloc_contiguous API Christoph Hellwig
2020-10-02 17:50 ` Tomasz Figa
2020-10-05 8:26 ` Christoph Hellwig
2020-10-06 20:56 ` Tomasz Figa
2020-10-07 6:21 ` Christoph Hellwig
2020-10-07 12:21 ` Tomasz Figa
2020-10-07 12:24 ` Christoph Hellwig
2020-10-14 13:20 ` Tomasz Figa
2020-10-14 15:03 ` David Laight
2020-11-09 14:53 ` Ricardo Ribalda
2020-11-10 9:25 ` Christoph Hellwig
2020-11-10 9:33 ` Ricardo Ribalda
2020-11-10 9:41 ` Christoph Hellwig
2020-11-10 9:50 ` Tomasz Figa
2020-11-10 9:57 ` Christoph Hellwig
2020-11-17 21:21 ` Ricardo Ribalda
2020-11-18 14:25 ` [PATCH] WIP! media: uvcvideo: Use dma_alloc_noncontiguos API Ricardo Ribalda
2020-11-24 11:35 ` Christoph Hellwig
2020-11-24 12:01 ` Ricardo Ribalda
2020-11-24 13:33 ` 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=20201006072445.8020-1-hdanton@sina.com \
--to=hdanton@sina.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robin.murphy@arm.com \
/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).