fix-redundant-judgment-in-warn_once-with-clang.patch removed from -mm tree
The quilt patch titled
Subject: include/linux/once_lite.h: fix judgment in WARN_ONCE with clang
has been removed from the -mm tree. Its filename was
fix-redundant-judgment-in-warn_once-with-clang.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Xie Yuanbin <[email protected]>
Subject: include/linux/once_lite.h: fix judgment in WARN_ONCE with clang
Date: Sun, 9 Nov 2025 16:37:15 +0800
For c code:
```c
extern int xx;
void test(void)
{
if (WARN_ONCE(xx, "x"))
__asm__ volatile ("nop":::);
}
```Clang will generate the following assembly code:
```assemble test: movl xx(%rip), %eax // Assume xx == 0 (likely case) testl %eax, %eax // judge once je .LBB0_3 // jump to .LBB0_3 testb $1, test.__already_done(%rip) je .LBB0_2 .LBB0_3: testl %eax, %eax // judge again je .LBB0_5 // jump to .LBB0_5 .LBB0_4: nop .LBB0_5: retq // omit ```
In the above code, xx == 0 should be a likely case, but in this case, xx has been judged twice.
Test info:
1. kernel source:
linux-next
commit 9c0826a5d9aa4d52206d ("Add linux-next specific files for 20251107")
2. compiler:
clang: Debian clang version 21.1.4 (8) with
Debian LLD 21.1.4 (compatible with GNU linkers)
3. config:
base on default x86_64_defconfig, and setting:CONFIG_MITIGATION_RETHUNK=nCONFIG_STACKPROTECTOR=n
Add unlikely to __ret_cond to help the compiler optimize correctly.
---
include/linux/once_lite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/once_lite.h renamed from include/linux/once_lite.h~fix-redundant-judgment-in-warn_once-with-clang +1 -1
@@ -16,7 +16,7 @@bool __ret_cond = !!(condition); \bool __ret_once = false; \ \ -if (unlikely (__ret_cond && !__already_done)) { \ +if (unlikely (__ret_cond) &&unlikely (!__already_done)) {\ __already_done = true; \ __ret_once = true; \ } \
_
Patches currently in -mm which might be from [email protected] are