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 07/15] perf: Remove redundant aux_unlock label
Date: Tue, 12 Aug 2025 12:39:05 +0200 [thread overview]
Message-ID: <20250812104019.131293512@infradead.org> (raw)
In-Reply-To: <20250812103858.234850285@infradead.org>
unlock and aux_unlock are now identical, remove the aux_unlock one.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/events/core.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7095,7 +7095,7 @@ static int perf_mmap(struct file *file,
rb = event->rb;
if (!rb)
- goto aux_unlock;
+ goto unlock;
aux_mutex = &rb->aux_mutex;
mutex_lock(aux_mutex);
@@ -7104,27 +7104,27 @@ static int perf_mmap(struct file *file,
aux_size = READ_ONCE(rb->user_page->aux_size);
if (aux_offset < perf_data_size(rb) + PAGE_SIZE)
- goto aux_unlock;
+ goto unlock;
if (aux_offset != vma->vm_pgoff << PAGE_SHIFT)
- goto aux_unlock;
+ goto unlock;
/* already mapped with a different offset */
if (rb_has_aux(rb) && rb->aux_pgoff != vma->vm_pgoff)
- goto aux_unlock;
+ goto unlock;
if (aux_size != nr_pages * PAGE_SIZE)
- goto aux_unlock;
+ goto unlock;
/* already mapped with a different size */
if (rb_has_aux(rb) && rb->aux_nr_pages != nr_pages)
- goto aux_unlock;
+ goto unlock;
if (!is_power_of_2(nr_pages))
- goto aux_unlock;
+ goto unlock;
if (!atomic_inc_not_zero(&rb->mmap_count))
- goto aux_unlock;
+ goto unlock;
if (rb_has_aux(rb)) {
atomic_inc(&rb->aux_mmap_count);
@@ -7158,7 +7158,6 @@ static int perf_mmap(struct file *file,
}
unlock:
-aux_unlock:
if (aux_mutex)
mutex_unlock(aux_mutex);
mutex_unlock(&event->mmap_mutex);
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 ` Peter Zijlstra [this message]
2025-08-13 5:56 ` [PATCH v3 07/15] perf: Remove redundant aux_unlock label 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 ` [PATCH v3 09/15] perf: Reflow to get rid of aux_success label Peter Zijlstra
2025-08-13 6:03 ` 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.131293512@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
all inboxes | Powered by JetHome®