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

s390/ism: don't pass bogus GFP_ flags to dma_alloc_coherent 

Bugzilla: https://bugzilla.redhat.com/2181354
Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

commit c08004eede4b2d8a42a9a14ee50904f47cb239a1
Author: Christoph Hellwig <hch@lst.de>
Date:   Wed Nov 9 08:23:05 2022 +0100

    s390/ism: don't pass bogus GFP_ flags to dma_alloc_coherent

    dma_alloc_coherent is an opaque allocator that only uses the GFP_ flags
    for allocation context control.  Don't pass __GFP_COMP which makes no
    sense for an allocation that can't in any way be converted to a page
    pointer.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Wenjia Zhang <wenjia@linux.ibm.com>

(cherry picked from commit c08004eede4b2d8a42a9a14ee50904f47cb239a1)
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
This commit is contained in:
Jerry Snitselaar 2023-03-11 11:24:37 -07:00
parent be5e263fa5
commit 6af5c83f5a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/net/ism_drv.c
View File

@ -243,7 +243,8 @@ static int ism_alloc_dmb(struct ism_dev *ism, struct smcd_dmb *dmb)
dmb->cpu_addr = dma_alloc_coherent(&ism->pdev->dev, dmb->dmb_len,
&dmb->dma_addr,
GFP_KERNEL | __GFP_NOWARN | __GFP_NOMEMALLOC | __GFP_COMP | __GFP_NORETRY);
GFP_KERNEL | __GFP_NOWARN |
__GFP_NOMEMALLOC | __GFP_NORETRY);
if (!dmb->cpu_addr)
clear_bit(dmb->sba_idx, ism->sba_bitmap);