From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jan 2025 18:52:03 +0000 (-0800)
Subject: Merge tag 'perf-core-2025-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.14-rc1~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c4aa896ebee5edf2b35a9d071e5a468797f96d8;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'perf-core-2025-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull performance events updates from Ingo Molnar:
 "Seqlock optimizations that arose in a perf context and were merged
  into the perf tree:

   - seqlock: Add raw_seqcount_try_begin (Suren Baghdasaryan)
   - mm: Convert mm_lock_seq to a proper seqcount (Suren Baghdasaryan)
   - mm: Introduce mmap_lock_speculate_{try_begin|retry} (Suren
     Baghdasaryan)
   - mm/gup: Use raw_seqcount_try_begin() (Peter Zijlstra)

  Core perf enhancements:

   - Reduce 'struct page' footprint of perf by mapping pages in advance
     (Lorenzo Stoakes)
   - Save raw sample data conditionally based on sample type (Yabin Cui)
   - Reduce sampling overhead by checking sample_type in
     perf_sample_save_callchain() and perf_sample_save_brstack() (Yabin
     Cui)
   - Export perf_exclude_event() (Namhyung Kim)

  Uprobes scalability enhancements: (Andrii Nakryiko)

   - Simplify find_active_uprobe_rcu() VMA checks
   - Add speculative lockless VMA-to-inode-to-uprobe resolution
   - Simplify session consumer tracking
   - Decouple return_instance list traversal and freeing
   - Ensure return_instance is detached from the list before freeing
   - Reuse return_instances between multiple uretprobes within task
   - Guard against kmemdup() failing in dup_return_instance()

  AMD core PMU driver enhancements:

   - Relax privilege filter restriction on AMD IBS (Namhyung Kim)

  AMD RAPL energy counters support: (Dhananjay Ugwekar)

   - Introduce topology_logical_core_id() (K Prateek Nayak)
   - Remove the unused get_rapl_pmu_cpumask() function
   - Remove the cpu_to_rapl_pmu() function
   - Rename rapl_pmu variables
   - Make rapl_model struct global
   - Add arguments to the init and cleanup functions
   - Modify the generic variable names to *_pkg*
   - Remove the global variable rapl_msrs
   - Move the cntr_mask to rapl_pmus struct
   - Add core energy counter support for AMD CPUs

  Intel core PMU driver enhancements:

   - Support RDPMC 'metrics clear mode' feature (Kan Liang)
   - Clarify adaptive PEBS processing (Kan Liang)
   - Factor out functions for PEBS records processing (Kan Liang)
   - Simplify the PEBS records processing for adaptive PEBS (Kan Liang)

  Intel uncore driver enhancements: (Kan Liang)

   - Convert buggy pmu->func_id use to pmu->registered
   - Support more units on Granite Rapids"

* tag 'perf-core-2025-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
  perf: map pages in advance
  perf/x86/intel/uncore: Support more units on Granite Rapids
  perf/x86/intel/uncore: Clean up func_id
  perf/x86/intel: Support RDPMC metrics clear mode
  uprobes: Guard against kmemdup() failing in dup_return_instance()
  perf/x86: Relax privilege filter restriction on AMD IBS
  perf/core: Export perf_exclude_event()
  uprobes: Reuse return_instances between multiple uretprobes within task
  uprobes: Ensure return_instance is detached from the list before freeing
  uprobes: Decouple return_instance list traversal and freeing
  uprobes: Simplify session consumer tracking
  uprobes: add speculative lockless VMA-to-inode-to-uprobe resolution
  uprobes: simplify find_active_uprobe_rcu() VMA checks
  mm: introduce mmap_lock_speculate_{try_begin|retry}
  mm: convert mm_lock_seq to a proper seqcount
  mm/gup: Use raw_seqcount_try_begin()
  seqlock: add raw_seqcount_try_begin
  perf/x86/rapl: Add core energy counter support for AMD CPUs
  perf/x86/rapl: Move the cntr_mask to rapl_pmus struct
  perf/x86/rapl: Remove the global variable rapl_msrs
  ...
---

6c4aa896ebee5edf2b35a9d071e5a468797f96d8
diff --cc kernel/events/uprobes.c
index 5d71ef85420c5,1f75a2f912067..e421a5f2ec7d0
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@@ -1921,10 -1958,22 +1959,21 @@@ void uprobe_free_utask(struct task_stru
  	timer_delete_sync(&utask->ri_timer);
  
  	ri = utask->return_instances;
- 	while (ri)
- 		ri = free_ret_instance(ri, true /* cleanup_hprobe */);
+ 	while (ri) {
+ 		ri_next = ri->next;
+ 		free_ret_instance(utask, ri, true /* cleanup_hprobe */);
+ 		ri = ri_next;
+ 	}
+ 
+ 	/* free_ret_instance() above might add to ri_pool, so this loop should come last */
+ 	ri = utask->ri_pool;
+ 	while (ri) {
+ 		ri_next = ri->next;
+ 		ri_free(ri);
+ 		ri = ri_next;
+ 	}
  
  	kfree(utask);
 -	t->utask = NULL;
  }
  
  #define RI_TIMER_PERIOD (HZ / 10) /* 100 ms */