2024-02-08 18:39:41

by Namhyung Kim

Subject: [PATCH] perf tools: Remove misleading comments on map functions

When it converts sample IP to or from objdump-capable one, there's a
comment saying that kernel modules have DSO_SPACE__USER. But commit
02213cec64bb ("perf maps: Mark module DSOs with kernel type") changed
it and makes the comment confusing. Let's get rid of it.

Signed-off-by: Namhyung Kim <[email protected]>
---
tools/perf/util/map.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index cf5a15db3a1f..14a5ea70d81e 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -553,10 +553,6 @@ u64 map__rip_2objdump(struct map *map, u64 rip)
if (dso->rel)
return rip - map__pgoff(map);

- /*
- * kernel modules also have DSO_TYPE_USER in dso->kernel,
- * but all kernel modules are ET_REL, so won't get here.
- */
if (dso->kernel == DSO_SPACE__USER)
return rip + dso->text_offset;

@@ -585,10 +581,6 @@ u64 map__objdump_2mem(struct map *map, u64 ip)
if (dso->rel)
return map__unmap_ip(map, ip + map__pgoff(map));

- /*
- * kernel modules also have DSO_TYPE_USER in dso->kernel,
- * but all kernel modules are ET_REL, so won't get here.
- */
if (dso->kernel == DSO_SPACE__USER)
return map__unmap_ip(map, ip - dso->text_offset);

--
2.43.0.687.g38aa6559b0-goog

2024-02-08 19:15:59

by Ian Rogers

Subject: Re: [PATCH] perf tools: Remove misleading comments on map functions

On Thu, Feb 8, 2024 at 10:10 AM Namhyung Kim <[email protected]> wrote:
>
> When it converts sample IP to or from objdump-capable one, there's a
> comment saying that kernel modules have DSO_SPACE__USER. But commit
> 02213cec64bb ("perf maps: Mark module DSOs with kernel type") changed
> it and makes the comment confusing. Let's get rid of it.
>
> Signed-off-by: Namhyung Kim <[email protected]>

Reviewed-by: Ian Rogers <[email protected]>

Thanks,
Ian

> ---
> tools/perf/util/map.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
> index cf5a15db3a1f..14a5ea70d81e 100644
> --- a/tools/perf/util/map.c
> +++ b/tools/perf/util/map.c
> @@ -553,10 +553,6 @@ u64 map__rip_2objdump(struct map *map, u64 rip)
> if (dso->rel)
> return rip - map__pgoff(map);
>
> - /*
> - * kernel modules also have DSO_TYPE_USER in dso->kernel,
> - * but all kernel modules are ET_REL, so won't get here.
> - */
> if (dso->kernel == DSO_SPACE__USER)
> return rip + dso->text_offset;
>
> @@ -585,10 +581,6 @@ u64 map__objdump_2mem(struct map *map, u64 ip)
> if (dso->rel)
> return map__unmap_ip(map, ip + map__pgoff(map));
>
> - /*
> - * kernel modules also have DSO_TYPE_USER in dso->kernel,
> - * but all kernel modules are ET_REL, so won't get here.
> - */
> if (dso->kernel == DSO_SPACE__USER)
> return map__unmap_ip(map, ip - dso->text_offset);
>
> --
> 2.43.0.687.g38aa6559b0-goog
>

2024-02-08 19:40:12

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf tools: Remove misleading comments on map functions

On Thu, Feb 08, 2024 at 10:10:25AM -0800, Namhyung Kim wrote:
> When it converts sample IP to or from objdump-capable one, there's a
> comment saying that kernel modules have DSO_SPACE__USER. But commit
> 02213cec64bb ("perf maps: Mark module DSOs with kernel type") changed
> it and makes the comment confusing. Let's get rid of it.

Acked-by: Arnaldo Carvalho de Melo <[email protected]>

- Arnaldo

> Signed-off-by: Namhyung Kim <[email protected]>
> ---
> tools/perf/util/map.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
> index cf5a15db3a1f..14a5ea70d81e 100644
> --- a/tools/perf/util/map.c
> +++ b/tools/perf/util/map.c
> @@ -553,10 +553,6 @@ u64 map__rip_2objdump(struct map *map, u64 rip)
> if (dso->rel)
> return rip - map__pgoff(map);
>
> - /*
> - * kernel modules also have DSO_TYPE_USER in dso->kernel,
> - * but all kernel modules are ET_REL, so won't get here.
> - */
> if (dso->kernel == DSO_SPACE__USER)
> return rip + dso->text_offset;
>
> @@ -585,10 +581,6 @@ u64 map__objdump_2mem(struct map *map, u64 ip)
> if (dso->rel)
> return map__unmap_ip(map, ip + map__pgoff(map));
>
> - /*
> - * kernel modules also have DSO_TYPE_USER in dso->kernel,
> - * but all kernel modules are ET_REL, so won't get here.
> - */
> if (dso->kernel == DSO_SPACE__USER)
> return map__unmap_ip(map, ip - dso->text_offset);
>
> --
> 2.43.0.687.g38aa6559b0-goog

2024-02-09 22:21:11

by Namhyung Kim

Subject: Re: [PATCH] perf tools: Remove misleading comments on map functions

On Thu, 8 Feb 2024 10:10:25 -0800, Namhyung Kim wrote:
> When it converts sample IP to or from objdump-capable one, there's a
> comment saying that kernel modules have DSO_SPACE__USER. But commit
> 02213cec64bb ("perf maps: Mark module DSOs with kernel type") changed
> it and makes the comment confusing. Let's get rid of it.
>
>

Applied perf-tools-next, thanks!

Best regards,
--
Namhyung Kim <[email protected]>