Re: [PATCH v3 09/15] perf: Reflow to get rid of aux_success label

[Lorenzo Stoakes <lorenzo.stoakes@oracle.com>]

On Tue, Aug 12, 2025 at 12:39:07PM +0200, Peter Zijlstra wrote:
> Mostly re-indent noise needed to get rid of that label.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

This is where a side-by-side git diff pager comes in handy :)

LGTM apart from nit/comment below so:

Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>

> ---
>  kernel/events/core.c |   37 ++++++++++++++++++-------------------
>  1 file changed, 18 insertions(+), 19 deletions(-)
>
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -7127,30 +7127,29 @@ static int perf_mmap(struct file *file,
>  		if (rb_has_aux(rb)) {
>  			atomic_inc(&rb->aux_mmap_count);
>  			ret = 0;
> -			goto aux_success;
> -		}
>
> -		if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
> -			ret = -EPERM;
> -			atomic_dec(&rb->mmap_count);
> -			goto unlock;
> -		}

NIT: These leaves  a space above:

		if (rb_has_aux(rb)) {
			atomic_inc(&rb->aux_mmap_count);
			ret = 0;

		} else {


> +		} else {
> +			if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) {
> +				ret = -EPERM;
> +				atomic_dec(&rb->mmap_count);
> +				goto unlock;
> +			}
>
> -		WARN_ON(!rb && event->rb);
> +			WARN_ON(!rb && event->rb);
>
> -		if (vma->vm_flags & VM_WRITE)
> -			flags |= RING_BUFFER_WRITABLE;
> +			if (vma->vm_flags & VM_WRITE)
> +				flags |= RING_BUFFER_WRITABLE;
>
> -		ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
> -				   event->attr.aux_watermark, flags);
> -		if (ret) {
> -			atomic_dec(&rb->mmap_count);
> -			goto unlock;
> -		}
> +			ret = rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages,
> +					   event->attr.aux_watermark, flags);
> +			if (ret) {
> +				atomic_dec(&rb->mmap_count);
> +				goto unlock;
> +			}
>
> -		atomic_set(&rb->aux_mmap_count, 1);
> -		rb->aux_mmap_locked = extra;
> -aux_success:
> +			atomic_set(&rb->aux_mmap_count, 1);
> +			rb->aux_mmap_locked = extra;
> +		}

This gets rid of the label but leave spretty horrid nesting, but I'm
guessing further refactorings will tame it.

>  		perf_mmap_account(vma, user_extra, extra);
>  		atomic_inc(&event->mmap_count);
>  	}
>
>