| Message ID | 20230719075127.47736-5-wangkefeng.wang@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm: convert to vma_is_initial_heap/stack() | expand |
On 19.07.23 09:51, Kefeng Wang wrote: > Use the helpers to simplify code, also kill unneeded goto cpy_name. > > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > kernel/events/core.c | 22 +++++++--------------- > 1 file changed, 7 insertions(+), 15 deletions(-) > > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 78ae7b6f90fd..d59f6327472f 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -8685,22 +8685,14 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) > } > > 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 (!name) { > + if (vma_is_initial_heap(vma)) > + name = "[heap]"; > + else if (vma_is_initial_stack(vma)) > + name = "[stack]"; > + else > + name = "//anon"; > } > - 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; If you're removing that goto, maybe also worth removing the goto at the end of the previous if branch. Reviewed-by: David Hildenbrand <david@redhat.com>
On Wed, Jul 19, 2023 at 03:51:14PM +0800, Kefeng Wang wrote:
> Use the helpers to simplify code, also kill unneeded goto cpy_name.
Grrr.. why am I only getting 4/4 ?
I'm going to write a bot that auto NAKs all partial series :/
On 2023/7/19 17:29, Peter Zijlstra wrote: > On Wed, Jul 19, 2023 at 03:51:14PM +0800, Kefeng Wang wrote: >> Use the helpers to simplify code, also kill unneeded goto cpy_name. > > Grrr.. why am I only getting 4/4 ? > > I'm going to write a bot that auto NAKs all partial series :/ Sorry, I should add all to cc list, here is all patches linke[1] [1] https://lore.kernel.org/linux-mm/20230719075127.47736-1-wangkefeng.wang@huawei.com/ Thanks. >
diff --git a/kernel/events/core.c b/kernel/events/core.c index 78ae7b6f90fd..d59f6327472f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8685,22 +8685,14 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) } 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 (!name) { + if (vma_is_initial_heap(vma)) + name = "[heap]"; + else if (vma_is_initial_stack(vma)) + name = "[stack]"; + else + name = "//anon"; } - 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:
Use the helpers to simplify code, also kill unneeded goto cpy_name. Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- kernel/events/core.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)