diff mbox series

perf tools: Remove misleading comments on map functions

Message ID 20240208181025.1329645-1-namhyung@kernel.org
State New
Headers
Series perf tools: Remove misleading comments on map functions |

Commit Message

Namhyung Kim Feb. 8, 2024, 6:10 p.m. UTC 
  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 <namhyung@kernel.org>
---
 tools/perf/util/map.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Ian Rogers Feb. 8, 2024, 6:59 p.m. UTC | #1 
On Thu, Feb 8, 2024 at 10:10 AM Namhyung Kim <namhyung@kernel.org> 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 <namhyung@kernel.org>

Reviewed-by: Ian Rogers <irogers@google.com>

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
>
Arnaldo Carvalho de Melo Feb. 8, 2024, 7:29 p.m. UTC | #2 
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 <acme@redhat.com>

- Arnaldo
 
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  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
Namhyung Kim Feb. 9, 2024, 10:17 p.m. UTC | #3 
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,
diff mbox series

Patch

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);