* [patch V2 m@/6] perf/core: Remove redundant condition for AUX buffer size
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out mlock limit handling Thomas Gleixner
` (5 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
It is already checked whether the VMA size is the same as
nr_pages * PAGE_SIZE, so later checking both:
aux_size == vma_size && aux_size == nr_pages * PAGE_SIZE
is redundant. Remove the vma_size check as nr_pages is what is actually
used in the allocation function. That prepares for splitting out the buffer
allocation into seperate functions, so that only nr_pages needs to be
handed in.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7043,7 +7043,7 @@ static int perf_mmap(struct file *file,
if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
goto aux_unlock;
- if (aux_size != vma_size || aux_size != nr_pages * PAGE_SIZE)
+ if (aux_size != nr_pages * PAGE_SIZE)
goto aux_unlock;
/* already mapped with a different size */
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch V2 m@/6] perf/core: Split out mlock limit handling
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Remove redundant condition for AUX buffer size Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 10:49 ` Peter Zijlstra
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out VM accounting Thomas Gleixner
` (4 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
To prepare for splitting the buffer allocation out into seperate functions
for the ring buffer and the AUX buffer, split out mlock limit handling into
a helper function, which can be called from both.
No functional change intended.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
---
kernel/events/core.c | 75 +++++++++++++++++++++++++--------------------------
1 file changed, 38 insertions(+), 37 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6927,17 +6927,49 @@ static int map_range(struct perf_buffer
return err;
}
+static bool perf_mmap_calc_limits(struct vm_area_struct *vma, long *user_extra, long *extra)
+{
+ unsigned long user_locked, user_lock_limit, locked, lock_limit;
+ struct user_struct *user = current_user();
+
+ user_lock_limit = sysctl_perf_event_mlock >> (PAGE_SHIFT - 10);
+ /* Increase the limit linearly with more CPUs */
+ user_lock_limit *= num_online_cpus();
+
+ user_locked = atomic_long_read(&user->locked_vm);
+
+ /*
+ * sysctl_perf_event_mlock may have changed, so that
+ * user->locked_vm > user_lock_limit
+ */
+ if (user_locked > user_lock_limit)
+ user_locked = user_lock_limit;
+ user_locked += *user_extra;
+
+ if (user_locked > user_lock_limit) {
+ /*
+ * charge locked_vm until it hits user_lock_limit;
+ * charge the rest from pinned_vm
+ */
+ *extra = user_locked - user_lock_limit;
+ *user_extra -= *extra;
+ }
+
+ lock_limit = rlimit(RLIMIT_MEMLOCK);
+ lock_limit >>= PAGE_SHIFT;
+ locked = atomic64_read(&vma->vm_mm->pinned_vm) + *extra;
+
+ return locked <= lock_limit || !perf_is_paranoid() || capable(CAP_IPC_LOCK);
+}
+
static int perf_mmap(struct file *file, struct vm_area_struct *vma)
{
struct perf_event *event = file->private_data;
- unsigned long user_locked, user_lock_limit;
struct user_struct *user = current_user();
+ unsigned long vma_size, nr_pages;
+ long user_extra = 0, extra = 0;
struct mutex *aux_mutex = NULL;
struct perf_buffer *rb = NULL;
- unsigned long locked, lock_limit;
- unsigned long vma_size;
- unsigned long nr_pages;
- long user_extra = 0, extra = 0;
int ret, flags = 0;
mapped_f mapped;
@@ -7063,38 +7095,7 @@ static int perf_mmap(struct file *file,
}
}
- user_lock_limit = sysctl_perf_event_mlock >> (PAGE_SHIFT - 10);
-
- /*
- * Increase the limit linearly with more CPUs:
- */
- user_lock_limit *= num_online_cpus();
-
- user_locked = atomic_long_read(&user->locked_vm);
-
- /*
- * sysctl_perf_event_mlock may have changed, so that
- * user->locked_vm > user_lock_limit
- */
- if (user_locked > user_lock_limit)
- user_locked = user_lock_limit;
- user_locked += user_extra;
-
- if (user_locked > user_lock_limit) {
- /*
- * charge locked_vm until it hits user_lock_limit;
- * charge the rest from pinned_vm
- */
- extra = user_locked - user_lock_limit;
- user_extra -= extra;
- }
-
- lock_limit = rlimit(RLIMIT_MEMLOCK);
- lock_limit >>= PAGE_SHIFT;
- locked = atomic64_read(&vma->vm_mm->pinned_vm) + extra;
-
- if ((locked > lock_limit) && perf_is_paranoid() &&
- !capable(CAP_IPC_LOCK)) {
+ if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
ret = -EPERM;
goto unlock;
}
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf/core: Split out mlock limit handling
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out mlock limit handling Thomas Gleixner
@ 2025-08-11 10:49 ` Peter Zijlstra
2025-08-11 12:42 ` Thomas Gleixner
0 siblings, 1 reply; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 10:49 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 09:06:37AM +0200, Thomas Gleixner wrote:
> To prepare for splitting the buffer allocation out into seperate functions
> for the ring buffer and the AUX buffer, split out mlock limit handling into
> a helper function, which can be called from both.
>
> No functional change intended.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
>
> ---
Does this not also need this? I found this stray user_extra when I
eventually removed the local user_extra variable.
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6997,8 +6997,6 @@ static int perf_mmap(struct file *file,
if (vma_size != PAGE_SIZE * nr_pages)
return -EINVAL;
- user_extra = nr_pages;
-
mutex_lock(&event->mmap_mutex);
ret = -EINVAL;
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [patch V2 m@/6] perf/core: Split out mlock limit handling
2025-08-11 10:49 ` Peter Zijlstra
@ 2025-08-11 12:42 ` Thomas Gleixner
2025-08-11 14:40 ` Peter Zijlstra
0 siblings, 1 reply; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 12:42 UTC (permalink / raw)
To: Peter Zijlstra
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11 2025 at 12:49, Peter Zijlstra wrote:
> On Mon, Aug 11, 2025 at 09:06:37AM +0200, Thomas Gleixner wrote:
>> To prepare for splitting the buffer allocation out into seperate functions
>> for the ring buffer and the AUX buffer, split out mlock limit handling into
>> a helper function, which can be called from both.
>>
>> No functional change intended.
>>
>> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
>>
>> ---
>
> Does this not also need this? I found this stray user_extra when I
> eventually removed the local user_extra variable.
>
>
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -6997,8 +6997,6 @@ static int perf_mmap(struct file *file,
> if (vma_size != PAGE_SIZE * nr_pages)
> return -EINVAL;
>
> - user_extra = nr_pages;
> -
> mutex_lock(&event->mmap_mutex);
> ret = -EINVAL;
>
No. That's how user_extra is initialized in the first place.
To remove that nr_pages must become an argument to that function.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [patch V2 m@/6] perf/core: Split out mlock limit handling
2025-08-11 12:42 ` Thomas Gleixner
@ 2025-08-11 14:40 ` Peter Zijlstra
0 siblings, 0 replies; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 14:40 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 02:42:58PM +0200, Thomas Gleixner wrote:
> > Does this not also need this? I found this stray user_extra when I
> > eventually removed the local user_extra variable.
> >
> >
> > --- a/kernel/events/core.c
> > +++ b/kernel/events/core.c
> > @@ -6997,8 +6997,6 @@ static int perf_mmap(struct file *file,
> > if (vma_size != PAGE_SIZE * nr_pages)
> > return -EINVAL;
> >
> > - user_extra = nr_pages;
> > -
> > mutex_lock(&event->mmap_mutex);
> > ret = -EINVAL;
> >
>
> No. That's how user_extra is initialized in the first place.
>
> To remove that nr_pages must become an argument to that function.
Ah, I see. Let me go fix that.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [patch V2 m@/6] perf/core: Split out VM accounting
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Remove redundant condition for AUX buffer size Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out mlock limit handling Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out AUX buffer allocation Thomas Gleixner
` (3 subsequent siblings)
6 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
Similary 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 seperate functions, move the
accounting into a helper function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
---
kernel/events/core.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6962,10 +6962,17 @@ static bool perf_mmap_calc_limits(struct
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,
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 */
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
` (2 preceding siblings ...)
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out VM accounting Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 9:04 ` Peter Zijlstra
` (2 more replies)
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split the ringbuffer mmap() and allocation code out Thomas Gleixner
` (2 subsequent siblings)
6 siblings, 3 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
The code logic in perf_mmap() is incomprehensible and has been source of
subtle bugs in the past. It makes it impossible to convert the atomic_t
reference counts to refcount_t.
There is not really much, which is shared between the ringbuffer and AUX
buffer allocation code since the mlock limit calculation and the
accounting has been split out into helper functions.
Move the AUX buffer allocation code out and integrate the call with a
momentary workaround to allow skipping the remaining ringbuffer related
code completely. That workaround will be removed once the ringbuffer
allocation is moved to its own function as well.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
V2: Fixup invers condition and add the dropped flags setup back - Lorenzo
Fixup subject line to match the content
---
kernel/events/core.c | 137 +++++++++++++++++++++++++++++----------------------
1 file changed, 78 insertions(+), 59 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6970,12 +6970,79 @@ static void perf_mmap_account(struct vm_
atomic64_add(extra, &vma->vm_mm->pinned_vm);
}
+static int perf_mmap_aux(struct vm_area_struct *vma, struct perf_event *event,
+ unsigned long nr_pages)
+{
+ long user_extra = nr_pages, extra = 0;
+ struct perf_buffer *rb = event->rb;
+ u64 aux_offset, aux_size;
+ int ret, rb_flags = 0;
+
+ /*
+ * AUX area mapping: if rb->aux_nr_pages != 0, it's already
+ * mapped, all subsequent mappings should have the same size
+ * and offset. Must be above the normal perf buffer.
+ */
+ aux_offset = READ_ONCE(rb->user_page->aux_offset);
+ aux_size = READ_ONCE(rb->user_page->aux_size);
+
+ if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
+ return -EINVAL;
+
+ if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
+ return -EINVAL;
+
+ /* Already mapped with a different offset */
+ if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
+ return -EINVAL;
+
+ if (aux_size != nr_pages * PAGE_SIZE)
+ return -EINVAL;
+
+ /* Already mapped with a different size */
+ if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
+ return -EINVAL;
+
+ if (!is_power_of_2(nr_pages))
+ return -EINVAL;
+
+ /* If this succeeds, subsequent failures have to undo it */
+ if (!atomic_inc_not_zero(&rb->mmap_count))
+ return -EINVAL;
+
+ /* If mapped, attach to it */
+ if (rb_has_aux(rb)) {
+ atomic_inc(&rb->aux_mmap_count);
+ return 0;
+ }
+
+ if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
+ atomic_dec(&rb->mmap_count);
+ return -EPERM;
+ }
+
+ if (vma->vm_flags & VM_WRITE)
+ rb_flags |= RING_BUFFER_WRITABLE;
+
+ ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
+ event->attr.aux_watermark, rb_flags);
+ if (ret) {
+ atomic_dec(&rb->mmap_count);
+ return ret;
+ }
+
+ atomic_set(&rb->aux_mmap_count, 1);
+ rb->aux_mmap_locked = extra;
+ perf_mmap_account(vma, user_extra, extra);
+ atomic_inc(&event->mmap_count);
+ return 0;
+}
+
static int perf_mmap(struct file *file, struct vm_area_struct *vma)
{
struct perf_event *event = file->private_data;
unsigned long vma_size, nr_pages;
long user_extra = 0, extra = 0;
- struct mutex *aux_mutex = NULL;
struct perf_buffer *rb = NULL;
int ret, flags = 0;
mapped_f mapped;
@@ -7055,51 +7122,15 @@ static int perf_mmap(struct file *file,
}
} else {
- /*
- * AUX area mapping: if rb->aux_nr_pages != 0, it's already
- * mapped, all subsequent mappings should have the same size
- * and offset. Must be above the normal perf buffer.
- */
- u64 aux_offset, aux_size;
-
- rb = event->rb;
- if (!rb)
- goto aux_unlock;
-
- aux_mutex = &rb->aux_mutex;
- mutex_lock(aux_mutex);
-
- aux_offset = READ_ONCE(rb->user_page->aux_offset);
- aux_size = READ_ONCE(rb->user_page->aux_size);
-
- if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
- goto aux_unlock;
-
- if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
- goto aux_unlock;
-
- /* already mapped with a different offset */
- if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
- goto aux_unlock;
-
- if (aux_size != nr_pages * PAGE_SIZE)
- goto aux_unlock;
-
- /* already mapped with a different size */
- if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
- goto aux_unlock;
-
- if (!is_power_of_2(nr_pages))
- goto aux_unlock;
-
- if (!atomic_inc_not_zero(&rb->mmap_count))
- goto aux_unlock;
-
- if (rb_has_aux(rb)) {
- atomic_inc(&rb->aux_mmap_count);
- ret = 0;
- goto unlock;
+ if (!event->rb) {
+ ret = -EINVAL;
+ } else {
+ scoped_guard(mutex, &event->rb->aux_mutex)
+ ret = perf_mmap_aux(vma, event, nr_pages);
}
+ // Temporary workaround to split out AUX handling first
+ mutex_unlock(&event->mmap_mutex);
+ goto out;
}
if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
@@ -7132,28 +7163,16 @@ static int perf_mmap(struct file *file,
perf_event_init_userpage(event);
perf_event_update_userpage(event);
ret = 0;
- } else {
- ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
- event->attr.aux_watermark, flags);
- if (!ret) {
- atomic_set(&rb->aux_mmap_count, 1);
- rb->aux_mmap_locked = extra;
- }
}
-
unlock:
if (!ret) {
perf_mmap_account(vma, user_extra, extra);
atomic_inc(&event->mmap_count);
- } else if (rb) {
- /* AUX allocation failed */
- atomic_dec(&rb->mmap_count);
}
-aux_unlock:
- if (aux_mutex)
- mutex_unlock(aux_mutex);
mutex_unlock(&event->mmap_mutex);
+// Temporary until RB allocation is split out.
+out:
if (ret)
return ret;
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out AUX buffer allocation Thomas Gleixner
@ 2025-08-11 9:04 ` Peter Zijlstra
2025-08-11 9:36 ` Peter Zijlstra
2025-08-11 10:04 ` Peter Zijlstra
2 siblings, 0 replies; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 9:04 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 09:06:41AM +0200, Thomas Gleixner wrote:
> @@ -7055,51 +7122,15 @@ static int perf_mmap(struct file *file,
> }
>
> } else {
> - /*
> - * AUX area mapping: if rb->aux_nr_pages != 0, it's already
> - * mapped, all subsequent mappings should have the same size
> - * and offset. Must be above the normal perf buffer.
> - */
> - u64 aux_offset, aux_size;
> -
> - rb = event->rb;
> - if (!rb)
> - goto aux_unlock;
> -
> - aux_mutex = &rb->aux_mutex;
> - mutex_lock(aux_mutex);
> -
> - aux_offset = READ_ONCE(rb->user_page->aux_offset);
> - aux_size = READ_ONCE(rb->user_page->aux_size);
> -
> - if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
> - goto aux_unlock;
> -
> - if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
> - goto aux_unlock;
> -
> - /* already mapped with a different offset */
> - if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
> - goto aux_unlock;
> -
> - if (aux_size != nr_pages * PAGE_SIZE)
> - goto aux_unlock;
> -
> - /* already mapped with a different size */
> - if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
> - goto aux_unlock;
> -
> - if (!is_power_of_2(nr_pages))
> - goto aux_unlock;
> -
> - if (!atomic_inc_not_zero(&rb->mmap_count))
> - goto aux_unlock;
> -
> - if (rb_has_aux(rb)) {
> - atomic_inc(&rb->aux_mmap_count);
> - ret = 0;
> - goto unlock;
> + if (!event->rb) {
> + ret = -EINVAL;
> + } else {
> + scoped_guard(mutex, &event->rb->aux_mutex)
> + ret = perf_mmap_aux(vma, event, nr_pages);
> }
> + // Temporary workaround to split out AUX handling first
> + mutex_unlock(&event->mmap_mutex);
> + goto out;
> }
>
> if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
> @@ -7132,28 +7163,16 @@ static int perf_mmap(struct file *file,
> perf_event_init_userpage(event);
> perf_event_update_userpage(event);
> ret = 0;
> - } else {
> - ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
> - event->attr.aux_watermark, flags);
> - if (!ret) {
> - atomic_set(&rb->aux_mmap_count, 1);
> - rb->aux_mmap_locked = extra;
> - }
> }
> -
> unlock:
> if (!ret) {
> perf_mmap_account(vma, user_extra, extra);
> atomic_inc(&event->mmap_count);
> - } else if (rb) {
> - /* AUX allocation failed */
> - atomic_dec(&rb->mmap_count);
> }
> -aux_unlock:
> - if (aux_mutex)
> - mutex_unlock(aux_mutex);
> mutex_unlock(&event->mmap_mutex);
>
> +// Temporary until RB allocation is split out.
> +out:
> if (ret)
> return ret;
Its a bit of a struggle getting back to work after spending 3 weeks on a
beach with the kids, but doesn't this remove the perf_mmap_account()
call out from under aux_mutex?
Notably, perf_mmap_close() seems to rely on this being the case.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out AUX buffer allocation Thomas Gleixner
2025-08-11 9:04 ` Peter Zijlstra
@ 2025-08-11 9:36 ` Peter Zijlstra
2025-08-11 10:04 ` Peter Zijlstra
2 siblings, 0 replies; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 9:36 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 09:06:41AM +0200, Thomas Gleixner wrote:
> +static int perf_mmap_aux(struct vm_area_struct *vma, struct perf_event *event,
> + unsigned long nr_pages)
> +{
> + long user_extra = nr_pages, extra = 0;
> + struct perf_buffer *rb = event->rb;
> + u64 aux_offset, aux_size;
> + int ret, rb_flags = 0;
> +
> + /*
> + * AUX area mapping: if rb->aux_nr_pages != 0, it's already
> + * mapped, all subsequent mappings should have the same size
> + * and offset. Must be above the normal perf buffer.
> + */
> + aux_offset = READ_ONCE(rb->user_page->aux_offset);
> + aux_size = READ_ONCE(rb->user_page->aux_size);
> +
> + if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
> + return -EINVAL;
> +
> + if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
> + return -EINVAL;
> +
> + /* Already mapped with a different offset */
> + if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
> + return -EINVAL;
> +
> + if (aux_size != nr_pages * PAGE_SIZE)
> + return -EINVAL;
> +
> + /* Already mapped with a different size */
> + if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
> + return -EINVAL;
> +
> + if (!is_power_of_2(nr_pages))
> + return -EINVAL;
> +
> + /* If this succeeds, subsequent failures have to undo it */
> + if (!atomic_inc_not_zero(&rb->mmap_count))
> + return -EINVAL;
> +
> + /* If mapped, attach to it */
> + if (rb_has_aux(rb)) {
> + atomic_inc(&rb->aux_mmap_count);
> + return 0;
> + }
> +
> + if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
> + atomic_dec(&rb->mmap_count);
> + return -EPERM;
> + }
> +
> + if (vma->vm_flags & VM_WRITE)
> + rb_flags |= RING_BUFFER_WRITABLE;
> +
> + ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
> + event->attr.aux_watermark, rb_flags);
> + if (ret) {
> + atomic_dec(&rb->mmap_count);
> + return ret;
> + }
> +
> + atomic_set(&rb->aux_mmap_count, 1);
> + rb->aux_mmap_locked = extra;
> + perf_mmap_account(vma, user_extra, extra);
> + atomic_inc(&event->mmap_count);
Ooh, you squirreled a perf_mmap_account call in here.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out AUX buffer allocation Thomas Gleixner
2025-08-11 9:04 ` Peter Zijlstra
2025-08-11 9:36 ` Peter Zijlstra
@ 2025-08-11 10:04 ` Peter Zijlstra
2025-08-11 12:28 ` Peter Zijlstra
2025-08-11 12:44 ` Thomas Gleixner
2 siblings, 2 replies; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 10:04 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 09:06:41AM +0200, Thomas Gleixner wrote:
> The code logic in perf_mmap() is incomprehensible and has been source of
> subtle bugs in the past. It makes it impossible to convert the atomic_t
> reference counts to refcount_t.
>
> There is not really much, which is shared between the ringbuffer and AUX
> buffer allocation code since the mlock limit calculation and the
> accounting has been split out into helper functions.
>
> Move the AUX buffer allocation code out and integrate the call with a
> momentary workaround to allow skipping the remaining ringbuffer related
> code completely. That workaround will be removed once the ringbuffer
> allocation is moved to its own function as well.
>
> No functional change.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
> V2: Fixup invers condition and add the dropped flags setup back - Lorenzo
> Fixup subject line to match the content
> ---
> kernel/events/core.c | 137 +++++++++++++++++++++++++++++----------------------
> 1 file changed, 78 insertions(+), 59 deletions(-)
>
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -6970,12 +6970,79 @@ static void perf_mmap_account(struct vm_
> atomic64_add(extra, &vma->vm_mm->pinned_vm);
> }
>
> +static int perf_mmap_aux(struct vm_area_struct *vma, struct perf_event *event,
> + unsigned long nr_pages)
> +{
> + long user_extra = nr_pages, extra = 0;
> + struct perf_buffer *rb = event->rb;
> + u64 aux_offset, aux_size;
> + int ret, rb_flags = 0;
> +
> + /*
> + * AUX area mapping: if rb->aux_nr_pages != 0, it's already
> + * mapped, all subsequent mappings should have the same size
> + * and offset. Must be above the normal perf buffer.
> + */
> + aux_offset = READ_ONCE(rb->user_page->aux_offset);
> + aux_size = READ_ONCE(rb->user_page->aux_size);
> +
> + if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
> + return -EINVAL;
> +
> + if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
> + return -EINVAL;
> +
> + /* Already mapped with a different offset */
> + if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
> + return -EINVAL;
> +
> + if (aux_size != nr_pages * PAGE_SIZE)
> + return -EINVAL;
> +
> + /* Already mapped with a different size */
> + if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
> + return -EINVAL;
> +
> + if (!is_power_of_2(nr_pages))
> + return -EINVAL;
> +
> + /* If this succeeds, subsequent failures have to undo it */
> + if (!atomic_inc_not_zero(&rb->mmap_count))
> + return -EINVAL;
> +
> + /* If mapped, attach to it */
> + if (rb_has_aux(rb)) {
> + atomic_inc(&rb->aux_mmap_count);
> + return 0;
so this was: ret = 0; goto unlock;, which then would've also taken the
!ret branch and done perf_mmap_account(), no?
> + }
> +
> + if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
> + atomic_dec(&rb->mmap_count);
> + return -EPERM;
> + }
> +
> + if (vma->vm_flags & VM_WRITE)
> + rb_flags |= RING_BUFFER_WRITABLE;
> +
> + ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
> + event->attr.aux_watermark, rb_flags);
> + if (ret) {
> + atomic_dec(&rb->mmap_count);
> + return ret;
> + }
> +
> + atomic_set(&rb->aux_mmap_count, 1);
> + rb->aux_mmap_locked = extra;
> + perf_mmap_account(vma, user_extra, extra);
> + atomic_inc(&event->mmap_count);
> + return 0;
> +}
These two aux and rb split out patches seem like they're trying to take
too big a step. Let me try and do the same with smaller steps.
If only to try and find bugs.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 10:04 ` Peter Zijlstra
@ 2025-08-11 12:28 ` Peter Zijlstra
2025-08-11 12:46 ` Thomas Gleixner
2025-08-11 12:44 ` Thomas Gleixner
1 sibling, 1 reply; 18+ messages in thread
From: Peter Zijlstra @ 2025-08-11 12:28 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11, 2025 at 12:04:04PM +0200, Peter Zijlstra wrote:
> These two aux and rb split out patches seem like they're trying to take
> too big a step. Let me try and do the same with smaller steps.
Find here:
git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git perf/core
Now, I need a food :-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 12:28 ` Peter Zijlstra
@ 2025-08-11 12:46 ` Thomas Gleixner
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 12:46 UTC (permalink / raw)
To: Peter Zijlstra
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11 2025 at 14:28, Peter Zijlstra wrote:
> On Mon, Aug 11, 2025 at 12:04:04PM +0200, Peter Zijlstra wrote:
>
>> These two aux and rb split out patches seem like they're trying to take
>> too big a step. Let me try and do the same with smaller steps.
>
> Find here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git perf/core
Cool. Seems your vacation has refreshed your brains :)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [patch V2 m@/6] perf/core: Split out AUX buffer allocation
2025-08-11 10:04 ` Peter Zijlstra
2025-08-11 12:28 ` Peter Zijlstra
@ 2025-08-11 12:44 ` Thomas Gleixner
1 sibling, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 12:44 UTC (permalink / raw)
To: Peter Zijlstra
Cc: LKML, Linus Torvalds, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
On Mon, Aug 11 2025 at 12:04, Peter Zijlstra wrote:
> On Mon, Aug 11, 2025 at 09:06:41AM +0200, Thomas Gleixner wrote:
>> + /* If mapped, attach to it */
>> + if (rb_has_aux(rb)) {
>> + atomic_inc(&rb->aux_mmap_count);
>> + return 0;
>
> so this was: ret = 0; goto unlock;, which then would've also taken the
> !ret branch and done perf_mmap_account(), no?
Indeed.
> These two aux and rb split out patches seem like they're trying to take
> too big a step. Let me try and do the same with smaller steps.
>
> If only to try and find bugs.
:)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [patch V2 m@/6] perf/core: Split the ringbuffer mmap() and allocation code out
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
` (3 preceding siblings ...)
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split out AUX buffer allocation Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Convert mmap() refcounts to refcount_t Thomas Gleixner
2025-08-11 8:02 ` [patch V2 m@/6] perf: Convert mmap() related reference counts " Lorenzo Stoakes
6 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
The code logic in perf_mmap() is incomprehensible and has been source of
subtle bugs in the past. It makes it impossible to convert the atomic_t
reference counts to refcount_t.
Now that the AUX buffer mapping and allocation code is in it's own function
apply the same treatment to the ringbuffer part and remove the temporary
workarounds created by the AUX split out.
No functional change intended.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/events/core.c | 176 ++++++++++++++++++++++-----------------------------
1 file changed, 78 insertions(+), 98 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6970,6 +6970,70 @@ static void perf_mmap_account(struct vm_
atomic64_add(extra, &vma->vm_mm->pinned_vm);
}
+static int perf_mmap_rb(struct vm_area_struct *vma, struct perf_event *event,
+ unsigned long nr_pages)
+{
+ long user_extra = nr_pages, extra = 0;
+ struct perf_buffer *rb = event->rb;
+ int rb_flags = 0;
+
+ /*
+ * If we have rb pages ensure they're a power-of-two number, so we
+ * can do bitmasks instead of modulo.
+ */
+ if (--nr_pages != 0 && !is_power_of_2(nr_pages))
+ return -EINVAL;
+
+ WARN_ON_ONCE(event->ctx->parent_ctx);
+
+ if (rb) {
+ /* Must have the same size */
+ if (data_page_nr(rb) != nr_pages)
+ return -EINVAL;
+
+ if (atomic_inc_not_zero(&event->rb->mmap_count)) {
+ /*
+ * Success -- managed to mmap() the same buffer
+ * multiple times.
+ */
+ atomic_inc(&event->mmap_count);
+ return 0;
+ }
+ /*
+ * Raced against perf_mmap_close()'s
+ * atomic_dec_and_mutex_lock() remove the event and
+ * continue as if !event->rb
+ */
+ ring_buffer_attach(event, NULL);
+ }
+
+ if (!perf_mmap_calc_limits(vma, &user_extra, &extra))
+ return -EPERM;
+
+ if (vma->vm_flags & VM_WRITE)
+ rb_flags |= RING_BUFFER_WRITABLE;
+
+ rb = rb_alloc(nr_pages, event->attr.watermark ? event->attr.wakeup_watermark : 0,
+ event->cpu, rb_flags);
+
+ if (!rb)
+ return -ENOMEM;
+
+ atomic_set(&rb->mmap_count, 1);
+ rb->mmap_user = get_current_user();
+ rb->mmap_locked = extra;
+
+ ring_buffer_attach(event, rb);
+
+ perf_event_update_time(event);
+ perf_event_init_userpage(event);
+ perf_event_update_userpage(event);
+
+ perf_mmap_account(vma, user_extra, extra);
+ atomic_set(&event->mmap_count, 1);
+ return 0;
+}
+
static int perf_mmap_aux(struct vm_area_struct *vma, struct perf_event *event,
unsigned long nr_pages)
{
@@ -7042,10 +7106,8 @@ static int perf_mmap(struct file *file,
{
struct perf_event *event = file->private_data;
unsigned long vma_size, nr_pages;
- long user_extra = 0, extra = 0;
- struct perf_buffer *rb = NULL;
- int ret, flags = 0;
mapped_f mapped;
+ int ret;
/*
* Don't allow mmap() of inherited per-task counters. This would
@@ -7071,114 +7133,32 @@ static int perf_mmap(struct file *file,
if (vma_size != PAGE_SIZE * nr_pages)
return -EINVAL;
- user_extra = nr_pages;
-
- mutex_lock(&event->mmap_mutex);
- ret = -EINVAL;
-
- /*
- * This relies on __pmu_detach_event() taking mmap_mutex after marking
- * the event REVOKED. Either we observe the state, or __pmu_detach_event()
- * will detach the rb created here.
- */
- if (event->state <= PERF_EVENT_STATE_REVOKED) {
- ret = -ENODEV;
- goto unlock;
- }
-
- if (vma->vm_pgoff == 0) {
- nr_pages -= 1;
-
+ scoped_guard(mutex, &event->mmap_mutex) {
/*
- * If we have rb pages ensure they're a power-of-two number, so we
- * can do bitmasks instead of modulo.
+ * This relies on __pmu_detach_event() taking mmap_mutex
+ * after marking the event REVOKED. Either we observe the
+ * state, or __pmu_detach_event() will detach the rb
+ * created here.
*/
- if (nr_pages != 0 && !is_power_of_2(nr_pages))
- goto unlock;
-
- WARN_ON_ONCE(event->ctx->parent_ctx);
+ if (event->state <= PERF_EVENT_STATE_REVOKED)
+ return -ENODEV;
- if (event->rb) {
- if (data_page_nr(event->rb) != nr_pages)
- goto unlock;
-
- if (atomic_inc_not_zero(&event->rb->mmap_count)) {
- /*
- * Success -- managed to mmap() the same buffer
- * multiple times.
- */
- ret = 0;
- /* We need the rb to map pages. */
- rb = event->rb;
- goto unlock;
- }
-
- /*
- * Raced against perf_mmap_close()'s
- * atomic_dec_and_mutex_lock() remove the
- * event and continue as if !event->rb
- */
- ring_buffer_attach(event, NULL);
- }
-
- } else {
- if (!event->rb) {
- ret = -EINVAL;
+ if (vma->vm_pgoff == 0) {
+ ret = perf_mmap_rb(vma, event, nr_pages);
} else {
+ if (!event->rb)
+ return -EINVAL;
scoped_guard(mutex, &event->rb->aux_mutex)
ret = perf_mmap_aux(vma, event, nr_pages);
}
- // Temporary workaround to split out AUX handling first
- mutex_unlock(&event->mmap_mutex);
- goto out;
- }
-
- if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
- ret = -EPERM;
- goto unlock;
- }
-
- WARN_ON(!rb && event->rb);
-
- if (vma->vm_flags & VM_WRITE)
- flags |= RING_BUFFER_WRITABLE;
-
- if (!rb) {
- rb = rb_alloc(nr_pages,
- event->attr.watermark ? event->attr.wakeup_watermark : 0,
- event->cpu, flags);
-
- if (!rb) {
- ret = -ENOMEM;
- goto unlock;
- }
-
- atomic_set(&rb->mmap_count, 1);
- rb->mmap_user = get_current_user();
- rb->mmap_locked = extra;
-
- ring_buffer_attach(event, rb);
-
- perf_event_update_time(event);
- perf_event_init_userpage(event);
- perf_event_update_userpage(event);
- ret = 0;
- }
-unlock:
- if (!ret) {
- perf_mmap_account(vma, user_extra, extra);
- atomic_inc(&event->mmap_count);
}
- mutex_unlock(&event->mmap_mutex);
-// Temporary until RB allocation is split out.
-out:
if (ret)
return ret;
/*
* Since pinned accounting is per vm we cannot allow fork() to copy our
- * vma.
+ * VMA. The VMA is fixed size and must not be included in dumps.
*/
vm_flags_set(vma, VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP);
vma->vm_ops = &perf_mmap_vmops;
@@ -7193,7 +7173,7 @@ static int perf_mmap(struct file *file,
* full cleanup in this case and therefore does not invoke
* vmops::close().
*/
- ret = map_range(rb, vma);
+ ret = map_range(event->rb, vma);
if (ret)
perf_mmap_close(vma);
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch V2 m@/6] perf/core: Convert mmap() refcounts to refcount_t
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
` (4 preceding siblings ...)
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Split the ringbuffer mmap() and allocation code out Thomas Gleixner
@ 2025-08-11 7:06 ` Thomas Gleixner
2025-08-11 8:02 ` [patch V2 m@/6] perf: Convert mmap() related reference counts " Lorenzo Stoakes
6 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 7:06 UTC (permalink / raw)
To: LKML
Cc: Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Lorenzo Stoakes, Kees Cook
The recently fixed reference count leaks could have been detected by using
refcount_t and refcount_t would have mitigated the potential overflow at
least.
Now that the code is properly structured, convert the mmap() related
mmap_count variants over to refcount_t.
No functional change intended.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
include/linux/perf_event.h | 2 +-
kernel/events/core.c | 40 ++++++++++++++++++++--------------------
kernel/events/internal.h | 4 ++--
kernel/events/ring_buffer.c | 2 +-
4 files changed, 24 insertions(+), 24 deletions(-)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -859,7 +859,7 @@ struct perf_event {
/* mmap bits */
struct mutex mmap_mutex;
- atomic_t mmap_count;
+ refcount_t mmap_count;
struct perf_buffer *rb;
struct list_head rb_entry;
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3968,7 +3968,7 @@ static noinline int visit_groups_merge(s
*/
static inline bool event_update_userpage(struct perf_event *event)
{
- if (likely(!atomic_read(&event->mmap_count)))
+ if (likely(!refcount_read(&event->mmap_count)))
return false;
perf_event_update_time(event);
@@ -6704,11 +6704,11 @@ static void perf_mmap_open(struct vm_are
struct perf_event *event = vma->vm_file->private_data;
mapped_f mapped = get_mapped(event, event_mapped);
- atomic_inc(&event->mmap_count);
- atomic_inc(&event->rb->mmap_count);
+ refcount_inc(&event->mmap_count);
+ refcount_inc(&event->rb->mmap_count);
if (vma->vm_pgoff)
- atomic_inc(&event->rb->aux_mmap_count);
+ refcount_inc(&event->rb->aux_mmap_count);
if (mapped)
mapped(event, vma->vm_mm);
@@ -6743,7 +6743,7 @@ static void perf_mmap_close(struct vm_ar
* to avoid complications.
*/
if (rb_has_aux(rb) && vma->vm_pgoff == rb->aux_pgoff &&
- atomic_dec_and_mutex_lock(&rb->aux_mmap_count, &rb->aux_mutex)) {
+ refcount_dec_and_mutex_lock(&rb->aux_mmap_count, &rb->aux_mutex)) {
/*
* Stop all AUX events that are writing to this buffer,
* so that we can free its AUX pages and corresponding PMU
@@ -6763,10 +6763,10 @@ static void perf_mmap_close(struct vm_ar
mutex_unlock(&rb->aux_mutex);
}
- if (atomic_dec_and_test(&rb->mmap_count))
+ if (refcount_dec_and_test(&rb->mmap_count))
detach_rest = true;
- if (!atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex))
+ if (!refcount_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex))
goto out_put;
ring_buffer_attach(event, NULL);
@@ -6991,17 +6991,17 @@ static int perf_mmap_rb(struct vm_area_s
if (data_page_nr(rb) != nr_pages)
return -EINVAL;
- if (atomic_inc_not_zero(&event->rb->mmap_count)) {
+ if (refcount_inc_not_zero(&event->rb->mmap_count)) {
/*
* Success -- managed to mmap() the same buffer
* multiple times.
*/
- atomic_inc(&event->mmap_count);
+ refcount_inc(&event->mmap_count);
return 0;
}
/*
* Raced against perf_mmap_close()'s
- * atomic_dec_and_mutex_lock() remove the event and
+ * refcount_dec_and_mutex_lock() remove the event and
* continue as if !event->rb
*/
ring_buffer_attach(event, NULL);
@@ -7019,7 +7019,7 @@ static int perf_mmap_rb(struct vm_area_s
if (!rb)
return -ENOMEM;
- atomic_set(&rb->mmap_count, 1);
+ refcount_set(&rb->mmap_count, 1);
rb->mmap_user = get_current_user();
rb->mmap_locked = extra;
@@ -7030,7 +7030,7 @@ static int perf_mmap_rb(struct vm_area_s
perf_event_update_userpage(event);
perf_mmap_account(vma, user_extra, extra);
- atomic_set(&event->mmap_count, 1);
+ refcount_set(&event->mmap_count, 1);
return 0;
}
@@ -7071,17 +7071,17 @@ static int perf_mmap_aux(struct vm_area_
return -EINVAL;
/* If this succeeds, subsequent failures have to undo it */
- if (!atomic_inc_not_zero(&rb->mmap_count))
+ if (!refcount_inc_not_zero(&rb->mmap_count))
return -EINVAL;
/* If mapped, attach to it */
if (rb_has_aux(rb)) {
- atomic_inc(&rb->aux_mmap_count);
+ refcount_inc(&rb->aux_mmap_count);
return 0;
}
if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
- atomic_dec(&rb->mmap_count);
+ refcount_dec(&rb->mmap_count);
return -EPERM;
}
@@ -7091,14 +7091,14 @@ static int perf_mmap_aux(struct vm_area_
ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
event->attr.aux_watermark, rb_flags);
if (ret) {
- atomic_dec(&rb->mmap_count);
+ refcount_dec(&rb->mmap_count);
return ret;
}
- atomic_set(&rb->aux_mmap_count, 1);
+ refcount_set(&rb->aux_mmap_count, 1);
rb->aux_mmap_locked = extra;
perf_mmap_account(vma, user_extra, extra);
- atomic_inc(&event->mmap_count);
+ refcount_inc(&event->mmap_count);
return 0;
}
@@ -13247,7 +13247,7 @@ perf_event_set_output(struct perf_event
mutex_lock_double(&event->mmap_mutex, &output_event->mmap_mutex);
set:
/* Can't redirect output if we've got an active mmap() */
- if (atomic_read(&event->mmap_count))
+ if (refcount_read(&event->mmap_count))
goto unlock;
if (output_event) {
@@ -13260,7 +13260,7 @@ perf_event_set_output(struct perf_event
goto unlock;
/* did we race against perf_mmap_close() */
- if (!atomic_read(&rb->mmap_count)) {
+ if (!refcount_read(&rb->mmap_count)) {
ring_buffer_put(rb);
goto unlock;
}
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -35,7 +35,7 @@ struct perf_buffer {
spinlock_t event_lock;
struct list_head event_list;
- atomic_t mmap_count;
+ refcount_t mmap_count;
unsigned long mmap_locked;
struct user_struct *mmap_user;
@@ -47,7 +47,7 @@ struct perf_buffer {
unsigned long aux_pgoff;
int aux_nr_pages;
int aux_overwrite;
- atomic_t aux_mmap_count;
+ refcount_t aux_mmap_count;
unsigned long aux_mmap_locked;
void (*free_aux)(void *);
refcount_t aux_refcount;
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -400,7 +400,7 @@ void *perf_aux_output_begin(struct perf_
* the same order, see perf_mmap_close. Otherwise we end up freeing
* aux pages in this path, which is a bug, because in_atomic().
*/
- if (!atomic_read(&rb->aux_mmap_count))
+ if (!refcount_read(&rb->aux_mmap_count))
goto err;
if (!refcount_inc_not_zero(&rb->aux_refcount))
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t
2025-08-11 7:06 [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t Thomas Gleixner
` (5 preceding siblings ...)
2025-08-11 7:06 ` [patch V2 m@/6] perf/core: Convert mmap() refcounts to refcount_t Thomas Gleixner
@ 2025-08-11 8:02 ` Lorenzo Stoakes
2025-08-11 12:32 ` Thomas Gleixner
6 siblings, 1 reply; 18+ messages in thread
From: Lorenzo Stoakes @ 2025-08-11 8:02 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Kees Cook
Hi Thomas,
I think a script went haywire here with 'm@/6', would you mind resending?
Otherwise it'll be hard for to figure out which is which.
Cheers, Lorenzo
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch V2 m@/6] perf: Convert mmap() related reference counts to refcount_t
2025-08-11 8:02 ` [patch V2 m@/6] perf: Convert mmap() related reference counts " Lorenzo Stoakes
@ 2025-08-11 12:32 ` Thomas Gleixner
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Gleixner @ 2025-08-11 12:32 UTC (permalink / raw)
To: Lorenzo Stoakes
Cc: LKML, Linus Torvalds, Peter Zijlstra, Ingo Molnar, Namhyung Kim,
Arnaldo Carvalho de Melo, Kees Cook
On Mon, Aug 11 2025 at 09:02, Lorenzo Stoakes wrote:
> I think a script went haywire here with 'm@/6', would you mind resending?
> Otherwise it'll be hard for to figure out which is which.
It wasn't the script. I fat fingered the template and the script did not
complain...
^ permalink raw reply [flat|nested] 18+ messages in thread