errseq: Eliminate special limitation for macro MAX_ERRNO
Subsystems (2)
PATCH 1/1 errseq: Eliminate special limitation for macro MAX_ERRNO
From: Zijun Hu <[email protected]>
Current errseq implementation depends on a very special precondition that macro MAX_ERRNO must be (2^n - 1).
Eliminate the limitation by
- redefine macro ERRSEQ_SHIFT.
- define a new macro ERRNO_MASK instead of MAX_ERRNO for errno mask.
--- lib/errseq.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
lib/errseq.c +7 -6
@@ -34,11 +34,14 @@*/ /* The low bits are designated for error code (max of MAX_ERRNO) */ -#define ERRSEQ_SHIFT ilog2(MAX_ERRNO + 1) +#define ERRSEQ_SHIFT (ilog2(MAX_ERRNO) + 1)/* This bit is used as a flag to indicate whether the value has been seen */ #define ERRSEQ_SEEN (1 << ERRSEQ_SHIFT) +/* Leverage macro ERRSEQ_SEEN to define errno mask macro here */ +#define ERRNO_MASK (ERRSEQ_SEEN - 1) +/* The lowest bit of the counter */ #define ERRSEQ_CTR_INC (1 << (ERRSEQ_SHIFT + 1))
@@ -60,8 +63,6 @@ errseq_t errseq_set(errseq_t *eseq, int err) {errseq_t cur, old; -/* MAX_ERRNO must be able to serve as a mask */ -BUILD_BUG_ON_NOT_POWER_OF_2 (MAX_ERRNO +1 );/* * Ensure the error code actually fits where we want it to go. If it
@@ -79,7 +80,7 @@ errseq_t errseq_set(errseq_t *eseq, int err)errseq_t new;/* Clear out error bits and set new error */ - new = (old & ~(MAX_ERRNO |ERRSEQ_SEEN )) | -err; + new = (old & ~(ERRNO_MASK |ERRSEQ_SEEN )) | -err;/* Only increment if someone has looked at it */ if (old &ERRSEQ_SEEN )
@@ -148,7 +149,7 @@ int errseq_check(errseq_t *eseq, errseq_t since)if (likely (cur == since))return 0 ; -return -(cur &MAX_ERRNO ); +return -(cur &ERRNO_MASK ); }EXPORT_SYMBOL (errseq_check);
@@ -200,7 +201,7 @@ int errseq_check_and_advance(errseq_t *eseq, errseq_t *since)if (new != old)cmpxchg (eseq, old, new); *since = new; - err = -(new &MAX_ERRNO ); + err = -(new &ERRNO_MASK ); }return err; }
---
base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8
change-id: 20250407-improve_errseq-8cfa1539f9e9
Best regards,
Signature · 1 line
Zijun Hu <[email protected]>
Jeff Layton
maintainerQuoted 75 lines · Zijun Hu
From: Zijun Hu <[email protected]>
Current errseq implementation depends on a very special precondition that macro
MAX_ERRNOmust be (2^n - 1).Eliminate the limitation by
- redefine macroERRSEQ_SHIFT.
- define a new macroERRNO_MASKinstead ofMAX_ERRNOfor errno mask.Signed-off-by Zijun Hu <[email protected]>--- lib/errseq.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)lib/errseq.c +7
-7@@ -34,11 +34,14 @@*/ /* The low bits are designated for error code (max of MAX_ERRNO) */ -#define ERRSEQ_SHIFT ilog2(MAX_ERRNO + 1) +#define ERRSEQ_SHIFT (ilog2(MAX_ERRNO) + 1)/* This bit is used as a flag to indicate whether the value has been seen */ #define ERRSEQ_SEEN (1 << ERRSEQ_SHIFT) +/* Leverage macro ERRSEQ_SEEN to define errno mask macro here */ +#define ERRNO_MASK (ERRSEQ_SEEN - 1) +/* The lowest bit of the counter */ #define ERRSEQ_CTR_INC (1 << (ERRSEQ_SHIFT + 1))@@ -60,8 +63,6 @@ errseq_t errseq_set(errseq_t *eseq, int err) {errseq_t cur, old; -/* MAX_ERRNO must be able to serve as a mask */ -BUILD_BUG_ON_NOT_POWER_OF_2 (MAX_ERRNO +1 );/* * Ensure the error code actually fits where we want it to go. If it @@ -79,7 +80,7 @@ errseq_t errseq_set(errseq_t *eseq, int err)errseq_t new;/* Clear out error bits and set new error */ - new = (old & ~(MAX_ERRNO |ERRSEQ_SEEN )) | -err; + new = (old & ~(ERRNO_MASK |ERRSEQ_SEEN )) | -err;/* Only increment if someone has looked at it */ if (old &ERRSEQ_SEEN )@@ -148,7 +149,7 @@ int errseq_check(errseq_t *eseq, errseq_t since)if (likely (cur == since))return 0 ; -return -(cur &MAX_ERRNO ); +return -(cur &ERRNO_MASK ); }EXPORT_SYMBOL (errseq_check);@@ -200,7 +201,7 @@ int errseq_check_and_advance(errseq_t *eseq, errseq_t *since)if (new != old)cmpxchg (eseq, old, new); *since = new; - err = -(new &MAX_ERRNO ); + err = -(new &ERRNO_MASK ); }return err; } ---base-commit:
0af2f6be1b4281385b618cb86ad946eded089ac8
change-id: 20250407-improve_errseq-8cfa1539f9e9
Quoted 1 line
Best regards,
Patch looks like it will do the right thing, but why change this? Is there some plan to change the value of MAX_ERRNO that I'm not aware of?
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 1 line · Jeff Layton
Patch looks like it will do the right thing, but why change this? Is
just make errseq implementation more generic.
Quoted 1 line
there some plan to change the value of
MAX_ERRNOthat I'm not aware of?
no.
Quoted 75 lines · Zijun Hu
From: Zijun Hu <[email protected]>
Current errseq implementation depends on a very special precondition that macro
MAX_ERRNOmust be (2^n - 1).Eliminate the limitation by
- redefine macroERRSEQ_SHIFT.
- define a new macroERRNO_MASKinstead ofMAX_ERRNOfor errno mask.Signed-off-by Zijun Hu <[email protected]>--- lib/errseq.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)lib/errseq.c +7
-7@@ -34,11 +34,14 @@*/ /* The low bits are designated for error code (max of MAX_ERRNO) */ -#define ERRSEQ_SHIFT ilog2(MAX_ERRNO + 1) +#define ERRSEQ_SHIFT (ilog2(MAX_ERRNO) + 1)/* This bit is used as a flag to indicate whether the value has been seen */ #define ERRSEQ_SEEN (1 << ERRSEQ_SHIFT) +/* Leverage macro ERRSEQ_SEEN to define errno mask macro here */ +#define ERRNO_MASK (ERRSEQ_SEEN - 1) +/* The lowest bit of the counter */ #define ERRSEQ_CTR_INC (1 << (ERRSEQ_SHIFT + 1))@@ -60,8 +63,6 @@ errseq_t errseq_set(errseq_t *eseq, int err) {errseq_t cur, old; -/* MAX_ERRNO must be able to serve as a mask */ -BUILD_BUG_ON_NOT_POWER_OF_2 (MAX_ERRNO +1 );/* * Ensure the error code actually fits where we want it to go. If it @@ -79,7 +80,7 @@ errseq_t errseq_set(errseq_t *eseq, int err)errseq_t new;/* Clear out error bits and set new error */ - new = (old & ~(MAX_ERRNO |ERRSEQ_SEEN )) | -err; + new = (old & ~(ERRNO_MASK |ERRSEQ_SEEN )) | -err;/* Only increment if someone has looked at it */ if (old &ERRSEQ_SEEN )@@ -148,7 +149,7 @@ int errseq_check(errseq_t *eseq, errseq_t since)if (likely (cur == since))return 0 ; -return -(cur &MAX_ERRNO ); +return -(cur &ERRNO_MASK ); }EXPORT_SYMBOL (errseq_check);@@ -200,7 +201,7 @@ int errseq_check_and_advance(errseq_t *eseq, errseq_t *since)if (new != old)cmpxchg (eseq, old, new); *since = new; - err = -(new &MAX_ERRNO ); + err = -(new &ERRNO_MASK ); }return err; } ---base-commit:
0af2f6be1b4281385b618cb86ad946eded089ac8
change-id: 20250407-improve_errseq-8cfa1539f9e9
Quoted 1 line
Best regards,
Looks sane to me, and it gets rid of the BUILD_BUG_ON.