make '%pD' print full path for file
Subsystems (4)
v4 cover make '%pD' print full path for file
Background
==========
Linus suggested printing full path for file instead of printing the components as '%pd'.
Typically, there is no need for printk specifiers to take any real locks (ie mount_lock or rename_lock). So I introduce a new helper d_path_fast which is similar to d_path except it doesn't take any seqlock/spinlock.
This series is based on Al Viro's d_path cleanup patches [1] which lifted the inner lockless loop into a new helper.
[1] https://lkml.org/lkml/2021/5/18/1260
Test
====
The cases I tested:
1. print '%pD' with full path of ext4 file
2. mount a ext4 filesystem upon a ext4 filesystem, and print the file with '%pD'
3. all test_print selftests, including the new '%14pD' '%-14pD'
4. kasnprintf
Changelog
=========
v4:
- don't support spec.precision anymore for '%pD'
- add Rasmus's patch into this series
v3:
- implement new d_path_unsafe to use [buf, end] instead of stack space for filling bytes (by Matthew)
- add new test cases for '%pD'
- drop patch "hmcdrv: remove the redundant directory path" before removing rfc.
v2:
- implement new d_path_fast based on Al Viro's patches
- add check_pointer check (by Petr)
- change the max full path size to 256 in stack space
v1: https://lkml.org/lkml/2021/5/8/122
Jia He (4):
fs: introduce helper d_path_unsafe() lib/vsprintf.c: make '%pD' print full path for file lib/test_printf.c: split write-beyond-buffer check in two lib/test_printf.c: add test cases for '%pD'
Documentation/core-api/printk-formats.rst | 5 +- fs/d_path.c | 83 ++++++++++++++++++++++- include/linux/dcache.h | 1 + lib/test_printf.c | 31 ++++++++- lib/vsprintf.c | 37 ++++++++-- 5 files changed, 148 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
RFC PATCH v4 1/4 fs: introduce helper d_path_unsafe()
This helper is similar to d_path except that it doesn't take any seqlock/spinlock. It is typical for debugging purpose. Besides, an additional return value *prenpend_len* is used to get the full path length of the dentry.
prepend_name_with_len() enhances the behavior of prepend_name(). Previously it will skip the loop at once in __prepen_path() when the space is not enough. __prepend_path() gets the full length of dentry together with the parent recusively.
Besides, if someone invokes snprintf with small but positive space, prepend_name_with() needs to move and copy the string partially.
More than that, kasnprintf will pass NULL _buf_ and _end_, hence it returns at the very beginning with false in this case;
--- fs/d_path.c | 83 +++++++++++++++++++++++++++++++++++++++++- include/linux/dcache.h | 1 + 2 files changed, 82 insertions(+), 2 deletions(-)
fs/d_path.c +81 -2
@@ -68,9 +68,66 @@ static bool prepend_name(struct prepend_buffer *p, const struct qstr *name)return true; } +static bool prepend_name_with_len (struct prepend_buffer *p,const struct qstr *name, +int orig_buflen) +{ +const char *dname =smp_load_acquire (&name->name);/* ^^^ */ +int dlen =READ_ONCE (name->len); +char *s; +int last_len = p->len; + + p->len -= dlen +1 ; + +if (unlikely (!p->buf)) +return false; + +if (orig_buflen <=0 ) +return false; +/* +* The first time we overflow the buffer. Then fill the string +* partially from the beginning +*/ +if (unlikely (p->len <0 )) { +int buflen =strlen (p->buf); + + s = p->buf; + +/* Still have small space to fill partially */ +if (last_len >0 ) { + p->buf -= last_len; + buflen += last_len; + } + +if (buflen > dlen +1 ) { +/* This dentry name can be fully filled */ +memmove (p->buf + dlen +1 , s, buflen - dlen -1 ); + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, dlen); + }else if (buflen >0 ) { +/* Partially filled, and drop last dentry name */ + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, buflen -1 ); + } + +return false; + } + + s = p->buf -= dlen +1 ; + *s++ ='/' ; +while (dlen--) { +char c = *dname++; + +if (!c) +break ; + *s++ = c; + } +return true; +}static int __prepend_path (const struct dentry *dentry,const struct mount *mnt,const struct path *root,struct prepend_buffer *p) { +int orig_buflen = p->len; +while (dentry != root->dentry || &mnt->mnt != root->mnt) {const struct dentry *parent =READ_ONCE (dentry->d_parent);
@@ -97,8 +154,7 @@ static int __prepend_path(const struct dentry *dentry, const struct mount *mnt,return 3 ;prefetch (parent); -if (!prepend_name (p, &dentry->d_name)) -break ; +prepend_name_with_len (p, &dentry->d_name, orig_buflen); dentry = parent; }return 0 ;
@@ -263,6 +319,29 @@ char *d_path(const struct path *path, char *buf, int buflen) }EXPORT_SYMBOL (d_path); +/** +* d_path_unsafe - fast return the full path of a dentry without taking +* any seqlock/spinlock. This helper is typical for debugging purpose. +*/ +char *d_path_unsafe (const struct path *path,char *buf,int buflen, +int *prepend_len) +{ +struct path root; +struct mount *mnt =real_mount (path->mnt); +DECLARE_BUFFER (b, buf, buflen); + +rcu_read_lock (); +get_fs_root_rcu (current->fs, &root); + +prepend (&b,"" ,1 ); +__prepend_path (path->dentry, mnt, &root, &b); +rcu_read_unlock (); + + *prepend_len = b.len; + +return b.buf; +} +/* * Helper function for dentry_operations.d_dname() members */
include/linux/dcache.h +1 -0
@@ -301,6 +301,7 @@ char *dynamic_dname(struct dentry *, char *, int, const char *, ...);extern char *__d_path (const struct path *,const struct path *,char *,int );extern char *d_absolute_path (const struct path *,char *,int );extern char *d_path (const struct path *,char *,int ); +extern char *d_path_unsafe (const struct path *,char *,int ,int *);extern char *dentry_path_raw (const struct dentry *,char *,int );extern char *dentry_path (const struct dentry *,char *,int );
Signature · 1 line
2.17.1
Re: [PATCH RFCv4 1/4] fs: introduce helper d_path_unsafe()
Quoted 3 lines · Jia He
This helper is similar to
d_pathexcept that it doesn't take any seqlock/spinlock. It is typical for debugging purpose. Besides,
purposes
Quoted 7 lines
an additional return value *prenpend_len* is used to get the full path length of the dentry.
prepend_name_with_len()enhances the behavior ofprepend_name(). Previously it will skip the loop at once in__prepen_path()when the space is not enough.__prepend_path()gets the full length of dentry together with the parent recusively.
recursively
Quoted 5 lines
Besides, if someone invokes snprintf with small but positive space,
prepend_name_with()needs to move and copy the string partially.More than that, kasnprintf will pass NULL _buf_ and _end_, hence
kasprintf()
Quoted 14 lines
it returns at the very beginning with false in this case;
Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Jia He <[email protected]>--- fs/d_path.c | 83 +++++++++++++++++++++++++++++++++++++++++- include/linux/dcache.h | 1 + 2 files changed, 82 insertions(+), 2 deletions(-)fs/d_path.c +0
-0
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, const struct qstr *name) · line 74
Quoted 7 lines
fs/d_path.c +4
-0@@ -68,9 +68,66 @@ static bool prepend_name(struct prepend_buffer *p, const struct qstr *name)return true; } +static bool prepend_name_with_len (struct prepend_buffer *p,const struct qstr *name, +int orig_buflen) +{ +const char *dname =smp_load_acquire (&name->name);/* ^^^ */
What does this funny comment mean?
Quoted 39 lines
fs/d_path.c +39
-0+int dlen =READ_ONCE (name->len); +char *s; +int last_len = p->len; + + p->len -= dlen +1 ; + +if (unlikely (!p->buf)) +return false; + +if (orig_buflen <=0 ) +return false; +/* +* The first time we overflow the buffer. Then fill the string +* partially from the beginning +*/ +if (unlikely (p->len <0 )) { +int buflen =strlen (p->buf); + + s = p->buf; + +/* Still have small space to fill partially */ +if (last_len >0 ) { + p->buf -= last_len; + buflen += last_len; + } + +if (buflen > dlen +1 ) { +/* This dentry name can be fully filled */ +memmove (p->buf + dlen +1 , s, buflen - dlen -1 ); + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, dlen); + }else if (buflen >0 ) { +/* Partially filled, and drop last dentry name */ + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, buflen -1 ); + } + +return false; + }
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, const struct qstr *name)
Quoted 10 lines
fs/d_path.c +9
-0+ + s = p->buf -= dlen +1 ; + *s++ ='/' ; +while (dlen--) { +char c = *dname++; + +if (!c) +break ; + *s++ = c;
I'm wondering why can't memcpy() be used here as well.
Quoted 22 lines
fs/d_path.c +6
-2+ } +return true; +}static int __prepend_path (const struct dentry *dentry,const struct mount *mnt,const struct path *root,struct prepend_buffer *p) { +int orig_buflen = p->len; +while (dentry != root->dentry || &mnt->mnt != root->mnt) {const struct dentry *parent =READ_ONCE (dentry->d_parent);@@ -97,8 +154,7 @@ static int __prepend_path(const struct dentry *dentry, const struct mount *mnt,return 3 ;prefetch (parent); -if (!prepend_name (p, &dentry->d_name)) -break ; +prepend_name_with_len (p, &dentry->d_name, orig_buflen); dentry = parent; }return 0 ;
fs/d_path.c char *d_path(const struct path *path, char *buf, int buflen) · line 324
Quoted 6 lines
fs/d_path.c +3
-0@@ -263,6 +319,29 @@ char *d_path(const struct path *path, char *buf, int buflen) }EXPORT_SYMBOL (d_path); +/** +* d_path_unsafe - fast return the full path of a dentry without taking +* any seqlock/spinlock. This helper is typical for debugging purpose.
purposes
Haven't you got kernel doc validation warnings? Please, describe parameters as well.
Quoted 38 lines
fs/d_path.c +20
-0+*/ +char *d_path_unsafe (const struct path *path,char *buf,int buflen, +int *prepend_len) +{ +struct path root; +struct mount *mnt =real_mount (path->mnt); +DECLARE_BUFFER (b, buf, buflen); + +rcu_read_lock (); +get_fs_root_rcu (current->fs, &root); + +prepend (&b,"" ,1 ); +__prepend_path (path->dentry, mnt, &root, &b); +rcu_read_unlock (); + + *prepend_len = b.len; + +return b.buf; +} +/* * Helper function for dentry_operations.d_dname() members */ include/linux/dcache.h +1
-1@@ -301,6 +301,7 @@ char *dynamic_dname(struct dentry *, char *, int, const char *, ...);extern char *__d_path (const struct path *,const struct path *,char *,int );extern char *d_absolute_path (const struct path *,char *,int );extern char *d_path (const struct path *,char *,int ); +extern char *d_path_unsafe (const struct path *,char *,int ,int *);extern char *dentry_path_raw (const struct dentry *,char *,int );extern char *dentry_path (const struct dentry *,char *,int ); --2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
RE: [PATCH RFCv4 1/4] fs: introduce helper d_path_unsafe()
Hi Andy
Thanks for the comments, I will resolve you mentioned typo/grammar issues
Some answer below
Quoted 59 lines
-----Original Message-----
From: Andy Shevchenko <[email protected]>
Sent: Wednesday, June 16, 2021 4:41 AM
To: Justin He <[email protected]>
Cc: Petr Mladek <[email protected]>; Steven Rostedt <[email protected]>; Sergey Senozhatsky <[email protected]>; Andy Shevchenko <[email protected]>; Rasmus Villemoes <[email protected]>; Jonathan Corbet <[email protected]>; Alexander Viro <[email protected]>; Linus Torvalds <torvalds@linux- foundation.org>; Peter Zijlstra (Intel) <[email protected]>; Eric Biggers <[email protected]>; Ahmed S. Darwish <[email protected]>; Linux Documentation List <[email protected]>; Linux Kernel Mailing List <[email protected]>; Linux FS Devel <linux- [email protected]>; Matthew Wilcox <[email protected]>
Subject: Re: [PATCH RFCv4 1/4] fs: introduce helperd_path_unsafe()Quoted 3 lines · Jia He
This helper is similar to
d_pathexcept that it doesn't take any seqlock/spinlock. It is typical for debugging purpose. Besides,purposes
Quoted 7 lines
an additional return value *prenpend_len* is used to get the full path length of the dentry.
prepend_name_with_len()enhances the behavior ofprepend_name(). Previously it will skip the loop at once in__prepen_path()when the space is not enough.__prepend_path()gets the full length of dentry together with the parent recusively.recursively
Quoted 5 lines
Besides, if someone invokes snprintf with small but positive space,
prepend_name_with()needs to move and copy the string partially.More than that, kasnprintf will pass NULL _buf_ and _end_, hence
kasprintf()fs/d_path.c static bool prepend_name(struct prepend_buffer *p,
Quoted 14 lines
it returns at the very beginning with false in this case;
Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Jia He <[email protected]>--- fs/d_path.c | 83 +++++++++++++++++++++++++++++++++++++++++- include/linux/dcache.h | 1 + 2 files changed, 82 insertions(+), 2 deletions(-)fs/d_path.c +0
-0@@ -68,9 +68,66 @@ static bool prepend_name(struct prepend_buffer *p,const struct qstr *name)
Quoted 3 lines
fs/d_path.c +0
-0return true; }
Quoted 7 lines
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, · line 71
Quoted 1 line
fs/d_path.c +1
-0+static bool prepend_name_with_len(struct prepend_buffer *p, const structqstr *name,
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, const struct qstr *name) · line 74
Quoted 3 lines
fs/d_path.c +3
-0+ int orig_buflen) +{ +const char *dname =smp_load_acquire (&name->name);/* ^^^ */ What does this funny comment mean?
It is inherited from the prepend_name()
Quoted 44 lines
Quoted 43 lines
fs/d_path.c +42
-0+int dlen =READ_ONCE (name->len); +char *s; +int last_len = p->len; + + p->len -= dlen +1 ; + +if (unlikely (!p->buf)) +return false; + +if (orig_buflen <=0 ) +return false; +/* +* The first time we overflow the buffer. Then fill the string +* partially from the beginning +*/ +if (unlikely (p->len <0 )) { +int buflen =strlen (p->buf); + + s = p->buf; + +/* Still have small space to fill partially */ +if (last_len >0 ) { + p->buf -= last_len; + buflen += last_len; + } + +if (buflen > dlen +1 ) { +/* This dentry name can be fully filled */ +memmove (p->buf + dlen +1 , s, buflen - dlen -1 ); + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, dlen); + }else if (buflen >0 ) { +/* Partially filled, and drop last dentry name */ + p->buf[0 ] ='/' ; +memcpy (p->buf +1 , dname, buflen -1 ); + } + +return false; + } + + s = p->buf -= dlen +1 ; + *s++ ='/' ;
Quoted 8 lines
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, const struct qstr *name) · line 122
Quoted 6 lines
fs/d_path.c +6
-0+while (dlen--) { +char c = *dname++; + +if (!c) +break ; + *s++ = c;I'm wondering why can't
memcpy()be used here as well.
From the comments of commit 7a5cf791:
Quoted 3 lines
However, there may be mismatch between length and pointer.
* The length cannot be trusted, we need to copy it byte-by-byte until
* the length is reached or a null byte is found.
Seems we shouldn't use memcpy/strcpy here
Quoted 30 lines
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, const struct qstr *name)
Quoted 5 lines
fs/d_path.c +3
-0+ } +return true; +} static int __prepend_path(const struct dentry *dentry, const structmount *mnt,
fs/d_path.c static bool prepend_name(struct prepend_buffer *p, · line 127
Quoted 1 line
fs/d_path.c +0
-0const struct path *root, struct prepend_buffer*p)
fs/d_path.c static int __prepend_path(const struct dentry *dentry,
Quoted 7 lines
fs/d_path.c +2
-0{ +int orig_buflen = p->len; +while (dentry != root->dentry || &mnt->mnt != root->mnt) {const struct dentry *parent =READ_ONCE (dentry->d_parent);@@ -97,8 +154,7 @@ static int __prepend_path(const struct dentry *dentry,const struct mount *mnt,
fs/d_path.c char *d_path(const struct path *path, char *buf, int
Quoted 10 lines
fs/d_path.c +1
-2return 3 ;prefetch (parent); -if (!prepend_name (p, &dentry->d_name)) -break ; +prepend_name_with_len (p, &dentry->d_name, orig_buflen); dentry = parent; }return 0 ;@@ -263,6 +319,29 @@ char *d_path(const struct path *path, char *buf, intbuflen)
Quoted 3 lines
fs/d_path.c +0
-0}EXPORT_SYMBOL (d_path);
Quoted 8 lines
fs/d_path.c char *d_path(const struct path *path, char *buf, int buflen) · line 324
Quoted 3 lines
fs/d_path.c +3
-0+/** +* d_path_unsafe - fast return the full path of a dentry without taking +* any seqlock/spinlock. This helper is typical for debugging purpose. purposes
Haven't you got kernel doc validation warnings? Please, describe parameters as well.
I will check it and update if there is a warning, thanks for the reminder.
--
Cheers,
Justin (Jia He)
RFC PATCH v4 2/4 lib/vsprintf.c: make '%pD' print full path for file
In reply to Jia HePreviously, the specifier '%pD' is for printing dentry name of struct file. It may not be perfect (by default it only prints one component.)
As suggested by Linus at [1]:
A dentry has a parent, but at the same time, a dentry really does inherently have "one name" (and given just the dentry pointers, you can't show mount-related parenthood, so in many ways the "show just one name" makes sense for "%pd" in ways it doesn't necessarily for "%pD"). But while a dentry arguably has that "one primary component", a _file_ is certainly not exclusively about that last component.
Hence change the behavior of '%pD' to print full path of that file.
Precision is never going to be used with %p (or any of its kernel extensions) if -Wformat is turned on.
.
[1] https://lore.kernel.org/lkml/CAHk-=wimsMqGdzik187YWLb-ru+iktb4MYbMQG1rnZ81dXYFVg@mail.gmail.com/
--- Documentation/core-api/printk-formats.rst | 5 +-- lib/vsprintf.c | 37 ++++++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-)
Documentation/core-api/printk-formats.rst +3 -2
@@ -408,12 +408,13 @@ dentry names :: %pd{,2,3,4} - %pD{,2,3,4} + %pD For printing dentry name; if we race with :c:func:`d_move`, the name might be a mix of old and new ones, but it won't oops. %pd dentry is a safer equivalent of %s dentry->d_name.name we used to use, %pd<n> prints ``n`` -last components. %pD does the same thing for struct file. +last components. %pD prints full file path together with mount-related +parenthood. Passed by reference.
lib/vsprintf.c +33 -4
@@ -27,6 +27,7 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/kernel.h> +#include <linux/dcache.h> #include <linux/kallsyms.h> #include <linux/math64.h> #include <linux/uaccess.h>
@@ -920,13 +921,41 @@ char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp }static noinline_for_stack -char *file_dentry_name(char *buf, char *end, const struct file *f, +char *file_d_path_name(char *buf, char *end, const struct file *f,struct printf_spec spec,const char *fmt) { +const struct path *path; +char *p; +int prepend_len, reserved_size, dpath_len; +if (check_pointer (&buf, end, f, spec))return buf; -return dentry_name (buf, end, f->f_path.dentry, spec, fmt); + path = &f->f_path; +if (check_pointer (&buf, end, path, spec)) +return buf; + + p =d_path_unsafe (path, buf, end - buf, &prepend_len); + +/* Calculate the full d_path length, ignoring the tail '\0' */ + dpath_len = end - buf - prepend_len -1 ; + + reserved_size =max_t (int, dpath_len, spec.field_width); + +/* case 1: no space at all, forward the buf with reserved size */ +if (buf >= end) +return buf + reserved_size; + +/* +* case 2: small scratch space for long d_path name. The space +* [buf,end] has been filled with truncated string. Hence use the +* full dpath_len for further string widening. +*/ +if (prepend_len <0 ) +return widen_string (buf + dpath_len, dpath_len, end, spec); + +/* case3: space is big enough */ +return string_nocheck (buf, end, p, spec); }#ifdef CONFIG_BLOCK static noinline_for_stack
@@ -2296,7 +2325,7 @@ early_param("no_hash_pointers", no_hash_pointers_enable);* - 'a[pd]' For address types [p] phys_addr_t, [d] dma_addr_t and derivatives * (default assumed to be phys_addr_t, passed by reference) * - 'd[234]' For a dentry name (optionally 2-4 last components) -* - 'D[234]' Same as 'd' but for a struct file +* - 'D' For full path name of a struct file * - 'g' For block_device name (gendisk + partition number) * - 't[RT][dt][r]' For time and date as represented by: * R struct rtc_time
@@ -2395,7 +2424,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'C' :return clock (buf, end, ptr, spec, fmt);case 'D' : -return file_dentry_name (buf, end, ptr, spec, fmt); +return file_d_path_name (buf, end, ptr, spec, fmt);#ifdef CONFIG_BLOCK case 'g' :return bdev_name (buf, end, ptr, spec, fmt);
Signature · 1 line
2.17.1
Re: [PATCH RFCv4 2/4] lib/vsprintf.c: make '%pD' print full path for file
Quoted 12 lines · Jia He
Previously, the specifier '%pD' is for printing dentry name of struct file. It may not be perfect (by default it only prints one component.)
As suggested by Linus at [1]:
A dentry has a parent, but at the same time, a dentry really does inherently have "one name" (and given just the dentry pointers, you can't show mount-related parenthood, so in many ways the "show just one name" makes sense for "%pd" in ways it doesn't necessarily for "%pD"). But while a dentry arguably has that "one primary component", a _file_ is certainly not exclusively about that last component.
Quoted 1 line
Hence change the behavior of '%pD' to print full path of that file.
print the full
Quoted 6 lines
Precision is never going to be used with %p (or any of its kernel extensions) if -Wformat is turned on.
.[1] https://lore.kernel.org/lkml/CAHk-=wimsMqGdzik187YWLb-ru+iktb4MYbMQG1rnZ81dXYFVg@mail.gmail.com/
Put it as a Link: tag?
Quoted 33 lines
Suggested-by Linus Torvalds <[email protected]>Signed-off-by Jia He <[email protected]>--- Documentation/core-api/printk-formats.rst | 5 +-- lib/vsprintf.c | 37 ++++++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-)Documentation/core-api/printk-formats.rst +3
-2@@ -408,12 +408,13 @@ dentry names :: %pd{,2,3,4} - %pD{,2,3,4} + %pD For printing dentry name; if we race with :c:func:`d_move`, the name might be a mix of old and new ones, but it won't oops. %pd dentry is a safer equivalent of %s dentry->d_name.name we used to use, %pd<n> prints ``n`` -last components. %pD does the same thing for struct file. +last components. %pD prints full file path together with mount-related +parenthood. Passed by reference.lib/vsprintf.c +0
-0
lib/vsprintf.c line 31
Quoted 5 lines
lib/vsprintf.c +1
-0@@ -27,6 +27,7 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/kernel.h> +#include <linux/dcache.h>
I know that this is an arbitrary order, but can you keep it after ctype.h?
Quoted 21 lines
lib/vsprintf.c +0
-0#include <linux/kallsyms.h> #include <linux/math64.h> #include <
linux/uaccess.h>lib/vsprintf.c +7
-2@@ -920,13 +921,41 @@ char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp }static noinline_for_stack -char *file_dentry_name(char *buf, char *end, const struct file *f, +char *file_d_path_name(char *buf, char *end, const struct file *f,struct printf_spec spec,const char *fmt) { +const struct path *path; +char *p; +int prepend_len, reserved_size, dpath_len; +if (check_pointer (&buf, end, f, spec))return buf; -return dentry_name (buf, end, f->f_path.dentry, spec, fmt); + path = &f->f_path; +if (check_pointer (&buf, end, path, spec))
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 945
Quoted 10 lines
lib/vsprintf.c +10
-0+return buf; + + p =d_path_unsafe (path, buf, end - buf, &prepend_len); + +/* Calculate the full d_path length, ignoring the tail '\0' */ + dpath_len = end - buf - prepend_len -1 ; + + reserved_size =max_t (int, dpath_len, spec.field_width); + +/* case 1: no space at all, forward the buf with reserved size */
Case 1:
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 950
Quoted 5 lines
lib/vsprintf.c +5
-0+if (buf >= end) +return buf + reserved_size; + +/* +* case 2: small scratch space for long d_path name. The space
Case 2:
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 957
Quoted 7 lines
lib/vsprintf.c +7
-0+* [buf,end] has been filled with truncated string. Hence use the +* full dpath_len for further string widening. +*/ +if (prepend_len <0 ) +return widen_string (buf + dpath_len, dpath_len, end, spec); + +/* case3: space is big enough */
Case 3:
Quoted 25 lines
lib/vsprintf.c +3
-3+return string_nocheck (buf, end, p, spec); }#ifdef CONFIG_BLOCK static noinline_for_stack@@ -2296,7 +2325,7 @@ early_param("no_hash_pointers", no_hash_pointers_enable);* - 'a[pd]' For address types [p] phys_addr_t, [d] dma_addr_t and derivatives * (default assumed to be phys_addr_t, passed by reference) * - 'd[234]' For a dentry name (optionally 2-4 last components) -* - 'D[234]' Same as 'd' but for a struct file +* - 'D' For full path name of a struct file * - 'g' For block_device name (gendisk + partition number) * - 't[RT][dt][r]' For time and date as represented by: * R struct rtc_time @@ -2395,7 +2424,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'C' :return clock (buf, end, ptr, spec, fmt);case 'D' : -return file_dentry_name (buf, end, ptr, spec, fmt); +return file_d_path_name (buf, end, ptr, spec, fmt);#ifdef CONFIG_BLOCK case 'g' :return bdev_name (buf, end, ptr, spec, fmt); --2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Petr Mladek
maintainerRe: [PATCH RFCv4 2/4] lib/vsprintf.c: make '%pD' print full path for file
In reply to Jia HeQuoted 40 lines · Jia He
Previously, the specifier '%pD' is for printing dentry name of struct file. It may not be perfect (by default it only prints one component.)
As suggested by Linus at [1]:
A dentry has a parent, but at the same time, a dentry really does inherently have "one name" (and given just the dentry pointers, you can't show mount-related parenthood, so in many ways the "show just one name" makes sense for "%pd" in ways it doesn't necessarily for "%pD"). But while a dentry arguably has that "one primary component", a _file_ is certainly not exclusively about that last component.Hence change the behavior of '%pD' to print full path of that file.
Precision is never going to be used with %p (or any of its kernel extensions) if -Wformat is turned on.
.[1] https://lore.kernel.org/lkml/CAHk-=wimsMqGdzik187YWLb-ru+iktb4MYbMQG1rnZ81dXYFVg@mail.gmail.com/
Suggested-by Linus Torvalds <[email protected]>Signed-off-by Jia He <[email protected]>lib/vsprintf.c +5
-2@@ -920,13 +921,41 @@ char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp }static noinline_for_stack -char *file_dentry_name(char *buf, char *end, const struct file *f, +char *file_d_path_name(char *buf, char *end, const struct file *f,struct printf_spec spec,const char *fmt) { +const struct path *path; +char *p; +int prepend_len, reserved_size, dpath_len; +if (check_pointer (&buf, end, f, spec))return buf; -return dentry_name (buf, end, f->f_path.dentry, spec, fmt);
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 943
Quoted 10 lines
lib/vsprintf.c +10
-0+ path = &f->f_path; +if (check_pointer (&buf, end, path, spec)) +return buf; + + p =d_path_unsafe (path, buf, end - buf, &prepend_len); + +/* Calculate the full d_path length, ignoring the tail '\0' */ + dpath_len = end - buf - prepend_len -1 ; + + reserved_size =max_t (int, dpath_len, spec.field_width);
"reserved_size" is kind of confusing. "dpath_widen_len" or just "widen_len" look much more obvious.
The below comments are not bad. But they still made me thing about it more than I wanted ;-) I wonder if it following is better:
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 947
Quoted 3 lines
lib/vsprintf.c +3
-0+/* case 1: no space at all, forward the buf with reserved size */ +if (buf >= end) +return buf + reserved_size;
/* Case 1: Already started past the buffer. Just forward @buf. */ if (buf >= end) return buf + widen_len;
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 955
Quoted 8 lines
lib/vsprintf.c +8
-0+ +/* +* case 2: small scratch space for long d_path name. The space +* [buf,end] has been filled with truncated string. Hence use the +* full dpath_len for further string widening. +*/ +if (prepend_len <0 ) +return widen_string (buf + dpath_len, dpath_len, end, spec);
/*
* Case 2: The entire remaining space of the buffer filled by
* the truncated path. Still need to get moved right when
* the filed width is greather than the full path length. */
if (prepend_len < 0)
return widen_string(buf + dpath_len, dpath_len, end, spec);
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 958
Quoted 2 lines
lib/vsprintf.c +2
-0+/* case3: space is big enough */ +return string_nocheck (buf, end, p, spec);
/* * Case 3: The full path is printed at the end of the buffer. * Print it at the right location in the same buffer. */ return string_nocheck(buf, end, p, spec);
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 961
Quoted 3 lines
lib/vsprintf.c +0
-0}#ifdef CONFIG_BLOCK static noinline_for_stack
In each case, I am happy that it was possible to simplify the logic. I got lost several times in the previous version.
Best Regards,
Petr
RE: [PATCH RFCv4 2/4] lib/vsprintf.c: make '%pD' print full path for file
Hi Petr
Quoted 58 lines
-----Original Message-----
From: Petr Mladek <[email protected]>
Sent: Thursday, June 17, 2021 10:10 PM
To: Justin He <[email protected]>
Cc: Steven Rostedt <[email protected]>; Sergey Senozhatsky <[email protected]>; Andy Shevchenko <[email protected]>; Rasmus Villemoes <[email protected]>; Jonathan Corbet <[email protected]>; Alexander Viro <[email protected]>; Linus Torvalds <torvalds@linux- foundation.org>; Peter Zijlstra (Intel) <[email protected]>; Eric Biggers <[email protected]>; Ahmed S. Darwish <[email protected]>; [email protected]; [email protected]; linux- [email protected]; Matthew Wilcox <[email protected]>
Subject: Re: [PATCH RFCv4 2/4]lib/vsprintf.c: make '%pD' print full path for fileQuoted 11 lines · Jia He
Previously, the specifier '%pD' is for printing dentry name of struct file. It may not be perfect (by default it only prints one component.)
As suggested by Linus at [1]:
A dentry has a parent, but at the same time, a dentry really does inherently have "one name" (and given just the dentry pointers, you can't show mount-related parenthood, so in many ways the "show just one name" makes sense for "%pd" in ways it doesn't necessarily for "%pD"). But while a dentry arguably has that "one primary component", a _file_ is certainly not exclusively about that last component.Quoted 7 lines
Hence change the behavior of '%pD' to print full path of that file.
Precision is never going to be used with %p (or any of its kernel extensions) if -Wformat is turned on.
.lib/vsprintf.c char *dentry_name(char *buf, char *end, const
Quoted 7 lines
Suggested-by Linus Torvalds <[email protected]>Signed-off-by Jia He <[email protected]>lib/vsprintf.c +0
-0@@ -920,13 +921,41 @@ char *dentry_name(char *buf, char *end, conststruct dentry *d, struct
printf_spQuoted 14 lines
lib/vsprintf.c +5
-1}static noinline_for_stack -char *file_dentry_name(char *buf, char *end, const struct file *f, +char *file_d_path_name(char *buf, char *end, const struct file *f,struct printf_spec spec,const char *fmt) { +const struct path *path; +char *p; +int prepend_len, reserved_size, dpath_len; +if (check_pointer (&buf, end, f, spec))return buf;
Quoted 14 lines
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 943
Quoted 11 lines
lib/vsprintf.c +10
-1-return dentry_name (buf, end, f->f_path.dentry, spec, fmt); + path = &f->f_path; +if (check_pointer (&buf, end, path, spec)) +return buf; + + p =d_path_unsafe (path, buf, end - buf, &prepend_len); + +/* Calculate the full d_path length, ignoring the tail '\0' */ + dpath_len = end - buf - prepend_len -1 ; + + reserved_size =max_t (int, dpath_len, spec.field_width);"
reserved_size" is kind of confusing. "dpath_widen_len" or just "widen_len" look much more obvious.
Okay
Quoted 4 lines
The below comments are not bad. But they still made me thing about it more than I wanted ;-) I wonder if it following is better:
Quoted 8 lines
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 947
Quoted 3 lines
lib/vsprintf.c +3
-0+/* case 1: no space at all, forward the buf with reserved size */ +if (buf >= end) +return buf + reserved_size;/* Case 1: Already started past the buffer. Just forward @buf. */ if (buf >= end) return buf + widen_len;
Okay
Quoted 9 lines
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 955
Quoted 8 lines
lib/vsprintf.c +8
-0+ +/* +* case 2: small scratch space for long d_path name. The space +* [buf,end] has been filled with truncated string. Hence use the +* full dpath_len for further string widening. +*/ +if (prepend_len <0 ) +return widen_string (buf + dpath_len, dpath_len, end, spec);
Quoted 8 lines
/*
* Case 2: The entire remaining space of the buffer filled by
* the truncated path. Still need to get moved right when
* the filed width is greather than the full path length. */
if (prepend_len< 0)
returnwiden_string(buf + dpath_len, dpath_len, end, spec);
Okay
Quoted 8 lines
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 958
Quoted 2 lines
lib/vsprintf.c +2
-0+/* case3: space is big enough */ +return string_nocheck (buf, end, p, spec);/* * Case 3: The full path is printed at the end of the buffer. * Print it at the right location in the same buffer. */ return string_nocheck(buf, end, p, spec);
Okay
Quoted 6 lines
lib/vsprintf.c char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp · line 961
Quoted 3 lines
lib/vsprintf.c +0
-0}#ifdef CONFIG_BLOCK static noinline_for_stackIn each case, I am happy that it was possible to simplify the logic. I got lost several times in the previous version.
Indeed, the cases can be much simpler if we don't consider spec.precision. More than that, maybe we could remove the spec.precision consideration for '%pd' or other pointer related specifiers also
--
Cheers,
Justin (Jia He)
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
RFC PATCH v4 3/4 lib/test_printf.c: split write-beyond-buffer check in two
In reply to Jia HeFrom: Rasmus Villemoes <[email protected]>
Before each invocation of vsnprintf(), do_test() memsets the entire allocated buffer to a sentinel value. That buffer includes leading and trailing padding which is never included in the buffer area handed to vsnprintf (spaces merely for clarity):
pad test_buffer pad
**** **************** ****
Then vsnprintf() is invoked with a bufsize argument <= BUF_SIZE. Suppose bufsize=10, then we'd have e.g.
|pad | test_buffer |pad |
**** pizza0 **** ****** ****
A B C D E
where vsnprintf() was given the area from B to D.
It is obviously a bug for vsnprintf to touch anything between A and B or between D and E. The former is checked for as one would expect. But for the latter, we are actually a little stricter in that we check the area between C and E.
Split that check in two, providing a clearer error message in case it was a genuine buffer overrun and not merely a write within the provided buffer, but after the end of the generated string.
So far, no part of the vsnprintf() implementation has had any use for using the whole buffer as scratch space, but it's not unreasonable to allow that, as long as the result is properly nul-terminated and the return value is the right one. However, it is somewhat unusual, and most %<something> won't need this, so keep the [C,D] check, but make it easy for a later patch to make that part opt-out for certain tests.
--- lib/test_printf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
lib/test_printf.c +6 -1
@@ -78,12 +78,17 @@ do_test(int bufsize, const char *expect, int elen,return 1 ; } -if (memchr_inv (test_buffer + written +1 ,FILL_CHAR ,BUF_SIZE +PAD_SIZE - (written +1 ))) { +if (memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) {pr_warn ("vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator\n" , bufsize, fmt);return 1 ; } +if (memchr_inv (test_buffer + bufsize,FILL_CHAR ,BUF_SIZE +PAD_SIZE - bufsize)) { +pr_warn ("vsnprintf(buf, %d, \"%s\", ...) wrote beyond buffer\n" , bufsize, fmt); +return 1 ; + } +if (memcmp (test_buffer, expect, written)) {pr_warn ("vsnprintf(buf, %d, \"%s\", ...) wrote '%s', expected '%.*s'\n" , bufsize, fmt, test_buffer, written, expect);
Signature · 1 line
2.17.1
Re: [PATCH RFCv4 3/4] lib/test_printf.c: split write-beyond-buffer check in two
Quoted 28 lines · Jia He
From: Rasmus Villemoes <[email protected]>
Before each invocation of
vsnprintf(),do_test()memsets the entire allocated buffer to a sentinel value. That buffer includes leading and trailing padding which is never included in the buffer area handed to vsnprintf (spaces merely for clarity):pad
test_bufferpad
**** **************** ****Then
vsnprintf()is invoked with a bufsize argument <=BUF_SIZE. Suppose bufsize=10, then we'd have e.g.|pad |
test_buffer|pad |
**** pizza0 **** ****** ****
A B C D Ewhere
vsnprintf()was given the area from B to D.It is obviously a bug for vsnprintf to touch anything between A and B or between D and E. The former is checked for as one would expect. But for the latter, we are actually a little stricter in that we check the area between C and E.
Split that check in two, providing a clearer error message in case it was a genuine buffer overrun and not merely a write within the provided buffer, but after the end of the generated string.
Quoted 6 lines
So far, no part of the
vsnprintf()implementation has had any use for using the whole buffer as scratch space, but it's not unreasonable to allow that, as long as the result is properly nul-terminated and the return value is the right one. However, it is somewhat unusual, and most %<something> won't need this, so keep the [C,D] check, but make it easy for a later patch to make that part opt-out for certain tests.
Excellent commit message.
Quoted 3 lines
Signed-off-by Rasmus Villemoes <[email protected]>Tested-by Jia He <[email protected]>Signed-off-by Jia He <[email protected]>
Best Regards,
Petr
Rasmus Villemoes
reviewerRe: [PATCH RFCv4 3/4] lib/test_printf.c: split write-beyond-buffer check in two
Quoted 36 lines · Petr Mladek
Quoted 28 lines · Jia He
From: Rasmus Villemoes <[email protected]>
Before each invocation of
vsnprintf(),do_test()memsets the entire allocated buffer to a sentinel value. That buffer includes leading and trailing padding which is never included in the buffer area handed to vsnprintf (spaces merely for clarity):pad
test_bufferpad
**** **************** ****Then
vsnprintf()is invoked with a bufsize argument <=BUF_SIZE. Suppose bufsize=10, then we'd have e.g.|pad |
test_buffer|pad |
**** pizza0 **** ****** ****
A B C D Ewhere
vsnprintf()was given the area from B to D.It is obviously a bug for vsnprintf to touch anything between A and B or between D and E. The former is checked for as one would expect. But for the latter, we are actually a little stricter in that we check the area between C and E.
Split that check in two, providing a clearer error message in case it was a genuine buffer overrun and not merely a write within the provided buffer, but after the end of the generated string.
Quoted 6 lines
So far, no part of the
vsnprintf()implementation has had any use for using the whole buffer as scratch space, but it's not unreasonable to allow that, as long as the result is properly nul-terminated and the return value is the right one. However, it is somewhat unusual, and most %<something> won't need this, so keep the [C,D] check, but make it easy for a later patch to make that part opt-out for certain tests.
Quoted 7 lines
Excellent commit message.
Quoted 3 lines
Signed-off-by Rasmus Villemoes <[email protected]>Tested-by Jia He <[email protected]>Signed-off-by Jia He <[email protected]>Reviewed-by Petr Mladek <[email protected]>
Hi Petr
It seems Justin's series got stalled, but I still think this patch makes sense on its own (especially since another series in flight mucks about in this area), so can you please pick it up directly?
The lore link for the above is
https://lore.kernel.org/lkml/[email protected]/ , while my original submission is at
https://lore.kernel.org/lkml/[email protected]/
.
Rasmus
Re: [PATCH RFCv4 3/4] lib/test_printf.c: split write-beyond-buffer check in two
Quoted 47 lines · Rasmus Villemoes
Quoted 36 lines · Petr Mladek
Quoted 28 lines · Jia He
From: Rasmus Villemoes <[email protected]>
Before each invocation of
vsnprintf(),do_test()memsets the entire allocated buffer to a sentinel value. That buffer includes leading and trailing padding which is never included in the buffer area handed to vsnprintf (spaces merely for clarity):pad
test_bufferpad
**** **************** ****Then
vsnprintf()is invoked with a bufsize argument <=BUF_SIZE. Suppose bufsize=10, then we'd have e.g.|pad |
test_buffer|pad |
**** pizza0 **** ****** ****
A B C D Ewhere
vsnprintf()was given the area from B to D.It is obviously a bug for vsnprintf to touch anything between A and B or between D and E. The former is checked for as one would expect. But for the latter, we are actually a little stricter in that we check the area between C and E.
Split that check in two, providing a clearer error message in case it was a genuine buffer overrun and not merely a write within the provided buffer, but after the end of the generated string.
Quoted 6 lines
So far, no part of the
vsnprintf()implementation has had any use for using the whole buffer as scratch space, but it's not unreasonable to allow that, as long as the result is properly nul-terminated and the return value is the right one. However, it is somewhat unusual, and most %<something> won't need this, so keep the [C,D] check, but make it easy for a later patch to make that part opt-out for certain tests.Quoted 7 lines
Excellent commit message.
Quoted 3 lines
Signed-off-by Rasmus Villemoes <[email protected]>Tested-by Jia He <[email protected]>Signed-off-by Jia He <[email protected]>Reviewed-by Petr Mladek <[email protected]>Hi Petr
Quoted 8 lines
It seems Justin's series got stalled, but I still think this patch makes sense on its own (especially since another series in flight mucks about in this area), so can you please pick it up directly?
The lore link for the above is
https://lore.kernel.org/lkml/[email protected]/ , while my original submission is at
https://lore.kernel.org/lkml/[email protected]/
That patch definitely clarifies things, feel free to add my reviewed-by tag
Petr Mladek
maintainerRe: [PATCH RFCv4 3/4] lib/test_printf.c: split write-beyond-buffer check in two
In reply to Rasmus VillemoesQuoted 43 lines · Rasmus Villemoes
Quoted 42 lines · Petr Mladek
Quoted 28 lines · Jia He
From: Rasmus Villemoes <[email protected]>
Before each invocation of
vsnprintf(),do_test()memsets the entire allocated buffer to a sentinel value. That buffer includes leading and trailing padding which is never included in the buffer area handed to vsnprintf (spaces merely for clarity):pad
test_bufferpad
**** **************** ****Then
vsnprintf()is invoked with a bufsize argument <=BUF_SIZE. Suppose bufsize=10, then we'd have e.g.|pad |
test_buffer|pad |
**** pizza0 **** ****** ****
A B C D Ewhere
vsnprintf()was given the area from B to D.It is obviously a bug for vsnprintf to touch anything between A and B or between D and E. The former is checked for as one would expect. But for the latter, we are actually a little stricter in that we check the area between C and E.
Split that check in two, providing a clearer error message in case it was a genuine buffer overrun and not merely a write within the provided buffer, but after the end of the generated string.
Quoted 6 lines
So far, no part of the
vsnprintf()implementation has had any use for using the whole buffer as scratch space, but it's not unreasonable to allow that, as long as the result is properly nul-terminated and the return value is the right one. However, it is somewhat unusual, and most %<something> won't need this, so keep the [C,D] check, but make it easy for a later patch to make that part opt-out for certain tests.Excellent commit message.
Quoted 3 lines
Signed-off-by Rasmus Villemoes <[email protected]>Tested-by Jia He <[email protected]>Signed-off-by Jia He <[email protected]>
Quoted 7 lines
Quoted 1 line
Reviewed-by Petr Mladek <[email protected]>Hi Petr
It seems Justin's series got stalled, but I still think this patch makes sense on its own (especially since another series in flight mucks about in this area), so can you please pick it up directly?
I have just committed this patch into printk/linux.git, branch for-5.20.
I am sorry that it took so long. Too many things have happened during last weeks.
Best Regards,
Petr
RFC PATCH v4 4/4 lib/test_printf.c: add test cases for '%pD'
In reply to Jia HeAfter the behaviour of specifier '%pD' is changed to print full path of struct file, the related test cases are also updated.
Given the string of '%pD' is prepended from the end of the buffer, the check of "wrote beyond the nul-terminator" should be skipped.
--- lib/test_printf.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
lib/test_printf.c +25 -1
@@ -16,6 +16,7 @@#include <linux/bitmap.h> #include <linux/dcache.h> +#include <linux/fs.h> #include <linux/socket.h> #include <linux/in.h>
@@ -34,6 +35,7 @@ KSTM_MODULE_GLOBALS();static char *test_buffer__initdata ;static char *alloced_buffer__initdata ; +static bool is_prepended_buf__initdata ;extern bool no_hash_pointers;
@@ -78,7 +80,7 @@ do_test(int bufsize, const char *expect, int elen,return 1 ; } -if (memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) { +if (!is_prepended_buf &&memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) {pr_warn ("vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator\n" , bufsize, fmt);return 1 ;
@@ -501,6 +503,27 @@ dentry(void)test (" bravo/alfa| bravo/alfa" ,"%12pd2|%*pd2" , &test_dentry[2 ],12 , &test_dentry[2 ]); } +static struct vfsmount test_vfsmnt__initdata = {}; + +static struct file test_file__initdata = { + .f_path = { .dentry = &test_dentry[2 ], + .mnt = &test_vfsmnt, + }, +}; + +static void __init +f_d_path (void ) +{ +test ("(null)" ,"%pD" ,NULL ); +test ("(efault)" ,"%pD" ,PTR_INVALID ); + + is_prepended_buf = true; +test ("/bravo/alfa |/bravo/alfa " ,"%-14pD|%*pD" , &test_file,-14 , &test_file); +test (" /bravo/alfa| /bravo/alfa" ,"%14pD|%*pD" , &test_file,14 , &test_file); +test (" /bravo/alfa|/bravo/alfa " ,"%14pD|%-14pD" , &test_file, &test_file); + is_prepended_buf = false; +} +static void __init struct_va_format (void ) {
@@ -784,6 +807,7 @@ test_pointer(void)ip ();uuid ();dentry (); +f_d_path ();struct_va_format ();time_and_date ();struct_clk ();
Signature · 1 line
2.17.1
Re: [PATCH RFCv4 4/4] lib/test_printf.c: add test cases for '%pD'
Quoted 33 lines · Jia He
After the behaviour of specifier '%pD' is changed to print full path of struct file, the related test cases are also updated.
Given the string of '%pD' is prepended from the end of the buffer, the check of "wrote beyond the nul-terminator" should be skipped.
Signed-off-by Jia He <[email protected]>--- lib/test_printf.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)lib/test_printf.c +2
-0@@ -16,6 +16,7 @@#include <linux/bitmap.h> #include <linux/dcache.h> +#include <linux/fs.h> #include <linux/socket.h> #include <linux/in.h> @@ -34,6 +35,7 @@ KSTM_MODULE_GLOBALS();static char *test_buffer__initdata ;static char *alloced_buffer__initdata ; +static bool is_prepended_buf__initdata ;extern bool no_hash_pointers;
lib/test_printf.c do_test(int bufsize, const char *expect, int elen, · line 84
Quoted 6 lines
lib/test_printf.c +1
-1@@ -78,7 +80,7 @@ do_test(int bufsize, const char *expect, int elen,return 1 ; } -if (memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) { +if (!is_prepended_buf &&memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) {
Can it be parametrized? I don't like the custom test case being involved here like this.
Quoted 42 lines
lib/test_printf.c +0
-0pr_warn ("vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator\n" , bufsize, fmt);return 1;lib/test_printf.c +22
-1@@ -501,6 +503,27 @@ dentry(void)test (" bravo/alfa| bravo/alfa" ,"%12pd2|%*pd2" , &test_dentry[2 ],12 , &test_dentry[2 ]); } +static struct vfsmount test_vfsmnt__initdata = {}; + +static struct file test_file__initdata = { + .f_path = { .dentry = &test_dentry[2 ], + .mnt = &test_vfsmnt, + }, +}; + +static void __init +f_d_path (void ) +{ +test ("(null)" ,"%pD" ,NULL ); +test ("(efault)" ,"%pD" ,PTR_INVALID ); + + is_prepended_buf = true; +test ("/bravo/alfa |/bravo/alfa " ,"%-14pD|%*pD" , &test_file,-14 , &test_file); +test (" /bravo/alfa| /bravo/alfa" ,"%14pD|%*pD" , &test_file,14 , &test_file); +test (" /bravo/alfa|/bravo/alfa " ,"%14pD|%-14pD" , &test_file, &test_file); + is_prepended_buf = false; +} +static void __init struct_va_format (void ) {@@ -784,6 +807,7 @@ test_pointer(void)ip ();uuid ();dentry (); +f_d_path ();struct_va_format ();time_and_date ();struct_clk (); --2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Petr Mladek
maintainerRe: [PATCH RFCv4 4/4] lib/test_printf.c: add test cases for '%pD'
Quoted 21 lines · Andy Shevchenko
Quoted 20 lines · Jia He
After the behaviour of specifier '%pD' is changed to print full path of struct file, the related test cases are also updated.
Given the string of '%pD' is prepended from the end of the buffer, the check of "wrote beyond the nul-terminator" should be skipped.
Signed-off-by Jia He <[email protected]>--- lib/test_printf.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)lib/test_printf.c +0
-0@@ -78,7 +80,7 @@ do_test(int bufsize, const char *expect, int elen,return 1 ; }
Quoted 6 lines
lib/test_printf.c do_test(int bufsize, const char *expect, int elen, · line 83
Quoted 3 lines
lib/test_printf.c +1
-1-if (memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) { +if (!is_prepended_buf &&memchr_inv (test_buffer + written +1 ,FILL_CHAR , bufsize - (written +1 ))) {Can it be parametrized? I don't like the custom test case being involved here like this.
Yup, it would be nice.
Also it is far from obvious what @is_prepended_buf means if you do not have context of this patchset. I think about a more generic name that comes from the wording used in 3rd patch, e.g.
@need_scratch_space or @using_scratch_space or @dirty_buf
Anyway, the most easy way to pass this as a parameter would be to add it to __test() and define a wrapper, .e.g:
static void __printf(3, 4) __init
__test(const char *expect, int elen, bool using_scratch_space,
const char *fmt, ...)
/*
* More relaxed test for non-standard formats that are using the provided buffer
* as a scratch space and write beyond the trailing '\0'.
*/
#define test_using_scratch_space(expect, fmt, ...) \ __test(expect, strlen(expect), true, fmt, ##__VA_ARGS__)
Best Regards,
Petr
RE: [PATCH RFCv4 4/4] lib/test_printf.c: add test cases for '%pD'
Quoted 64 lines
-----Original Message-----
From: Petr Mladek <[email protected]>
Sent: Thursday, June 17, 2021 10:53 PM
To: Andy Shevchenko <[email protected]>
Cc: Justin He <[email protected]>; Steven Rostedt <[email protected]>; Sergey Senozhatsky <[email protected]>; Andy Shevchenko <[email protected]>; Rasmus Villemoes <[email protected]>; Jonathan Corbet <[email protected]>; Alexander Viro <[email protected]>; Linus Torvalds <torvalds@linux- foundation.org>; Peter Zijlstra (Intel) <[email protected]>; Eric Biggers <[email protected]>; Ahmed S. Darwish <[email protected]>; Linux Documentation List <[email protected]>; Linux Kernel Mailing List <[email protected]>; Linux FS Devel <linux- [email protected]>; Matthew Wilcox <[email protected]>
Subject: Re: [PATCH RFCv4 4/4]lib/test_printf.c: add test cases for '%pD'Quoted 21 lines · Andy Shevchenko
Quoted 20 lines · Jia He
After the behaviour of specifier '%pD' is changed to print full path of struct file, the related test cases are also updated.
Given the string of '%pD' is prepended from the end of the buffer, the check of "wrote beyond the nul-terminator" should be skipped.
Signed-off-by Jia He <[email protected]>--- lib/test_printf.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)lib/test_printf.c +0
-0@@ -78,7 +80,7 @@ do_test(int bufsize, const char *expect, int elen,return 1 ; }Quoted 1 line
lib/test_printf.c do_test(int bufsize, const char *expect, int elen, · line 81
Quoted 1 line
lib/test_printf.c +0
-1- if (memchr_inv(test_buffer + written + 1, FILL_CHAR, bufsize -(written + 1))) {
Quoted 2 lines
lib/test_printf.c do_test(int bufsize, const char *expect, int elen, · line 83
Quoted 2 lines
lib/test_printf.c +1
-0+ if (!is_prepended_buf && memchr_inv(test_buffer + written + 1,
FILL_CHAR, bufsize - (written + 1))) {Quoted 3 lines
Can it be parametrized? I don't like the custom test case being involved here like this.
Yup, it would be nice.
Also it is far from obvious what @is_prepended_buf means if you do not have context of this patchset. I think about a more generic name that comes from the wording used in 3rd patch, e.g.
@need_scratch_space or @using_scratch_space or @dirty_buf
Anyway, the most easy way to pass this as a parameter would be to add it to
__test()and define a wrapper, .e.g:static void
__printf(3, 4)__init
__test(const char *expect, int elen, boolusing_scratch_space,const char *fmt, ...)
Quoted 7 lines
/*
* More relaxed test for non-standard formats that are using the provided
buffer
* as a scratch space and write beyond the trailing '\0'.
*/#define test_using_scratch_space(expect, fmt, ...) \ __test(expect, strlen(expect), true, fmt, ##__VA_ARGS__)
Okay, thanks for the suggestion.
--
Cheers,
Justin (Jia He)
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
Quoted 4 lines · Jia He
Background
==========
Linus suggested printing full path for file instead of printing
the full
the file
Quoted 11 lines
the components as '%pd'.
Typically, there is no need for printk specifiers to take any real locks (ie
mount_lockorrename_lock). So I introduce a new helperd_path_fastwhich is similar tod_pathexcept it doesn't take any seqlock/spinlock.This series is based on Al Viro's
d_pathcleanup patches [1] which lifted the inner lockless loop into a new helper.
Quoted 8 lines
Test
====
The cases I tested:
1. print '%pD' with full path of ext4 file
2. mount a ext4 filesystem upon a ext4 filesystem, and print the file with '%pD'
3. alltest_printselftests, including the new '%14pD' '%-14pD'
4. kasnprintf
kasprintf()
After commenting on patch 1, I suggest you to always build with make W=1 ...
Quoted 34 lines
Changelog
=========
v4:
- don't support spec.precision anymore for '%pD'
- add Rasmus's patch into this seriesv3:
- implement newd_path_unsafeto use [buf, end] instead of stack space for filling bytes (by Matthew)
- add new test cases for '%pD'
- drop patch "hmcdrv: remove the redundant directory path" before removing rfc.v2:
- implement newd_path_fastbased on Al Viro's patches
- addcheck_pointercheck (by Petr)
- change the max full path size to 256 in stack space
v1: https://lkml.org/lkml/2021/5/8/122Jia He (4):
fs: introduce helperd_path_unsafe()lib/vsprintf.c: make '%pD' print full path for filelib/test_printf.c: split write-beyond-buffer check in twolib/test_printf.c: add test cases for '%pD'Documentation/core-api/printk-formats.rst | 5 +- fs/d_path.c | 83 ++++++++++++++++++++++- include/linux/dcache.h | 1 + lib/test_printf.c | 31 ++++++++- lib/vsprintf.c | 37 ++++++++-- 5 files changed, 148 insertions(+), 9 deletions(-)--
2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Btw, please throw in a patch to convert iomap_swapfile_fail over to the new %pD as that started the whole flamewar^H^H^H^H^H^H^Hdiscussion.
Hi Christoph
Quoted 15 lines
-----Original Message-----
From: Christoph Hellwig <[email protected]>
Sent: Wednesday, June 16, 2021 1:09 PM
To: Justin He <[email protected]>
Cc: Petr Mladek <[email protected]>; Steven Rostedt <[email protected]>; Sergey Senozhatsky <[email protected]>; Andy Shevchenko <[email protected]>; Rasmus Villemoes <[email protected]>; Jonathan Corbet <[email protected]>; Alexander Viro <[email protected]>; Linus Torvalds <torvalds@linux- foundation.org>; Peter Zijlstra (Intel) <[email protected]>; Eric Biggers <[email protected]>; Ahmed S. Darwish <[email protected]>; [email protected]; [email protected]; linux- [email protected]; Matthew Wilcox <[email protected]>
Subject: Re: [PATCH RFCv4 0/4] make '%pD' print full path for file
Quoted 2 lines
Btw, please throw in a patch to convert
iomap_swapfile_failover to the new %pD as that started the whole flamewar^H^H^H^H^H^H^Hdiscussion.
Ok, thanks for the reminder.
After all of the solution/helper/interface is stable (maybe after removing RFC), I tend to add more patches:
1. s390/hmcdrv: remove the redundant directory after using '%pD'
2. remove all the '%pD[2,3,4]' usage in fs/
3. your mentioned iomap_swapfile_fail
--
Cheers,
Justin (Jia He)