From: Guoqing Jiang <guoqing.jiang@linux.dev>
To: bmt@zurich.ibm.com, jgg@ziepe.ca, leon@kernel.org
Cc: linux-rdma@vger.kernel.org
Subject: [PATCH V5 09/17] RDMA/siw: Add one parameter to siw_destroy_cpulist
Date: Mon, 13 Nov 2023 19:57:18 +0800 [thread overview]
Message-ID: <20231113115726.12762-10-guoqing.jiang@linux.dev> (raw)
In-Reply-To: <20231113115726.12762-1-guoqing.jiang@linux.dev>
With that we can reuse it in siw_init_cpulist.
Acked-by: Bernard Metzler <bmt@zurich.ibm.com>
Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
---
drivers/infiniband/sw/siw/siw_main.c | 30 +++++++++++++---------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index 1ab62982df74..61ad8ca3d1a2 100644
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -109,6 +109,17 @@ static struct {
int num_nodes;
} siw_cpu_info;
+static void siw_destroy_cpulist(int number)
+{
+ int i = 0;
+
+ while (i < number)
+ kfree(siw_cpu_info.tx_valid_cpus[i++]);
+
+ kfree(siw_cpu_info.tx_valid_cpus);
+ siw_cpu_info.tx_valid_cpus = NULL;
+}
+
static int siw_init_cpulist(void)
{
int i, num_nodes = nr_node_ids;
@@ -138,24 +149,11 @@ static int siw_init_cpulist(void)
out_err:
siw_cpu_info.num_nodes = 0;
- while (--i >= 0)
- kfree(siw_cpu_info.tx_valid_cpus[i]);
- kfree(siw_cpu_info.tx_valid_cpus);
- siw_cpu_info.tx_valid_cpus = NULL;
+ siw_destroy_cpulist(i);
return -ENOMEM;
}
-static void siw_destroy_cpulist(void)
-{
- int i = 0;
-
- while (i < siw_cpu_info.num_nodes)
- kfree(siw_cpu_info.tx_valid_cpus[i++]);
-
- kfree(siw_cpu_info.tx_valid_cpus);
-}
-
/*
* Choose CPU with least number of active QP's from NUMA node of
* TX interface.
@@ -558,7 +556,7 @@ static __init int siw_init_module(void)
pr_info("SoftIWARP attach failed. Error: %d\n", rv);
siw_cm_exit();
- siw_destroy_cpulist();
+ siw_destroy_cpulist(siw_cpu_info.num_nodes);
return rv;
}
@@ -573,7 +571,7 @@ static void __exit siw_exit_module(void)
siw_cm_exit();
- siw_destroy_cpulist();
+ siw_destroy_cpulist(siw_cpu_info.num_nodes);
if (siw_crypto_shash)
crypto_free_shash(siw_crypto_shash);
--
2.35.3
next prev parent reply other threads:[~2023-11-13 11:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 11:57 [PATCH V5 00/17] Cleanup for siw Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 01/17] RDMA/siw: Introduce siw_get_page Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 02/17] RDMA/siw: Introduce siw_update_skb_rcvd Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 03/17] RDMA/siw: Use iov.iov_len in kernel_sendmsg Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 04/17] RDMA/siw: Remove goto lable in siw_mmap Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 05/17] RDMA/siw: Remove rcu from siw_qp Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 06/17] RDMA/siw: No need to check term_info.valid before call siw_send_terminate Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 07/17] RDMA/siw: Factor out siw_rx_data helper Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 08/17] RDMA/siw: Introduce SIW_STAG_MAX_INDEX Guoqing Jiang
2023-11-13 11:57 ` Guoqing Jiang [this message]
2023-11-13 11:57 ` [PATCH V5 10/17] RDMA/siw: Introduce siw_cep_set_free_and_put Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 11/17] RDMA/siw: Introduce siw_free_cm_id Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 12/17] RDMA/siw: Cleanup siw_accept Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 13/17] RDMA/siw: Remove siw_sk_save_upcalls Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 14/17] RDMA/siw: Fix typo Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 15/17] RDMA/siw: Only check attrs->cap.max_send_wr in siw_create_qp Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 16/17] RDMA/siw: Introduce siw_destroy_cep_sock Guoqing Jiang
2023-11-13 11:57 ` [PATCH V5 17/17] RDMA/siw: Update comments for siw_qp_sq_process Guoqing Jiang
2023-11-15 13:58 ` [PATCH V5 00/17] Cleanup for siw Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231113115726.12762-10-guoqing.jiang@linux.dev \
--to=guoqing.jiang@linux.dev \
--cc=bmt@zurich.ibm.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox