[PATCHv2 0/6] lib/string: introduce kbasename helper

[PATCHv2 0/6] lib/string: introduce kbasename helper

[Andy Shevchenko]

There are several places in kernel that duplicate code to get last part of the pathname.
This patchset introduces a helper.

Since v1:
 - fix changelog of the patch 1 - we are doing basname(3) alike helper
 - usb related patch temporary excluded from series (under discussion with
   Greg)

Andy Shevchenko (6):
  string: introduce helper to get base file name from given path
  lib: dynamic_debug: reuse kbasename()
  staging: rts_pstor: reuse kbasename()
  mm: reuse kbasename() functionality
  procfs: reuse kbasename() functionality
  trace: reuse kbasename() functionality

 drivers/staging/rts_pstor/trace.h |   16 +++-------------
 fs/proc/proc_devtree.c            |    7 ++-----
 include/linux/string.h            |   11 +++++++++++
 kernel/trace/trace_uprobe.c       |    6 +++---
 lib/dynamic_debug.c               |    9 +--------
 mm/memory.c                       |    8 +++-----
 6 files changed, 23 insertions(+), 34 deletions(-)

-- 
1.7.10.4

[PATCHv2 1/6] string: introduce helper to get base file name from given path

[Andy Shevchenko]

There are several places in the kernel that use functionality like basename(3)
with the exception: in case of '/foo/bar/' we expect to get an empty string.
Let's do it common helper for them.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/linux/string.h |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/linux/string.h b/include/linux/string.h
index b917881..b09a342 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -147,5 +147,16 @@ static inline bool strstarts(const char *str, const char *prefix)
 
 extern size_t memweight(const void *ptr, size_t bytes);
 
+/**
+ * kbasename - return the last part of a pathname.
+ *
+ * @path: path to extract the filename from.
+ */
+static inline const char *kbasename(const char *path)
+{
+	const char *tail = strrchr(path, '/');
+	return tail ? tail + 1 : path;
+}
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_STRING_H_ */
-- 
1.7.10.4

[PATCHv2 2/6] lib: dynamic_debug: reuse kbasename()

[Andy Shevchenko]

Remove the custom implementation of the functionality similar to kbasename().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Jason Baron <jbaron@redhat.com>
---
 lib/dynamic_debug.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index e7f7d99..1db1fc6 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -62,13 +62,6 @@ static LIST_HEAD(ddebug_tables);
 static int verbose = 0;
 module_param(verbose, int, 0644);
 
