perf/core: Introduce perf_free_addr_filters()

Replace _free_event()'s use of perf_addr_filters_splice()s use with an
explicit perf_free_addr_filters() with the explicit propery that it is
able to be called a second time without ill effect.

Most notable, referencing event->pmu must be avoided when there are no
filters left (from eg a previous call).

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com>
Link: https://lore.kernel.org/r/20241104135518.868460518@infradead.org

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 0c7015f3ec030987efcbdd947e8145b55b95dad7..525c64ee7925b53e81d0cb0aace729df464ffc3b 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5339,8 +5339,7 @@ static bool exclusive_event_installable(struct perf_event *event,
        return true;
 }
 
-static void perf_addr_filters_splice(struct perf_event *event,
-                                      struct list_head *head);
+static void perf_free_addr_filters(struct perf_event *event);
 
 static void perf_pending_task_sync(struct perf_event *event)
 {
@@ -5439,7 +5438,7 @@ static void _free_event(struct perf_event *event)
        }
 
        perf_event_free_bpf_prog(event);
-       perf_addr_filters_splice(event, NULL);
+       perf_free_addr_filters(event);
 
        __free_event(event);
 }
@@ -11004,6 +11003,17 @@ static void perf_addr_filters_splice(struct perf_event *event,
        free_filters_list(&list);
 }
 
+static void perf_free_addr_filters(struct perf_event *event)
+{
+       /*
+        * Used during free paths, there is no concurrency.
+        */
+       if (list_empty(&event->addr_filters.list))
+               return;
+
+       perf_addr_filters_splice(event, NULL);
+}
+
 /*
  * Scan through mm's vmas and see if one of them matches the
  * @filter; if so, adjust filter's address range.