* [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability
@ 2025-09-09 1:33 Ye Liu
2025-09-09 6:34 ` Anshuman Khandual
2025-09-10 6:46 ` Vlastimil Babka
0 siblings, 2 replies; 3+ messages in thread
From: Ye Liu @ 2025-09-09 1:33 UTC (permalink / raw)
To: Vlastimil Babka, Andrew Morton
Cc: Ye Liu, Harry Yoo, Christoph Lameter, David Rientjes,
Roman Gushchin, linux-mm, linux-kernel
From: Ye Liu <liuye@kylinos.cn>
Use IS_ENABLED() and standard if-else to make the code clearer.
Signed-off-by: Ye Liu <liuye@kylinos.cn>
Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
Reviewed-by: Christoph Lameter (Ampere) <cl@gentwo.org>
---
Changes in v3:
- Add "---" in front of the change log.
Changes in v2:
- Insert newline after && as it's more than 80 columns.
---
mm/slub.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index 30003763d224..5711d6d29a3f 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3064,18 +3064,17 @@ static inline void note_cmpxchg_failure(const char *n,
pr_info("%s %s: cmpxchg redo ", n, s->name);
-#ifdef CONFIG_PREEMPTION
- if (tid_to_cpu(tid) != tid_to_cpu(actual_tid))
+ if (IS_ENABLED(CONFIG_PREEMPTION) &&
+ tid_to_cpu(tid) != tid_to_cpu(actual_tid)) {
pr_warn("due to cpu change %d -> %d\n",
tid_to_cpu(tid), tid_to_cpu(actual_tid));
- else
-#endif
- if (tid_to_event(tid) != tid_to_event(actual_tid))
+ } else if (tid_to_event(tid) != tid_to_event(actual_tid)) {
pr_warn("due to cpu running other code. Event %ld->%ld\n",
tid_to_event(tid), tid_to_event(actual_tid));
- else
+ } else {
pr_warn("for unknown reason: actual=%lx was=%lx target=%lx\n",
actual_tid, tid, next_tid(tid));
+ }
#endif
stat(s, CMPXCHG_DOUBLE_CPU_FAIL);
}
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability
2025-09-09 1:33 [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability Ye Liu
@ 2025-09-09 6:34 ` Anshuman Khandual
2025-09-10 6:46 ` Vlastimil Babka
1 sibling, 0 replies; 3+ messages in thread
From: Anshuman Khandual @ 2025-09-09 6:34 UTC (permalink / raw)
To: Ye Liu, Vlastimil Babka, Andrew Morton
Cc: Ye Liu, Harry Yoo, Christoph Lameter, David Rientjes,
Roman Gushchin, linux-mm, linux-kernel
On 09/09/25 7:03 AM, Ye Liu wrote:
> From: Ye Liu <liuye@kylinos.cn>
>
> Use IS_ENABLED() and standard if-else to make the code clearer.
>
> Signed-off-by: Ye Liu <liuye@kylinos.cn>
> Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
> Reviewed-by: Christoph Lameter (Ampere) <cl@gentwo.org>
>
> ---
> Changes in v3:
> - Add "---" in front of the change log.
> Changes in v2:
> - Insert newline after && as it's more than 80 columns.
> ---
> mm/slub.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/mm/slub.c b/mm/slub.c
> index 30003763d224..5711d6d29a3f 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -3064,18 +3064,17 @@ static inline void note_cmpxchg_failure(const char *n,
>
> pr_info("%s %s: cmpxchg redo ", n, s->name);
>
> -#ifdef CONFIG_PREEMPTION
> - if (tid_to_cpu(tid) != tid_to_cpu(actual_tid))
> + if (IS_ENABLED(CONFIG_PREEMPTION) &&
> + tid_to_cpu(tid) != tid_to_cpu(actual_tid)) {
> pr_warn("due to cpu change %d -> %d\n",
> tid_to_cpu(tid), tid_to_cpu(actual_tid));
> - else
> -#endif
> - if (tid_to_event(tid) != tid_to_event(actual_tid))
> + } else if (tid_to_event(tid) != tid_to_event(actual_tid)) {
> pr_warn("due to cpu running other code. Event %ld->%ld\n",
> tid_to_event(tid), tid_to_event(actual_tid));
> - else
> + } else {
> pr_warn("for unknown reason: actual=%lx was=%lx target=%lx\n",
> actual_tid, tid, next_tid(tid));
> + }
> #endif
> stat(s, CMPXCHG_DOUBLE_CPU_FAIL);
> }
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability
2025-09-09 1:33 [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability Ye Liu
2025-09-09 6:34 ` Anshuman Khandual
@ 2025-09-10 6:46 ` Vlastimil Babka
1 sibling, 0 replies; 3+ messages in thread
From: Vlastimil Babka @ 2025-09-10 6:46 UTC (permalink / raw)
To: Ye Liu, Andrew Morton
Cc: Ye Liu, Harry Yoo, Christoph Lameter, David Rientjes,
Roman Gushchin, linux-mm, linux-kernel
On 9/9/25 03:33, Ye Liu wrote:
> From: Ye Liu <liuye@kylinos.cn>
>
> Use IS_ENABLED() and standard if-else to make the code clearer.
>
> Signed-off-by: Ye Liu <liuye@kylinos.cn>
> Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
> Reviewed-by: Christoph Lameter (Ampere) <cl@gentwo.org>
Thanks, added to slab/for-next
>
> ---
> Changes in v3:
> - Add "---" in front of the change log.
> Changes in v2:
> - Insert newline after && as it's more than 80 columns.
> ---
> mm/slub.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/mm/slub.c b/mm/slub.c
> index 30003763d224..5711d6d29a3f 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -3064,18 +3064,17 @@ static inline void note_cmpxchg_failure(const char *n,
>
> pr_info("%s %s: cmpxchg redo ", n, s->name);
>
> -#ifdef CONFIG_PREEMPTION
> - if (tid_to_cpu(tid) != tid_to_cpu(actual_tid))
> + if (IS_ENABLED(CONFIG_PREEMPTION) &&
> + tid_to_cpu(tid) != tid_to_cpu(actual_tid)) {
> pr_warn("due to cpu change %d -> %d\n",
> tid_to_cpu(tid), tid_to_cpu(actual_tid));
> - else
> -#endif
> - if (tid_to_event(tid) != tid_to_event(actual_tid))
> + } else if (tid_to_event(tid) != tid_to_event(actual_tid)) {
> pr_warn("due to cpu running other code. Event %ld->%ld\n",
> tid_to_event(tid), tid_to_event(actual_tid));
> - else
> + } else {
> pr_warn("for unknown reason: actual=%lx was=%lx target=%lx\n",
> actual_tid, tid, next_tid(tid));
> + }
> #endif
> stat(s, CMPXCHG_DOUBLE_CPU_FAIL);
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-10 6:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-09 1:33 [PATCH v3] mm/slub: Refactor note_cmpxchg_failure for better readability Ye Liu
2025-09-09 6:34 ` Anshuman Khandual
2025-09-10 6:46 ` Vlastimil Babka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox