X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-eq.c;h=354c9768a3a1d3ebc9eb9bd5a3d94bede048d056;hb=78f7b7709f9b45b5faae6e7c7b3093c246a08086;hp=fec269a9a664033568e14345868a5049d9626093;hpb=dd62978b709aebf3dda536f2230f1b79c5361d9c;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index fec269a..354c976 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -15,17 +15,15 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -58,7 +56,7 @@ * \param handle On successful return, this location will hold a handle for * the newly created EQ. * - * \retval 0 On success. + * \retval 0 On success. * \retval -EINVAL If an parameter is not valid. * \retval -ENOMEM If memory for the EQ can't be allocated. * @@ -66,18 +64,18 @@ */ int LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, - lnet_handle_eq_t *handle) + struct lnet_handle_eq *handle) { - lnet_eq_t *eq; + struct lnet_eq *eq; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_refcount > 0); - /* We need count to be a power of 2 so that when eq_{enq,deq}_seq - * overflow, they don't skip entries, so the queue has the same - * apparent capacity at all times */ + /* We need count to be a power of 2 so that when eq_{enq,deq}_seq + * overflow, they don't skip entries, so the queue has the same + * apparent capacity at all times */ - count = cfs_power2_roundup(count); + if (count) + count = roundup_pow_of_two(count); if (callback != LNET_EQ_HANDLER_NONE && count != 0) { CWARN("EQ callback is guaranteed to get every event, " @@ -96,17 +94,17 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, return -ENOMEM; if (count != 0) { - LIBCFS_ALLOC(eq->eq_events, count * sizeof(lnet_event_t)); + LIBCFS_ALLOC(eq->eq_events, count * sizeof(struct lnet_event)); 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_callback = callback; + eq->eq_deq_seq = 1; + eq->eq_enq_seq = 1; + eq->eq_size = count; + eq->eq_callback = callback; eq->eq_refs = cfs_percpt_alloc(lnet_cpt_table(), sizeof(*eq->eq_refs[0])); @@ -120,7 +118,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, 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); + list_add(&eq->eq_list, &the_lnet.ln_eq_container.rec_active); lnet_eq_wait_unlock(); lnet_res_unlock(LNET_LOCK_EX); @@ -130,7 +128,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, failed: if (eq->eq_events != NULL) - LIBCFS_FREE(eq->eq_events, count * sizeof(lnet_event_t)); + LIBCFS_FREE(eq->eq_events, count * sizeof(struct lnet_event)); if (eq->eq_refs != NULL) cfs_percpt_free(eq->eq_refs); @@ -151,19 +149,16 @@ EXPORT_SYMBOL(LNetEQAlloc); * \retval -EBUSY If the EQ is still in use by some MDs. */ int -LNetEQFree(lnet_handle_eq_t eqh) +LNetEQFree(struct lnet_handle_eq eqh) { struct lnet_eq *eq; - lnet_event_t *events = NULL; + struct lnet_event *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 */ @@ -192,14 +187,14 @@ LNetEQFree(lnet_handle_eq_t eqh) refs = eq->eq_refs; lnet_res_lh_invalidate(&eq->eq_lh); - cfs_list_del(&eq->eq_list); - lnet_eq_free_locked(eq); + list_del(&eq->eq_list); + lnet_eq_free(eq); out: lnet_eq_wait_unlock(); lnet_res_unlock(LNET_LOCK_EX); if (events != NULL) - LIBCFS_FREE(events, size * sizeof(lnet_event_t)); + LIBCFS_FREE(events, size * sizeof(struct lnet_event)); if (refs != NULL) cfs_percpt_free(refs); @@ -208,7 +203,7 @@ LNetEQFree(lnet_handle_eq_t eqh) EXPORT_SYMBOL(LNetEQFree); void -lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev) +lnet_eq_enqueue_event(struct lnet_eq *eq, struct lnet_event *ev) { /* MUST called with resource lock hold but w/o lnet_eq_wait_lock */ int index; @@ -230,26 +225,17 @@ lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev) if (eq->eq_callback != LNET_EQ_HANDLER_NONE) eq->eq_callback(ev); -#ifdef __KERNEL__ - /* Wake anyone waiting in LNetEQPoll() */ - if (cfs_waitq_active(&the_lnet.ln_eq_waitq)) - cfs_waitq_broadcast(&the_lnet.ln_eq_waitq); -#else -# ifndef HAVE_LIBPTHREAD - /* LNetEQPoll() calls into _the_ LND to wait for action */ -# else /* Wake anyone waiting in LNetEQPoll() */ - pthread_cond_broadcast(&the_lnet.ln_eq_cond); -# endif -#endif + if (waitqueue_active(&the_lnet.ln_eq_waitq)) + wake_up_all(&the_lnet.ln_eq_waitq); lnet_eq_wait_unlock(); } -int -lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) +static int +lnet_eq_dequeue_event(struct lnet_eq *eq, struct lnet_event *ev) { int new_index = eq->eq_deq_seq & (eq->eq_size - 1); - lnet_event_t *new_event = &eq->eq_events[new_index]; + struct lnet_event *new_event = &eq->eq_events[new_index]; int rc; ENTRY; @@ -263,19 +249,19 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) CDEBUG(D_INFO, "event: %p, sequence: %lu, eq->size: %u\n", new_event, eq->eq_deq_seq, eq->eq_size); - /* ...but did it overwrite an event we've not seen yet? */ - if (eq->eq_deq_seq == new_event->sequence) { - rc = 1; - } else { - /* don't complain with CERROR: some EQs are sized small - * anyway; if it's important, the caller should complain */ - CDEBUG(D_NET, "Event Queue Overflow: eq seq %lu ev seq %lu\n", - eq->eq_deq_seq, new_event->sequence); - rc = -EOVERFLOW; - } - - eq->eq_deq_seq = new_event->sequence + 1; - RETURN(rc); + /* ...but did it overwrite an event we've not seen yet? */ + if (eq->eq_deq_seq == new_event->sequence) { + rc = 1; + } else { + /* don't complain with CERROR: some EQs are sized small + * anyway; if it's important, the caller should complain */ + CDEBUG(D_NET, "Event Queue Overflow: eq seq %lu ev seq %lu\n", + eq->eq_deq_seq, new_event->sequence); + rc = -EOVERFLOW; + } + + eq->eq_deq_seq = new_event->sequence + 1; + RETURN(rc); } /** @@ -287,20 +273,20 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) * \param event On successful return (1 or -EOVERFLOW), this location will * hold the next event in the EQ. * - * \retval 0 No pending event in the EQ. - * \retval 1 Indicates success. + * \retval 0 No pending event in the EQ. + * \retval 1 Indicates success. * \retval -ENOENT If \a eventq does not point to a valid EQ. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the * EQ has been dropped due to limited space in the EQ. */ int -LNetEQGet (lnet_handle_eq_t eventq, lnet_event_t *event) +LNetEQGet(struct lnet_handle_eq eventq, struct lnet_event *event) { - int which; + int which; - return LNetEQPoll(&eventq, 1, 0, - event, &which); + return LNetEQPoll(&eventq, 1, 0, + event, &which); } EXPORT_SYMBOL(LNetEQGet); @@ -314,170 +300,48 @@ EXPORT_SYMBOL(LNetEQGet); * \param event On successful return (1 or -EOVERFLOW), this location will * hold the next event in the EQ. * - * \retval 1 Indicates success. + * \retval 1 Indicates success. * \retval -ENOENT If \a eventq does not point to a valid EQ. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the * EQ has been dropped due to limited space in the EQ. */ int -LNetEQWait (lnet_handle_eq_t eventq, lnet_event_t *event) +LNetEQWait(struct lnet_handle_eq eventq, struct lnet_event *event) { - int which; + int which; - return LNetEQPoll(&eventq, 1, LNET_TIME_FOREVER, - event, &which); + return LNetEQPoll(&eventq, 1, MAX_SCHEDULE_TIMEOUT, + event, &which); } EXPORT_SYMBOL(LNetEQWait); -#ifdef __KERNEL__ - static int -lnet_eq_wait_locked(int *timeout_ms) +lnet_eq_wait_locked(signed long *timeout) +__must_hold(&the_lnet.ln_eq_wait_lock) { - int tms = *timeout_ms; - int wait; - cfs_waitlink_t wl; - cfs_time_t now; + signed long tms = *timeout; + wait_queue_entry_t wl; + int wait; if (tms == 0) - return -1; /* don't want to wait and no new event */ + return -ENXIO; /* don't want to wait and no new event */ - cfs_waitlink_init(&wl); - cfs_set_current_state(CFS_TASK_INTERRUPTIBLE); - cfs_waitq_add(&the_lnet.ln_eq_waitq, &wl); + init_waitqueue_entry(&wl, current); + add_wait_queue(&the_lnet.ln_eq_waitq, &wl); lnet_eq_wait_unlock(); - if (tms < 0) { - cfs_waitq_wait(&wl, CFS_TASK_INTERRUPTIBLE); - - } else { - struct timeval tv; - - now = cfs_time_current(); - cfs_waitq_timedwait(&wl, CFS_TASK_INTERRUPTIBLE, - cfs_time_seconds(tms) / 1000); - cfs_duration_usec(cfs_time_sub(cfs_time_current(), now), &tv); - tms -= (int)(tv.tv_sec * 1000 + tv.tv_usec / 1000); - if (tms < 0) /* no more wait but may have new event */ - tms = 0; - } - + tms = schedule_timeout_interruptible(tms); wait = tms != 0; /* might need to call here again */ - *timeout_ms = tms; + *timeout = tms; lnet_eq_wait_lock(); - cfs_waitq_del(&the_lnet.ln_eq_waitq, &wl); - - return wait; -} - -#else /* !__KERNEL__ */ - -# ifdef HAVE_LIBPTHREAD -static void -lnet_eq_cond_wait(struct timespec *ts) -{ - if (ts == NULL) { - 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_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; - - 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; - if (unlikely(eq_waitni == NULL)) { - lnet_net_unlock(0); - - 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); - - } else { - gettimeofday(&then, NULL); - - (eq_waitni->ni_lnd->lnd_wait)(eq_waitni, tms); - - gettimeofday(&now, NULL); - tms -= (now.tv_sec - then.tv_sec) * 1000 + - (now.tv_usec - then.tv_usec) / 1000; - if (tms < 0) - tms = 0; - } - - 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 - * set the_lnet.ln_eqwaitni correctly. */ - LBUG(); -# else /* HAVE_LIBPTHREAD */ - struct timespec ts; - - if (tms == 0) /* don't want to wait and new event */ - return -1; - - if (tms < 0) { - lnet_eq_cond_wait(NULL); - - } else { - - gettimeofday(&then, NULL); - - ts.tv_sec = then.tv_sec + tms / 1000; - ts.tv_nsec = then.tv_usec * 1000 + - (tms % 1000) * 1000000; - if (ts.tv_nsec >= 1000000000) { - ts.tv_sec++; - ts.tv_nsec -= 1000000000; - } - - lnet_eq_cond_wait(&ts); - - gettimeofday(&now, NULL); - tms -= (now.tv_sec - then.tv_sec) * 1000 + - (now.tv_usec - then.tv_usec) / 1000; - if (tms < 0) - tms = 0; - } -# endif /* HAVE_LIBPTHREAD */ - } - - wait = tms != 0; - *timeout_ms = tms; + remove_wait_queue(&the_lnet.ln_eq_waitq, &wl); return wait; } -#endif /* __KERNEL__ */ - - /** * Block the calling process until there's an event from a set of EQs or * timeout happens. @@ -490,50 +354,39 @@ lnet_eq_wait_locked(int *timeout_ms) * fixed period, or block indefinitely. * * \param eventqs,neq An array of EQ handles, and size of the array. - * \param timeout_ms Time in milliseconds to wait for an event to occur on - * one of the EQs. The constant LNET_TIME_FOREVER can be used to indicate an + * \param timeout Time in jiffies to wait for an event to occur on + * one of the EQs. The constant MAX_SCHEDULE_TIMEOUT can be used to indicate an * infinite timeout. * \param event,which On successful return (1 or -EOVERFLOW), \a event will * hold the next event in the EQs, and \a which will contain the index of the * EQ from which the event was taken. * - * \retval 0 No pending event in the EQs after timeout. - * \retval 1 Indicates success. + * \retval 0 No pending event in the EQs after timeout. + * \retval 1 Indicates success. * \retval -EOVERFLOW Indicates success (i.e., an event is returned) and that * at least one event between this event and the last event obtained from the * EQ indicated by \a which has been dropped due to limited space in the EQ. * \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(struct lnet_handle_eq *eventqs, int neq, signed long timeout, + struct lnet_event *event, int *which) { int wait = 1; int rc; int i; - ENTRY; + ENTRY; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_refcount > 0); - if (neq < 1) - RETURN(-ENOENT); + if (neq < 1) + RETURN(-ENOENT); lnet_eq_wait_lock(); for (;;) { -#ifndef __KERNEL__ - 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(); - - lnet_eq_wait_lock(); -#endif for (i = 0; i < neq; i++) { - lnet_eq_t *eq = lnet_handle2eq(&eventqs[i]); + struct lnet_eq *eq = lnet_handle2eq(&eventqs[i]); if (eq == NULL) { lnet_eq_wait_unlock(); @@ -556,9 +409,9 @@ LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, * -1 : did nothing and it's sure no new event * 1 : sleep inside and wait until new event * 0 : don't want to wait anymore, but might have new event - * so need to call dequeue again + * so need to call dequeue again */ - wait = lnet_eq_wait_locked(&timeout_ms); + wait = lnet_eq_wait_locked(&timeout); if (wait < 0) /* no new event */ break; }