1/7 create kstrdup library function
Subsystems (2)
PATCH 1/1 1/7 create kstrdup library function
This patch creates the kstrdup library function so that it doesn't have to be reimplemented (or even EXPORT'ed) by every user that needs it.
--
Paulo Marques - www.grupopie.com
All that is necessary for the triumph of evil is that good men do nothing. Edmund Burke (1729 - 1797)
include/linux/string.h +2 -0
@@ -88,6 +88,8 @@ extern int memcmp(const void *,const voiextern void *memchr (const void *,int ,__kernel_size_t );#endif +extern char *kstrdup (const char *s,int gfp); + #ifdef __cplusplus }#endif
lib/string.c +20 -0
@@ -599,3 +599,23 @@ void *memchr(const void *s, int c, size_ }EXPORT_SYMBOL (memchr);#endif + +/* +* kstrdup - allocate space for and copy an existing string +* +* @s: the string to duplicate +* @gfp: the GFP mask used in the kmalloc() call when allocating memory +*/ +char *kstrdup (const char *s,int gfp) +{ +int len; +char *buf; + +if (!s)return NULL ; + + len =strlen (s) +1 ; + buf =kmalloc (len, gfp); +if (buf) +memcpy (buf, s, len); +return buf; +}
+
+EXPORT_SYMBOL(kstrdup);
Hi,
Quoted 25 lines · On Tue, 1 Feb 2005 03:28:21 +0000, [email protected]…
This patch creates the kstrdup library function so that it doesn't have to be reimplemented (or even EXPORT'ed) by every user that needs it.
Signed-off-by Paulo Marques <[email protected]>diff -buprN -X dontdiff
vanilla-2.6.11-rc2-bk9/lib/string.clinux-2.6.11-rc2-bk9/lib/string.clib/string.c 2005-01-31 20:00:31.000000000 +0000 renamed from lib/string.c 2005-01-31 20:05:37.000000000 +0000 +12
-0@@ -599,3 +599,23 @@ void *memchr(const void *s, int c, size_ } EXPORT_SYMBOL(memchr); #endif + +/* + * kstrdup - allocate space for and copy an existing string + * + * @s: the string to duplicate + * @gfp: the GFP mask used in the kmalloc() call when allocating memory + */ +char *kstrdup(const char *s, int gfp) +{ + int len; + char *buf; +
lib/string.c 2005-01-31 20:00:31.000000000 +0000 void *memchr(const void *s, int c, size_
Quoted 10 lines
lib/string.c 2005-01-31 20:00:31.000000000 +0000 renamed from lib/string.c 2005-01-31 20:05:37.000000000 +0000 +10
-0+ if (!s) return NULL; + + len = strlen(s) + 1; + buf = kmalloc(len, gfp); + if (buf) + memcpy(buf, s, len); + return buf; +} + +EXPORT_SYMBOL(kstrdup);
kstrdup() is a special-case _memory allocator_ (not so much a string operation) so I think it should go into mm/slab.c where we currently have kcalloc().
P.S. Please inline patches to your email as per Documentation/SubmittingPatches. I, for one, have trouble with attachments.
Pekka
Quoted 5 lines · Pekka Enberg
[...]
kstrdup()is a special-case_memoryallocator_(not so much a string operation) so I think it should go intomm/slab.cwhere we currently havekcalloc().
I was following Rusty Russell's approach. Also, I believe this is more intuitive because the standard libc strdup function is declared in string.h.
However, I really don't have strong feelings either way, so if the majority agrees that this should be in mm/slab, its fine by me.
Quoted 3 lines
P.S. Please inline patches to your email as perDocumentation/SubmittingPatches. I, for one, have trouble with attachments.
Unfortunately my email client messes up inline patches and wordwraps / mangles white space, so I resort to attaching them until I have time to look into fixing that :(
Signature · 4 lines
Paulo Marques - www.grupopie.com All that is necessary for the triumph of evil is that good men do nothing. Edmund Burke (1729 - 1797)
Quoted 3 lines · At some point in time, I wrote:
Quoted 3 lines
kstrdup()is a special-case_memoryallocator_(not so much a string operation) so I think it should go intomm/slab.cwhere we currently havekcalloc().
Quoted 5 lines · Paulo Marques
I was following Rusty Russell's approach. Also, I believe this is more intuitive because the standard libc strdup function is declared in
string.h.However, I really don't have strong feelings either way, so if the majority agrees that this should be in mm/slab, its fine by me.
Intuitive, perhaps, but I think it's wrong. I don't like it because it makes string operations depend on slab. Furthermore, kstrdup() is not a string operation. It is about memory allocation, really, just like kcalloc().
One possible way to clean this up would be to extract the standard-like allocators (kmalloc, kcalloc, and kstrdup) from mm/slab.c and move them into a separate file.
Pekka
Quoted 12 lines · Pekka Enberg
Quoted 3 lines · At some point in time, I wrote:
Quoted 3 lines
kstrdup()is a special-case_memoryallocator_(not so much a string operation) so I think it should go intomm/slab.cwhere we currently havekcalloc().Quoted 3 lines · Paulo Marques
I was following Rusty Russell's approach. Also, I believe this is more intuitive because the standard libc strdup function is declared in
string.h.
Quoted 8 lines
Quoted 2 lines
However, I really don't have strong feelings either way, so if the majority agrees that this should be in mm/slab, its fine by me.
Intuitive, perhaps, but I think it's wrong. I don't like it because it makes string operations depend on slab. Furthermore,
kstrdup()is not a string operation. It is about memory allocation, really, just likekcalloc().
I agree with the "is like kcalloc" argument in the sense that it does an allocation + something else. But in this case the "something else" is in fact a string operation, so this just seem to be in the middle.
Quoted 3 lines
One possible way to clean this up would be to extract the standard-like allocators (kmalloc, kcalloc, and kstrdup) from
mm/slab.cand move them into a separate file.
I don't like this approach. From a quick grep you get 4972 kmalloc's in .c files in the kernel tree and only 35 kstrdup's. Moving kstrdup around is still just 7 patches, kmalloc is a much bigger problem.
Anyway, as I said before, if more people believe that moving kstrdup into mm/slab.c is the way to go, then its fine by me. The problem I was trying to solve was having several versions of strdup-like functions all around the kernel, and this problem gets fixed either way. Right now, the poll goes something like this:
string.c: me, Rusty Russellslab.c: Pekka Enberg
I think we need more votes :)
Signature · 4 lines
Paulo Marques - www.grupopie.com All that is necessary for the triumph of evil is that good men do nothing. Edmund Burke (1729 - 1797)
Quoted 1 line · Paulo Marques
I agree with the "is like kcalloc" argument in the sense that it does an allocation + something else. But in this case the "something else" is in fact a string operation, so this just seem to be in the middle.
Sure, but now you're forcing all users of <string.h> to depend on the slab as well. Conceptually, kstrdup() is an initializing memory allocator, not a string operation, which is why I think it should go into slab.c.
Quoted 1 line · Paulo Marques
I don't like this approach. From a quick grep you get 4972 kmalloc's in .c files in the kernel tree and only 35 kstrdup's. Moving kstrdup around is still just 7 patches, kmalloc is a much bigger problem.
Hmm? Yes, moving the declaration from slab.h to some other header is painful. I only talked about moving the definition from slab.c.
Quoted 6 lines · Paulo Marques
Anyway, as I said before, if more people believe that moving kstrdup into
mm/slab.cis the way to go, then its fine by me. The problem I was trying to solve was having several versions of strdup-like functions all around the kernel, and this problem gets fixed either way. Right now, the poll goes something like this:
string.c: me, Rusty Russellslab.c: Pekka EnbergI think we need more votes :)
Could we also get Rusty's confirmation on this?
Pekka