From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] unwind: Simplify unwind_reset_info()
Date: Wed, 29 Oct 2025 09:36:19 -0000 [thread overview]
Message-ID: <176173057929.2601451.653673305854375483.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250924080118.777916262@infradead.org>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 52a1ec718b3eb6da29a76d05a662365a997139cc
Gitweb: https://git.kernel.org/tip/52a1ec718b3eb6da29a76d05a662365a997139cc
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 22 Sep 2025 15:46:00 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 29 Oct 2025 10:29:55 +01:00
unwind: Simplify unwind_reset_info()
Invert the condition of the first if and make it an early exit to
reduce an indent level for the rest fo the function.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Link: https://patch.msgid.link/20250924080118.777916262@infradead.org
---
include/linux/unwind_deferred.h | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/linux/unwind_deferred.h b/include/linux/unwind_deferred.h
index 25f4dff..196e12c 100644
--- a/include/linux/unwind_deferred.h
+++ b/include/linux/unwind_deferred.h
@@ -46,22 +46,22 @@ void unwind_deferred_task_exit(struct task_struct *task);
static __always_inline void unwind_reset_info(void)
{
struct unwind_task_info *info = ¤t->unwind_info;
- unsigned long bits;
+ unsigned long bits = info->unwind_mask;
/* Was there any unwinding? */
- if (unlikely(info->unwind_mask)) {
- bits = info->unwind_mask;
- do {
- /* Is a task_work going to run again before going back */
- if (bits & UNWIND_PENDING)
- return;
- } while (!try_cmpxchg(&info->unwind_mask, &bits, 0UL));
- current->unwind_info.id.id = 0;
-
- if (unlikely(info->cache)) {
- info->cache->nr_entries = 0;
- info->cache->unwind_completed = 0;
- }
+ if (likely(!bits))
+ return;
+
+ do {
+ /* Is a task_work going to run again before going back */
+ if (bits & UNWIND_PENDING)
+ return;
+ } while (!try_cmpxchg(&info->unwind_mask, &bits, 0UL));
+ current->unwind_info.id.id = 0;
+
+ if (unlikely(info->cache)) {
+ info->cache->nr_entries = 0;
+ info->cache->unwind_completed = 0;
}
}
next prev parent reply other threads:[~2025-10-29 9:36 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-24 7:59 [PATCH 00/12] Various fixes and x86 support Peter Zijlstra
2025-09-24 7:59 ` [PATCH 01/12] task_work: Fix NMI race condition Peter Zijlstra
2025-10-01 15:31 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 02/12] unwind: Shorten lines Peter Zijlstra
2025-10-01 15:32 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 03/12] unwind: Add required include files Peter Zijlstra
2025-10-01 15:32 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 04/12] unwind: Simplify unwind_reset_info() Peter Zijlstra
2025-10-01 15:33 ` Steven Rostedt
2025-10-29 9:36 ` tip-bot2 for Peter Zijlstra [this message]
2025-09-24 7:59 ` [PATCH 05/12] unwind: Add comment to unwind_deferred_task_exit() Peter Zijlstra
2025-10-01 15:35 ` Steven Rostedt
2025-10-20 10:16 ` Peter Zijlstra
2025-10-22 15:16 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 06/12] unwind: Fix unwind_deferred_request() vs NMI Peter Zijlstra
2025-10-01 15:37 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 07/12] unwind: Clarify calling context Peter Zijlstra
2025-10-01 15:38 ` Steven Rostedt
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 08/12] unwind: Simplify unwind_user_faultable() Peter Zijlstra
2025-10-01 15:40 ` Steven Rostedt
2025-10-20 10:17 ` Peter Zijlstra
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 09/12] unwind: Make unwind_task_info::unwind_mask consistent Peter Zijlstra
2025-10-01 15:47 ` Steven Rostedt
2025-10-20 10:20 ` Peter Zijlstra
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 10/12] unwind: Simplify unwind_user_next_fp() alignment check Peter Zijlstra
2025-10-01 15:55 ` Steven Rostedt
2025-10-20 10:28 ` Peter Zijlstra
2025-10-22 15:20 ` Steven Rostedt
2025-10-23 9:53 ` Peter Zijlstra
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 7:59 ` [PATCH 11/12] unwind: Implement compat fp unwind Peter Zijlstra
2025-10-17 15:47 ` Jens Remus
2025-10-20 9:16 ` Jens Remus
2025-10-20 10:39 ` Peter Zijlstra
2025-10-20 10:48 ` Peter Zijlstra
2025-10-22 15:23 ` Steven Rostedt
2025-10-24 13:45 ` Peter Zijlstra
2025-10-22 14:55 ` Jens Remus
2025-10-24 13:40 ` Peter Zijlstra
2025-10-20 10:38 ` Peter Zijlstra
2025-10-22 18:31 ` Steven Rostedt
2025-10-24 14:10 ` Peter Zijlstra
2025-10-24 14:16 ` Peter Zijlstra
2025-10-29 9:36 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-09-24 8:00 ` [PATCH 12/12] unwind_user/x86: Enable frame pointer unwinding on x86 Peter Zijlstra
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=176173057929.2601451.653673305854375483.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.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®