linux-kernel - [PATCH v2] LoongArch: Use __pmd()/__pte() helper for swap entry conversions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251204024512.104519-1-wangyuli@aosc.io>
Date: Thu,  4 Dec 2025 10:45:12 +0800
From: WangYuli <wangyuli@...c.io>
To: chenhuacai@...nel.org,
	kernel@...0n.name
Cc: akpm@...ux-foundation.org,
	david@...nel.org,
	willy@...radead.org,
	bjorn@...osinc.com,
	agordeev@...ux.ibm.com,
	zhangtianyang@...ngson.cn,
	apopple@...dia.com,
	thuth@...hat.com,
	linmag7@...il.com,
	wangyuli@...c.io,
	loongarch@...ts.linux.dev,
	linux-kernel@...r.kernel.org,
	WangYuli <wangyl5933@...naunicom.cn>
Subject: [PATCH v2] LoongArch: Use __pmd()/__pte() helper for swap entry conversions

From: WangYuli <wangyl5933@...naunicom.cn>

The __pmd() and __pte() helper macros provide the correct initialization
syntax and abstraction for the pmd_t and pte_t types.

Fix follow warning on gcc-15 under specific configs [1] :

  In file included from ./include/linux/pgtable.h:6,
                   from ./include/linux/mm.h:31,
                   from ./include/linux/pagemap.h:8,
                   from arch/loongarch/mm/init.c:14:
  ./include/linux/swapops.h: In function ‘swp_entry_to_pmd’:
  ./arch/loongarch/include/asm/pgtable.h:302:34: error: missing braces around initializer [-Werror=missing-braces]
    302 | #define __swp_entry_to_pmd(x)   ((pmd_t) { (x).val | _PAGE_HUGE })
        |                                  ^
  ./include/linux/swapops.h:559:16: note: in expansion of macro ‘__swp_entry_to_pmd’
    559 |         return __swp_entry_to_pmd(arch_entry);
        |                ^~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors

Also update __swp_entry_to_pte() to use __pte() for consistency.

[1]. https://download.01.org/0day-ci/archive/20251119/202511190316.luI90kAo-lkp@intel.com/config

Signed-off-by: WangYuli <wangyl5933@...naunicom.cn>
Signed-off-by: WangYuli <wangyuli@...c.io>
---
Changelog:
 *v1 -> v2: Update __swp_entry_to_pte() to use __pte() for consistency.
---
 arch/loongarch/include/asm/pgtable.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h
index 03fb60432fde..9a7029285fd5 100644
--- a/arch/loongarch/include/asm/pgtable.h
+++ b/arch/loongarch/include/asm/pgtable.h
@@ -297,9 +297,9 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 #define __swp_offset(x)		((x).val >> 24)
 #define __swp_entry(type, offset) ((swp_entry_t) { pte_val(mk_swap_pte((type), (offset))) })
 #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)	((pte_t) { (x).val })
+#define __swp_entry_to_pte(x)	__pte((x).val)
 #define __pmd_to_swp_entry(pmd) ((swp_entry_t) { pmd_val(pmd) })
-#define __swp_entry_to_pmd(x)	((pmd_t) { (x).val | _PAGE_HUGE })
+#define __swp_entry_to_pmd(x)	__pmd((x).val | _PAGE_HUGE)
 
 static inline bool pte_swp_exclusive(pte_t pte)
 {
-- 
2.51.0