uprobes: Use file_inode()
Subsystems (2)
Oleg Nesterov
maintainerPATCH 1/1 uprobes: Use file_inode()
Cleanup. Now that we have f_inode/file_inode() we can use it instead of ->f_mapping->host.
--- kernel/events/uprobes.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
kernel/events/uprobes.c +5 -5
@@ -758,7 +758,7 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)down_write (&mm->mmap_sem); vma =find_vma (mm, info->vaddr);if (!vma || !valid_vma (vma, is_register) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode) goto unlock; if (vma->vm_start > info->vaddr ||
@@ -917,7 +917,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)loff_t offset;if (!valid_vma (vma, false) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode)continue ; offset = (loff_t )vma->vm_pgoff <<PAGE_SHIFT ;
@@ -1010,7 +1010,7 @@ int uprobe_mmap(struct vm_area_struct *vma)if (no_uprobe_events () || !valid_vma (vma, true))return 0 ; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file);if (!inode)return 0 ;
@@ -1041,7 +1041,7 @@ vma_has_uprobes(struct vm_area_struct *vma, unsigned long start, unsigned long estruct inode *inode;struct rb_node *n; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file); min =vaddr_to_offset (vma, start); max = min + (end - start) -1 ;
@@ -1465,7 +1465,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) vma =find_vma (mm, bp_vaddr);if (vma && vma->vm_start <= bp_vaddr) {if (valid_vma (vma, false)) { -struct inode *inode = vma->vm_file->f_mapping->host; +struct inode *inode =file_inode (vma->vm_file);loff_t offset =vaddr_to_offset (vma, bp_vaddr); uprobe =find_uprobe (inode, offset);
Signature · 1 line
1.5.5.1
Quoted 2 lines · Oleg Nesterov
Cleanup. Now that we have f_inode/file_inode() we can use it instead of ->f_mapping->host.
No. This is *not* guaranteed to be the same thing in general; note that e.g. for block devices ->f_mapping->host is *not* equal to file_inode(). It probably is valid in this particular case, but at the very least you need to explain that in commit message, or soon we'll get the Knights of Holy Commit Count(tm) crapping all over the tree, breaking stuff.
Oleg Nesterov
maintainerQuoted 7 lines · Al Viro
Quoted 2 lines · Oleg Nesterov
Cleanup. Now that we have f_inode/file_inode() we can use it instead of ->f_mapping->host.
No. This is *not* guaranteed to be the same thing in general; note that e.g. for block devices ->f_mapping->host is *not* equal to
file_inode().
Yes,
Quoted 1 line
It probably is valid in this particular case,
And yes (I think). In fact I think ->f_mode is "more correct" in this case. Say, if this uprobe was created by create_trace_uprobe() we use d_inode, and uprobe_mmap/etc uses file_inode() only to compare this pointer with uprobe->inode.
But I'll try to recheck, and:
Quoted 2 lines
but at the very least you
need to explain that in commit message,
OK. Will do, thanks.
Oleg.
Oleg Nesterov
maintainerPATCH v2 1/1 uprobes: Use file_inode()
Cleanup. Now that we have f_inode/file_inode() we can use it instead of ->f_mapping->host.
This should not make any difference for uprobes, but in theory this change is more correct. We use this inode as a key, to compare it with uprobe->inode set by uprobe_register(inode), and the caller uses d_inode.
--- kernel/events/uprobes.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
kernel/events/uprobes.c +5 -5
@@ -758,7 +758,7 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)down_write (&mm->mmap_sem); vma =find_vma (mm, info->vaddr);if (!vma || !valid_vma (vma, is_register) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode) goto unlock; if (vma->vm_start > info->vaddr ||
@@ -917,7 +917,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)loff_t offset;if (!valid_vma (vma, false) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode)continue ; offset = (loff_t )vma->vm_pgoff <<PAGE_SHIFT ;
@@ -1010,7 +1010,7 @@ int uprobe_mmap(struct vm_area_struct *vma)if (no_uprobe_events () || !valid_vma (vma, true))return 0 ; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file);if (!inode)return 0 ;
@@ -1041,7 +1041,7 @@ vma_has_uprobes(struct vm_area_struct *vma, unsigned long start, unsigned long estruct inode *inode;struct rb_node *n; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file); min =vaddr_to_offset (vma, start); max = min + (end - start) -1 ;
@@ -1465,7 +1465,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) vma =find_vma (mm, bp_vaddr);if (vma && vma->vm_start <= bp_vaddr) {if (valid_vma (vma, false)) { -struct inode *inode = vma->vm_file->f_mapping->host; +struct inode *inode =file_inode (vma->vm_file);loff_t offset =vaddr_to_offset (vma, bp_vaddr); uprobe =find_uprobe (inode, offset);
Signature · 1 line
1.5.5.1
Quoted 9 lines · Oleg Nesterov
Cleanup. Now that we have f_inode/file_inode() we can use it instead of ->f_mapping->host.
This should not make any difference for uprobes, but in theory this change is more correct. We use this inode as a key, to compare it with
uprobe->inodeset byuprobe_register(inode), and the caller usesd_inode.Signed-off-by Oleg Nesterov <[email protected]>
Looks good to me.
Quoted 58 lines
--- kernel/events/uprobes.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)kernel/events/uprobes.c +5
-5@@ -758,7 +758,7 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)down_write (&mm->mmap_sem); vma =find_vma (mm, info->vaddr);if (!vma || !valid_vma (vma, is_register) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode) goto unlock; if (vma->vm_start > info->vaddr ||@@ -917,7 +917,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)loff_t offset;if (!valid_vma (vma, false) || - vma->vm_file->f_mapping->host != uprobe->inode) +file_inode (vma->vm_file) != uprobe->inode)continue ; offset = (loff_t )vma->vm_pgoff <<PAGE_SHIFT ;@@ -1010,7 +1010,7 @@ int uprobe_mmap(struct vm_area_struct *vma)if (no_uprobe_events () || !valid_vma (vma, true))return 0 ; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file);if (!inode)return 0 ;@@ -1041,7 +1041,7 @@ vma_has_uprobes(struct vm_area_struct *vma, unsigned long start, unsigned long estruct inode *inode;struct rb_node *n; - inode = vma->vm_file->f_mapping->host; + inode =file_inode (vma->vm_file); min =vaddr_to_offset (vma, start); max = min + (end - start) -1 ;@@ -1465,7 +1465,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) vma =find_vma (mm, bp_vaddr);if (vma && vma->vm_start <= bp_vaddr) {if (valid_vma (vma, false)) { -struct inode *inode = vma->vm_file->f_mapping->host; +struct inode *inode =file_inode (vma->vm_file);loff_t offset =vaddr_to_offset (vma, bp_vaddr); uprobe =find_uprobe (inode, offset);Signature · 1 line
1.5.5.1
Signature · 2 lines
Thanks and Regards Srikar Dronamraju