forked from Minki/linux
b9ef520f9c
Fix deadlock condition resulting from trying to destroy a cm_id from the context of a CM thread. The synchronization around the ucm context structure is simplified as a result, and some simple code cleanup is included. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
87 lines
2.6 KiB
C
87 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2005 Topspin Communications. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
* $Id: ucm.h 2208 2005-04-22 23:24:31Z libor $
|
|
*/
|
|
|
|
#ifndef UCM_H
|
|
#define UCM_H
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/device.h>
|
|
#include <linux/cdev.h>
|
|
#include <linux/idr.h>
|
|
|
|
#include <ib_cm.h>
|
|
#include <ib_user_cm.h>
|
|
|
|
#define IB_UCM_CM_ID_INVALID 0xffffffff
|
|
|
|
struct ib_ucm_file {
|
|
struct semaphore mutex;
|
|
struct file *filp;
|
|
|
|
struct list_head ctxs; /* list of active connections */
|
|
struct list_head events; /* list of pending events */
|
|
wait_queue_head_t poll_wait;
|
|
};
|
|
|
|
struct ib_ucm_context {
|
|
int id;
|
|
wait_queue_head_t wait;
|
|
atomic_t ref;
|
|
|
|
struct ib_ucm_file *file;
|
|
struct ib_cm_id *cm_id;
|
|
|
|
struct list_head events; /* list of pending events. */
|
|
struct list_head file_list; /* member in file ctx list */
|
|
};
|
|
|
|
struct ib_ucm_event {
|
|
struct ib_ucm_context *ctx;
|
|
struct list_head file_list; /* member in file event list */
|
|
struct list_head ctx_list; /* member in ctx event list */
|
|
|
|
struct ib_ucm_event_resp resp;
|
|
void *data;
|
|
void *info;
|
|
int data_len;
|
|
int info_len;
|
|
/*
|
|
* new connection identifiers needs to be saved until
|
|
* userspace can get a handle on them.
|
|
*/
|
|
struct ib_cm_id *cm_id;
|
|
};
|
|
|
|
#endif /* UCM_H */
|