Commit 5338abb2 authored by Junxian Huang's avatar Junxian Huang Committed by Leon Romanovsky
Browse files

RDMA/hns: Drop GFP_NOWARN 



GFP_NOWARN silences all warnings on dma_alloc_coherent() failure,
which might otherwise help with troubleshooting.

Fixes: 9a443537 ("IB/hns: Add driver files for hns RoCE driver")
Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20250703113905.3597124-6-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 278c18a4

drivers/infiniband/hw/hns/hns_roce_hem.c

+5 −13
Original line number Diff line number Diff line
@@ -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;