From: Andrzej Hajda <a.hajda@samsung.com>
To: linux-mm@kvack.org
Cc: Andrzej Hajda <a.hajda@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
linux-kernel@vger.kernel.org
Subject: [RFC PATCH 1/4] mm/util: add kstrdup_const
Date: Mon, 29 Dec 2014 15:48:27 +0100 [thread overview]
Message-ID: <1419864510-24834-2-git-send-email-a.hajda@samsung.com> (raw)
In-Reply-To: <1419864510-24834-1-git-send-email-a.hajda@samsung.com>
The patch adds alternative version of kstrdup which returns pointer
to constant char array. The function checks if input string is in
persistent and read-only memory section, if yes it returns the input string,
otherwise it fallbacks to kstrdup.
kstrdup_const is accompanied by kfree_const performing conditional memory
deallocation of the string.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
include/linux/string.h | 3 +++
mm/util.c | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/include/linux/string.h b/include/linux/string.h
index a0c6fd5..c9cd44e 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -115,7 +115,10 @@ extern void * memchr(const void *,int,__kernel_size_t);
#endif
void *memchr_inv(const void *s, int c, size_t n);
+extern void kfree_const(const void *x);
+
extern char *kstrdup(const char *s, gfp_t gfp);
+extern const char *kstrdup_const(const char *s, gfp_t gfp);
extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
extern char *kstrimdup(const char *s, gfp_t gfp);
extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
diff --git a/mm/util.c b/mm/util.c
index d25558b..7fc0094 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -13,10 +13,24 @@
#include <linux/hugetlb.h>
#include <linux/vmalloc.h>
+#include <asm/sections.h>
#include <asm/uaccess.h>
#include "internal.h"
+static inline int is_kernel_rodata(unsigned long addr)
+{
+ return addr >= (unsigned long)__start_rodata &&
+ addr < (unsigned long)__end_rodata;
+}
+
+void kfree_const(const void *x)
+{
+ if (!is_kernel_rodata((unsigned long)x))
+ kfree(x);
+}
+EXPORT_SYMBOL(kfree_const);
+
/**
* kstrdup - allocate space for and copy an existing string
* @s: the string to duplicate
@@ -38,6 +52,14 @@ char *kstrdup(const char *s, gfp_t gfp)
}
EXPORT_SYMBOL(kstrdup);
+const char *kstrdup_const(const char *s, gfp_t gfp)
+{
+ if (is_kernel_rodata((unsigned long)s))
+ return s;
+
+ return kstrdup(s, gfp);
+}
+
/**
* kstrndup - allocate space for and copy an existing string
* @s: the string to duplicate
--
1.9.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-12-29 14:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-29 14:48 [RFC PATCH 0/4] kstrdup optimization Andrzej Hajda
2014-12-29 14:48 ` Andrzej Hajda [this message]
2014-12-29 14:48 ` [RFC PATCH 2/4] kernfs: use kstrdup_const for node name allocation Andrzej Hajda
2014-12-29 14:48 ` [RFC PATCH 3/4] clk: use kstrdup_const for clock name allocations Andrzej Hajda
2014-12-29 14:48 ` [RFC PATCH 4/4] mm/slab: use kstrdup_const for allocating cache names Andrzej Hajda
2014-12-30 6:45 ` [RFC PATCH 0/4] kstrdup optimization Andi Kleen
2014-12-30 7:16 ` Andrzej Hajda
2014-12-30 8:32 ` Andreas Mohr
2014-12-30 21:29 ` Andi Kleen
2015-01-08 10:54 ` Andrzej Hajda
2014-12-31 13:05 ` Andrzej Hajda
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=1419864510-24834-2-git-send-email-a.hajda@samsung.com \
--to=a.hajda@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
/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