IB/cm refactors
Subsystems (2)
cover IB/cm refactors
Hi,
This series provides 2 IB/cm refactors:
- The first 2 patches remove the usage of service_mask, as it is always -1 so it doesn't help;
- The third one refines cm_insert_listen() and cm_find_listen().
Thanks.
Mark Zhang (3):
IB/cm: Remove the service_mask parameter from ib_cm_listen() IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter
of cm_init_listen()
IB/cm: Refactor cm_insert_listen() and cm_find_listen()
drivers/infiniband/core/cm.c | 65 +++++++++---------------- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- include/rdma/ib_cm.h | 8 +-- 4 files changed, 26 insertions(+), 53 deletions(-)
Signature · 1 line
2.26.3
PATCH 1/3 IB/cm: Remove the service_mask parameter from ib_cm_listen()
Remove the service_mask parameter of ib_cm_listen(), as all callers use 0.
--- drivers/infiniband/core/cm.c | 8 ++------ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 ++-- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- include/rdma/ib_cm.h | 7 +------ 4 files changed, 6 insertions(+), 15 deletions(-)
drivers/infiniband/core/cm.c +2 -6
@@ -1185,12 +1185,8 @@ static int cm_init_listen(struct cm_id_private *cm_id_priv, __be64 service_id,* and service ID resolution requests. The service ID should be specified * network-byte order. If set to IB_CM_ASSIGN_SERVICE_ID, the CM will * assign a service ID to the caller. -* @service_mask: Mask applied to service ID used to listen across a -* range of service IDs. If set to 0, the service ID is matched -* exactly. This parameter is ignored if %service_id is set to -* IB_CM_ASSIGN_SERVICE_ID. */ -int ib_cm_listen (struct ib_cm_id *cm_id,__be64 service_id,__be64 service_mask) +int ib_cm_listen (struct ib_cm_id *cm_id,__be64 service_id) {struct cm_id_private *cm_id_priv = container_of(cm_id, struct cm_id_private, id);
@@ -1203,7 +1199,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask) goto out; } - ret =cm_init_listen (cm_id_priv, service_id, service_mask); + ret =cm_init_listen (cm_id_priv, service_id,0 );if (ret) goto out;
drivers/infiniband/ulp/ipoib/ipoib_cm.c +2 -2
@@ -884,8 +884,8 @@ int ipoib_cm_dev_open(struct net_device *dev) goto err_cm; } - ret =ib_cm_listen (priv->cm.id,cpu_to_be64 (IPOIB_CM_IETF_ID | priv->qp->qp_num), -0 ); + ret =ib_cm_listen (priv->cm.id, +cpu_to_be64 (IPOIB_CM_IETF_ID | priv->qp->qp_num));if (ret) {pr_warn ("%s: failed to listen on ID 0x%llx\n" , priv->ca->name,IPOIB_CM_IETF_ID | priv->qp->qp_num);
drivers/infiniband/ulp/srpt/ib_srpt.c +1 -1
@@ -3191,7 +3191,7 @@ static int srpt_add_one(struct ib_device *device)* if this HCA is gone bad and replaced by different HCA */ ret = sdev->cm_id ? -ib_cm_listen (sdev->cm_id,cpu_to_be64 (srpt_service_guid),0 ) : +ib_cm_listen (sdev->cm_id,cpu_to_be64 (srpt_service_guid)) :0 ;if (ret <0 ) { pr_err("ib_cm_listen() failed: %d (cm_id state = %d)\n", ret,
include/rdma/ib_cm.h +1 -6
@@ -340,13 +340,8 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id);* and service ID resolution requests. The service ID should be specified * network-byte order. If set to IB_CM_ASSIGN_SERVICE_ID, the CM will * assign a service ID to the caller. -* @service_mask: Mask applied to service ID used to listen across a -* range of service IDs. If set to 0, the service ID is matched -* exactly. This parameter is ignored if %service_id is set to -* IB_CM_ASSIGN_SERVICE_ID. */ -int ib_cm_listen (struct ib_cm_id *cm_id,__be64 service_id, -__be64 service_mask); +int ib_cm_listen (struct ib_cm_id *cm_id,__be64 service_id); struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device, ib_cm_handler cm_handler,
Signature · 1 line
2.26.3
PATCH 2/3 IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
In reply to Mark ZhangThe service_mask is always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with a service_id. Remove it for simplicity.
--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)
drivers/infiniband/core/cm.c +8 -20
@@ -617,7 +617,6 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv,struct rb_node *parent =NULL ;struct cm_id_private *cur_cm_id_priv;__be64 service_id = cm_id_priv->id.service_id; -__be64 service_mask = cm_id_priv->id.service_mask;unsigned long flags;spin_lock_irqsave (&cm.lock, flags);
@@ -625,8 +624,7 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv, parent = *link; cur_cm_id_priv = rb_entry(parent, struct cm_id_private, service_node); -if ((cur_cm_id_priv->id.service_mask & service_id) == - (service_mask & cur_cm_id_priv->id.service_id) && +if ((service_id == cur_cm_id_priv->id.service_id) && (cm_id_priv->id.device == cur_cm_id_priv->id.device)) {/* * Sharing an ib_cm_id with different handlers is not
@@ -670,8 +668,7 @@ static struct cm_id_private *cm_find_listen(struct ib_device *device,while (node) { cm_id_priv = rb_entry(node, struct cm_id_private, service_node); -if ((cm_id_priv->id.service_mask & service_id) == - cm_id_priv->id.service_id && +if ((service_id == cm_id_priv->id.service_id) && (cm_id_priv->id.device == device)) {refcount_inc (&cm_id_priv->refcount);return cm_id_priv;
@@ -1158,22 +1155,17 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id) }EXPORT_SYMBOL (ib_destroy_cm_id); -static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id, -__be64 service_mask) +static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id) { - service_mask = service_mask ? service_mask : ~cpu_to_be64 (0 ); - service_id &= service_mask;if ((service_id &IB_SERVICE_ID_AGN_MASK ) ==IB_CM_ASSIGN_SERVICE_ID && (service_id !=IB_CM_ASSIGN_SERVICE_ID ))return -EINVAL ; -if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else cm_id_priv->id.service_id = service_id; - cm_id_priv->id.service_mask = service_mask; - } +return 0 ; }
@@ -1199,7 +1191,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id) goto out; } - ret =cm_init_listen (cm_id_priv, service_id,0 ); + ret =cm_init_listen (cm_id_priv, service_id);if (ret) goto out;
@@ -1247,7 +1239,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,if (IS_ERR (cm_id_priv))return ERR_CAST (cm_id_priv); - err =cm_init_listen (cm_id_priv, service_id,0 ); + err =cm_init_listen (cm_id_priv, service_id);if (err) {ib_destroy_cm_id (&cm_id_priv->id);return ERR_PTR (err);
@@ -1518,7 +1510,6 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, } } cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms =cm_convert_to_ms ( param->primary_path->packet_life_time) *2 + cm_convert_to_ms(
@@ -2075,7 +2066,6 @@ static int cm_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_REQ_LOCAL_COMM_ID , req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_REQ_SERVICE_ID , req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = req_msg->hdr.tid; cm_id_priv->timeout_ms =cm_convert_to_ms (IBA_GET (CM_REQ_LOCAL_CM_RESPONSE_TIMEOUT , req_msg));
@@ -3482,7 +3472,6 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,spin_lock_irqsave (&cm_id_priv->lock, flags);cm_move_av_from_path (&cm_id_priv->av, &av); cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries;if (cm_id->state !=IB_CM_IDLE ) {
@@ -3557,7 +3546,6 @@ static int cm_sidr_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_SIDR_REQ_REQUESTID , sidr_req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_SIDR_REQ_SERVICEID , sidr_req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = sidr_req_msg->hdr.tid; wc = work->mad_recv_wc->wc;
include/rdma/ib_cm.h +0 -1
@@ -294,7 +294,6 @@ struct ib_cm_id {void *context;struct ib_device *device;__be64 service_id; -__be64 service_mask;enum ib_cm_state state;/* internal CM/debug use */ enum ib_cm_lap_state lap_state;/* internal CM/debug use */ __be32 local_id;
Signature · 1 line
2.26.3
Leon Romanovsky
maintainerRe: [PATCH rdma-next 2/3] IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
Quoted 54 lines · Mark Zhang
The
service_maskis always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with aservice_id. Remove it for simplicity.Signed-off-by Mark Zhang <[email protected]>--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)drivers/infiniband/core/cm.c +3
-9@@ -617,7 +617,6 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv,struct rb_node *parent =NULL ;struct cm_id_private *cur_cm_id_priv;__be64 service_id = cm_id_priv->id.service_id; -__be64 service_mask = cm_id_priv->id.service_mask;unsigned long flags;spin_lock_irqsave (&cm.lock, flags);@@ -625,8 +624,7 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv, parent = *link; cur_cm_id_priv = rb_entry(parent, struct cm_id_private, service_node); -if ((cur_cm_id_priv->id.service_mask & service_id) == - (service_mask & cur_cm_id_priv->id.service_id) && +if ((service_id == cur_cm_id_priv->id.service_id) && (cm_id_priv->id.device == cur_cm_id_priv->id.device)) {/* * Sharing an ib_cm_id with different handlers is not @@ -670,8 +668,7 @@ static struct cm_id_private *cm_find_listen(struct ib_device *device,while (node) { cm_id_priv = rb_entry(node, struct cm_id_private, service_node); -if ((cm_id_priv->id.service_mask & service_id) == - cm_id_priv->id.service_id && +if ((service_id == cm_id_priv->id.service_id) && (cm_id_priv->id.device == device)) {refcount_inc (&cm_id_priv->refcount);return cm_id_priv;@@ -1158,22 +1155,17 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id) }EXPORT_SYMBOL (ib_destroy_cm_id); -static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id, -__be64 service_mask) +static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id) { - service_mask = service_mask ? service_mask : ~cpu_to_be64 (0 ); - service_id &= service_mask;if ((service_id &IB_SERVICE_ID_AGN_MASK ) ==IB_CM_ASSIGN_SERVICE_ID && (service_id !=IB_CM_ASSIGN_SERVICE_ID ))return -EINVAL ;
drivers/infiniband/core/cm.c void ib_destroy_cm_id(struct ib_cm_id *cm_id) · line 1176
Quoted 10 lines
drivers/infiniband/core/cm.c +2
-5-if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else cm_id_priv->id.service_id = service_id; - cm_id_priv->id.service_mask = service_mask; - }
If service_id != IB_CM_ASSIGN_SERVICE_ID, we had zero as service_mask and not FFF... like you wrote. It puts in question all cm_id_priv->id.service_mask & service_id => service_id conversions in this patch.
Thanks
Quoted 69 lines
drivers/infiniband/core/cm.c +3
-6+return 0 ; }@@ -1199,7 +1191,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id) goto out; } - ret =cm_init_listen (cm_id_priv, service_id,0 ); + ret =cm_init_listen (cm_id_priv, service_id);if (ret) goto out;@@ -1247,7 +1239,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,if (IS_ERR (cm_id_priv))return ERR_CAST (cm_id_priv); - err =cm_init_listen (cm_id_priv, service_id,0 ); + err =cm_init_listen (cm_id_priv, service_id);if (err) {ib_destroy_cm_id (&cm_id_priv->id);return ERR_PTR (err);@@ -1518,7 +1510,6 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, } } cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms =cm_convert_to_ms ( param->primary_path->packet_life_time) *2 + cm_convert_to_ms(@@ -2075,7 +2066,6 @@ static int cm_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_REQ_LOCAL_COMM_ID , req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_REQ_SERVICE_ID , req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = req_msg->hdr.tid; cm_id_priv->timeout_ms =cm_convert_to_ms (IBA_GET (CM_REQ_LOCAL_CM_RESPONSE_TIMEOUT , req_msg));@@ -3482,7 +3472,6 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,spin_lock_irqsave (&cm_id_priv->lock, flags);cm_move_av_from_path (&cm_id_priv->av, &av); cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries;if (cm_id->state !=IB_CM_IDLE ) {@@ -3557,7 +3546,6 @@ static int cm_sidr_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_SIDR_REQ_REQUESTID , sidr_req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_SIDR_REQ_SERVICEID , sidr_req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = sidr_req_msg->hdr.tid; wc = work->mad_recv_wc->wc;include/rdma/ib_cm.h +0
-1@@ -294,7 +294,6 @@ struct ib_cm_id {void *context;struct ib_device *device;__be64 service_id; -__be64 service_mask;enum ib_cm_state state;/* internal CM/debug use */ enum ib_cm_lap_state lap_state;/* internal CM/debug use */ __be32 local_id;Signature · 1 line
2.26.3
Re: [PATCH rdma-next 2/3] IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
Quoted 56 lines · Leon Romanovsky
Quoted 55 lines · Mark Zhang
The
service_maskis always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with aservice_id. Remove it for simplicity.Signed-off-by Mark Zhang <[email protected]>--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)drivers/infiniband/core/cm.c +3
-9@@ -617,7 +617,6 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv,struct rb_node *parent =NULL ;struct cm_id_private *cur_cm_id_priv;__be64 service_id = cm_id_priv->id.service_id; -__be64 service_mask = cm_id_priv->id.service_mask;unsigned long flags;spin_lock_irqsave (&cm.lock, flags);@@ -625,8 +624,7 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv, parent = *link; cur_cm_id_priv = rb_entry(parent, struct cm_id_private, service_node); -if ((cur_cm_id_priv->id.service_mask & service_id) == - (service_mask & cur_cm_id_priv->id.service_id) && +if ((service_id == cur_cm_id_priv->id.service_id) && (cm_id_priv->id.device == cur_cm_id_priv->id.device)) {/* * Sharing an ib_cm_id with different handlers is not @@ -670,8 +668,7 @@ static struct cm_id_private *cm_find_listen(struct ib_device *device,while (node) { cm_id_priv = rb_entry(node, struct cm_id_private, service_node); -if ((cm_id_priv->id.service_mask & service_id) == - cm_id_priv->id.service_id && +if ((service_id == cm_id_priv->id.service_id) && (cm_id_priv->id.device == device)) {refcount_inc (&cm_id_priv->refcount);return cm_id_priv;@@ -1158,22 +1155,17 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id) }EXPORT_SYMBOL (ib_destroy_cm_id); -static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id, -__be64 service_mask) +static int cm_init_listen (struct cm_id_private *cm_id_priv,__be64 service_id) { - service_mask = service_mask ? service_mask : ~cpu_to_be64 (0 ); - service_id &= service_mask;if ((service_id &IB_SERVICE_ID_AGN_MASK ) ==IB_CM_ASSIGN_SERVICE_ID && (service_id !=IB_CM_ASSIGN_SERVICE_ID ))return -EINVAL ;
Quoted 14 lines
drivers/infiniband/core/cm.c void ib_destroy_cm_id(struct ib_cm_id *cm_id) · line 1176
Quoted 9 lines
drivers/infiniband/core/cm.c +2
-5-if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else cm_id_priv->id.service_id = service_id; - cm_id_priv->id.service_mask = service_mask; - }If
service_id!=IB_CM_ASSIGN_SERVICE_ID, we had zero asservice_maskand not FFF... like you wrote. It puts in question allcm_id_priv->id.service_mask&service_id=>service_idconversions in this patch.
The id.service_mask field is removed in this patch, check the change in include/rdma/ib_cm.h
Quoted 70 lines
Quoted 70 lines
drivers/infiniband/core/cm.c +3
-6+return 0 ; }@@ -1199,7 +1191,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id) goto out; } - ret =cm_init_listen (cm_id_priv, service_id,0 ); + ret =cm_init_listen (cm_id_priv, service_id);if (ret) goto out;@@ -1247,7 +1239,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,if (IS_ERR (cm_id_priv))return ERR_CAST (cm_id_priv); - err =cm_init_listen (cm_id_priv, service_id,0 ); + err =cm_init_listen (cm_id_priv, service_id);if (err) {ib_destroy_cm_id (&cm_id_priv->id);return ERR_PTR (err);@@ -1518,7 +1510,6 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, } } cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms =cm_convert_to_ms ( param->primary_path->packet_life_time) *2 + cm_convert_to_ms(@@ -2075,7 +2066,6 @@ static int cm_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_REQ_LOCAL_COMM_ID , req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_REQ_SERVICE_ID , req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = req_msg->hdr.tid; cm_id_priv->timeout_ms =cm_convert_to_ms (IBA_GET (CM_REQ_LOCAL_CM_RESPONSE_TIMEOUT , req_msg));@@ -3482,7 +3472,6 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,spin_lock_irqsave (&cm_id_priv->lock, flags);cm_move_av_from_path (&cm_id_priv->av, &av); cm_id->service_id = param->service_id; - cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries;if (cm_id->state !=IB_CM_IDLE ) {@@ -3557,7 +3546,6 @@ static int cm_sidr_req_handler(struct cm_work *work)cpu_to_be32 (IBA_GET (CM_SIDR_REQ_REQUESTID , sidr_req_msg)); cm_id_priv->id.service_id =cpu_to_be64 (IBA_GET (CM_SIDR_REQ_SERVICEID , sidr_req_msg)); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); cm_id_priv->tid = sidr_req_msg->hdr.tid; wc = work->mad_recv_wc->wc;include/rdma/ib_cm.h +0
-1@@ -294,7 +294,6 @@ struct ib_cm_id {void *context;struct ib_device *device;__be64 service_id; -__be64 service_mask;enum ib_cm_state state;/* internal CM/debug use */ enum ib_cm_lap_state lap_state;/* internal CM/debug use */ __be32 local_id;Signature · 1 line
2.26.3
Leon Romanovsky
maintainerRe: [PATCH rdma-next 2/3] IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
Quoted 10 lines · Mark Zhang
Quoted 9 lines · Leon Romanovsky
Quoted 8 lines · Mark Zhang
The
service_maskis always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with aservice_id. Remove it for simplicity.Signed-off-by Mark Zhang <[email protected]>--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)
<...>
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
drivers/infiniband/core/cm.c +2
-3-if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else Quoted 8 lines
drivers/infiniband/core/cm.c void ib_destroy_cm_id(struct ib_cm_id *cm_id) · line 1176
Quoted 3 lines
cm_id_priv->id.service_id = service_id;drivers/infiniband/core/cm.c +0
-2- cm_id_priv->id.service_mask = service_mask; - }If
service_id!=IB_CM_ASSIGN_SERVICE_ID, we had zero asservice_maskand not FFF... like you wrote. It puts in question allcm_id_priv->id.service_mask&service_id=>service_idconversions in this patch.
Quoted 2 lines
The id.service_mask field is removed in this patch, check the change in
include/rdma/ib_cm.h
Right, you removed service_mask and described it "is always ~cpu_to_be64(0)".
As far as I can tell, this is not true and in this "if (service_id == IB_CM_ASSIGN_SERVICE_ID)" sometimes we set cm_id_priv->id.service_mask to be 0 and sometimes 0xFF....
Why is it correct to remove cm_id_priv->id.service_mask in this hunk?
Thanks
Re: [PATCH rdma-next 2/3] IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
Quoted 29 lines · Leon Romanovsky
Quoted 10 lines · Mark Zhang
Quoted 9 lines · Leon Romanovsky
Quoted 8 lines · Mark Zhang
The
service_maskis always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with aservice_id. Remove it for simplicity.Signed-off-by Mark Zhang <[email protected]>--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)<...>
Quoted 15 lines
Quoted 14 lines
drivers/infiniband/core/cm.c void ib_destroy_cm_id(struct ib_cm_id *cm_id) · line 1176
Quoted 9 lines
drivers/infiniband/core/cm.c +2
-5-if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else cm_id_priv->id.service_id = service_id; - cm_id_priv->id.service_mask = service_mask; - }If
service_id!=IB_CM_ASSIGN_SERVICE_ID, we had zero asservice_maskand not FFF... like you wrote. It puts in question allcm_id_priv->id.service_mask&service_id=>service_idconversions in this patch.
Quoted 8 lines
Quoted 2 lines
The id.service_mask field is removed in this patch, check the change in
include/rdma/ib_cm.hRight, you removed
service_maskand described it "is always ~cpu_to_be64(0)".
As far as I can tell, this is not true and in this "if (service_id==IB_CM_ASSIGN_SERVICE_ID)" sometimes we setcm_id_priv->id.service_maskto be 0 and sometimes0xFF....Why is it correct to remove
cm_id_priv->id.service_maskin this hunk?
1. service_id == IB_CM_ASSIGN_SERVICE_ID:
cm_id_priv->id.service_mask = ~cpu_to_be64(0);
2. service_id != IB_CM_ASSIGN_SERVICE_ID:
cm_id_priv->id.service_mask = service_mask;
It's also ~cpu_to_be64(0), because cm_init_listen() is always called
with service_mask = 0:
ib_cm_listen(..., 0) -> cm_init_listen(..., 0)
ib_cm_insert_listen() -> cm_init_listen(..., 0)So it's always ~cpu_to_be64(0)..
Thanks
Leon Romanovsky
maintainerRe: [PATCH rdma-next 2/3] IB/cm: remove cm_id_priv->id.service_mask and service_mask parameter of cm_init_listen()
Quoted 42 lines · Mark Zhang
Quoted 29 lines · Leon Romanovsky
Quoted 10 lines · Mark Zhang
Quoted 9 lines · Leon Romanovsky
Quoted 8 lines · Mark Zhang
The
service_maskis always ~cpu_to_be64(0), so the result is always a NOP when it is &'d with aservice_id. Remove it for simplicity.Signed-off-by Mark Zhang <[email protected]>--- drivers/infiniband/core/cm.c | 28 ++++++++-------------------- include/rdma/ib_cm.h | 1 - 2 files changed, 8 insertions(+), 21 deletions(-)<...>
Quoted 15 lines
Quoted 14 lines
drivers/infiniband/core/cm.c void ib_destroy_cm_id(struct ib_cm_id *cm_id) · line 1176
Quoted 9 lines
drivers/infiniband/core/cm.c +2
-5-if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { +if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) cm_id_priv->id.service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id_priv->id.service_mask = ~cpu_to_be64 (0 ); - }else { +else cm_id_priv->id.service_id = service_id; - cm_id_priv->id.service_mask = service_mask; - }If
service_id!=IB_CM_ASSIGN_SERVICE_ID, we had zero asservice_maskand not FFF... like you wrote. It puts in question allcm_id_priv->id.service_mask&service_id=>service_idconversions in this patch.Quoted 8 lines
Quoted 2 lines
The id.service_mask field is removed in this patch, check the change in
include/rdma/ib_cm.hRight, you removed
service_maskand described it "is always ~cpu_to_be64(0)".
As far as I can tell, this is not true and in this "if (service_id==IB_CM_ASSIGN_SERVICE_ID)" sometimes we setcm_id_priv->id.service_maskto be 0 and sometimes0xFF....Why is it correct to remove
cm_id_priv->id.service_maskin this hunk?1.
service_id==IB_CM_ASSIGN_SERVICE_ID:
cm_id_priv->id.service_mask= ~cpu_to_be64(0);
Quoted 8 lines
2.
service_id!=IB_CM_ASSIGN_SERVICE_ID:cm_id_priv->id.service_mask = service_mask; It's also ~cpu_to_be64(0), because cm_init_listen() is always called with service_mask = 0: ib_cm_listen(..., 0) -> cm_init_listen(..., 0) ib_cm_insert_listen() -> cm_init_listen(..., 0)So it's always ~cpu_to_be64(0)..
I see it now, thanks.
Quoted 7 lines
Thanks
PATCH 3/3 IB/cm: Refactor cm_insert_listen() and cm_find_listen()
In reply to Mark ZhangMove the device and service_id match code at the top of cm_insert_listen() and cm_find_listen() into the final else branch.
--- drivers/infiniband/core/cm.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/infiniband/core/cm.c +15 -20
@@ -624,8 +624,16 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv, parent = *link; cur_cm_id_priv = rb_entry(parent, struct cm_id_private, service_node); -if ((service_id == cur_cm_id_priv->id.service_id) && - (cm_id_priv->id.device == cur_cm_id_priv->id.device)) { + +if (cm_id_priv->id.device < cur_cm_id_priv->id.device) + link = &(*link)->rb_left; +else if (cm_id_priv->id.device > cur_cm_id_priv->id.device) + link = &(*link)->rb_right; +else if (be64_lt (service_id, cur_cm_id_priv->id.service_id)) + link = &(*link)->rb_left; +else if (be64_gt (service_id, cur_cm_id_priv->id.service_id)) + link = &(*link)->rb_right; +else {/* * Sharing an ib_cm_id with different handlers is not * supported
@@ -641,17 +649,6 @@ static struct cm_id_private *cm_insert_listen(struct cm_id_private *cm_id_priv,spin_unlock_irqrestore (&cm.lock, flags);return cur_cm_id_priv; } - -if (cm_id_priv->id.device < cur_cm_id_priv->id.device) - link = &(*link)->rb_left; -else if (cm_id_priv->id.device > cur_cm_id_priv->id.device) - link = &(*link)->rb_right; -else if (be64_lt (service_id, cur_cm_id_priv->id.service_id)) - link = &(*link)->rb_left; -else if (be64_gt (service_id, cur_cm_id_priv->id.service_id)) - link = &(*link)->rb_right; -else - link = &(*link)->rb_right; } cm_id_priv->listen_sharecount++;rb_link_node (&cm_id_priv->service_node, parent, link);
@@ -668,11 +665,7 @@ static struct cm_id_private *cm_find_listen(struct ib_device *device,while (node) { cm_id_priv = rb_entry(node, struct cm_id_private, service_node); -if ((service_id == cm_id_priv->id.service_id) && - (cm_id_priv->id.device == device)) { -refcount_inc (&cm_id_priv->refcount); -return cm_id_priv; - } +if (device < cm_id_priv->id.device) node = node->rb_left;else if (device > cm_id_priv->id.device)
@@ -681,8 +674,10 @@ static struct cm_id_private *cm_find_listen(struct ib_device *device, node = node->rb_left; else if (be64_gt(service_id, cm_id_priv->id.service_id)) node = node->rb_right; - else - node = node->rb_right; + else { +refcount_inc (&cm_id_priv->refcount); +return cm_id_priv; + } }return NULL ; }
Signature · 1 line
2.26.3
Leon Romanovsky
AppliedQuoted 9 lines · Mark Zhang
Hi,
This series provides 2 IB/cm refactors:
- The first 2 patches remove the usage ofservice_mask, as it is always -1 so it doesn't help;
- The third one refinescm_insert_listen()andcm_find_listen().
Quoted 8 lines
Thanks.
Mark Zhang (3):
IB/cm: Remove theservice_maskparameter fromib_cm_listen()IB/cm: removecm_id_priv->id.service_maskandservice_maskparameter
ofcm_init_listen()
IB/cm: Refactorcm_insert_listen()andcm_find_listen()
Thanks, applied.