Commit 15865e7d authored by Haggai Eran's avatar Haggai Eran Committed by Doug Ledford

IB/cm: Expose service ID in request events

Expose the service ID on an incoming CM or SIDR request to the event
handler. This will allow the RDMA CM module to de-multiplex connection
requests based on the information encoded in the service ID.
Acked-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ddde896e
...@@ -1268,6 +1268,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, ...@@ -1268,6 +1268,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
primary_path->packet_life_time = primary_path->packet_life_time =
cm_req_get_primary_local_ack_timeout(req_msg); cm_req_get_primary_local_ack_timeout(req_msg);
primary_path->packet_life_time -= (primary_path->packet_life_time > 0); primary_path->packet_life_time -= (primary_path->packet_life_time > 0);
primary_path->service_id = req_msg->service_id;
if (req_msg->alt_local_lid) { if (req_msg->alt_local_lid) {
memset(alt_path, 0, sizeof *alt_path); memset(alt_path, 0, sizeof *alt_path);
...@@ -1289,6 +1290,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, ...@@ -1289,6 +1290,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
alt_path->packet_life_time = alt_path->packet_life_time =
cm_req_get_alt_local_ack_timeout(req_msg); cm_req_get_alt_local_ack_timeout(req_msg);
alt_path->packet_life_time -= (alt_path->packet_life_time > 0); alt_path->packet_life_time -= (alt_path->packet_life_time > 0);
alt_path->service_id = req_msg->service_id;
} }
} }
...@@ -2992,6 +2994,7 @@ static void cm_format_sidr_req_event(struct cm_work *work, ...@@ -2992,6 +2994,7 @@ static void cm_format_sidr_req_event(struct cm_work *work,
param = &work->cm_event.param.sidr_req_rcvd; param = &work->cm_event.param.sidr_req_rcvd;
param->pkey = __be16_to_cpu(sidr_req_msg->pkey); param->pkey = __be16_to_cpu(sidr_req_msg->pkey);
param->listen_id = listen_id; param->listen_id = listen_id;
param->service_id = sidr_req_msg->service_id;
param->port = work->port->port_num; param->port = work->port->port_num;
work->cm_event.private_data = &sidr_req_msg->private_data; work->cm_event.private_data = &sidr_req_msg->private_data;
} }
......
...@@ -223,6 +223,7 @@ struct ib_cm_apr_event_param { ...@@ -223,6 +223,7 @@ struct ib_cm_apr_event_param {
struct ib_cm_sidr_req_event_param { struct ib_cm_sidr_req_event_param {
struct ib_cm_id *listen_id; struct ib_cm_id *listen_id;
__be64 service_id;
u8 port; u8 port;
u16 pkey; u16 pkey;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment