From: Peter Zijlstra <peterz@infradead.org>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
torvalds@linuxfoundation.org, mingo@kernel.org,
namhyung@kernel.org, acme@redhat.com, kees@kernel.org
Subject: [PATCH v3 09/15] perf: Reflow to get rid of aux_success label
Date: Tue, 12 Aug 2025 12:39:07 +0200 [thread overview]
Message-ID: <20250812104019.362581570@infradead.org> (raw)
In-Reply-To: 20250812103858.234850285@infradead.org
Mostly re-indent noise needed to get rid of that label.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
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;
- }
+ } 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;
+ }
perf_mmap_account(vma, user_extra, extra);
atomic_inc(&event->mmap_count);
}
next prev parent reply other threads:[~2025-08-12 10:46 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-12 10:38 [PATCH v3 00/15] perf: Convert mmap() related reference counts to refcount_t Peter Zijlstra
2025-08-12 10:38 ` [PATCH v3 01/15] perf: Remove redundant condition for AUX buffer size Peter Zijlstra
2025-08-13 5:35 ` Lorenzo Stoakes
2025-08-18 10:23 ` [tip: perf/core] " tip-bot2 for Thomas Gleixner
2025-08-12 10:39 ` [PATCH v3 02/15] perf: Split out mlock limit handling Peter Zijlstra
2025-08-13 5:36 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Thomas Gleixner
2025-08-12 10:39 ` [PATCH v3 03/15] perf: Split out VM accounting Peter Zijlstra
2025-08-13 5:37 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Thomas Gleixner
2025-08-12 10:39 ` [PATCH v3 04/15] perf: Move perf_mmap_calc_limits() into both rb and aux branches Peter Zijlstra
2025-08-13 5:28 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 05/15] perf: Merge consecutive conditionals in perf_mmap() Peter Zijlstra
2025-08-13 5:41 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 06/15] perf: Move common code into both rb and aux branches Peter Zijlstra
2025-08-13 5:55 ` Lorenzo Stoakes
2025-08-13 8:25 ` Peter Zijlstra
2025-08-13 8:27 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 07/15] perf: Remove redundant aux_unlock label Peter Zijlstra
2025-08-13 5:56 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 08/15] perf: Use guard() for aux_mutex in perf_mmap() Peter Zijlstra
2025-08-13 6:00 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` Peter Zijlstra [this message]
2025-08-13 6:03 ` [PATCH v3 09/15] perf: Reflow to get rid of aux_success label Lorenzo Stoakes
2025-08-13 8:29 ` Peter Zijlstra
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 10/15] perf: Split out the AUX buffer allocation Peter Zijlstra
2025-08-13 6:10 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 11/15] perf: Make RB allocation branch self sufficient Peter Zijlstra
2025-08-13 6:24 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 12/15] perf: Split out the RB allocation Peter Zijlstra
2025-08-13 6:35 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 13/15] perf: Use scoped_guard() for mmap_mutex in perf_mmap() Peter Zijlstra
2025-08-13 6:42 ` Lorenzo Stoakes
2025-08-13 8:32 ` Peter Zijlstra
2025-08-13 8:44 ` Peter Zijlstra
2025-08-13 8:52 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 14/15] perf: Identify the 0->1 transition for event::mmap_count Peter Zijlstra
2025-08-12 11:15 ` Peter Zijlstra
2025-08-13 6:53 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-08-12 10:39 ` [PATCH v3 15/15] perf: Convert mmap() refcounts to refcount_t Peter Zijlstra
2025-08-13 7:09 ` Lorenzo Stoakes
2025-08-18 10:22 ` [tip: perf/core] " tip-bot2 for Thomas Gleixner
2025-08-13 7:11 ` [PATCH v3 00/15] perf: Convert mmap() related reference counts " Lorenzo Stoakes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250812104019.362581570@infradead.org \
--to=peterz@infradead.org \
--cc=acme@redhat.com \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).