mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
fs: create helper file_user_path() for user displayed mapped file path
Overlayfs uses backing files with "fake" overlayfs f_path and "real" underlying f_inode, in order to use underlying inode aops for mapped files and to display the overlayfs path in /proc/<pid>/maps. In preparation for storing the overlayfs "fake" path instead of the underlying "real" path in struct backing_file, define a noop helper file_user_path() that returns f_path for now. Use the new helper in procfs and kernel logs whenever a path of a mapped file is displayed to users. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Link: https://lore.kernel.org/r/20231009153712.1566422-3-amir73il@gmail.com Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
83bc1d2941
commit
08582d678f
@ -90,10 +90,12 @@ static void show_faulting_vma(unsigned long address)
|
|||||||
*/
|
*/
|
||||||
if (vma) {
|
if (vma) {
|
||||||
char buf[ARC_PATH_MAX];
|
char buf[ARC_PATH_MAX];
|
||||||
char *nm = "?";
|
char *nm = "anon";
|
||||||
|
|
||||||
if (vma->vm_file) {
|
if (vma->vm_file) {
|
||||||
nm = file_path(vma->vm_file, buf, ARC_PATH_MAX-1);
|
/* XXX: can we use %pD below and get rid of buf? */
|
||||||
|
nm = d_path(file_user_path(vma->vm_file), buf,
|
||||||
|
ARC_PATH_MAX-1);
|
||||||
if (IS_ERR(nm))
|
if (IS_ERR(nm))
|
||||||
nm = "?";
|
nm = "?";
|
||||||
}
|
}
|
||||||
|
@ -2218,7 +2218,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
|
|||||||
rc = -ENOENT;
|
rc = -ENOENT;
|
||||||
vma = find_exact_vma(mm, vm_start, vm_end);
|
vma = find_exact_vma(mm, vm_start, vm_end);
|
||||||
if (vma && vma->vm_file) {
|
if (vma && vma->vm_file) {
|
||||||
*path = vma->vm_file->f_path;
|
*path = *file_user_path(vma->vm_file);
|
||||||
path_get(path);
|
path_get(path);
|
||||||
rc = 0;
|
rc = 0;
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
|
|||||||
|
|
||||||
if (file) {
|
if (file) {
|
||||||
seq_pad(m, ' ');
|
seq_pad(m, ' ');
|
||||||
seq_file_path(m, file, "");
|
seq_path(m, file_user_path(file), "");
|
||||||
}
|
}
|
||||||
|
|
||||||
seq_putc(m, '\n');
|
seq_putc(m, '\n');
|
||||||
|
@ -296,7 +296,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
|
|||||||
if (anon_name)
|
if (anon_name)
|
||||||
seq_printf(m, "[anon_shmem:%s]", anon_name->name);
|
seq_printf(m, "[anon_shmem:%s]", anon_name->name);
|
||||||
else
|
else
|
||||||
seq_file_path(m, file, "\n");
|
seq_path(m, file_user_path(file), "\n");
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1967,7 +1967,7 @@ static int show_numa_map(struct seq_file *m, void *v)
|
|||||||
|
|
||||||
if (file) {
|
if (file) {
|
||||||
seq_puts(m, " file=");
|
seq_puts(m, " file=");
|
||||||
seq_file_path(m, file, "\n\t= ");
|
seq_path(m, file_user_path(file), "\n\t= ");
|
||||||
} else if (vma_is_initial_heap(vma)) {
|
} else if (vma_is_initial_heap(vma)) {
|
||||||
seq_puts(m, " heap");
|
seq_puts(m, " heap");
|
||||||
} else if (vma_is_initial_stack(vma)) {
|
} else if (vma_is_initial_stack(vma)) {
|
||||||
|
@ -157,7 +157,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
|
|||||||
|
|
||||||
if (file) {
|
if (file) {
|
||||||
seq_pad(m, ' ');
|
seq_pad(m, ' ');
|
||||||
seq_file_path(m, file, "");
|
seq_path(m, file_user_path(file), "");
|
||||||
} else if (mm && vma_is_initial_stack(vma)) {
|
} else if (mm && vma_is_initial_stack(vma)) {
|
||||||
seq_pad(m, ' ');
|
seq_pad(m, ' ');
|
||||||
seq_puts(m, "[stack]");
|
seq_puts(m, "[stack]");
|
||||||
|
@ -2513,6 +2513,20 @@ static inline const struct path *file_real_path(struct file *f)
|
|||||||
return &f->f_path;
|
return &f->f_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* file_user_path - get the path to display for memory mapped file
|
||||||
|
*
|
||||||
|
* When mmapping a file on a stackable filesystem (e.g., overlayfs), the file
|
||||||
|
* stored in ->vm_file is a backing file whose f_inode is on the underlying
|
||||||
|
* filesystem. When the mapped file path is displayed to user (e.g. via
|
||||||
|
* /proc/<pid>/maps), this helper should be used to get the path to display
|
||||||
|
* to the user, which is the path of the fd that user has requested to map.
|
||||||
|
*/
|
||||||
|
static inline const struct path *file_user_path(struct file *f)
|
||||||
|
{
|
||||||
|
return &f->f_path;
|
||||||
|
}
|
||||||
|
|
||||||
static inline struct file *file_clone_open(struct file *file)
|
static inline struct file *file_clone_open(struct file *file)
|
||||||
{
|
{
|
||||||
return dentry_open(&file->f_path, file->f_flags, file->f_cred);
|
return dentry_open(&file->f_path, file->f_flags, file->f_cred);
|
||||||
|
@ -404,7 +404,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm,
|
|||||||
vmstart = vma->vm_start;
|
vmstart = vma->vm_start;
|
||||||
}
|
}
|
||||||
if (file) {
|
if (file) {
|
||||||
ret = trace_seq_path(s, &file->f_path);
|
ret = trace_seq_path(s, file_user_path(file));
|
||||||
if (ret)
|
if (ret)
|
||||||
trace_seq_printf(s, "[+0x%lx]",
|
trace_seq_printf(s, "[+0x%lx]",
|
||||||
ip - vmstart);
|
ip - vmstart);
|
||||||
|
Loading…
Reference in New Issue
Block a user