[PATCH v3 4/4] perf/core: use vma_is_initial_stack() and vma_is_initial_heap()

[Kefeng Wang]

Use the helpers to simplify code, also kill unneeded goto cpy_name.

Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
Reviewed-by: David Hildenbrand <da...@redhat.com>
Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 kernel/events/core.c | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index f84e2640ea2f..b36d0823ff33 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8631,7 +8631,7 @@ static void perf_event_mmap_event(struct perf_mmap_event 
*mmap_event)
        unsigned int size;
        char tmp[16];
        char *buf = NULL;
-       char *name;
+       char *name = NULL;
 
        if (vma->vm_flags & VM_READ)
                prot |= PROT_READ;
@@ -8678,29 +8678,18 @@ static void perf_event_mmap_event(struct 
perf_mmap_event *mmap_event)
 
                goto got_name;
        } else {
-               if (vma->vm_ops && vma->vm_ops->name) {
+               if (vma->vm_ops && vma->vm_ops->name)
                        name = (char *) vma->vm_ops->name(vma);
-                       if (name)
-                               goto cpy_name;
+               if (!name)
+                       name = (char *)arch_vma_name(vma);
+               if (!name) {
+                       if (vma_is_initial_heap(vma))
+                               name = "[heap]";
+                       else if (vma_is_initial_stack(vma))
+                               name = "[stack]";
+                       else
+                               name = "//anon";
                }
-
-               name = (char *)arch_vma_name(vma);
-               if (name)
-                       goto cpy_name;
-
-               if (vma->vm_start <= vma->vm_mm->start_brk &&
-                               vma->vm_end >= vma->vm_mm->brk) {
-                       name = "[heap]";
-                       goto cpy_name;
-               }
-               if (vma->vm_start <= vma->vm_mm->start_stack &&
-                               vma->vm_end >= vma->vm_mm->start_stack) {
-                       name = "[stack]";
-                       goto cpy_name;
-               }
-
-               name = "//anon";
-               goto cpy_name;
        }
 
 cpy_name:
-- 
2.41.0