* [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
@ 2007-11-26 9:02 Joonwoo Park
2007-11-26 9:06 ` Robert P. J. Day
2007-11-26 9:10 ` Patrick McHardy
0 siblings, 2 replies; 6+ messages in thread
From: Joonwoo Park @ 2007-11-26 9:02 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
xfrm_hash: kmalloc + memset conversion to kzalloc
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Thanks.
Joonwoo
---
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
index 55ab579..37795bd 100644
--- a/net/xfrm/xfrm_hash.c
+++ b/net/xfrm/xfrm_hash.c
@@ -17,16 +17,17 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz)
struct hlist_head *n;
if (sz <= PAGE_SIZE)
- n = kmalloc(sz, GFP_KERNEL);
- else if (hashdist)
- n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
- else
- n = (struct hlist_head *)
- __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
- get_order(sz));
-
- if (n)
- memset(n, 0, sz);
+ n = kzalloc(sz, GFP_KERNEL);
+ else {
+ if (hashdist)
+ n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
+ else
+ n = (struct hlist_head *)
+ __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
+ get_order(sz));
+ if (n)
+ memset(n, 0, sz);
+ }
return n;
}
---
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
2007-11-26 9:02 [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc Joonwoo Park
@ 2007-11-26 9:06 ` Robert P. J. Day
2007-11-26 10:28 ` Joonwoo Park
2007-11-26 9:10 ` Patrick McHardy
1 sibling, 1 reply; 6+ messages in thread
From: Robert P. J. Day @ 2007-11-26 9:06 UTC (permalink / raw)
To: Joonwoo Park; +Cc: netdev, linux-kernel
On Mon, 26 Nov 2007, Joonwoo Park wrote:
> xfrm_hash: kmalloc + memset conversion to kzalloc
>
> Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
>
> Thanks.
> Joonwoo
>
> ---
> diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
> index 55ab579..37795bd 100644
> --- a/net/xfrm/xfrm_hash.c
> +++ b/net/xfrm/xfrm_hash.c
> @@ -17,16 +17,17 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz)
> struct hlist_head *n;
>
> if (sz <= PAGE_SIZE)
> - n = kmalloc(sz, GFP_KERNEL);
> - else if (hashdist)
> - n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
> - else
> - n = (struct hlist_head *)
> - __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
> - get_order(sz));
> -
> - if (n)
> - memset(n, 0, sz);
> + n = kzalloc(sz, GFP_KERNEL);
> + else {
> + if (hashdist)
i believe the more common standard for the above is:
else if (hashdist) {
to reduce the level of overall indentation, no?
rday
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://crashcourse.ca
========================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
2007-11-26 9:02 [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc Joonwoo Park
2007-11-26 9:06 ` Robert P. J. Day
@ 2007-11-26 9:10 ` Patrick McHardy
2007-11-26 10:23 ` Joonwoo Park
1 sibling, 1 reply; 6+ messages in thread
From: Patrick McHardy @ 2007-11-26 9:10 UTC (permalink / raw)
To: Joonwoo Park; +Cc: netdev, linux-kernel
Joonwoo Park wrote:
> diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
> index 55ab579..37795bd 100644
> --- a/net/xfrm/xfrm_hash.c
> +++ b/net/xfrm/xfrm_hash.c
> @@ -17,16 +17,17 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz)
> struct hlist_head *n;
>
> if (sz <= PAGE_SIZE)
> - n = kmalloc(sz, GFP_KERNEL);
> - else if (hashdist)
> - n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
> - else
> - n = (struct hlist_head *)
> - __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
> - get_order(sz));
> -
> - if (n)
> - memset(n, 0, sz);
> + n = kzalloc(sz, GFP_KERNEL);
> + else {
> + if (hashdist)
> + n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
> + else
> + n = (struct hlist_head *)
> + __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
> + get_order(sz));
> + if (n)
> + memset(n, 0, sz);
How about also switching vmalloc/get_free_pages to GFP_ZERO
and getting rid of the memset entirely while you're at it?
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
2007-11-26 9:10 ` Patrick McHardy
@ 2007-11-26 10:23 ` Joonwoo Park
2007-11-26 15:24 ` Herbert Xu
0 siblings, 1 reply; 6+ messages in thread
From: Joonwoo Park @ 2007-11-26 10:23 UTC (permalink / raw)
To: 'Patrick McHardy'; +Cc: netdev, linux-kernel
2007/11/26, Patrick McHardy <kaber@trash.net>:
> How about also switching vmalloc/get_free_pages to GFP_ZERO
> and getting rid of the memset entirely while you're at it?
>
xfrm_hash: kmalloc + memset conversion to kzalloc
fix to avoid memset entirely.
Thanks Patrick.
Thanks.
Joonwoo
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
---
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
index 55ab579..a2023ec 100644
--- a/net/xfrm/xfrm_hash.c
+++ b/net/xfrm/xfrm_hash.c
@@ -17,17 +17,14 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz)
struct hlist_head *n;
if (sz <= PAGE_SIZE)
- n = kmalloc(sz, GFP_KERNEL);
+ n = kzalloc(sz, GFP_KERNEL);
else if (hashdist)
- n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
+ n = __vmalloc(sz, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);
else
n = (struct hlist_head *)
- __get_free_pages(GFP_KERNEL | __GFP_NOWARN,
+ __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
get_order(sz));
- if (n)
- memset(n, 0, sz);
-
return n;
}
---
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
2007-11-26 9:06 ` Robert P. J. Day
@ 2007-11-26 10:28 ` Joonwoo Park
0 siblings, 0 replies; 6+ messages in thread
From: Joonwoo Park @ 2007-11-26 10:28 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: netdev, linux-kernel
>
> i believe the more common standard for the above is:
>
> else if (hashdist) {
>
> to reduce the level of overall indentation, no?
>
No, it was.
Because there was a memset in that indentation, but I made it by
removing memset.
Thanks.
Joonwoo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc
2007-11-26 10:23 ` Joonwoo Park
@ 2007-11-26 15:24 ` Herbert Xu
0 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2007-11-26 15:24 UTC (permalink / raw)
To: Joonwoo Park; +Cc: 'Patrick McHardy', netdev, linux-kernel
On Mon, Nov 26, 2007 at 10:23:51AM +0000, Joonwoo Park wrote:
> 2007/11/26, Patrick McHardy <kaber@trash.net>:
> > How about also switching vmalloc/get_free_pages to GFP_ZERO
> > and getting rid of the memset entirely while you're at it?
> >
>
> xfrm_hash: kmalloc + memset conversion to kzalloc
> fix to avoid memset entirely.
Patch applied. Thanks everyone!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-11-26 15:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-26 9:02 [PATCH 1/4] xfrm_hash: kmalloc + memset conversion to kzalloc Joonwoo Park
2007-11-26 9:06 ` Robert P. J. Day
2007-11-26 10:28 ` Joonwoo Park
2007-11-26 9:10 ` Patrick McHardy
2007-11-26 10:23 ` Joonwoo Park
2007-11-26 15:24 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).