X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fptlrpcd.c;h=b000473d2b2b86cc79773479d3385f3bfb2f8f64;hb=be5a77ae66eab1841f67da28ac9bca10a038a1fb;hp=b7b9700812876826cc48e9a3adbf67622a8202e0;hpb=a45e27e28023e9a40f796daace5b1c0a2c02651b;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c index b7b9700..b000473 100644 --- a/lustre/ptlrpc/ptlrpcd.c +++ b/lustre/ptlrpc/ptlrpcd.c @@ -4,96 +4,110 @@ * Copyright (C) 2001-2003 Cluster File Systems, Inc. * Author Peter Braam * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. * */ #define DEBUG_SUBSYSTEM S_RPC #ifdef __KERNEL__ -# include -# include -# include -# include -# include -# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) -# include -# include -# else -# include -# endif +# include #else /* __KERNEL__ */ # include -#endif - -#include -#include - -#ifndef __CYGWIN__ -# include -# include -#else # include #endif -#include -#include /* for OBD_FAIL_CHECK */ -#include +#include +#include +# include + +#include +#include /* for obd_zombie */ +#include /* for OBD_FAIL_CHECK */ +#include #define LIOD_STOP 0 -static struct ptlrpcd_ctl { +struct ptlrpcd_ctl { unsigned long pc_flags; spinlock_t pc_lock; struct completion pc_starting; struct completion pc_finishing; - struct list_head pc_req_list; - wait_queue_head_t pc_waitq; struct ptlrpc_request_set *pc_set; -} ptlrpcd_pc; + char pc_name[16]; +#ifndef __KERNEL__ + int pc_recurred; + void *pc_callback; + void *pc_wait_callback; + void *pc_idle_callback; +#endif +}; -static DECLARE_MUTEX(ptlrpcd_sem); +static struct ptlrpcd_ctl ptlrpcd_pc; +static struct ptlrpcd_ctl ptlrpcd_recovery_pc; + +struct semaphore ptlrpcd_sem; static int ptlrpcd_users = 0; +void ptlrpcd_wake(struct ptlrpc_request *req) +{ + struct ptlrpc_request_set *rq_set = req->rq_set; + + LASSERT(rq_set != NULL); + + cfs_waitq_signal(&rq_set->set_waitq); +} + +/* requests that are added to the ptlrpcd queue are sent via + * ptlrpcd_check->ptlrpc_check_set() */ void ptlrpcd_add_req(struct ptlrpc_request *req) { - struct ptlrpcd_ctl *pc = &ptlrpcd_pc; + struct ptlrpcd_ctl *pc; + + if (req->rq_send_state == LUSTRE_IMP_FULL) + pc = &ptlrpcd_pc; + else + pc = &ptlrpcd_recovery_pc; ptlrpc_set_add_new_req(pc->pc_set, req); - wake_up(&pc->pc_waitq); + cfs_waitq_signal(&pc->pc_set->set_waitq); } static int ptlrpcd_check(struct ptlrpcd_ctl *pc) { struct list_head *tmp, *pos; struct ptlrpc_request *req; - unsigned long flags; int rc = 0; ENTRY; if (test_bit(LIOD_STOP, &pc->pc_flags)) RETURN(1); - spin_lock_irqsave(&pc->pc_set->set_new_req_lock, flags); + obd_zombie_impexp_cull(); + + spin_lock(&pc->pc_set->set_new_req_lock); list_for_each_safe(pos, tmp, &pc->pc_set->set_new_requests) { req = list_entry(pos, struct ptlrpc_request, rq_set_chain); list_del_init(&req->rq_set_chain); ptlrpc_set_add_req(pc->pc_set, req); rc = 1; /* need to calculate its timeout */ } - spin_unlock_irqrestore(&pc->pc_set->set_new_req_lock, flags); + spin_unlock(&pc->pc_set->set_new_req_lock); if (pc->pc_set->set_remaining) { rc = rc | ptlrpc_check_set(pc->pc_set); @@ -112,6 +126,13 @@ static int ptlrpcd_check(struct ptlrpcd_ctl *pc) } } + if (rc == 0) { + /* If new requests have been added, make sure to wake up */ + spin_lock(&pc->pc_set->set_new_req_lock); + rc = !list_empty(&pc->pc_set->set_new_requests); + spin_unlock(&pc->pc_set->set_new_req_lock); + } + RETURN(rc); } @@ -122,50 +143,48 @@ static int ptlrpcd_check(struct ptlrpcd_ctl *pc) static int ptlrpcd(void *arg) { struct ptlrpcd_ctl *pc = arg; - unsigned long flags; + int rc; ENTRY; - kportal_daemonize("ptlrpcd"); - - SIGNAL_MASK_LOCK(current, flags); - sigfillset(¤t->blocked); - RECALC_SIGPENDING; - SIGNAL_MASK_UNLOCK(current, flags); + if ((rc = cfs_daemonize_ctxt(pc->pc_name))) { + complete(&pc->pc_starting); + return rc; + } complete(&pc->pc_starting); - /* like kswapd */ - current->flags |= PF_MEMALLOC; - /* this mainloop strongly resembles ptlrpc_set_wait except * that our set never completes. ptlrpcd_check calls ptlrpc_check_set * when there are requests in the set. new requests come in * on the set's new_req_list and ptlrpcd_check moves them into * the set. */ while (1) { - wait_queue_t set_wait; struct l_wait_info lwi; - int timeout; + cfs_duration_t timeout; - timeout = ptlrpc_set_next_timeout(pc->pc_set) * HZ; + timeout = cfs_time_seconds(ptlrpc_set_next_timeout(pc->pc_set)); lwi = LWI_TIMEOUT(timeout, ptlrpc_expired_set, pc->pc_set); - /* ala the pinger, wait on pc's waitqueue and the set's */ - init_waitqueue_entry(&set_wait, current); - add_wait_queue(&pc->pc_set->set_waitq, &set_wait); - l_wait_event(pc->pc_waitq, ptlrpcd_check(pc), &lwi); - remove_wait_queue(&pc->pc_set->set_waitq, &set_wait); + l_wait_event(pc->pc_set->set_waitq, ptlrpcd_check(pc), &lwi); if (test_bit(LIOD_STOP, &pc->pc_flags)) break; } - /* XXX should be making sure we don't have anything in flight */ + /* wait for inflight requests to drain */ + if (!list_empty(&pc->pc_set->set_requests)) + ptlrpc_set_wait(pc->pc_set); complete(&pc->pc_finishing); return 0; } + +static void ptlrpcd_zombie_impexp_notify(void) +{ + LASSERT(ptlrpcd_pc.pc_set != NULL); // call before ptlrpcd inited ? + + cfs_waitq_signal(&ptlrpcd_pc.pc_set->set_waitq); +} + #else -static int ptlrpcd_recurred = 0; -static void *ptlrpcd_callback; int ptlrpcd_check_async_rpcs(void *arg) { @@ -173,68 +192,116 @@ int ptlrpcd_check_async_rpcs(void *arg) int rc = 0; /* single threaded!! */ - ptlrpcd_recurred++; + pc->pc_recurred++; - if (ptlrpcd_recurred == 1) + if (pc->pc_recurred == 1) { rc = ptlrpcd_check(pc); + if (!rc) + ptlrpc_expired_set(pc->pc_set); + /*XXX send replay requests */ + if (pc == &ptlrpcd_recovery_pc) + rc = ptlrpcd_check(pc); + } - ptlrpcd_recurred--; + pc->pc_recurred--; return rc; } -#endif -int ptlrpcd_addref(void) +int ptlrpcd_idle(void *arg) { - struct ptlrpcd_ctl *pc = &ptlrpcd_pc; - int rc = 0; - ENTRY; + struct ptlrpcd_ctl *pc = arg; - down(&ptlrpcd_sem); - if (++ptlrpcd_users != 1) - GOTO(out, rc); + return (list_empty(&pc->pc_set->set_new_requests) && + pc->pc_set->set_remaining == 0); +} + +#endif + +static int ptlrpcd_start(char *name, struct ptlrpcd_ctl *pc) +{ + int rc; + ENTRY; memset(pc, 0, sizeof(*pc)); init_completion(&pc->pc_starting); init_completion(&pc->pc_finishing); - init_waitqueue_head(&pc->pc_waitq); pc->pc_flags = 0; spin_lock_init(&pc->pc_lock); - INIT_LIST_HEAD(&pc->pc_req_list); + snprintf (pc->pc_name, sizeof (pc->pc_name), name); pc->pc_set = ptlrpc_prep_set(); if (pc->pc_set == NULL) - GOTO(out, rc = -ENOMEM); + RETURN(-ENOMEM); #ifdef __KERNEL__ - if (kernel_thread(ptlrpcd, pc, 0) < 0) { + /* wake ptlrpcd when zombie imports or exports exist */ + obd_zombie_impexp_notify = ptlrpcd_zombie_impexp_notify; + + rc = cfs_kernel_thread(ptlrpcd, pc, 0); + if (rc < 0) { ptlrpc_set_destroy(pc->pc_set); - GOTO(out, rc = -ECHILD); + RETURN(rc); } wait_for_completion(&pc->pc_starting); #else - ptlrpcd_callback = - liblustre_register_wait_callback(&ptlrpcd_check_async_rpcs, pc); + pc->pc_wait_callback = + liblustre_register_wait_callback("ptlrpcd_check_async_rpcs", + &ptlrpcd_check_async_rpcs, pc); + pc->pc_idle_callback = + liblustre_register_idle_callback("ptlrpcd_check_idle_rpcs", + &ptlrpcd_idle, pc); + (void)rc; +#endif + RETURN(0); +} + +static void ptlrpcd_stop(struct ptlrpcd_ctl *pc) +{ + set_bit(LIOD_STOP, &pc->pc_flags); + cfs_waitq_signal(&pc->pc_set->set_waitq); +#ifdef __KERNEL__ + obd_zombie_impexp_notify = NULL; + wait_for_completion(&pc->pc_finishing); +#else + liblustre_deregister_wait_callback(pc->pc_wait_callback); + liblustre_deregister_idle_callback(pc->pc_idle_callback); #endif + ptlrpc_set_destroy(pc->pc_set); +} + +int ptlrpcd_addref(void) +{ + int rc = 0; + ENTRY; + + mutex_down(&ptlrpcd_sem); + if (++ptlrpcd_users != 1) + GOTO(out, rc); + + rc = ptlrpcd_start("ptlrpcd", &ptlrpcd_pc); + if (rc) { + --ptlrpcd_users; + GOTO(out, rc); + } + + rc = ptlrpcd_start("ptlrpcd-recov", &ptlrpcd_recovery_pc); + if (rc) { + ptlrpcd_stop(&ptlrpcd_pc); + --ptlrpcd_users; + GOTO(out, rc); + } out: - up(&ptlrpcd_sem); + mutex_up(&ptlrpcd_sem); RETURN(rc); } void ptlrpcd_decref(void) { - struct ptlrpcd_ctl *pc = &ptlrpcd_pc; - - down(&ptlrpcd_sem); + mutex_down(&ptlrpcd_sem); if (--ptlrpcd_users == 0) { - set_bit(LIOD_STOP, &pc->pc_flags); - wake_up(&pc->pc_waitq); -#ifdef __KERNEL__ - wait_for_completion(&pc->pc_finishing); -#else - liblustre_deregister_wait_callback(ptlrpcd_callback); -#endif - ptlrpc_set_destroy(pc->pc_set); + ptlrpcd_stop(&ptlrpcd_pc); + ptlrpcd_stop(&ptlrpcd_recovery_pc); } - up(&ptlrpcd_sem); + mutex_up(&ptlrpcd_sem); }