]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
RDMA/hns: Drop GFP_NOWARN
authorJunxian Huang <huangjunxian6@hisilicon.com>
Thu, 3 Jul 2025 11:39:04 +0000 (19:39 +0800)
committerLeon Romanovsky <leon@kernel.org>
Mon, 7 Jul 2025 05:37:35 +0000 (01:37 -0400)
GFP_NOWARN silences all warnings on dma_alloc_coherent() failure,
which might otherwise help with troubleshooting.

Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20250703113905.3597124-6-huangjunxian6@hisilicon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
drivers/infiniband/hw/hns/hns_roce_hem.c

index ca0798224e565c88569acbcabb5f03756f750913..3d479c63b117a948cc170f1454a2fd7ff2971d67 100644 (file)
@@ -249,15 +249,12 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev,
 }
 
 static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,
-                                              unsigned long hem_alloc_size,
-                                              gfp_t gfp_mask)
+                                              unsigned long hem_alloc_size)
 {
        struct hns_roce_hem *hem;
        int order;
        void *buf;
 
-       WARN_ON(gfp_mask & __GFP_HIGHMEM);
-
        order = get_order(hem_alloc_size);
        if (PAGE_SIZE << order != hem_alloc_size) {
                dev_err(hr_dev->dev, "invalid hem_alloc_size: %lu!\n",
@@ -265,13 +262,12 @@ static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,
                return NULL;
        }
 
-       hem = kmalloc(sizeof(*hem),
-                     gfp_mask & ~(__GFP_HIGHMEM | __GFP_NOWARN));
+       hem = kmalloc(sizeof(*hem), GFP_KERNEL);
        if (!hem)
                return NULL;
 
        buf = dma_alloc_coherent(hr_dev->dev, hem_alloc_size,
-                                &hem->dma, gfp_mask);
+                                &hem->dma, GFP_KERNEL);
        if (!buf)
                goto fail;
 
@@ -378,7 +374,6 @@ static int alloc_mhop_hem(struct hns_roce_dev *hr_dev,
 {
        u32 bt_size = mhop->bt_chunk_size;
        struct device *dev = hr_dev->dev;
-       gfp_t flag;
        u64 bt_ba;
        u32 size;
        int ret;
@@ -417,8 +412,7 @@ static int alloc_mhop_hem(struct hns_roce_dev *hr_dev,
         * alloc bt space chunk for MTT/CQE.
         */
        size = table->type < HEM_TYPE_MTT ? mhop->buf_chunk_size : bt_size;
-       flag = GFP_KERNEL | __GFP_NOWARN;
-       table->hem[index->buf] = hns_roce_alloc_hem(hr_dev, size, flag);
+       table->hem[index->buf] = hns_roce_alloc_hem(hr_dev, size);
        if (!table->hem[index->buf]) {
                ret = -ENOMEM;
                goto err_alloc_hem;
@@ -546,9 +540,7 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev,
                goto out;
        }
 
-       table->hem[i] = hns_roce_alloc_hem(hr_dev,
-                                      table->table_chunk_size,
-                                      GFP_KERNEL | __GFP_NOWARN);
+       table->hem[i] = hns_roce_alloc_hem(hr_dev, table->table_chunk_size);
        if (!table->hem[i]) {
                ret = -ENOMEM;
                goto out;