RDMA/rxe: Fix inaccurate constants in rxe_type_info
Subsystems (2)
PATCH v2 1/2 RDMA/rxe: Fix inaccurate constants in rxe_type_info
ibv_query_device() has reported incorrect device attributes, which are actually not used by the device. Make the constants correspond with the attributes shown to users.
--- drivers/infiniband/sw/rxe/rxe_pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/infiniband/sw/rxe/rxe_pool.c +11 -11
@@ -23,16 +23,16 @@ static const struct rxe_type_info { .size = sizeof(struct rxe_ucontext), .elem_offset = offsetof(struct rxe_ucontext, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_UCONTEXT, + .max_elem = RXE_MAX_UCONTEXT, }, [RXE_TYPE_PD] = { .name = "pd", .size = sizeof(struct rxe_pd), .elem_offset = offsetof(struct rxe_pd, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_PD, + .max_elem = RXE_MAX_PD, }, [RXE_TYPE_AH] = { .name = "ah",
@@ -40,7 +40,7 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_ah, elem), .min_index = RXE_MIN_AH_INDEX, .max_index = RXE_MAX_AH_INDEX, - .max_elem = RXE_MAX_AH_INDEX - RXE_MIN_AH_INDEX + 1, + .max_elem = RXE_MAX_AH, }, [RXE_TYPE_SRQ] = { .name = "srq",
@@ -49,7 +49,7 @@ static const struct rxe_type_info { .cleanup = rxe_srq_cleanup, .min_index = RXE_MIN_SRQ_INDEX, .max_index = RXE_MAX_SRQ_INDEX, - .max_elem = RXE_MAX_SRQ_INDEX - RXE_MIN_SRQ_INDEX + 1, + .max_elem = RXE_MAX_SRQ, }, [RXE_TYPE_QP] = { .name = "qp",
@@ -58,7 +58,7 @@ static const struct rxe_type_info { .cleanup = rxe_qp_cleanup, .min_index = RXE_MIN_QP_INDEX, .max_index = RXE_MAX_QP_INDEX, - .max_elem = RXE_MAX_QP_INDEX - RXE_MIN_QP_INDEX + 1, + .max_elem = RXE_MAX_QP, }, [RXE_TYPE_CQ] = { .name = "cq",
@@ -66,8 +66,8 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_cq, elem), .cleanup = rxe_cq_cleanup, .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_CQ, + .max_elem = RXE_MAX_CQ, }, [RXE_TYPE_MR] = { .name = "mr",
@@ -76,7 +76,7 @@ static const struct rxe_type_info { .cleanup = rxe_mr_cleanup, .min_index = RXE_MIN_MR_INDEX, .max_index = RXE_MAX_MR_INDEX, - .max_elem = RXE_MAX_MR_INDEX - RXE_MIN_MR_INDEX + 1, + .max_elem = RXE_MAX_MR, }, [RXE_TYPE_MW] = { .name = "mw",
@@ -85,7 +85,7 @@ static const struct rxe_type_info { .cleanup = rxe_mw_cleanup, .min_index = RXE_MIN_MW_INDEX, .max_index = RXE_MAX_MW_INDEX, - .max_elem = RXE_MAX_MW_INDEX - RXE_MIN_MW_INDEX + 1, + .max_elem = RXE_MAX_MW, }, };
Signature · 1 line
2.31.1
PATCH v2 2/2 RDMA/rxe: Prevent faulty rkey generation
If you create MRs more than 0x10000 times after loading the module, responder starts to reply NAKs for RDMA/Atomic operations because of rkey violation detected in check_rkey(). The root cause is that rkeys are incremented each time a new MR is created and the value overflows into the range reserved for MWs.
This commit also increases the value of RXE_MAX_MW that has been limited unlike other parameters.
---v1->v2:
Fixed the value of RXE_MAX_MR as suggested by Li. Increased the value of RXE_MAX_MW.
drivers/infiniband/sw/rxe/rxe_param.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/infiniband/sw/rxe/rxe_param.h +5 -5
@@ -98,11 +98,11 @@ enum rxe_device_param {RXE_MAX_SRQ =DEFAULT_MAX_VALUE -RXE_MIN_SRQ_INDEX ,RXE_MIN_MR_INDEX =0x00000001 , -RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE , -RXE_MAX_MR =DEFAULT_MAX_VALUE -RXE_MIN_MR_INDEX , -RXE_MIN_MW_INDEX =0x00010001 , -RXE_MAX_MW_INDEX =0x00020000 , -RXE_MAX_MW =0x00001000 , +RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE >>1 , +RXE_MAX_MR =RXE_MAX_MR_INDEX -RXE_MIN_MR_INDEX , +RXE_MIN_MW_INDEX = (DEFAULT_MAX_VALUE >>1 ) +1 , +RXE_MAX_MW_INDEX =DEFAULT_MAX_VALUE , +RXE_MAX_MW =RXE_MAX_MW_INDEX -RXE_MIN_MW_INDEX , RXE_MAX_PKT_PER_ACK = 64,
Signature · 1 line
2.31.1
Re: [PATCH v2 2/2] RDMA/rxe: Prevent faulty rkey generation
Quoted 25 lines · Daisuke Matsuda
If you create MRs more than
0x10000times after loading the module, responder starts to reply NAKs for RDMA/Atomic operations because of rkey violation detected incheck_rkey(). The root cause is that rkeys are incremented each time a new MR is created and the value overflows into the range reserved for MWs.This commit also increases the value of
RXE_MAX_MWthat has been limited unlike other parameters.Fixes 0994a1bcd5f7 ("RDMA/rxe: Bump up default maximum values used via uverbs")Signed-off-by Daisuke Matsuda <[email protected]>---
v1->v2:
Fixed the value ofRXE_MAX_MRas suggested by Li. Increased the value ofRXE_MAX_MW.drivers/infiniband/sw/rxe/rxe_param.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/infiniband/sw/rxe/rxe_param.h +0
-0@@ -98,11 +98,11 @@ enum rxe_device_param { RXE_MAX_SRQ = DEFAULT_MAX_VALUE - RXE_MIN_SRQ_INDEX,
drivers/infiniband/sw/rxe/rxe_param.h enum rxe_device_param { · line 103
Quoted 10 lines
drivers/infiniband/sw/rxe/rxe_param.h +3
-5RXE_MIN_MR_INDEX =0x00000001 , -RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE , -RXE_MAX_MR =DEFAULT_MAX_VALUE -RXE_MIN_MR_INDEX , -RXE_MIN_MW_INDEX =0x00010001 , -RXE_MAX_MW_INDEX =0x00020000 , - RXE_MAX_MW = 0x00001000, +RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE >>1 , +RXE_MAX_MR =RXE_MAX_MR_INDEX -RXE_MIN_MR_INDEX , + RXE_MIN_MW_INDEX = (DEFAULT_MAX_VALUE >> 1) + 1,
Please change to:RXE_MIN_MW_INDEX = RXE_MAX_MR_INDEX + 1
Otherwise, LGTM
Quoted 5 lines
drivers/infiniband/sw/rxe/rxe_param.h +2
-0+RXE_MAX_MW_INDEX =DEFAULT_MAX_VALUE , +RXE_MAX_MW =RXE_MAX_MW_INDEX -RXE_MIN_MW_INDEX , RXE_MAX_PKT_PER_ACK = 64,
LGTM,
Thanks
Zhijian
Quoted 92 lines · Daisuke Matsuda
ibv_query_device()has reported incorrect device attributes, which are actually not used by the device. Make the constants correspond with the attributes shown to users.Fixes 3ccffe8abf2f ("RDMA/rxe: Move max_elem into rxe_type_info")Fixes 3225717f6dfa ("RDMA/rxe: Replace red-black trees by xarrays")Signed-off-by Daisuke Matsuda <[email protected]>--- drivers/infiniband/sw/rxe/rxe_pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)drivers/infiniband/sw/rxe/rxe_pool.c +11
-11@@ -23,16 +23,16 @@ static const struct rxe_type_info { .size = sizeof(struct rxe_ucontext), .elem_offset = offsetof(struct rxe_ucontext, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_UCONTEXT, + .max_elem = RXE_MAX_UCONTEXT, }, [RXE_TYPE_PD] = { .name = "pd", .size = sizeof(struct rxe_pd), .elem_offset = offsetof(struct rxe_pd, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_PD, + .max_elem = RXE_MAX_PD, }, [RXE_TYPE_AH] = { .name = "ah",@@ -40,7 +40,7 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_ah, elem), .min_index = RXE_MIN_AH_INDEX, .max_index = RXE_MAX_AH_INDEX, - .max_elem = RXE_MAX_AH_INDEX - RXE_MIN_AH_INDEX + 1, + .max_elem = RXE_MAX_AH, }, [RXE_TYPE_SRQ] = { .name = "srq",@@ -49,7 +49,7 @@ static const struct rxe_type_info { .cleanup = rxe_srq_cleanup, .min_index = RXE_MIN_SRQ_INDEX, .max_index = RXE_MAX_SRQ_INDEX, - .max_elem = RXE_MAX_SRQ_INDEX - RXE_MIN_SRQ_INDEX + 1, + .max_elem = RXE_MAX_SRQ, }, [RXE_TYPE_QP] = { .name = "qp",@@ -58,7 +58,7 @@ static const struct rxe_type_info { .cleanup = rxe_qp_cleanup, .min_index = RXE_MIN_QP_INDEX, .max_index = RXE_MAX_QP_INDEX, - .max_elem = RXE_MAX_QP_INDEX - RXE_MIN_QP_INDEX + 1, + .max_elem = RXE_MAX_QP, }, [RXE_TYPE_CQ] = { .name = "cq",@@ -66,8 +66,8 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_cq, elem), .cleanup = rxe_cq_cleanup, .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_CQ, + .max_elem = RXE_MAX_CQ, }, [RXE_TYPE_MR] = { .name = "mr",@@ -76,7 +76,7 @@ static const struct rxe_type_info { .cleanup = rxe_mr_cleanup, .min_index = RXE_MIN_MR_INDEX, .max_index = RXE_MAX_MR_INDEX, - .max_elem = RXE_MAX_MR_INDEX - RXE_MIN_MR_INDEX + 1, + .max_elem = RXE_MAX_MR, }, [RXE_TYPE_MW] = { .name = "mw",@@ -85,7 +85,7 @@ static const struct rxe_type_info { .cleanup = rxe_mw_cleanup, .min_index = RXE_MIN_MW_INDEX, .max_index = RXE_MAX_MW_INDEX, - .max_elem = RXE_MAX_MW_INDEX - RXE_MIN_MW_INDEX + 1, + .max_elem = RXE_MAX_MW, }, };