Skip to contentSkip to conversation

IB/hfi1: kzalloc to kzalloc_flex

PATCH Superseded Rosen Penev 2 participants 4 messages Mar 8 – Mar 9

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IB/hfi1: kzalloc to kzalloc_flex

Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.

---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +---------
 drivers/infiniband/hw/hfi1/user_exp_rcv.h |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +1 -9
index 5b01070ed66f..2597d311fb1f 100644
@@ -257,7 +257,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
 	if (tinfo->length == 0)
 		return -EINVAL;
 
-	tidbuf = kzalloc(sizeof(*tidbuf), GFP_KERNEL);
+	tidbuf = kzalloc_flex(*tidbuf, psets, uctxt->expected_count);
 	if (!tidbuf)
 		return -ENOMEM;
 
@@ -265,12 +265,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
 	tidbuf->vaddr = tinfo->vaddr;
 	tidbuf->length = tinfo->length;
 	tidbuf->npages = num_user_pages(tidbuf->vaddr, tidbuf->length);
-	tidbuf->psets = kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets),
-				GFP_KERNEL);
-	if (!tidbuf->psets) {
-		ret = -ENOMEM;
-		goto fail_release_mem;
-	}
 
 	if (fd->use_mn) {
 		ret = mmu_interval_notifier_insert(
@@ -448,7 +442,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
 	if (fd->use_mn)
 		mmu_interval_notifier_remove(&tidbuf->notifier);
 	kfree(tidbuf->pages);
-	kfree(tidbuf->psets);
 	kfree(tidbuf);
 	kfree(tidlist);
 	return 0;
@@ -471,7 +464,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
 		unpin_rcv_pages(fd, tidbuf, NULL, 0, pinned, false);
 fail_release_mem:
 	kfree(tidbuf->pages);
-	kfree(tidbuf->psets);
 	kfree(tidbuf);
 	kfree(tidlist);
 	return ret;
drivers/infiniband/hw/hfi1/user_exp_rcv.h +1 -1
index 055726f7c139..b4a309a051f9 100644
@@ -22,8 +22,8 @@ struct tid_user_buf {
 	unsigned long length;
 	unsigned int npages;
 	struct page **pages;
-	struct tid_pageset *psets;
 	unsigned int n_psets;
+	struct tid_pageset psets[];
 };
 
 struct tid_rb_node {
Signature · 1 line
2.53.0
#1 lore raw
Quoted 8 lines · Rosen Penev

Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.

---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +---------
 drivers/infiniband/hw/hfi1/user_exp_rcv.h |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

This patch needs to be rebased to latest rdma-next, due to the conflict
with already merged 94ff7c59cdfd ("RDMA: Complete k[z|m|c]alloc-to-k[z|m]alloc_obj conversion").

Thanks

#2 lore raw
Quoted 5 lines · Leon Romanovsky
Quoted 3 lines · Rosen Penev

Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.

Quoted 8 lines
Quoted 5 lines
---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +---------
 drivers/infiniband/hw/hfi1/user_exp_rcv.h |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

This patch needs to be rebased to latest rdma-next, due to the conflict
with already merged 94ff7c59cdfd ("RDMA: Complete k[z|m|c]alloc-to-k[z|m]alloc_obj conversion").

https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/commit/?id=94ff7c59cdfd

Notice: this object is not reachable from any branch.

I'll take your word for it and rebase based on that.

Quoted 2 lines

Thanks

#3 lore raw
Quoted 12 lines · Rosen Penev
Quoted 11 lines · Leon Romanovsky
Quoted 8 lines · Rosen Penev

Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.

---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +---------
 drivers/infiniband/hw/hfi1/user_exp_rcv.h |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)
Quoted 7 lines
Quoted 2 lines

This patch needs to be rebased to latest rdma-next, due to the conflict
with already merged 94ff7c59cdfd ("RDMA: Complete k[z|m|c]alloc-to-k[z|m]alloc_obj conversion").

https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/commit/?id=94ff7c59cdfd

Notice: this object is not reachable from any branch.

I'll take your word for it and rebase based on that.

You looked at my private repo, while the patch exist in official RDMA repository.

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=94ff7c59cdfd

Thanks

Quoted 2 lines
Quoted 2 lines

Thanks