From 573a92486cfa2979cc416a3d9a183828b547d573 Mon Sep 17 00:00:00 2001
From: Subhadeep Bhattacharya <subhadeepb@nvidia.com>
Date: Fri, 2 Feb 2024 15:08:07 -0800
Subject: [PATCH] Fix bug: incorrect callsite stack traceback during .so file
 handling

Co-authored-by: Artem Polyakov <artpol84@gmail.com>
Signed-off-by: Subhadeep Bhattacharya <subhadeepb@nvidia.com>
---
 mpiPi.h     |  1 +
 pc_lookup.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mpiPi.h b/mpiPi.h
index 56ce5bd..8e341c1 100644
--- a/mpiPi.h
+++ b/mpiPi.h
@@ -113,6 +113,7 @@ typedef struct SO_INFO
 {
   void *lvma;
   void *uvma;
+  size_t offset;
   char *fpath;
   bfd *bfd;
 } so_info_t;
diff --git a/pc_lookup.c b/pc_lookup.c
index 4c59564..38fef9a 100644
--- a/pc_lookup.c
+++ b/pc_lookup.c
@@ -262,12 +262,12 @@ mpiPi_print_so_node_info (const void *so_node, VISIT which, int depth)
     case preorder:
       break;
     case postorder:
-      printf ("%p - %p : %s\n", cso->lvma, cso->uvma, cso->fpath);
+      printf ("%p - %p %lx: %s\n", cso->lvma, cso->uvma, cso->offset, cso->fpath);
       break;
     case endorder:
       break;
     case leaf:
-      printf ("%p - %p : %s\n", cso->lvma, cso->uvma, cso->fpath);
+      printf ("%p - %p %lx: %s\n", cso->lvma, cso->uvma, cso->offset, cso->fpath);
       break;
     }
 }
@@ -317,6 +317,7 @@ mpiPi_parse_maps ()
   char fbuf[64];
   FILE *fh;
   void *lvma, *uvma;
+  size_t offset;
   char *fpath, *inbuf = NULL, *tokptr;
   so_info_t *cso = NULL;
   size_t inbufsize;
@@ -334,9 +335,9 @@ mpiPi_parse_maps ()
     }
 
   if (sizeof (void *) == 4)
-    scan_str = "%x-%x";
+    scan_str = "%x-%x %*s %x";
   else
-    scan_str = "%llx-%llx";
+    scan_str = "%llx-%llx %*s %llx";
 
   mpiPi.so_info = NULL;
 
@@ -349,10 +350,10 @@ mpiPi_parse_maps ()
       mpiPi_msg_debug ("maps getline is %s\n", inbuf);
 
       /* scan address range */
-      if (sscanf (inbuf, scan_str, &lvma, &uvma) < 2)
+      if (sscanf (inbuf, scan_str, &lvma, &uvma, &offset) < 2)
         return 0;
 
-      mpiPi_msg_debug ("Parsed range as %lx - %lx\n", lvma, uvma);
+      mpiPi_msg_debug ("Parsed range as %lx - %lx offset: %lx\n", lvma, uvma, offset);
 
       /* get pointer to address range */
       tokptr = strtok_r (inbuf, delim, &sp);
@@ -387,6 +388,7 @@ mpiPi_parse_maps ()
         return 0;
       cso->lvma = lvma;
       cso->uvma = uvma;
+      cso->offset = offset;
       cso->fpath = strdup (fpath);
       cso->bfd = NULL;
       if (tsearch (cso, (void **) &(mpiPi.so_info), mpiPi_so_info_compare) !=
@@ -468,7 +470,7 @@ mpiP_find_src_loc (void *i_addr_hex, char **o_file_str, int *o_lineno,
               fso->bfd = (bfd *) open_bfd_object (fso->fpath);
             }
 
-          pc = (char *) i_addr_hex - (char *) fso->lvma;
+          pc = (((char *) i_addr_hex - (char *) fso->lvma) + fso->offset);
           mpiPi_msg_debug
               ("Calling bfd_map_over_sections with new bfd for %p\n", pc);