Skip to contentSkip to conversation

percpu: add __percpu to SHIFT_PERCPU_PTR

PATCH In review Ben Dooks 3 participants 4 messages Oct 15, 2019 – Nov 26, 2019

Subsystems (2)
lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

PATCH 1/1 percpu: add __percpu to SHIFT_PERCPU_PTR

The SHIFT_PERCPU_PTR() returns a pointer used by a number of functions that expect the pointer to be __percpu annotated (sparse address space 3). Adding __percpu to this makes the following sparse warnings go away.

Note, this then creates the problem the __percup is marked as noderef, which may need removing for some of the internal functions, or to remove other warnings.

mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *

---
Cc: Dennis Zhou <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: [email protected]

---
 include/linux/percpu-defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/percpu-defs.h +1 -1
index a6fabd865211..a49b6c702598 100644
@@ -229,7 +229,7 @@ do {									\
  * pointer value.  The weird cast keeps both GCC and sparse happy.
  */
 #define SHIFT_PERCPU_PTR(__p, __offset)					\
-	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+	RELOC_HIDE((typeof(*(__p)) __kernel __percpu __force *)(__p), (__offset))
 
 #define per_cpu_ptr(ptr, cpu)						\
 ({									\
Signature · 1 line
2.23.0
maintainer
#1 lore raw
Quoted 108 lines · Ben Dooks

The SHIFT_PERCPU_PTR() returns a pointer used by a number of functions that expect the pointer to be __percpu annotated (sparse address space 3). Adding __percpu to this makes the following sparse warnings go away.

Note, this then creates the problem the __percup is marked as noderef, which may need removing for some of the internal functions, or to remove other warnings.

mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *

---
Cc: Dennis Zhou <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: [email protected]

---
 include/linux/percpu-defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/percpu-defs.h +1 -1
index a6fabd865211..a49b6c702598 100644
@@ -229,7 +229,7 @@ do {									\
  * pointer value.  The weird cast keeps both GCC and sparse happy.
  */
 #define SHIFT_PERCPU_PTR(__p, __offset)					\
-	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+	RELOC_HIDE((typeof(*(__p)) __kernel __percpu __force *)(__p), (__offset))
 
 #define per_cpu_ptr(ptr, cpu)						\
 ({									\
Signature · 1 line
2.23.0

Hello,

I've applied it for-5.5.

Thanks,
Dennis

maintainer
#2 lore raw
Quoted 112 lines · Dennis Zhou
Quoted 108 lines · Ben Dooks

The SHIFT_PERCPU_PTR() returns a pointer used by a number of functions that expect the pointer to be __percpu annotated (sparse address space 3). Adding __percpu to this makes the following sparse warnings go away.

Note, this then creates the problem the __percup is marked as noderef, which may need removing for some of the internal functions, or to remove other warnings.

mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:385:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:385:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:385:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:401:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:401:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:401:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:429:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:429:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:429:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:445:13: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:445:13: expected signed char [noderef] [usertype] <asn:3> *__p
mm/vmstat.c:445:13: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:763:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:763:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:763:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *
mm/vmstat.c:825:29: warning: incorrect type in initializer (different address spaces)
mm/vmstat.c:825:29: expected signed char [noderef] <asn:3> *__p
mm/vmstat.c:825:29: got signed char *

---
Cc: Dennis Zhou <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: [email protected]

---
 include/linux/percpu-defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/percpu-defs.h +1 -1
index a6fabd865211..a49b6c702598 100644
@@ -229,7 +229,7 @@ do {									\
  * pointer value.  The weird cast keeps both GCC and sparse happy.
  */
 #define SHIFT_PERCPU_PTR(__p, __offset)					\
-	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+	RELOC_HIDE((typeof(*(__p)) __kernel __percpu __force *)(__p), (__offset))
 
 #define per_cpu_ptr(ptr, cpu)						\
 ({									\
Signature · 1 line
2.23.0

Hello,

Quoted 4 lines

I've applied it for-5.5.

Thanks,
Dennis

Hi Ben,

I've reverted this commit. After spending a little more time on it, I don't think this is the fix we want because after we call RELOC_HIDE, we are shifting from __percpu to __kernel address spaces as we're adding the offset here.

Thanks,
Dennis

#3 lore raw
Quoted 30 lines · Dennis Zhou
Quoted 21 lines · Dennis Zhou
Quoted 20 lines · Ben Dooks

The SHIFT_PERCPU_PTR() returns a pointer used by a number of functions that expect the pointer to be __percpu annotated (sparse address space 3). Adding __percpu to this makes the following sparse warnings go away.

Note, this then creates the problem the __percup is marked as noderef, which may need removing for some of the internal functions, or to remove other warnings.

include/linux/percpu-defs.h +1 -1
index a6fabd865211..a49b6c702598 100644
@@ -229,7 +229,7 @@ do {									\
  * pointer value.  The weird cast keeps both GCC and sparse happy.
  */
 #define SHIFT_PERCPU_PTR(__p, __offset)					\
-	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+	RELOC_HIDE((typeof(*(__p)) __kernel __percpu __force *)(__p), (__offset))
 
Quoted 5 lines
Quoted 5 lines
include/linux/percpu-defs.h +0 -0
 #define per_cpu_ptr(ptr, cpu)						\
 ({									\
Signature · 1 line
2.23.0

Hi Ben,

Quoted 4 lines

I've reverted this commit. After spending a little more time on it, I don't think this is the fix we want because after we call RELOC_HIDE, we are shifting from __percpu to __kernel address spaces as we're adding the offset here.

I agree. SHIFT_PERCPU_PTR()'s type is as designed. Also, it should be noted that this warning doesn't exist on x86.

The problem lies in include/asm-generic/percpu.h, in this case within:

	#define raw_cpu_generic_add_return(pcp, val)		\
	({							\
		typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));	\
								\
		*__p += val;					\
		*__p;						\
	})

There, the variable __p is declared as a __percpu pointer but:
1) the value assigned to it, the return value of raw_cpu_ptr(), is not a plain (__kernel) pointer.
2) the variable is dereferenced just after when a __percpu pointer is implicitly __noderef.
It's thus not SHIFT_PERCPU_PTR() or raw_cpu_ptr() that must have their return type changed but the declaration of __p.

Here is a quick patch, only compile & sparse tested on mm/vmstat.c:

include/asm-generic/percpu.h +1 -1
index c2de013b2..757b667ca 100644
@@ -74,7 +74,7 @@ do {									\
 
 #define raw_cpu_generic_add_return(pcp, val)				\
 ({									\
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
+	typeof(pcp) __kernel __force *__p = raw_cpu_ptr(&(pcp));	\
 									\
 	*__p += val;							\
 	*__p;								\

Note: the same problem is present in raw_cpu_generic_xchg(),
raw_cpu_generic_cmpxchg() & raw_cpu_generic_cmpxchg_double()

I need more testing and to evaluate possible side-effects before sending a proper patch.

Best regards,
-- Luc Van Oostenryck