*
* 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) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_RPC
+#include <linux/kthread.h>
+#include <linux/workqueue.h>
#include <obd_support.h>
#include <obd_class.h>
#include "ptlrpc_internal.h"
static int suppress_pings;
-CFS_MODULE_PARM(suppress_pings, "i", int, 0644, "Suppress pings");
+module_param(suppress_pings, int, 0644);
+MODULE_PARM_DESC(suppress_pings, "Suppress pings");
struct mutex pinger_mutex;
static struct list_head pinger_imports =
static struct list_head timeout_list =
LIST_HEAD_INIT(timeout_list);
-int ptlrpc_pinger_suppress_pings()
+int ptlrpc_pinger_suppress_pings(void)
{
return suppress_pings;
}
struct ptlrpc_request *
ptlrpc_prep_ping(struct obd_import *imp)
{
- struct ptlrpc_request *req;
-
- req = ptlrpc_request_alloc_pack(imp, &RQF_OBD_PING,
- LUSTRE_OBD_VERSION, OBD_PING);
- if (req) {
- ptlrpc_request_set_replen(req);
- req->rq_no_resend = req->rq_no_delay = 1;
- }
- return req;
+ struct ptlrpc_request *req;
+
+ req = ptlrpc_request_alloc_pack(imp, &RQF_OBD_PING,
+ LUSTRE_OBD_VERSION, OBD_PING);
+ if (req) {
+ ptlrpc_request_set_replen(req);
+ req->rq_no_resend = req->rq_no_delay = 1;
+ }
+ return req;
}
int ptlrpc_obd_ping(struct obd_device *obd)
{
- int rc;
- struct ptlrpc_request *req;
- ENTRY;
+ int rc;
+ struct ptlrpc_request *req;
+
+ ENTRY;
- req = ptlrpc_prep_ping(obd->u.cli.cl_import);
- if (req == NULL)
- RETURN(-ENOMEM);
+ req = ptlrpc_prep_ping(obd->u.cli.cl_import);
+ if (!req)
+ RETURN(-ENOMEM);
- req->rq_send_state = LUSTRE_IMP_FULL;
+ req->rq_send_state = LUSTRE_IMP_FULL;
- rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_queue_wait(req);
- ptlrpc_req_finished(req);
+ ptlrpc_req_finished(req);
- RETURN(rc);
+ RETURN(rc);
}
EXPORT_SYMBOL(ptlrpc_obd_ping);
-int ptlrpc_ping(struct obd_import *imp)
+static bool ptlrpc_check_import_is_idle(struct obd_import *imp)
{
- struct ptlrpc_request *req;
- ENTRY;
-
- req = ptlrpc_prep_ping(imp);
- if (req == NULL) {
- CERROR("OOM trying to ping %s->%s\n",
- imp->imp_obd->obd_uuid.uuid,
- obd2cli_tgt(imp->imp_obd));
- RETURN(-ENOMEM);
- }
-
- DEBUG_REQ(D_INFO, req, "pinging %s->%s",
- imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd));
- ptlrpcd_add_req(req, PDL_POLICY_ROUND, -1);
-
- RETURN(0);
+ struct ldlm_namespace *ns = imp->imp_obd->obd_namespace;
+ time64_t now;
+
+ if (!imp->imp_idle_timeout)
+ return false;
+
+ /*
+ * 4 comes from:
+ * - client_obd_setup() - hashed import
+ * - ptlrpcd_alloc_work()
+ * - ptlrpcd_alloc_work()
+ * - ptlrpc_pinger_add_import
+ */
+ if (atomic_read(&imp->imp_refcount) > 4)
+ return false;
+
+ /* any lock increases ns_bref being a resource holder */
+ if (ns && atomic_read(&ns->ns_bref) > 0)
+ return false;
+
+ now = ktime_get_real_seconds();
+ if (now - imp->imp_last_reply_time < imp->imp_idle_timeout)
+ return false;
+
+ return true;
+}
+
+static int ptlrpc_ping(struct obd_import *imp)
+{
+ struct ptlrpc_request *req;
+
+ ENTRY;
+
+ if (ptlrpc_check_import_is_idle(imp))
+ RETURN(ptlrpc_disconnect_and_idle_import(imp));
+
+ req = ptlrpc_prep_ping(imp);
+ if (!req) {
+ CERROR("OOM trying to ping %s->%s\n",
+ imp->imp_obd->obd_uuid.uuid,
+ obd2cli_tgt(imp->imp_obd));
+ RETURN(-ENOMEM);
+ }
+
+ DEBUG_REQ(D_INFO, req, "pinging %s->%s",
+ imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd));
+ ptlrpcd_add_req(req);
+
+ RETURN(0);
}
-void ptlrpc_update_next_ping(struct obd_import *imp, int soon)
+static void ptlrpc_update_next_ping(struct obd_import *imp, int soon)
{
#ifdef ENABLE_PINGER
- int time = soon ? PING_INTERVAL_SHORT : PING_INTERVAL;
- if (imp->imp_state == LUSTRE_IMP_DISCON) {
- int dtime = max_t(int, CONNECTION_SWITCH_MIN,
- AT_OFF ? 0 :
- at_get(&imp->imp_at.iat_net_latency));
- time = min(time, dtime);
- }
- imp->imp_next_ping = cfs_time_shift(time);
+ time64_t time = soon ? PING_INTERVAL_SHORT : PING_INTERVAL;
+
+ if (imp->imp_state == LUSTRE_IMP_DISCON) {
+ time64_t dtime = max_t(time64_t, CONNECTION_SWITCH_MIN,
+ AT_OFF ? 0 :
+ at_get(&imp->imp_at.iat_net_latency));
+ time = min(time, dtime);
+ }
+ imp->imp_next_ping = ktime_get_seconds() + time;
#endif /* ENABLE_PINGER */
}
void ptlrpc_ping_import_soon(struct obd_import *imp)
{
- imp->imp_next_ping = cfs_time_current();
+ imp->imp_next_ping = ktime_get_seconds();
}
static inline int imp_is_deactive(struct obd_import *imp)
{
- return (imp->imp_deactive ||
- OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_IMP_DEACTIVE));
+ return imp->imp_deactive ||
+ OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_IMP_DEACTIVE);
}
-static inline int ptlrpc_next_reconnect(struct obd_import *imp)
+static inline time64_t ptlrpc_next_reconnect(struct obd_import *imp)
{
- if (imp->imp_server_timeout)
- return cfs_time_shift(obd_timeout / 2);
- else
- return cfs_time_shift(obd_timeout);
+ if (imp->imp_server_timeout)
+ return ktime_get_seconds() + (obd_timeout >> 1);
+ else
+ return ktime_get_seconds() + obd_timeout;
}
-cfs_duration_t pinger_check_timeout(cfs_time_t time)
+static time64_t pinger_check_timeout(time64_t time)
{
- struct timeout_item *item;
- cfs_time_t timeout = PING_INTERVAL;
+ struct timeout_item *item;
+ time64_t timeout = PING_INTERVAL;
- /* The timeout list is a increase order sorted list */
+ /* This list is sorted in increasing timeout order */
mutex_lock(&pinger_mutex);
list_for_each_entry(item, &timeout_list, ti_chain) {
- int ti_timeout = item->ti_timeout;
- if (timeout > ti_timeout)
- timeout = ti_timeout;
- break;
- }
+ time64_t ti_timeout = item->ti_timeout;
+
+ if (timeout > ti_timeout)
+ timeout = ti_timeout;
+ break;
+ }
mutex_unlock(&pinger_mutex);
- return cfs_time_sub(cfs_time_add(time, cfs_time_seconds(timeout)),
- cfs_time_current());
+ return time + timeout - ktime_get_seconds();
}
-
static bool ir_up;
void ptlrpc_pinger_ir_up(void)
EXPORT_SYMBOL(ptlrpc_pinger_ir_down);
static void ptlrpc_pinger_process_import(struct obd_import *imp,
- unsigned long this_ping)
+ time64_t this_ping)
{
int level;
int force;
imp->imp_force_verify = 0;
- if (cfs_time_aftereq(imp->imp_next_ping - 5 * CFS_TICK, this_ping) &&
- !force) {
+ if (imp->imp_next_ping - 5 >= this_ping && !force) {
spin_unlock(&imp->imp_lock);
return;
}
imp->imp_force_next_verify = 0;
- spin_unlock(&imp->imp_lock);
-
- CDEBUG(level == LUSTRE_IMP_FULL ? D_INFO : D_HA, "%s->%s: level %s/%u "
- "force %u force_next %u deactive %u pingable %u suppress %u\n",
+ CDEBUG(level == LUSTRE_IMP_FULL ? D_INFO : D_HA,
+ "%s->%s: level %s/%u force %u force_next %u deactive %u pingable %u suppress %u\n",
imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd),
ptlrpc_import_state_name(level), level, force, force_next,
imp->imp_deactive, imp->imp_pingable, suppress);
- if (level == LUSTRE_IMP_DISCON && !imp_is_deactive(imp)) {
- /* wait for a while before trying recovery again */
- imp->imp_next_ping = ptlrpc_next_reconnect(imp);
- if (!imp->imp_no_pinger_recover)
- ptlrpc_initiate_recovery(imp);
- } else if (level != LUSTRE_IMP_FULL ||
- imp->imp_obd->obd_no_recov ||
- imp_is_deactive(imp)) {
- CDEBUG(D_HA, "%s->%s: not pinging (in recovery "
- "or recovery disabled: %s)\n",
+ if (level == LUSTRE_IMP_DISCON && !imp_is_deactive(imp)) {
+ /* wait for a while before trying recovery again */
+ imp->imp_next_ping = ptlrpc_next_reconnect(imp);
+ spin_unlock(&imp->imp_lock);
+ if (!imp->imp_no_pinger_recover ||
+ imp->imp_connect_error == -EAGAIN)
+ ptlrpc_initiate_recovery(imp);
+ } else if (level != LUSTRE_IMP_FULL || imp->imp_obd->obd_no_recov ||
+ imp_is_deactive(imp)) {
+ CDEBUG(D_HA,
+ "%s->%s: not pinging (in recovery or recovery disabled: %s)\n",
imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd),
ptlrpc_import_state_name(level));
- if (force) {
- spin_lock(&imp->imp_lock);
+ if (force)
imp->imp_force_verify = 1;
- spin_unlock(&imp->imp_lock);
- }
+ spin_unlock(&imp->imp_lock);
} else if ((imp->imp_pingable && !suppress) || force_next || force) {
+ spin_unlock(&imp->imp_lock);
ptlrpc_ping(imp);
+ } else {
+ spin_unlock(&imp->imp_lock);
}
}
-static int ptlrpc_pinger_main(void *arg)
-{
- struct ptlrpc_thread *thread = (struct ptlrpc_thread *)arg;
- ENTRY;
-
- /* Record that the thread is running */
- thread_set_flags(thread, SVC_RUNNING);
- wake_up(&thread->t_ctl_waitq);
+static struct workqueue_struct *pinger_wq;
+static void ptlrpc_pinger_main(struct work_struct *ws);
+static DECLARE_DELAYED_WORK(ping_work, ptlrpc_pinger_main);
- /* And now, loop forever, pinging as needed. */
- while (1) {
- cfs_time_t this_ping = cfs_time_current();
- struct l_wait_info lwi;
- cfs_duration_t time_to_next_wake;
- struct timeout_item *item;
- struct list_head *iter;
+static void ptlrpc_pinger_main(struct work_struct *ws)
+{
+ time64_t this_ping = ktime_get_seconds();
+ time64_t time_to_next_wake;
+ struct timeout_item *item;
+ struct obd_import *imp;
+ struct list_head *iter;
+ do {
mutex_lock(&pinger_mutex);
list_for_each_entry(item, &timeout_list, ti_chain)
- item->ti_cb(item, item->ti_cb_data);
+ item->ti_cb(item, item->ti_cb_data);
list_for_each(iter, &pinger_imports) {
- struct obd_import *imp = list_entry(iter,
- struct obd_import,
- imp_pinger_chain);
-
- ptlrpc_pinger_process_import(imp, this_ping);
- /* obd_timeout might have changed */
- if (imp->imp_pingable && imp->imp_next_ping &&
- cfs_time_after(imp->imp_next_ping,
- cfs_time_add(this_ping,
- cfs_time_seconds(PING_INTERVAL))))
- ptlrpc_update_next_ping(imp, 0);
- }
+ imp = list_entry(iter, struct obd_import,
+ imp_pinger_chain);
+
+ ptlrpc_pinger_process_import(imp, this_ping);
+ /* obd_timeout might have changed */
+ if (imp->imp_pingable && imp->imp_next_ping &&
+ imp->imp_next_ping > this_ping + PING_INTERVAL)
+ ptlrpc_update_next_ping(imp, 0);
+ }
mutex_unlock(&pinger_mutex);
- /* update memory usage info */
- obd_update_maxusage();
-
- /* Wait until the next ping time, or until we're stopped. */
- time_to_next_wake = pinger_check_timeout(this_ping);
- /* The ping sent by ptlrpc_send_rpc may get sent out
- say .01 second after this.
- ptlrpc_pinger_sending_on_import will then set the
- next ping time to next_ping + .01 sec, which means
- we will SKIP the next ping at next_ping, and the
- ping will get sent 2 timeouts from now! Beware. */
- CDEBUG(D_INFO, "next wakeup in "CFS_DURATION_T" ("
- CFS_TIME_T")\n", time_to_next_wake,
- cfs_time_add(this_ping,cfs_time_seconds(PING_INTERVAL)));
- if (time_to_next_wake > 0) {
- lwi = LWI_TIMEOUT(max_t(cfs_duration_t,
- time_to_next_wake,
- cfs_time_seconds(1)),
- NULL, NULL);
- l_wait_event(thread->t_ctl_waitq,
- thread_is_stopping(thread) ||
- thread_is_event(thread),
- &lwi);
- if (thread_test_and_clear_flags(thread, SVC_STOPPING)) {
- EXIT;
- break;
- } else {
- /* woken after adding import to reset timer */
- thread_test_and_clear_flags(thread, SVC_EVENT);
- }
- }
- }
-
- thread_set_flags(thread, SVC_STOPPED);
- wake_up(&thread->t_ctl_waitq);
-
- CDEBUG(D_NET, "pinger thread exiting, process %d\n", current_pid());
- return 0;
+ /* update memory usage info */
+ obd_update_maxusage();
+
+ /* Wait until the next ping time, or until we're stopped. */
+ time_to_next_wake = pinger_check_timeout(this_ping);
+ /*
+ * The ping sent by ptlrpc_send_rpc may get sent out
+ * say .01 second after this.
+ * ptlrpc_pinger_sending_on_import will then set the
+ * next ping time to next_ping + .01 sec, which means
+ * we will SKIP the next ping at next_ping, and the
+ * ping will get sent 2 timeouts from now! Beware.
+ */
+ CDEBUG(D_INFO, "next wakeup in %lld (%lld)\n",
+ time_to_next_wake, this_ping + PING_INTERVAL);
+ } while (time_to_next_wake <= 0);
+
+ queue_delayed_work(pinger_wq, &ping_work,
+ cfs_time_seconds(max(time_to_next_wake, 1LL)));
}
-static struct ptlrpc_thread pinger_thread;
-
int ptlrpc_start_pinger(void)
{
- struct l_wait_info lwi = { 0 };
- struct task_struct *task;
- int rc;
-#ifndef ENABLE_PINGER
- return 0;
-#endif
- ENTRY;
-
- if (!thread_is_init(&pinger_thread) &&
- !thread_is_stopped(&pinger_thread))
- RETURN(-EALREADY);
-
- init_waitqueue_head(&pinger_thread.t_ctl_waitq);
-
- strcpy(pinger_thread.t_name, "ll_ping");
+#ifdef ENABLE_PINGER
+ if (pinger_wq)
+ return -EALREADY;
- /* CLONE_VM and CLONE_FILES just avoid a needless copy, because we
- * just drop the VM and FILES in kthread_run() right away. */
- task = kthread_run(ptlrpc_pinger_main, &pinger_thread,
- pinger_thread.t_name);
- if (IS_ERR(task)) {
- rc = PTR_ERR(task);
- CERROR("cannot start pinger thread: rc = %d\n", rc);
- RETURN(rc);
+ pinger_wq = alloc_workqueue("ptlrpc_pinger", 0, 1);
+ if (!pinger_wq) {
+ CERROR("cannot start pinger workqueue\n");
+ return -ENOMEM;
}
- l_wait_event(pinger_thread.t_ctl_waitq,
- thread_is_running(&pinger_thread), &lwi);
+ queue_delayed_work(pinger_wq, &ping_work, 0);
if (suppress_pings)
- CWARN("Pings will be suppressed at the request of the "
- "administrator. The configuration shall meet the "
- "additional requirements described in the manual. "
- "(Search for the \"suppress_pings\" kernel module "
- "parameter.)\n");
-
- RETURN(0);
+ CWARN("Pings will be suppressed at the request of the administrator. The configuration shall meet the additional requirements described in the manual. (Search for the \"suppress_pings\" kernel module parameter.)\n");
+#endif
+ return 0;
}
int ptlrpc_pinger_remove_timeouts(void);
int ptlrpc_stop_pinger(void)
{
- struct l_wait_info lwi = { 0 };
-#ifndef ENABLE_PINGER
- return 0;
-#endif
- ENTRY;
-
- if (thread_is_init(&pinger_thread) ||
- thread_is_stopped(&pinger_thread))
- RETURN(-EALREADY);
+#ifdef ENABLE_PINGER
+ if (!pinger_wq)
+ return -EALREADY;
ptlrpc_pinger_remove_timeouts();
- thread_set_flags(&pinger_thread, SVC_STOPPING);
- wake_up(&pinger_thread.t_ctl_waitq);
-
- l_wait_event(pinger_thread.t_ctl_waitq,
- thread_is_stopped(&pinger_thread), &lwi);
- RETURN(0);
+ cancel_delayed_work_sync(&ping_work);
+ destroy_workqueue(pinger_wq);
+ pinger_wq = NULL;
+#endif
+ return 0;
}
void ptlrpc_pinger_sending_on_import(struct obd_import *imp)
{
- ptlrpc_update_next_ping(imp, 0);
+ ptlrpc_update_next_ping(imp, 0);
}
-EXPORT_SYMBOL(ptlrpc_pinger_sending_on_import);
void ptlrpc_pinger_commit_expected(struct obd_import *imp)
{
int ptlrpc_pinger_add_import(struct obd_import *imp)
{
- ENTRY;
+ ENTRY;
if (!list_empty(&imp->imp_pinger_chain))
- RETURN(-EALREADY);
+ RETURN(-EALREADY);
mutex_lock(&pinger_mutex);
- CDEBUG(D_HA, "adding pingable import %s->%s\n",
- imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd));
- /* if we add to pinger we want recovery on this import */
- imp->imp_obd->obd_no_recov = 0;
- ptlrpc_update_next_ping(imp, 0);
- /* XXX sort, blah blah */
+ CDEBUG(D_HA, "adding pingable import %s->%s\n",
+ imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd));
+ /* if we add to pinger we want recovery on this import */
+ imp->imp_obd->obd_no_recov = 0;
+ ptlrpc_update_next_ping(imp, 0);
+ /* XXX sort, blah blah */
list_add_tail(&imp->imp_pinger_chain, &pinger_imports);
- class_import_get(imp);
+ class_import_get(imp);
- ptlrpc_pinger_wake_up();
+ ptlrpc_pinger_wake_up();
mutex_unlock(&pinger_mutex);
- RETURN(0);
+ RETURN(0);
}
EXPORT_SYMBOL(ptlrpc_pinger_add_import);
* Register a timeout callback to the pinger list, and the callback will
* be called when timeout happens.
*/
-struct timeout_item* ptlrpc_new_timeout(int time, enum timeout_event event,
- timeout_cb_t cb, void *data)
+static struct timeout_item *ptlrpc_new_timeout(time64_t time,
+ enum timeout_event event,
+ timeout_cb_t cb, void *data)
{
- struct timeout_item *ti;
+ struct timeout_item *ti;
- OBD_ALLOC_PTR(ti);
- if (!ti)
- return(NULL);
+ OBD_ALLOC_PTR(ti);
+ if (!ti)
+ return NULL;
INIT_LIST_HEAD(&ti->ti_obd_list);
INIT_LIST_HEAD(&ti->ti_chain);
- ti->ti_timeout = time;
- ti->ti_event = event;
- ti->ti_cb = cb;
- ti->ti_cb_data = data;
+ ti->ti_timeout = time;
+ ti->ti_event = event;
+ ti->ti_cb = cb;
+ ti->ti_cb_data = data;
- return ti;
+ return ti;
}
/**
* Note: the timeout list is an sorted list with increased timeout value.
*/
static struct timeout_item*
-ptlrpc_pinger_register_timeout(int time, enum timeout_event event,
- timeout_cb_t cb, void *data)
+ptlrpc_pinger_register_timeout(time64_t time, enum timeout_event event,
+ timeout_cb_t cb, void *data)
{
struct timeout_item *item, *tmp;
/* Add a client_obd to the timeout event list, when timeout(@time)
* happens, the callback(@cb) will be called.
*/
-int ptlrpc_add_timeout_client(int time, enum timeout_event event,
- timeout_cb_t cb, void *data,
+int ptlrpc_add_timeout_client(time64_t time, enum timeout_event event,
+ timeout_cb_t cb, void *data,
struct list_head *obd_list)
{
- struct timeout_item *ti;
+ struct timeout_item *ti;
mutex_lock(&pinger_mutex);
- ti = ptlrpc_pinger_register_timeout(time, event, cb, data);
- if (!ti) {
+ ti = ptlrpc_pinger_register_timeout(time, event, cb, data);
+ if (!ti) {
mutex_unlock(&pinger_mutex);
- return (-EINVAL);
- }
+ return -EINVAL;
+ }
list_add(obd_list, &ti->ti_obd_list);
mutex_unlock(&pinger_mutex);
- return 0;
+ return 0;
}
EXPORT_SYMBOL(ptlrpc_add_timeout_client);
break;
}
}
- LASSERTF(ti != NULL, "ti is NULL !\n");
+ LASSERTF(ti, "ti is NULL !\n");
if (list_empty(&ti->ti_obd_list)) {
list_del(&ti->ti_chain);
OBD_FREE_PTR(ti);
int ptlrpc_pinger_remove_timeouts(void)
{
- struct timeout_item *item, *tmp;
+ struct timeout_item *item, *tmp;
mutex_lock(&pinger_mutex);
list_for_each_entry_safe(item, tmp, &timeout_list, ti_chain) {
LASSERT(list_empty(&item->ti_obd_list));
list_del(&item->ti_chain);
- OBD_FREE_PTR(item);
- }
+ OBD_FREE_PTR(item);
+ }
mutex_unlock(&pinger_mutex);
- return 0;
+ return 0;
}
-void ptlrpc_pinger_wake_up()
+void ptlrpc_pinger_wake_up(void)
{
#ifdef ENABLE_PINGER
- thread_add_flags(&pinger_thread, SVC_EVENT);
- wake_up(&pinger_thread.t_ctl_waitq);
+ mod_delayed_work(pinger_wq, &ping_work, 0);
#endif
}
#define PET_READY 1
#define PET_TERMINATE 2
-static int pet_refcount = 0;
-static int pet_state;
+static int pet_refcount;
+static int pet_state;
static wait_queue_head_t pet_waitq;
-struct list_head pet_list;
+static LIST_HEAD(pet_list);
static DEFINE_SPINLOCK(pet_lock);
int ping_evictor_wake(struct obd_export *exp)
static int ping_evictor_main(void *arg)
{
- struct obd_device *obd;
- struct obd_export *exp;
- struct l_wait_info lwi = { 0 };
- time_t expire_time;
- ENTRY;
+ struct obd_device *obd;
+ struct obd_export *exp;
+ time64_t expire_time;
+ ENTRY;
unshare_fs_struct();
CDEBUG(D_HA, "Starting Ping Evictor\n");
pet_state = PET_READY;
while (1) {
- l_wait_event(pet_waitq, (!list_empty(&pet_list)) ||
- (pet_state == PET_TERMINATE), &lwi);
+ wait_event_idle(pet_waitq,
+ (!list_empty(&pet_list)) ||
+ (pet_state == PET_TERMINATE));
/* loop until all obd's will be removed */
if ((pet_state == PET_TERMINATE) && list_empty(&pet_list))
break;
- /* we only get here if pet_exp != NULL, and the end of this
+ /*
+ * we only get here if pet_exp != NULL, and the end of this
* loop is the only place which sets it NULL again, so lock
- * is not strictly necessary. */
+ * is not strictly necessary.
+ */
spin_lock(&pet_lock);
obd = list_entry(pet_list.next, struct obd_device,
obd_evict_list);
spin_unlock(&pet_lock);
- expire_time = cfs_time_current_sec() - PING_EVICT_TIMEOUT;
+ expire_time = ktime_get_real_seconds() - PING_EVICT_TIMEOUT;
- CDEBUG(D_HA, "evicting all exports of obd %s older than %ld\n",
+ CDEBUG(D_HA, "evicting all exports of obd %s older than %lld\n",
obd->obd_name, expire_time);
- /* Exports can't be deleted out of the list while we hold
+ /*
+ * Exports can't be deleted out of the list while we hold
* the obd lock (class_unlink_export), which means we can't
* lose the last ref on the export. If they've already been
- * removed from the list, we won't find them here. */
+ * removed from the list, we won't find them here.
+ */
spin_lock(&obd->obd_dev_lock);
while (!list_empty(&obd->obd_exports_timed)) {
exp = list_entry(obd->obd_exports_timed.next,
struct obd_export,
exp_obd_chain_timed);
if (expire_time > exp->exp_last_request_time) {
+ struct obd_uuid *client_uuid;
+
class_export_get(exp);
+ client_uuid = &exp->exp_client_uuid;
spin_unlock(&obd->obd_dev_lock);
- LCONSOLE_WARN("%s: haven't heard from client %s"
- " (at %s) in %ld seconds. I think"
- " it's dead, and I am evicting"
- " it. exp %p, cur %ld expire %ld"
- " last %ld\n",
- obd->obd_name,
- obd_uuid2str(&exp->exp_client_uuid),
- obd_export_nid2str(exp),
- (long)(cfs_time_current_sec() -
- exp->exp_last_request_time),
- exp, (long)cfs_time_current_sec(),
- (long)expire_time,
- (long)exp->exp_last_request_time);
- CDEBUG(D_HA, "Last request was at %ld\n",
- exp->exp_last_request_time);
- class_fail_export(exp);
- class_export_put(exp);
+ LCONSOLE_WARN("%s: haven't heard from client %s (at %s) in %lld seconds. I think it's dead, and I am evicting it. exp %p, cur %lld expire %lld last %lld\n",
+ obd->obd_name,
+ obd_uuid2str(client_uuid),
+ obd_export_nid2str(exp),
+ ktime_get_real_seconds() -
+ exp->exp_last_request_time,
+ exp, ktime_get_real_seconds(),
+ expire_time,
+ exp->exp_last_request_time);
+ CDEBUG(D_HA, "Last request was at %lld\n",
+ exp->exp_last_request_time);
+ class_fail_export(exp);
+ class_export_put(exp);
spin_lock(&obd->obd_dev_lock);
} else {
/* List is sorted, so everyone below is ok */
list_del_init(&obd->obd_evict_list);
spin_unlock(&pet_lock);
- class_decref(obd, "evictor", obd);
- }
- CDEBUG(D_HA, "Exiting Ping Evictor\n");
+ class_decref(obd, "evictor", obd);
+ }
+ CDEBUG(D_HA, "Exiting Ping Evictor\n");
- RETURN(0);
+ RETURN(0);
}
void ping_evictor_start(void)
if (++pet_refcount > 1)
return;
- INIT_LIST_HEAD(&pet_list);
init_waitqueue_head(&pet_waitq);
task = kthread_run(ping_evictor_main, NULL, "ll_evictor");
void ping_evictor_stop(void)
{
- if (--pet_refcount > 0)
- return;
+ if (--pet_refcount > 0)
+ return;
- pet_state = PET_TERMINATE;
+ pet_state = PET_TERMINATE;
wake_up(&pet_waitq);
}
EXPORT_SYMBOL(ping_evictor_stop);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff