Skip to contentSkip to conversation

x86/platform/UV: Replace kmalloc and memset with kzalloc and kcalloc

PATCH In review Gustavo A. R. Silva 3 participants 4 messages Jan 15, 2019 – Jan 22, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/platform/UV: Replace kmalloc and memset with kzalloc and kcalloc

Replace kmalloc_node and memset with kzalloc_node, and kmalloc_array and memset with kcalloc.

Also, remove unnecessary pointer to void vp.

This code was detected with the help of Coccinelle.

---
 arch/x86/platform/uv/tlb_uv.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/platform/uv/tlb_uv.c +2 -6
index a4130b84d1ff..ed7e3a21344b 100644
@@ -2010,8 +2010,7 @@ static void make_per_cpu_thp(struct bau_control *smaster)
 	int cpu;
 	size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus();
 
-	smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
-	memset(smaster->thp, 0, hpsz);
+	smaster->thp = kzalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
 	for_each_present_cpu(cpu) {
 		smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode;
 		smaster->thp[cpu].uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
@@ -2135,15 +2134,12 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
 static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
 {
 	unsigned char *uvhub_mask;
-	void *vp;
 	struct uvhub_desc *uvhub_descs;
 
 	if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
 		timeout_us = calculate_destination_timeout();
 
-	vp = kmalloc_array(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
-	uvhub_descs = (struct uvhub_desc *)vp;
-	memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+	uvhub_descs = kcalloc(nuvhubs, sizeof(*uvhub_descs), GFP_KERNEL);
 	uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
 
 	if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 30 lines · Gustavo A. R. Silva

Replace kmalloc_node and memset with kzalloc_node, and kmalloc_array and memset with kcalloc.

Also, remove unnecessary pointer to void vp.

This code was detected with the help of Coccinelle.

---
 arch/x86/platform/uv/tlb_uv.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/platform/uv/tlb_uv.c +1 -2
index a4130b84d1ff..ed7e3a21344b 100644
@@ -2010,8 +2010,7 @@ static void make_per_cpu_thp(struct bau_control *smaster)
 	int cpu;
 	size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus();
 
-	smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
-	memset(smaster->thp, 0, hpsz);
+	smaster->thp = kzalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
 	for_each_present_cpu(cpu) {
 		smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode;
 		smaster->thp[cpu].uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
@@ -2135,15 +2134,12 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
 static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
 {
 	unsigned char *uvhub_mask;

arch/x86/platform/uv/tlb_uv.c static int __init summarize_uvhub_sockets(int nuvhubs, · line 2142

Quoted 10 lines
arch/x86/platform/uv/tlb_uv.c +1 -4
-	void *vp;
 	struct uvhub_desc *uvhub_descs;
 
 	if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
 		timeout_us = calculate_destination_timeout();
 
-	vp = kmalloc_array(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
-	uvhub_descs = (struct uvhub_desc *)vp;
-	memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+	uvhub_descs = kcalloc(nuvhubs, sizeof(*uvhub_descs), GFP_KERNEL);
				       ^^^^^^^^^^^^^^^^^^^^

I'm changing that back to sizeof(struct uvhub_desc) as it is clearer this way.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
#3 lore raw

[tip:x86/cleanups] x86/platform/UV: Replace kmalloc() and memset() with k[cz]alloc() calls

In reply to Gustavo A. R. Silva
x86/platform/UV: Replace kmalloc() and memset() with k[cz]alloc() calls
Commit-ID:  2bc217c61685487987c5befd807e10936371643c
Gitweb:     https://git.kernel.org/tip/2bc217c61685487987c5befd807e10936371643c
Author:     Gustavo A. R. Silva <[email protected]>
AuthorDate: Tue, 15 Jan 2019 11:37:13 -0600
Committer:  Borislav Petkov <[email protected]>
CommitDate: Wed, 16 Jan 2019 13:01:26 +0100

x86/platform/UV: Replace kmalloc() and memset() with k[cz]alloc() calls

Replace kmalloc_node() and memset() with kzalloc_node(), and kmalloc_array() and memset() with kcalloc().

This code was detected with the help of Coccinelle.

No functional changes.

Cc "H. Peter Anvin" <[email protected]>
Cc "Peter Zijlstra (Intel)" <[email protected]>
Cc Andrew Banman <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Colin Ian King <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kees Cook <[email protected]>
Cc Nicolai Stange <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Varsha Rao <[email protected]>
Cc x86-ml <[email protected]>
---
 arch/x86/platform/uv/tlb_uv.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/platform/uv/tlb_uv.c +2 -6
index a4130b84d1ff..2c53b0f19329 100644
@@ -2010,8 +2010,7 @@ static void make_per_cpu_thp(struct bau_control *smaster)
 	int cpu;
 	size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus();
 
-	smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
-	memset(smaster->thp, 0, hpsz);
+	smaster->thp = kzalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
 	for_each_present_cpu(cpu) {
 		smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode;
 		smaster->thp[cpu].uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
@@ -2135,15 +2134,12 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
 static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
 {
 	unsigned char *uvhub_mask;
-	void *vp;
 	struct uvhub_desc *uvhub_descs;
 
 	if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
 		timeout_us = calculate_destination_timeout();
 
-	vp = kmalloc_array(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
-	uvhub_descs = (struct uvhub_desc *)vp;
-	memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+	uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
 	uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
 
 	if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
#2 lore raw
In reply to Borislav Petkov
Quoted 9 lines · Borislav Petkov

arch/x86/platform/uv/tlb_uv.c static int __init summarize_uvhub_sockets(int nuvhubs, · line 2142

Quoted 4 lines
arch/x86/platform/uv/tlb_uv.c +1 -3
-	vp = kmalloc_array(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
-	uvhub_descs = (struct uvhub_desc *)vp;
-	memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+	uvhub_descs = kcalloc(nuvhubs, sizeof(*uvhub_descs), GFP_KERNEL);
				       ^^^^^^^^^^^^^^^^^^^^

I'm changing that back to sizeof(struct uvhub_desc) as it is clearer this way.

Okay.

Thanks, Boris.

--
Gustavo