Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1528729

[PATCH V3 for-next 03/11] IB/hns: Optimize the logic of allocating memory using APIs

Show all headers | View raw

From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>

This patch modified the logic of allocating memory using APIs in
hns RoCE driver. We used kcalloc instead of kmalloc_array and
bitmap_zero. And When kcalloc failed, call vzalloc to alloc
memory.

Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Ping Zhang <zhangping5@huawei.com>
Signed-off-by: Salil Mehta  <salil.mehta@huawei.com>
---
Change log:

PATCH V2: Addressed comment given by Leon
         Link: https://patchwork.kernel.org/patch/9412859/
PATCH V1: Initial Submit
---
 drivers/infiniband/hw/hns/hns_roce_mr.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index fb87883..d87d189 100644
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -137,11 +137,13 @@ static int hns_roce_buddy_init(struct hns_roce_buddy *buddy, int max_order)
 
 	for (i = 0; i <= buddy->max_order; ++i) {
 		s = BITS_TO_LONGS(1 << (buddy->max_order - i));
-		buddy->bits[i] = kmalloc_array(s, sizeof(long), GFP_KERNEL);
-		if (!buddy->bits[i])
-			goto err_out_free;
-
-		bitmap_zero(buddy->bits[i], 1 << (buddy->max_order - i));
+		buddy->bits[i] = kcalloc(s, sizeof(long), GFP_KERNEL |
+					 __GFP_NOWARN);
+		if (!buddy->bits[i]) {
+			buddy->bits[i] = vzalloc(s * sizeof(long));
+			if (!buddy->bits[i])
+				goto err_out_free;
+		}
 	}
 
 	set_bit(0, buddy->bits[buddy->max_order]);
@@ -151,7 +153,7 @@ static int hns_roce_buddy_init(struct hns_roce_buddy *buddy, int max_order)
 
 err_out_free:
 	for (i = 0; i <= buddy->max_order; ++i)
-		kfree(buddy->bits[i]);
+		kvfree(buddy->bits[i]);
 
 err_out:
 	kfree(buddy->bits);
@@ -164,7 +166,7 @@ static void hns_roce_buddy_cleanup(struct hns_roce_buddy *buddy)
 	int i;
 
 	for (i = 0; i <= buddy->max_order; ++i)
-		kfree(buddy->bits[i]);
+		kvfree(buddy->bits[i]);
 
 	kfree(buddy->bits);
 	kfree(buddy->num_free);
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V3 for-next 00/11] Code improvements & fixes for HNS RoCE driver Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 11/11] IB/hns: Fix for Checkpatch.pl comment style errors Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 02/11] IB/hns: Add code for refreshing CQ CI using TPTR Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 01/11] IB/hns: Add the interface for querying QP1 Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 06/11] IB/hns: Fix the bug for qp state in hns_roce_v1_m_qp() Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 04/11] IB/hns: add self loopback for CM Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 08/11] IB/hns: Modify query info named port_num when querying RC QP Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 07/11] IB/hns: Modify the macro for the timeout when cmd process Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 09/11] IB/hns: Change qpn allocation to round-robin mode. Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 03/11] IB/hns: Optimize the logic of allocating memory using APIs Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100
  [PATCH V3 for-next 10/11] IB/hns: Implement the add_gid/del_gid and optimize the GIDs management Salil Mehta <salil.mehta@huawei.com> - 2016-11-23 20:50 +0100

csiph-web