(Was: perf_event_mmap(vma) && !vma->vm_mm)
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 14 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | perf: Kill the dead !vma->vm_mm code in perf_event_mmap_event()kernel/ | +6 | 0 replies | |
| 2/2 | perf: Do not waste PAGE_SIZE bytes for ALIGN(8) in perf_event_mmap_event()kernel/ | +7 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/2] (Was: perf_event_mmap(vma) && !vma->vm_mm)
Peter,
you know, I was going to forget about this, but then I looked at perf_event_mmap_event() again and I am even more puzzled.
I believe it asks for cleanups.
Quoted 16 lines · Peter Zijlstra
Quoted 9 lines · Oleg Nesterov
But please ignore, the only question is that I can't understand this
if (!vma->vm_mm) { name = strncpy(tmp, "[vdso]", sizeof(tmp)); goto got_name; }Quoted 4 lines
code in
perf_event_mmap_event()and I am just curious. How it is possible thatvma->vm_mm== NULL ?perf_event_mmap(vma)is never called with, say, vma ==gate_vma. And even if it was possiblearch_vma_name()should handle this case?
Quoted 4 lines
Uuuhhhh... I wrote that didn't I ;-)
So I think that was due to the
x86_32gate_vma, but yes I don't think we'd ever callperf_event_mmap()(perf_counter_mmapat the time) on it.
OK, so I think this code should die, it only adds the confusion.
Note also that at least on x86_64 "[vdso]" is not correct (if !vma_mm was possible), this adds more confusion.
Quoted 2 lines
Also, the
x86_32arch_vma_name()didn't deal with thegate_vma(it still doesn't appear to do so) as opposed tox86_64which does.
Hmm... I am looking into arch/x86/vdso/vdso32-setup.c, it seems it does. But probably I missed something, this doesn't matter.
Quoted 2 lines
But the main reason I added it was because task_mmu.c:show_map_vma() did so too; I just wanted to be extra careful.
Yes, but this code can actually hit gate_vma. (and I'd say that if some arch/ has the global gate_vma-like vma's, it should implement arch_vma_name correctly, but this is off-topic).
---------------------------------------------------------------------------
Please look at these 2 simple patches. Initially I was going to send the 3rd patch, but I simply can't understand the "align" logic.
First of all, we surely do not need __GFP_ZERO for kzalloc(PATH_MAX), even if we need to nullify the alignment. So I am going to send another patch in any case.
But do we really need to nullify the extra bytes after strlen()? If yes, for what? If no, we can simply do s/kzalloc/kmalloc/ and kill that memset(tmp, 0, sizeof(tmp)) at the start.
Otoh. Why do we need the temporary string buffer (char tmp[16]) at all? We either use the result from d_path() (which has a room), or we use a string literal (may be returned by arch_vma_name), in the latter case it is safe to assume we can read the extra 7 bytes from .data?
IOW. Could you explain why the patch below (on top of 1-2) is wrong?
Thanks,
Oleg.
kernel/events/core.c +6 -11
@@ -5098,19 +5098,16 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)int maj =0 , min =0 ;u64 ino =0 , gen =0 ;unsigned int size; -char tmp[16 ];char *buf =NULL ;const char *name; -memset (tmp,0 ,sizeof (tmp)); -if (file) {struct inode *inode;dev_t dev; - buf =kzalloc (PATH_MAX ,GFP_KERNEL ); + buf =kmalloc (PATH_MAX ,GFP_KERNEL );if (!buf) { - name =strncpy (tmp,"//enomem" ,sizeof (tmp)); + name ="//enomem" ; goto got_name; }/*
@@ -5120,7 +5117,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)*/ name =d_path (&file->f_path, buf,PATH_MAX -sizeof (u64));if (IS_ERR (name)) { - name =strncpy (tmp,"//toolong" ,sizeof (tmp)); + name ="//toolong" ; goto got_name; } inode =file_inode (vma->vm_file);
@@ -5133,23 +5130,21 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) }else { name =arch_vma_name (vma);if (name) { - name =strncpy (tmp, name,sizeof (tmp) -1 ); - tmp[sizeof (tmp) -1 ] ='\0' ; goto got_name; }if (vma->vm_start <= vma->vm_mm->start_brk && vma->vm_end >= vma->vm_mm->brk) { - name =strncpy (tmp,"[heap]" ,sizeof (tmp)); + name ="[heap]" ; goto got_name; }if (vma->vm_start <= vma->vm_mm->start_stack && vma->vm_end >= vma->vm_mm->start_stack) { - name =strncpy (tmp,"[stack]" ,sizeof (tmp)); + name ="[stack]" ; goto got_name; } - name =strncpy (tmp,"//anon" ,sizeof (tmp)); + name ="//anon" ; goto got_name; }