-/* Return the last part of a pathname */
-static inline const char *basename(const char *path)
-{
-	const char *tail = strrchr(path, '/');
-	return tail ? tail+1 : path;
-}
-
 /* Return the path relative to source root */
 static inline const char *trim_prefix(const char *path)
 {
@@ -154,7 +147,7 @@ static int ddebug_change(const struct ddebug_query *query,
 			/* match against the source filename */
 			if (query->filename &&
 			    strcmp(query->filename, dp->filename) &&
-			    strcmp(query->filename, basename(dp->filename)) &&
+			    strcmp(query->filename, kbasename(dp->filename)) &&
 			    strcmp(query->filename, trim_prefix(dp->filename)))
 				continue;
 
-- 
1.7.10.4

[PATCHv2 3/6] staging: rts_pstor: reuse kbasename()

[Andy Shevchenko]

The custom filename function mostly repeats the kernel's kbasename. This patch
simplifies it. The updated filename() will not check for the '\' in the
filenames. It seems redundant in Linux.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: YAMANE Toshiaki <yamanetoshi@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/rts_pstor/trace.h |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rts_pstor/trace.h b/drivers/staging/rts_pstor/trace.h
index cf60a1b..59c5686 100644
--- a/drivers/staging/rts_pstor/trace.h
+++ b/drivers/staging/rts_pstor/trace.h
@@ -24,26 +24,16 @@
 #ifndef __REALTEK_RTSX_TRACE_H
 #define __REALTEK_RTSX_TRACE_H
 
+#include <linux/string.h>
+
 #define _MSG_TRACE
 
 #ifdef _MSG_TRACE
 static inline char *filename(char *path)
 {
-	char *ptr;
-
 	if (path == NULL)
 		return NULL;
-
-	ptr = path;
-
-	while (*ptr != '\0') {
-		if ((*ptr == '\\') || (*ptr == '/'))
-			path = ptr + 1;
-		
-		ptr++;
-	}
-
-	return path;
+	return kbasename(path);
 }
 
 #define TRACE_RET(chip, ret)   										\
-- 
1.7.10.4

[PATCHv2 4/6] mm: reuse kbasename() functionality

[Andy Shevchenko]

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-mm@kvack.org
---
 mm/memory.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 0e3a516..6b101a2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -58,6 +58,7 @@
 #include <linux/elf.h>
 #include <linux/gfp.h>
 #include <linux/migrate.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/pgalloc.h>
@@ -4034,15 +4035,12 @@ void print_vma_addr(char *prefix, unsigned long ip)
 		struct file *f = vma->vm_file;
 		char *buf = (char *)__get_free_page(GFP_KERNEL);
 		if (buf) {
-			char *p, *s;
+			char *p;
 
 			p = d_path(&f->f_path, buf, PAGE_SIZE);
 			if (IS_ERR(p))
 				p = "?";
-			s = strrchr(p, '/');
-			if (s)
-				p = s+1;
-			printk("%s%s[%lx+%lx]", prefix, p,
+			printk("%s%s[%lx+%lx]", prefix, kbasename(p),
 					vma->vm_start,
 					vma->vm_end - vma->vm_start);
 			free_page((unsigned long)buf);
-- 
1.7.10.4

[PATCHv2 5/6] procfs: reuse kbasename() functionality

[Andy Shevchenko]

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 fs/proc/proc_devtree.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index df7dd08..3d9fd66 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -13,6 +13,7 @@
 #include <linux/of.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 #include <asm/prom.h>
 #include <asm/uaccess.h>
 #include "internal.h"
@@ -195,11 +196,7 @@ void proc_device_tree_add_node(struct device_node *np,
 	set_node_proc_entry(np, de);
 	for (child = NULL; (child = of_get_next_child(np, child));) {
 		/* Use everything after the last slash, or the full name */
-		p = strrchr(child->full_name, '/');
-		if (!p)
-			p = child->full_name;
-		else
-			++p;
+		p = kbasename(child->full_name);
 
 		if (duplicate_name(de, p))
 			p = fixup_name(np, de, p);
-- 
1.7.10.4

[PATCHv2 6/6] trace: reuse kbasename() functionality

[Andy Shevchenko]

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org> (maintainer:TRACING)
Cc: Frederic Weisbecker <fweisbec@gmail.com> (maintainer:TRACING)
---
 kernel/trace/trace_uprobe.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 03003cd..a2b2fab 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -22,6 +22,7 @@
 #include <linux/uaccess.h>
 #include <linux/uprobes.h>
 #include <linux/namei.h>
+#include <linux/string.h>
 
 #include "trace_probe.h"
 
@@ -263,16 +264,15 @@ static int create_trace_uprobe(int argc, char **argv)
 
 	/* setup a probe */
 	if (!event) {
-		char *tail = strrchr(filename, '/');
+		char *tail;
 		char *ptr;
 
-		ptr = kstrdup((tail ? tail + 1 : filename), GFP_KERNEL);
+		tail = ptr = kstrdup(kbasename(filename), GFP_KERNEL);
 		if (!ptr) {
 			ret = -ENOMEM;
 			goto fail_address_parse;
 		}
 
-		tail = ptr;
 		ptr = strpbrk(tail, ".-_");
 		if (ptr)
 			*ptr = '\0';
-- 
1.7.10.4

[PATCHv2.5] trace: reuse kbasename() functionality

[Andy Shevchenko]

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
---
 kernel/trace/trace_uprobe.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 03003cd..c7ba4f6 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -22,6 +22,7 @@
 #include <linux/uaccess.h>
 #include <linux/uprobes.h>
 #include <linux/namei.h>
+#include <linux/string.h>
 
 #include "trace_probe.h"
 
@@ -263,16 +264,15 @@ static int create_trace_uprobe(int argc, char **argv)
 
 	/* setup a probe */
 	if (!event) {
-		char *tail = strrchr(filename, '/');
+		char *tail;
 		char *ptr;
 
-		ptr = kstrdup((tail ? tail + 1 : filename), GFP_KERNEL);
-		if (!ptr) {
+		tail = kstrdup(kbasename(filename), GFP_KERNEL);
+		if (!tail) {
 			ret = -ENOMEM;
 			goto fail_address_parse;
 		}
 
-		tail = ptr;
 		ptr = strpbrk(tail, ".-_");
 		if (ptr)
 			*ptr = '\0';
-- 
1.7.10.4

Re: [PATCHv2 3/6] staging: rts_pstor: reuse kbasename()

[Kirill A. Shutemov]

On Wed, Oct 03, 2012 at 11:43:00AM +0300, Andy Shevchenko wrote:
> The custom filename function mostly repeats the kernel's kbasename. This patch
> simplifies it. The updated filename() will not check for the '\' in the
> filenames. It seems redundant in Linux.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: YAMANE Toshiaki <yamanetoshi@gmail.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  drivers/staging/rts_pstor/trace.h |   16 +++-------------
>  1 file changed, 3 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/staging/rts_pstor/trace.h b/drivers/staging/rts_pstor/trace.h
> index cf60a1b..59c5686 100644
> --- a/drivers/staging/rts_pstor/trace.h
> +++ b/drivers/staging/rts_pstor/trace.h
> @@ -24,26 +24,16 @@
>  #ifndef __REALTEK_RTSX_TRACE_H
>  #define __REALTEK_RTSX_TRACE_H
>  
> +#include <linux/string.h>
> +
>  #define _MSG_TRACE
>  
>  #ifdef _MSG_TRACE
>  static inline char *filename(char *path)
>  {
> -	char *ptr;
> -
>  	if (path == NULL)
>  		return NULL;
> -
> -	ptr = path;
> -
> -	while (*ptr != '\0') {
> -		if ((*ptr == '\\') || (*ptr == '/'))
> -			path = ptr + 1;
> -		
> -		ptr++;
> -	}
> -
> -	return path;
> +	return kbasename(path);

Looks like you silentely drop const qualifier here from kbasename() return
value.

-- 
 Kirill A. Shutemov

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Steven Rostedt]

On Wed, 2012-10-03 at 11:53 +0300, Andy Shevchenko wrote:
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> ---
>  kernel/trace/trace_uprobe.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 03003cd..c7ba4f6 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -22,6 +22,7 @@
>  #include <linux/uaccess.h>
>  #include <linux/uprobes.h>
>  #include <linux/namei.h>
> +#include <linux/string.h>
>  
>  #include "trace_probe.h"
>  
> @@ -263,16 +264,15 @@ static int create_trace_uprobe(int argc, char **argv)
>  
>  	/* setup a probe */
>  	if (!event) {
> -		char *tail = strrchr(filename, '/');
> +		char *tail;
>  		char *ptr;
>  
> -		ptr = kstrdup((tail ? tail + 1 : filename), GFP_KERNEL);
> -		if (!ptr) {
> +		tail = kstrdup(kbasename(filename), GFP_KERNEL);

I don't see kbasename() anywhere. Is this based off of other patches?

-- Steve

> +		if (!tail) {
>  			ret = -ENOMEM;
>  			goto fail_address_parse;
>  		}
>  
> -		tail = ptr;
>  		ptr = strpbrk(tail, ".-_");
>  		if (ptr)
>  			*ptr = '\0';

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Andy Shevchenko]

On Fri, Oct 5, 2012 at 7:49 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> On Wed, 2012-10-03 at 11:53 +0300, Andy Shevchenko wrote:
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> Cc: Steven Rostedt <rostedt@goodmis.org>
>> Cc: Frederic Weisbecker <fweisbec@gmail.com>
>> ---
>>  kernel/trace/trace_uprobe.c |    8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
>> index 03003cd..c7ba4f6 100644
>> --- a/kernel/trace/trace_uprobe.c
>> +++ b/kernel/trace/trace_uprobe.c
>> @@ -22,6 +22,7 @@
>>  #include <linux/uaccess.h>
>>  #include <linux/uprobes.h>
>>  #include <linux/namei.h>
>> +#include <linux/string.h>
>>
>>  #include "trace_probe.h"
>>
>> @@ -263,16 +264,15 @@ static int create_trace_uprobe(int argc, char **argv)
>>
>>       /* setup a probe */
>>       if (!event) {
>> -             char *tail = strrchr(filename, '/');
>> +             char *tail;
>>               char *ptr;
>>
>> -             ptr = kstrdup((tail ? tail + 1 : filename), GFP_KERNEL);
>> -             if (!ptr) {
>> +             tail = kstrdup(kbasename(filename), GFP_KERNEL);
>
> I don't see kbasename() anywhere. Is this based off of other patches?
It's introduced by first patch in the series.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Steven Rostedt]

On Fri, 2012-10-05 at 20:02 +0300, Andy Shevchenko wrote:

> > I don't see kbasename() anywhere. Is this based off of other patches?
> It's introduced by first patch in the series.
> 

Usually a series has the format of:

[PATCH x/n] ....

Where x is the patch number and n is the total number of patches. I'm
not sure what a v2.5 is. This is version 2 and a half?

-- Seve

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Steven Rostedt]

On Fri, 2012-10-05 at 13:12 -0400, Steven Rostedt wrote:

> -- Seve

Error: SIGFAULT!

-- Steve ;-)

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Andy Shevchenko]

On Fri, Oct 5, 2012 at 8:12 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 2012-10-05 at 20:02 +0300, Andy Shevchenko wrote:
>
>> > I don't see kbasename() anywhere. Is this based off of other patches?
>> It's introduced by first patch in the series.
> Usually a series has the format of:
>
> [PATCH x/n] ....
>
> Where x is the patch number and n is the total number of patches. I'm
> not sure what a v2.5 is. This is version 2 and a half?
Ah, it's an update to patch 6/6. You could see it by
Message-Id/In-Reply-To chains.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCHv2.5] trace: reuse kbasename() functionality

[Steven Rostedt]

On Fri, 2012-10-05 at 20:21 +0300, Andy Shevchenko wrote:
> On Fri, Oct 5, 2012 at 8:12 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> > On Fri, 2012-10-05 at 20:02 +0300, Andy Shevchenko wrote:
> >
> >> > I don't see kbasename() anywhere. Is this based off of other patches?
> >> It's introduced by first patch in the series.
> > Usually a series has the format of:
> >
> > [PATCH x/n] ....
> >
> > Where x is the patch number and n is the total number of patches. I'm
> > not sure what a v2.5 is. This is version 2 and a half?
> Ah, it's an update to patch 6/6. You could see it by
> Message-Id/In-Reply-To chains.
> 

OK, that's where the confusion stems from. The original patch 6/6 had in
the patch:

Cc: Steven Rostedt <rostedt@goodmis.org> (maintainer:TRACING)                                                                                                                       
Cc: Frederic Weisbecker <fweisbec@gmail.com> (maintainer:TRACING)

But I neither I nor Frederic were on the actual Cc (I had to open my
LKML folder to see it). Perhaps whatever tool you used to send the
patches got confused by the (maintainer:TRACING) line.

Thus, the only thing that ended up in my INBOX was the [PATCHv2.5] one.

-- Steve