linux/types.h: Tidy __bitwise, add __CHECKER__ hints
Subsystems (2)
v2 cover linux/types.h: Tidy __bitwise, add __CHECKER__ hints
From: Bjorn Helgaas <[email protected]>
- Tidy up __bitwise__, which is unused except in the __bitwise definition
- Add hints about what __CHECKER__ means
Changes since v1:
- Also remove unnecessary __bitwise__ in tools/include/linux/types.h (thanks to Andrew for pointing this out)
v1: https://lore.kernel.org/all/[email protected]/
Bjorn Helgaas (2):
linux/types.h: Remove unnecessary __bitwise__ Documentation/sparse: Add hints about __CHECKER__
Documentation/dev-tools/sparse.rst | 2 ++ include/linux/compiler_types.h | 1 + include/uapi/linux/types.h | 6 +++--- tools/include/linux/types.h | 5 ++--- 4 files changed, 8 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/2 linux/types.h: Remove unnecessary __bitwise__
From: Bjorn Helgaas <[email protected]>
There are no users of "__bitwise__" except the definition of "__bitwise". Remove __bitwise__ and define __bitwise directly.
This is a follow-up to 05de97003c77 ("linux/types.h: enable endian checks for all sparse builds").
--- include/uapi/linux/types.h | 5 ++--- tools/include/linux/types.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)
include/uapi/linux/types.h +2 -3
@@ -20,11 +20,10 @@*/ #ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__typedef __u16 __bitwise __le16 ;typedef __u16 __bitwise __be16 ;
tools/include/linux/types.h +2 -3
@@ -43,11 +43,10 @@ typedef __u8 u8;typedef __s8 s8 ;#ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__#define __force#define __user
Signature · 1 line
2.25.1
Re: [PATCH v2 1/2] linux/types.h: Remove unnecessary __bitwise__
Quoted 10 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
There are no users of "
__bitwise__" except the definition of "__bitwise". Remove__bitwise__and define__bitwisedirectly.This is a follow-up to
05de97003c77("linux/types.h: enable endian checks for all sparse builds").Signed-off-by Bjorn Helgaas <[email protected]>Cc Michael S. Tsirkin <[email protected]>
Quoted 43 lines
--- include/uapi/linux/types.h | 5 ++--- tools/include/linux/types.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)include/uapi/linux/types.h +2
-3@@ -20,11 +20,10 @@*/ #ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__typedef __u16 __bitwise __le16 ;typedef __u16 __bitwise __be16 ;tools/include/linux/types.h +2
-3@@ -43,11 +43,10 @@ typedef __u8 u8;typedef __s8 s8 ;#ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__#define __force#define __userSignature · 1 line
2.25.1
Re: [PATCH v2 1/2] linux/types.h: Remove unnecessary __bitwise__
In reply to Bjorn HelgaasQuoted 20 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
There are no users of "
__bitwise__" except the definition of "__bitwise". Remove__bitwise__and define__bitwisedirectly.This is a follow-up to
05de97003c77("linux/types.h: enable endian checks for all sparse builds").Signed-off-by Bjorn Helgaas <[email protected]>Cc Michael S. Tsirkin <[email protected]>--- include/uapi/linux/types.h | 5 ++--- tools/include/linux/types.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)include/uapi/linux/types.h +0
-0
include/uapi/linux/types.h line 27
Quoted 10 lines
include/uapi/linux/types.h +2
-3@@ -20,11 +20,10 @@*/ #ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__
Hi,
this broke userspace, like open-iscsi:
Quoted 5 lines
include/uapi/linux/types.h +0
-0[ 34s] In file included from session_info.h:9,[ 34s] from iscsi_util.c:38: [ 34s] ../include/iscsi_proto.h:66:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'itt_t' [ 34s] 66 | typedef uint32_t __bitwise__ itt_t; [ 34s] | ^~~~~
It looks like we need __bitwise__ back.
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH v2 1/2] linux/types.h: Remove unnecessary __bitwise__
Quoted 33 lines · Jiri Slaby
Quoted 20 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
There are no users of "
__bitwise__" except the definition of "__bitwise". Remove__bitwise__and define__bitwisedirectly.This is a follow-up to
05de97003c77("linux/types.h: enable endian checks for all sparse builds").Signed-off-by Bjorn Helgaas <[email protected]>Cc Michael S. Tsirkin <[email protected]>--- include/uapi/linux/types.h | 5 ++--- tools/include/linux/types.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)include/uapi/linux/types.h +0
-0include/uapi/linux/types.h line 26
Quoted 9 lines
include/uapi/linux/types.h +2
-3@@ -20,11 +20,10 @@*/ #ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) +#define __bitwise __attribute__((bitwise))#else -#define __bitwise__ +#define __bitwise#endif -#define __bitwise __bitwise__Hi,
Quoted 8 lines
this broke userspace, like open-iscsi:
Quoted 5 lines
include/uapi/linux/types.h +0
-0[ 34s] In file included from session_info.h:9,[ 34s] from iscsi_util.c:38: [ 34s] ../include/iscsi_proto.h:66:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'itt_t' [ 34s] 66 | typedef uint32_t __bitwise__ itt_t; [ 34s] | ^~~~~It looks like we need
__bitwise__back.
Crap, sorry. I don't know why I thought it would be safe to remove something from uapi. I'll send a revert.
Bjorn
PATCH v2 2/2 Documentation/sparse: Add hints about __CHECKER__
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Several attributes depend on __CHECKER__, but previously there was no clue in the tree about when __CHECKER__ might be defined. Add hints at the most common places (__kernel, __user, __iomem, __bitwise) and in the sparse documentation.
--- Documentation/dev-tools/sparse.rst | 2 ++ include/linux/compiler_types.h | 1 + include/uapi/linux/types.h | 1 + 3 files changed, 4 insertions(+)
Documentation/dev-tools/sparse.rst +2 -0
@@ -100,3 +100,5 @@ have already built it. The optional make variable CF can be used to pass arguments to sparse. The build system passes -Wbitwise to sparse automatically. + +Note that sparse defines the __CHECKER__ preprocessor symbol.
include/linux/compiler_types.h +1 -0
@@ -4,6 +4,7 @@#ifndef __ASSEMBLY__ +/* sparse defines __CHECKER__; see Documentation/dev-tools/sparse.rst */ #ifdef __CHECKER__/* address spaces */ # define __kernel __attribute__((address_space(0)))
include/uapi/linux/types.h +1 -0
@@ -19,6 +19,7 @@* any application/library that wants linux/types.h. */ +/* sparse defines __CHECKER__; see Documentation/dev-tools/sparse.rst */ #ifdef __CHECKER__#define __bitwise __attribute__((bitwise))#else
Signature · 1 line
2.25.1