if (count != 0) {
LIBCFS_ALLOC(eq->eq_events, count * sizeof(lnet_event_t));
- if (eq->eq_events == NULL) {
- lnet_eq_free(eq);
- return -ENOMEM;
- }
+ if (eq->eq_events == NULL)
+ goto failed;
/* NB allocator has set all event sequence numbers to 0,
* so all them should be earlier than eq_deq_seq */
}
eq->eq_deq_seq = 1;
eq->eq_enq_seq = 1;
eq->eq_size = count;
- eq->eq_refcount = 0;
eq->eq_callback = callback;
- LNET_LOCK();
+ eq->eq_refs = cfs_percpt_alloc(lnet_cpt_table(),
+ sizeof(*eq->eq_refs[0]));
+ if (eq->eq_refs == NULL)
+ goto failed;
+
+ /* MUST hold both exclusive lnet_res_lock */
+ lnet_res_lock(LNET_LOCK_EX);
+ /* NB: hold lnet_eq_wait_lock for EQ link/unlink, so we can do
+ * both EQ lookup and poll event with only lnet_eq_wait_lock */
+ lnet_eq_wait_lock();
lnet_res_lh_initialize(&the_lnet.ln_eq_container, &eq->eq_lh);
cfs_list_add(&eq->eq_list, &the_lnet.ln_eq_container.rec_active);
- LNET_UNLOCK();
+ lnet_eq_wait_unlock();
+ lnet_res_unlock(LNET_LOCK_EX);
+
+ lnet_eq2handle(handle, eq);
+ return 0;
- lnet_eq2handle(handle, eq);
- return (0);
+failed:
+ if (eq->eq_events != NULL)
+ LIBCFS_FREE(eq->eq_events, count * sizeof(lnet_event_t));
+
+ if (eq->eq_refs != NULL)
+ cfs_percpt_free(eq->eq_refs);
+
+ lnet_eq_free(eq);
+ return -ENOMEM;
}
+EXPORT_SYMBOL(LNetEQAlloc);
/**
* Release the resources associated with an event queue if it's idle;
int
LNetEQFree(lnet_handle_eq_t eqh)
{
- lnet_eq_t *eq;
- int size;
- lnet_event_t *events;
-
- LASSERT (the_lnet.ln_init);
- LASSERT (the_lnet.ln_refcount > 0);
-
- LNET_LOCK();
+ struct lnet_eq *eq;
+ lnet_event_t *events = NULL;
+ int **refs = NULL;
+ int *ref;
+ int rc = 0;
+ int size = 0;
+ int i;
+
+ LASSERT(the_lnet.ln_init);
+ LASSERT(the_lnet.ln_refcount > 0);
+
+ lnet_res_lock(LNET_LOCK_EX);
+ /* NB: hold lnet_eq_wait_lock for EQ link/unlink, so we can do
+ * both EQ lookup and poll event with only lnet_eq_wait_lock */
+ lnet_eq_wait_lock();
+
+ eq = lnet_handle2eq(&eqh);
+ if (eq == NULL) {
+ rc = -ENOENT;
+ goto out;
+ }
- eq = lnet_handle2eq(&eqh);
- if (eq == NULL) {
- LNET_UNLOCK();
- return (-ENOENT);
- }
+ cfs_percpt_for_each(ref, i, eq->eq_refs) {
+ LASSERT(*ref >= 0);
+ if (*ref == 0)
+ continue;
- if (eq->eq_refcount != 0) {
- CDEBUG(D_NET, "Event queue (%d) busy on destroy.\n",
- eq->eq_refcount);
- LNET_UNLOCK();
- return (-EBUSY);
- }
+ CDEBUG(D_NET, "Event equeue (%d: %d) busy on destroy.\n",
+ i, *ref);
+ rc = -EBUSY;
+ goto out;
+ }
- /* stash for free after lock dropped */
- events = eq->eq_events;
- size = eq->eq_size;
+ /* stash for free after lock dropped */
+ events = eq->eq_events;
+ size = eq->eq_size;
+ refs = eq->eq_refs;
lnet_res_lh_invalidate(&eq->eq_lh);
- cfs_list_del (&eq->eq_list);
+ cfs_list_del(&eq->eq_list);
lnet_eq_free_locked(eq);
-
- LNET_UNLOCK();
+ out:
+ lnet_eq_wait_unlock();
+ lnet_res_unlock(LNET_LOCK_EX);
if (events != NULL)
LIBCFS_FREE(events, size * sizeof(lnet_event_t));
+ if (refs != NULL)
+ cfs_percpt_free(refs);
- return 0;
+ return rc;
}
+EXPORT_SYMBOL(LNetEQFree);
void
lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev)
{
- /* MUST called with resource lock hold */
+ /* MUST called with resource lock hold but w/o lnet_eq_wait_lock */
int index;
if (eq->eq_size == 0) {
return;
}
+ lnet_eq_wait_lock();
ev->sequence = eq->eq_enq_seq++;
LASSERT(eq->eq_size == LOWEST_BIT_SET(eq->eq_size));
pthread_cond_broadcast(&the_lnet.ln_eq_cond);
# endif
#endif
+ lnet_eq_wait_unlock();
}
int
lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev)
{
- int new_index = eq->eq_deq_seq & (eq->eq_size - 1);
- lnet_event_t *new_event = &eq->eq_events[new_index];
- int rc;
- ENTRY;
+ int new_index = eq->eq_deq_seq & (eq->eq_size - 1);
+ lnet_event_t *new_event = &eq->eq_events[new_index];
+ int rc;
+ ENTRY;
- if (LNET_SEQ_GT (eq->eq_deq_seq, new_event->sequence)) {
- RETURN(0);
- }
+ /* must called with lnet_eq_wait_lock hold */
+ if (LNET_SEQ_GT(eq->eq_deq_seq, new_event->sequence))
+ RETURN(0);
- /* We've got a new event... */
- *ev = *new_event;
+ /* We've got a new event... */
+ *ev = *new_event;
CDEBUG(D_INFO, "event: %p, sequence: %lu, eq->size: %u\n",
new_event, eq->eq_deq_seq, eq->eq_size);
return LNetEQPoll(&eventq, 1, 0,
event, &which);
}
+EXPORT_SYMBOL(LNetEQGet);
/**
* Block the calling process until there is an event in the EQ.
return LNetEQPoll(&eventq, 1, LNET_TIME_FOREVER,
event, &which);
}
+EXPORT_SYMBOL(LNetEQWait);
#ifdef __KERNEL__
static int
lnet_eq_wait_locked(int *timeout_ms)
{
- int tms = *timeout_ms;
- int wait;
- cfs_waitlink_t wl;
- cfs_time_t now;
+ int tms = *timeout_ms;
+ int wait;
+ cfs_waitlink_t wl;
+ cfs_time_t now;
if (tms == 0)
return -1; /* don't want to wait and no new event */
cfs_set_current_state(CFS_TASK_INTERRUPTIBLE);
cfs_waitq_add(&the_lnet.ln_eq_waitq, &wl);
- LNET_UNLOCK();
+ lnet_eq_wait_unlock();
if (tms < 0) {
cfs_waitq_wait(&wl, CFS_TASK_INTERRUPTIBLE);
wait = tms != 0; /* might need to call here again */
*timeout_ms = tms;
- LNET_LOCK();
+ lnet_eq_wait_lock();
cfs_waitq_del(&the_lnet.ln_eq_waitq, &wl);
return wait;
lnet_eq_cond_wait(struct timespec *ts)
{
if (ts == NULL) {
- pthread_cond_wait(&the_lnet.ln_eq_cond, &the_lnet.ln_lock);
+ pthread_cond_wait(&the_lnet.ln_eq_cond,
+ &the_lnet.ln_eq_wait_lock);
} else {
pthread_cond_timedwait(&the_lnet.ln_eq_cond,
- &the_lnet.ln_lock, ts);
+ &the_lnet.ln_eq_wait_lock, ts);
}
}
# endif
static int
lnet_eq_wait_locked(int *timeout_ms)
{
- lnet_ni_t *eq_waitni = NULL;
- int tms = *timeout_ms;
- int wait;
- struct timeval then;
- struct timeval now;
+ lnet_ni_t *eq_waitni = NULL;
+ int tms = *timeout_ms;
+ int wait;
+ struct timeval then;
+ struct timeval now;
if (the_lnet.ln_eq_waitni != NULL) {
/* I have a single NI that I have to call into, to get
* events queued, or to block. */
+ lnet_eq_wait_unlock();
+
+ lnet_net_lock(0);
eq_waitni = the_lnet.ln_eq_waitni;
- lnet_ni_addref_locked(eq_waitni);
+ if (unlikely(eq_waitni == NULL)) {
+ lnet_net_unlock(0);
- LNET_UNLOCK();
+ lnet_eq_wait_lock();
+ return -1;
+ }
+
+ lnet_ni_addref_locked(eq_waitni, 0);
+ lnet_net_unlock(0);
if (tms <= 0) { /* even for tms == 0 */
(eq_waitni->ni_lnd->lnd_wait)(eq_waitni, tms);
tms = 0;
}
- LNET_LOCK();
- lnet_ni_decref_locked(eq_waitni);
+ lnet_ni_decref(eq_waitni);
+ lnet_eq_wait_lock();
} else { /* w/o eq_waitni */
# ifndef HAVE_LIBPTHREAD
/* If I'm single-threaded, LNET fails at startup if it can't
* \retval -ENOENT If there's an invalid handle in \a eventqs.
*/
int
-LNetEQPoll (lnet_handle_eq_t *eventqs, int neq, int timeout_ms,
- lnet_event_t *event, int *which)
+LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms,
+ lnet_event_t *event, int *which)
{
int wait = 1;
int rc;
if (neq < 1)
RETURN(-ENOENT);
- LNET_LOCK();
+ lnet_eq_wait_lock();
- for (;;) {
+ for (;;) {
#ifndef __KERNEL__
- LNET_UNLOCK();
+ lnet_eq_wait_unlock();
- /* Recursion breaker */
- if (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING &&
- !LNetHandleIsEqual(eventqs[0], the_lnet.ln_rc_eqh))
- lnet_router_checker();
+ /* Recursion breaker */
+ if (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING &&
+ !LNetHandleIsEqual(eventqs[0], the_lnet.ln_rc_eqh))
+ lnet_router_checker();
- LNET_LOCK();
+ lnet_eq_wait_lock();
#endif
- for (i = 0; i < neq; i++) {
- lnet_eq_t *eq = lnet_handle2eq(&eventqs[i]);
+ for (i = 0; i < neq; i++) {
+ lnet_eq_t *eq = lnet_handle2eq(&eventqs[i]);
- if (eq == NULL) {
- LNET_UNLOCK();
- RETURN(-ENOENT);
- }
+ if (eq == NULL) {
+ lnet_eq_wait_unlock();
+ RETURN(-ENOENT);
+ }
rc = lnet_eq_dequeue_event(eq, event);
- if (rc != 0) {
- LNET_UNLOCK();
- *which = i;
- RETURN(rc);
- }
- }
+ if (rc != 0) {
+ lnet_eq_wait_unlock();
+ *which = i;
+ RETURN(rc);
+ }
+ }
if (wait == 0)
break;
break;
}
- LNET_UNLOCK();
+ lnet_eq_wait_unlock();
RETURN(0);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff