The patch titled
Subject: percpu: merge VERIFY_PERCPU_PTR() into its only user
has been added to the -mm mm-nonmm-unstable branch. Its filename is
percpu-merge-verify_percpu_ptr-into-its-only-user.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/percpu-merge-verify_percpu_ptr-into-its-only-user.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Uros Bizjak <ubizjak@xxxxxxxxx>
Subject: percpu: merge VERIFY_PERCPU_PTR() into its only user
Date: Mon, 21 Oct 2024 10:07:36 +0200
Merge VERIFY_PERCPU_PTR() into non-CONFIG_SMP per_cpu_ptr() to make macro
similar to CONFIG_SMP per_cpu_ptr(). This will allow a follow-up patch to
refactor common code to a macro.
No functional changes, non-CONFIG_SMP per_cpu_ptr() was the only user of
VERIFY_PERCPU_PTR().
Link: https://lkml.kernel.org/r/20241021080856.48746-1-ubizjak@xxxxxxxxx
Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Cc: Dennis Zhou <dennis@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/percpu-defs.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/include/linux/percpu-defs.h~percpu-merge-verify_percpu_ptr-into-its-only-user
+++ a/include/linux/percpu-defs.h
@@ -254,13 +254,13 @@ do { \
#else /* CONFIG_SMP */
-#define VERIFY_PERCPU_PTR(__p) \
+#define per_cpu_ptr(ptr, cpu) \
({ \
- __verify_pcpu_ptr(__p); \
- (typeof(*(__p)) __kernel __force *)(__p); \
+ (void)(cpu); \
+ __verify_pcpu_ptr(ptr); \
+ (typeof(*(ptr)) __kernel __force *)(ptr); \
})
-#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
#define raw_cpu_ptr(ptr) per_cpu_ptr(ptr, 0)
#define this_cpu_ptr(ptr) raw_cpu_ptr(ptr)
_
Patches currently in -mm which might be from ubizjak@xxxxxxxxx are
perf-hw_breakpoint-use-err_ptr_pcpu-is_err_pcpu-and-ptr_err_pcpu-macros.patch
percpu-merge-verify_percpu_ptr-into-its-only-user.patch
percpu-introduce-percpu_ptr-macro.patch
percpu-cast-percpu-pointer-in-percpu_ptr-via-unsigned-long.patch
