]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
perf: Split out VM accounting
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Aug 2025 10:39:01 +0000 (12:39 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Fri, 15 Aug 2025 11:12:59 +0000 (13:12 +0200)
Similarly to the mlock limit calculation the VM accounting is required for
both the ringbuffer and the AUX buffer allocations.

To prepare for splitting them out into separate functions, move the
accounting into a helper function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Link: https://lore.kernel.org/r/20250812104018.660347811@infradead.org
kernel/events/core.c

index f6299012ed734fd29ef51a851c340b28d9256c1b..f90847101ade97082ca8a7be77bf5738d2e952c9 100644 (file)
@@ -6962,10 +6962,17 @@ static bool perf_mmap_calc_limits(struct vm_area_struct *vma, long *user_extra,
        return locked <= lock_limit || !perf_is_paranoid() || capable(CAP_IPC_LOCK);
 }
 
+static void perf_mmap_account(struct vm_area_struct *vma, long user_extra, long extra)
+{
+       struct user_struct *user = current_user();
+
+       atomic_long_add(user_extra, &user->locked_vm);
+       atomic64_add(extra, &vma->vm_mm->pinned_vm);
+}
+
 static int perf_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct perf_event *event = file->private_data;
-       struct user_struct *user = current_user();
        unsigned long vma_size, nr_pages;
        long user_extra = 0, extra = 0;
        struct mutex *aux_mutex = NULL;
@@ -7136,9 +7143,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
 
 unlock:
        if (!ret) {
-               atomic_long_add(user_extra, &user->locked_vm);
-               atomic64_add(extra, &vma->vm_mm->pinned_vm);
-
+               perf_mmap_account(vma, user_extra, extra);
                atomic_inc(&event->mmap_count);
        } else if (rb) {
                /* AUX allocation failed */