OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/cm: Remove compare_data checks 

Now that there are no ib_cm clients using the compare_data feature for
matching IB CM requests' private data, remove the compare_data parameter of
ib_cm_listen and remove the code implementing the feature.

Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Haggai Eran 2015-07-30 17:50:26 +03:00 committed by Doug Ledford
parent 51efe394bc
commit 73fec7fd04
5 changed files with 23 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
drivers/infiniband/core/cm.c
View File

@ -222,7 +222,6 @@ struct cm_id_private {
/* todo: use alternate port on send failure */ /* todo: use alternate port on send failure */
struct cm_av av; struct cm_av av;
struct cm_av alt_av; struct cm_av alt_av;
struct ib_cm_compare_data *compare_data;
void *private_data; void *private_data;
__be64 tid; __be64 tid;
@ -443,40 +442,6 @@ static struct cm_id_private * cm_acquire_id(__be32 local_id, __be32 remote_id)
return cm_id_priv; return cm_id_priv;
} }
static void cm_mask_copy(u32 *dst, const u32 *src, const u32 *mask)
{
int i;
for (i = 0; i < IB_CM_COMPARE_SIZE; i++)
dst[i] = src[i] & mask[i];
}
static int cm_compare_data(struct ib_cm_compare_data *src_data,
struct ib_cm_compare_data *dst_data)
{
u32 src[IB_CM_COMPARE_SIZE];
u32 dst[IB_CM_COMPARE_SIZE];
if (!src_data || !dst_data)
return 0;
cm_mask_copy(src, src_data->data, dst_data->mask);
cm_mask_copy(dst, dst_data->data, src_data->mask);
return memcmp(src, dst, sizeof(src));
}
static int cm_compare_private_data(u32 *private_data,
struct ib_cm_compare_data *dst_data)
{
u32 src[IB_CM_COMPARE_SIZE];
if (!dst_data)
return 0;
cm_mask_copy(src, private_data, dst_data->mask);
return memcmp(src, dst_data->data, sizeof(src));
}
/* /*
* Trivial helpers to strip endian annotation and compare; the * Trivial helpers to strip endian annotation and compare; the
* endianness doesn't actually matter since we just need a stable * endianness doesn't actually matter since we just need a stable
@ -509,18 +474,14 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)
struct cm_id_private *cur_cm_id_priv; struct cm_id_private *cur_cm_id_priv;
__be64 service_id = cm_id_priv->id.service_id; __be64 service_id = cm_id_priv->id.service_id;
__be64 service_mask = cm_id_priv->id.service_mask; __be64 service_mask = cm_id_priv->id.service_mask;
int data_cmp;
while (*link) { while (*link) {
parent = *link; parent = *link;
cur_cm_id_priv = rb_entry(parent, struct cm_id_private, cur_cm_id_priv = rb_entry(parent, struct cm_id_private,
service_node); service_node);
data_cmp = cm_compare_data(cm_id_priv->compare_data,
cur_cm_id_priv->compare_data);
if ((cur_cm_id_priv->id.service_mask & service_id) == if ((cur_cm_id_priv->id.service_mask & service_id) ==
(service_mask & cur_cm_id_priv->id.service_id) && (service_mask & cur_cm_id_priv->id.service_id) &&
(cm_id_priv->id.device == cur_cm_id_priv->id.device) && (cm_id_priv->id.device == cur_cm_id_priv->id.device))
!data_cmp)
return cur_cm_id_priv; return cur_cm_id_priv;
if (cm_id_priv->id.device < cur_cm_id_priv->id.device) if (cm_id_priv->id.device < cur_cm_id_priv->id.device)
@ -531,8 +492,6 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)
link = &(*link)->rb_left; link = &(*link)->rb_left;
else if (be64_gt(service_id, cur_cm_id_priv->id.service_id)) else if (be64_gt(service_id, cur_cm_id_priv->id.service_id))
link = &(*link)->rb_right; link = &(*link)->rb_right;
else if (data_cmp < 0)
link = &(*link)->rb_left;
else else
link = &(*link)->rb_right; link = &(*link)->rb_right;
} }
@ -542,20 +501,16 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)
} }
static struct cm_id_private * cm_find_listen(struct ib_device *device, static struct cm_id_private * cm_find_listen(struct ib_device *device,
__be64 service_id, __be64 service_id)
u32 *private_data)
{ {
struct rb_node *node = cm.listen_service_table.rb_node; struct rb_node *node = cm.listen_service_table.rb_node;
struct cm_id_private *cm_id_priv; struct cm_id_private *cm_id_priv;
int data_cmp;
while (node) { while (node) {
cm_id_priv = rb_entry(node, struct cm_id_private, service_node); cm_id_priv = rb_entry(node, struct cm_id_private, service_node);
data_cmp = cm_compare_private_data(private_data,
cm_id_priv->compare_data);
if ((cm_id_priv->id.service_mask & service_id) == if ((cm_id_priv->id.service_mask & service_id) ==
cm_id_priv->id.service_id && cm_id_priv->id.service_id &&
(cm_id_priv->id.device == device) && !data_cmp) (cm_id_priv->id.device == device))
return cm_id_priv; return cm_id_priv;
if (device < cm_id_priv->id.device) if (device < cm_id_priv->id.device)
@ -566,8 +521,6 @@ static struct cm_id_private * cm_find_listen(struct ib_device *device,
node = node->rb_left; node = node->rb_left;
else if (be64_gt(service_id, cm_id_priv->id.service_id)) else if (be64_gt(service_id, cm_id_priv->id.service_id))
node = node->rb_right; node = node->rb_right;
else if (data_cmp < 0)
node = node->rb_left;
else else
node = node->rb_right; node = node->rb_right;
} }
@ -939,7 +892,6 @@ retest:
wait_for_completion(&cm_id_priv->comp); wait_for_completion(&cm_id_priv->comp);
while ((work = cm_dequeue_work(cm_id_priv)) != NULL) while ((work = cm_dequeue_work(cm_id_priv)) != NULL)
cm_free_work(work); cm_free_work(work);
kfree(cm_id_priv->compare_data);
kfree(cm_id_priv->private_data); kfree(cm_id_priv->private_data);
kfree(cm_id_priv); kfree(cm_id_priv);
} }
@ -962,20 +914,11 @@ EXPORT_SYMBOL(ib_destroy_cm_id);
* range of service IDs. If set to 0, the service ID is matched * range of service IDs. If set to 0, the service ID is matched
* exactly. This parameter is ignored if %service_id is set to * exactly. This parameter is ignored if %service_id is set to
* IB_CM_ASSIGN_SERVICE_ID. * IB_CM_ASSIGN_SERVICE_ID.
* @compare_data: This parameter is optional. It specifies data that must
* appear in the private data of a connection request for the specified
* listen request.
* @lock: If set, lock the cm.lock spin-lock when adding the id to the
* listener tree. When false, the caller must already hold the spin-lock,
* and compare_data must be NULL.
*/ */
static int __ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, static int __ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id,
__be64 service_mask, __be64 service_mask)
struct ib_cm_compare_data *compare_data,
bool lock)
{ {
struct cm_id_private *cm_id_priv, *cur_cm_id_priv; struct cm_id_private *cm_id_priv, *cur_cm_id_priv;
unsigned long flags = 0;
int ret = 0; int ret = 0;
service_mask = service_mask ? service_mask : ~cpu_to_be64(0); service_mask = service_mask ? service_mask : ~cpu_to_be64(0);
@ -988,22 +931,9 @@ static int __ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id,
if (cm_id->state != IB_CM_IDLE) if (cm_id->state != IB_CM_IDLE)
return -EINVAL; return -EINVAL;
if (compare_data) {
cm_id_priv->compare_data = kzalloc(sizeof *compare_data,
GFP_KERNEL);
if (!cm_id_priv->compare_data)
return -ENOMEM;
cm_mask_copy(cm_id_priv->compare_data->data,
compare_data->data, compare_data->mask);
memcpy(cm_id_priv->compare_data->mask, compare_data->mask,
sizeof(compare_data->mask));
}
cm_id->state = IB_CM_LISTEN; cm_id->state = IB_CM_LISTEN;
if (lock)
spin_lock_irqsave(&cm.lock, flags);
++cm_id_priv->listen_sharecount; ++cm_id_priv->listen_sharecount;
if (service_id == IB_CM_ASSIGN_SERVICE_ID) { if (service_id == IB_CM_ASSIGN_SERVICE_ID) {
cm_id->service_id = cpu_to_be64(cm.listen_service_id++); cm_id->service_id = cpu_to_be64(cm.listen_service_id++);
cm_id->service_mask = ~cpu_to_be64(0); cm_id->service_mask = ~cpu_to_be64(0);
@ -1016,22 +946,21 @@ static int __ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id,
if (cur_cm_id_priv) { if (cur_cm_id_priv) {
cm_id->state = IB_CM_IDLE; cm_id->state = IB_CM_IDLE;
--cm_id_priv->listen_sharecount; --cm_id_priv->listen_sharecount;
kfree(cm_id_priv->compare_data);
cm_id_priv->compare_data = NULL;
ret = -EBUSY; ret = -EBUSY;
} }
if (lock)
spin_unlock_irqrestore(&cm.lock, flags);
return ret; return ret;
} }
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, __be64 service_mask)
struct ib_cm_compare_data *compare_data)
{ {
return __ib_cm_listen(cm_id, service_id, service_mask, compare_data, unsigned long flags;
true); int ret;
spin_lock_irqsave(&cm.lock, flags);
ret = __ib_cm_listen(cm_id, service_id, service_mask);
spin_unlock_irqrestore(&cm.lock, flags);
return ret;
} }
EXPORT_SYMBOL(ib_cm_listen); EXPORT_SYMBOL(ib_cm_listen);
@ -1071,7 +1000,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
goto new_id; goto new_id;
/* Find an existing ID */ /* Find an existing ID */
cm_id_priv = cm_find_listen(device, service_id, NULL); cm_id_priv = cm_find_listen(device, service_id);
if (cm_id_priv) { if (cm_id_priv) {
if (cm_id->cm_handler != cm_handler || cm_id->context) { if (cm_id->cm_handler != cm_handler || cm_id->context) {
/* Sharing an ib_cm_id with different handlers is not /* Sharing an ib_cm_id with different handlers is not
@ -1090,7 +1019,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
new_id: new_id:
/* Use newly created ID */ /* Use newly created ID */
err = __ib_cm_listen(cm_id, service_id, 0, NULL, false); err = __ib_cm_listen(cm_id, service_id, 0);
spin_unlock_irqrestore(&cm.lock, flags); spin_unlock_irqrestore(&cm.lock, flags);
@ -1615,8 +1544,7 @@ static struct cm_id_private * cm_match_req(struct cm_work *work,
/* Find matching listen request. */ /* Find matching listen request. */
listen_cm_id_priv = cm_find_listen(cm_id_priv->id.device, listen_cm_id_priv = cm_find_listen(cm_id_priv->id.device,
req_msg->service_id, req_msg->service_id);
req_msg->private_data);
if (!listen_cm_id_priv) { if (!listen_cm_id_priv) {
cm_cleanup_timewait(cm_id_priv->timewait_info); cm_cleanup_timewait(cm_id_priv->timewait_info);
spin_unlock_irq(&cm.lock); spin_unlock_irq(&cm.lock);
@ -3164,8 +3092,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
} }
cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD; cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD;
cur_cm_id_priv = cm_find_listen(cm_id->device, cur_cm_id_priv = cm_find_listen(cm_id->device,
sidr_req_msg->service_id, sidr_req_msg->service_id);
sidr_req_msg->private_data);
if (!cur_cm_id_priv) { if (!cur_cm_id_priv) {
spin_unlock_irq(&cm.lock); spin_unlock_irq(&cm.lock);
cm_reject_sidr_req(cm_id_priv, IB_SIDR_UNSUPPORTED); cm_reject_sidr_req(cm_id_priv, IB_SIDR_UNSUPPORTED);

3
drivers/infiniband/core/ucm.c
View File

@ -658,8 +658,7 @@ static ssize_t ib_ucm_listen(struct ib_ucm_file *file,
if (result) if (result)
goto out; goto out;
result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask, result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask);
NULL);
out: out:
ib_ucm_ctx_put(ctx); ib_ucm_ctx_put(ctx);
return result; return result;

2
drivers/infiniband/ulp/ipoib/ipoib_cm.c
View File

@ -848,7 +848,7 @@ int ipoib_cm_dev_open(struct net_device *dev)
} }
ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num), ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num),
0, NULL); 0);
if (ret) { if (ret) {
printk(KERN_WARNING "%s: failed to listen on ID 0x%llx\n", priv->ca->name, printk(KERN_WARNING "%s: failed to listen on ID 0x%llx\n", priv->ca->name,
IPOIB_CM_IETF_ID | priv->qp->qp_num); IPOIB_CM_IETF_ID | priv->qp->qp_num);

2
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@ -3250,7 +3250,7 @@ static void srpt_add_one(struct ib_device *device)
* in the system as service_id; therefore, the target_id will change * in the system as service_id; therefore, the target_id will change
* if this HCA is gone bad and replaced by different HCA * if this HCA is gone bad and replaced by different HCA
*/ */
if (ib_cm_listen(sdev->cm_id, cpu_to_be64(srpt_service_guid), 0, NULL)) if (ib_cm_listen(sdev->cm_id, cpu_to_be64(srpt_service_guid), 0))
goto err_cm; goto err_cm;
INIT_IB_EVENT_HANDLER(&sdev->event_handler, sdev->device, INIT_IB_EVENT_HANDLER(&sdev->event_handler, sdev->device,

14
include/rdma/ib_cm.h
View File

@ -105,8 +105,6 @@ enum ib_cm_data_size {
IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216, IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216,
IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136, IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136,
IB_CM_SIDR_REP_INFO_LENGTH = 72, IB_CM_SIDR_REP_INFO_LENGTH = 72,
/* compare done u32 at a time */
IB_CM_COMPARE_SIZE = (64 / sizeof(u32))
}; };
struct ib_cm_id; struct ib_cm_id;
@ -344,11 +342,6 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id);
#define IB_SDP_SERVICE_ID cpu_to_be64(0x0000000000010000ULL) #define IB_SDP_SERVICE_ID cpu_to_be64(0x0000000000010000ULL)
#define IB_SDP_SERVICE_ID_MASK cpu_to_be64(0xFFFFFFFFFFFF0000ULL) #define IB_SDP_SERVICE_ID_MASK cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
struct ib_cm_compare_data {
u32 data[IB_CM_COMPARE_SIZE];
u32 mask[IB_CM_COMPARE_SIZE];
};
/** /**
* ib_cm_listen - Initiates listening on the specified service ID for * ib_cm_listen - Initiates listening on the specified service ID for
* connection and service ID resolution requests. * connection and service ID resolution requests.
@ -361,12 +354,9 @@ struct ib_cm_compare_data {
* range of service IDs. If set to 0, the service ID is matched * range of service IDs. If set to 0, the service ID is matched
* exactly. This parameter is ignored if %service_id is set to * exactly. This parameter is ignored if %service_id is set to
* IB_CM_ASSIGN_SERVICE_ID. * IB_CM_ASSIGN_SERVICE_ID.
* @compare_data: This parameter is optional. It specifies data that must
* appear in the private data of a connection request for the specified
* listen request.
*/ */
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_compare_data *compare_data); __be64 service_mask);
struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device, struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
ib_cm_handler cm_handler, ib_cm_handler cm_handler,