From 1dc75542b4f500d43c158f1bc4dc4db142c612f2 Mon Sep 17 00:00:00 2001
From: Dan Everton <deverton@expedia.com>
Date: Fri, 19 Nov 2021 09:16:15 +1000
Subject: [PATCH] Handle probe entry offsets

---
 aya/src/programs/probe.rs | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/aya/src/programs/probe.rs b/aya/src/programs/probe.rs
index b0e19012..6ae5c353 100644
--- a/aya/src/programs/probe.rs
+++ b/aya/src/programs/probe.rs
@@ -183,24 +183,37 @@ fn create_probe_event(
         .open(&events_file_name)
         .map_err(|e| (events_file_name.clone(), e))?;
 
-    // FIXME: add offset
     let p = match kind {
-        KProbe => format!(
-            "{}:{}s/{} {}",
-            probe_type_prefix, event_type, event_alias, fn_name
-        ),
+        KProbe => {
+            if offset > 0 {
+                format!(
+                    "{}:{}s/{} {}+{}",
+                    probe_type_prefix, event_type, event_alias, fn_name, offset
+                )
+            } else {
+                format!(
+                    "{}:{}s/{} {}",
+                    probe_type_prefix, event_type, event_alias, fn_name
+                )
+            }
+        }
         KRetProbe => format!(
             "{}:{}s/{} {}",
             probe_type_prefix, event_type, event_alias, fn_name
         ),
-        UProbe => format!(
-            "{}:{}s/{} {}",
-            probe_type_prefix, event_type, event_alias, fn_name
-        ),
-        URetProbe => format!(
-            "{}:{}s/{} {}",
-            probe_type_prefix, event_type, event_alias, fn_name
-        ),
+        UProbe | URetProbe => {
+            if offset > 0 {
+                format!(
+                    "{}:{}s/{} {}:{:#x}",
+                    probe_type_prefix, event_type, event_alias, fn_name, offset
+                )
+            } else {
+                format!(
+                    "{}:{}s/{} {}",
+                    probe_type_prefix, event_type, event_alias, fn_name
+                )
+            }
+        }
     };
 
     events_file