From 29772e7ac2010173072fa4e954014f82f6aea07f Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 24 Jul 2023 15:30:16 -0700
Subject: [PATCH] sysprofd: add proxy support for mmap2/build_id

We will want to be able to open perf event streams with these options so
that we can get the build-id extracted from an ELF without having to rely
on parsing it at resolution time.

Additionally, it could give us an option for live-decoding at some point
in userspace without having to write the major DWARF capture data to disk.
---
 src/libsysprof/sysprof-perf-event-stream.c |  4 +++
 src/sysprofd/helpers.c                     | 32 ++++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/libsysprof/sysprof-perf-event-stream.c b/src/libsysprof/sysprof-perf-event-stream.c
index 4b5be46e..1ec14ad2 100644
--- a/src/libsysprof/sysprof-perf-event-stream.c
+++ b/src/libsysprof/sysprof-perf-event-stream.c
@@ -122,6 +122,8 @@ build_options_dict (const struct perf_event_attr *attr)
                             "{'disabled', <%b>},"
                             "{'exclude_idle', <%b>},"
                             "{'mmap', <%b>},"
+                            "{'mmap2', <%b>},"
+                            "{'build_id', <%b>},"
                             "{'wakeup_events', <%u>},"
                             "{'sample_id_all', <%b>},"
                             "{'sample_period', <%t>},"
@@ -138,6 +140,8 @@ build_options_dict (const struct perf_event_attr *attr)
                           (gboolean)!!attr->disabled,
                           (gboolean)!!attr->exclude_idle,
                           (gboolean)!!attr->mmap,
+                          (gboolean)!!attr->mmap2,
+                          (gboolean)!!attr->build_id,
                           (guint32)attr->wakeup_events,
                           (gboolean)!!attr->sample_id_all,
                           (guint64)attr->sample_period,
diff --git a/src/sysprofd/helpers.c b/src/sysprofd/helpers.c
index 49167aef..2aebc417 100644
--- a/src/sysprofd/helpers.c
+++ b/src/sysprofd/helpers.c
@@ -120,20 +120,22 @@ helpers_perf_event_open (GVariant *options,
   struct perf_event_attr attr = {0};
   GVariantIter iter;
   GVariant *value;
-  gchar *key;
+  char *key;
   gint32 disabled = 0;
   gint32 wakeup_events = 149;
   gint32 type = 0;
   guint64 sample_period = 0;
   guint64 sample_type = 0;
   guint64 config = 0;
-  gint clockid = CLOCK_MONOTONIC;
-  gint comm = 0;
-  gint mmap_ = 0;
-  gint task = 0;
-  gint exclude_idle = 0;
-  gint use_clockid = 0;
-  gint sample_id_all = 0;
+  int clockid = CLOCK_MONOTONIC;
+  int comm = 0;
+  int mmap_ = 0;
+  int mmap2 = 0;
+  int build_id = 0;
+  int task = 0;
+  int exclude_idle = 0;
+  int use_clockid = 0;
+  int sample_id_all = 0;
 
   g_assert (out_fd != NULL);
 
@@ -162,6 +164,12 @@ helpers_perf_event_open (GVariant *options,
             goto bad_arg;
           sample_id_all = g_variant_get_boolean (value);
         }
+      else if (strcmp (key, "build_id") == 0)
+        {
+          if (!g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+            goto bad_arg;
+          build_id = g_variant_get_boolean (value);
+        }
       else if (strcmp (key, "clockid") == 0)
         {
           if (!g_variant_is_of_type (value, G_VARIANT_TYPE_INT32))
@@ -186,6 +194,12 @@ helpers_perf_event_open (GVariant *options,
             goto bad_arg;
           mmap_ = g_variant_get_boolean (value);
         }
+      else if (strcmp (key, "mmap2") == 0)
+        {
+          if (!g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+            goto bad_arg;
+          mmap2 = g_variant_get_boolean (value);
+        }
       else if (strcmp (key, "config") == 0)
         {
           if (!g_variant_is_of_type (value, G_VARIANT_TYPE_UINT64))
@@ -235,6 +249,8 @@ helpers_perf_event_open (GVariant *options,
   attr.disabled = disabled;
   attr.exclude_idle = !!exclude_idle;
   attr.mmap = !!mmap_;
+  attr.mmap2 = !!mmap2;
+  attr.build_id = !!build_id;
   attr.sample_id_all = sample_id_all;
   attr.sample_period = sample_period;
   attr.sample_type = sample_type;