qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dma-direct: cleanup parameters to dma_direct_optimal_gfp_mask 

JIRA: https://issues.redhat.com/browse/RHEL-10094
Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

commit 25a4ce564921db0973b74c04e0ea23bd2ee12a3a
Author: Petr Tesarik <petrtesarik@huaweicloud.com>
Date:   Mon Feb 20 16:06:22 2023 +0100

    dma-direct: cleanup parameters to dma_direct_optimal_gfp_mask

    Since both callers of dma_direct_optimal_gfp_mask() pass
    dev->coherent_dma_mask as the second argument, it is better to
    remove that parameter altogether.

    Not only is reducing number of parameters good for readability, but
    the new function signature is also more logical: The optimal flags
    depend only on data contained in struct device.

    While touching this code, let's also rename phys_mask to phys_limit
    in dma_direct_alloc_from_pool(), because it is indeed a limit.

    Signed-off-by: Petr Tesarik <petrtesarik@huaweicloud.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>

(cherry picked from commit 25a4ce564921db0973b74c04e0ea23bd2ee12a3a)
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
This commit is contained in:
Jerry Snitselaar 2023-02-20 16:06:22 +01:00
parent 57c8ede818
commit c0753862c6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/dma/direct.c
View File

@ -44,10 +44,11 @@ u64 dma_direct_get_required_mask(struct device *dev)
return (1ULL << (fls64(max_dma) - 1)) * 2 - 1;
}
static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask,
u64 *phys_limit)
static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 *phys_limit)
{
u64 dma_limit = min_not_zero(dma_mask, dev->bus_dma_limit);
u64 dma_limit = min_not_zero(
dev->coherent_dma_mask,
dev->bus_dma_limit);
/*
* Optimistically try the zone that the physical address mask falls
@ -126,8 +127,7 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
if (is_swiotlb_for_alloc(dev))
return dma_direct_alloc_swiotlb(dev, size);
gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,
&phys_limit);
gfp |= dma_direct_optimal_gfp_mask(dev, &phys_limit);
page = dma_alloc_contiguous(dev, size, gfp);
if (page) {
if (!dma_coherent_ok(dev, page_to_phys(page), size) ||
@ -172,14 +172,13 @@ static void *dma_direct_alloc_from_pool(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp)
{
struct page *page;
u64 phys_mask;
u64 phys_limit;
void *ret;
if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_DMA_COHERENT_POOL)))
return NULL;
gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,
&phys_mask);
gfp |= dma_direct_optimal_gfp_mask(dev, &phys_limit);
page = dma_alloc_from_pool(dev, size, &ret, gfp, dma_coherent_ok);
if (!page)
return NULL;