RDMA/srp (gcc13): move large values to a new enum
Subsystems (2)
PATCH v2 1/1 RDMA/srp (gcc13): move large values to a new enum
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two:
SRP_TAG_NO_REQ = ~0U,
SRP_TAG_TSK_MGMT = 1U << 31
all other members are unsigned ints.
Esp. with SRP_MAX_SGE and SRP_TSK_MGMT_SQ_SIZE and their use in min(), this results in the following warnings:
include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a cast drivers/infiniband/ulp/srp/ib_srp.c:563:42: note: in expansion of macro 'min'
include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a cast drivers/infiniband/ulp/srp/ib_srp.c:2369:27: note: in expansion of macro 'min'
So move the large values away to a separate enum, so that they don't affect other members.
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
---
Notes:
[v2] move to a new enum instead of min_t()s (Bart)
drivers/infiniband/ulp/srp/ib_srp.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.h +5 -3
@@ -62,9 +62,6 @@ enum {SRP_DEFAULT_CMD_SQ_SIZE =SRP_DEFAULT_QUEUE_SIZE -SRP_RSP_SQ_SIZE -SRP_TSK_MGMT_SQ_SIZE , -SRP_TAG_NO_REQ = ~0U , -SRP_TAG_TSK_MGMT =1U <<31 , -SRP_MAX_PAGES_PER_MR =512 , SRP_MAX_ADD_CDB_LEN = 16,
@@ -79,6 +76,11 @@ enum { sizeof(struct srp_imm_buf), }; +enum { +SRP_TAG_NO_REQ = ~0U , +SRP_TAG_TSK_MGMT =BIT (31 ), +}; +enum srp_target_state {SRP_TARGET_SCANNING ,SRP_TARGET_LIVE ,
Signature · 1 line
2.38.1
Quoted 11 lines · Jiri Slaby (SUSE)
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two:
SRP_TAG_NO_REQ= ~0U,
SRP_TAG_TSK_MGMT= 1U << 31
all other members are unsigned ints.Esp. with
SRP_MAX_SGEandSRP_TSK_MGMT_SQ_SIZEand their use inmin(),
this results in the following warnings:
include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a castdrivers/infiniband/ulp/srp/ib_srp.c:563:42: note: in expansion of macro 'min'
Quoted 5 lines
include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a castdrivers/infiniband/ulp/srp/ib_srp.c:2369:27: note: in expansion of macro 'min'So move the large values away to a separate enum, so that they don't affect other members.
Leon Romanovsky
AppliedQuoted 6 lines · Jiri Slaby (SUSE)
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two:
SRP_TAG_NO_REQ= ~0U,
SRP_TAG_TSK_MGMT= 1U << 31
all other members are unsigned ints.
Quoted 6 lines
Esp. with
SRP_MAX_SGEandSRP_TSK_MGMT_SQ_SIZEand their use inmin(), this results in the following warnings:
include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a castdrivers/infiniband/ulp/srp/ib_srp.c:563:42: note: in expansion of macro 'min'[...]
Applied, thanks!
[1/1] RDMA/srp (gcc13): move large values to a new enum
https://git.kernel.org/rdma/rdma/c/fb5b88f5b78192
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>