X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fwatchdog.c;h=05c984afcbd1913b8b3d807cf7dbb08bd0aa089d;hb=bcb737a19433e3e32df6a826f29d15a3666f54d8;hp=93802acfd9001c2dca59fb835e69215ff2a0ec49;hpb=a3850a044ef7cc2658b355672338b9865ed59fe4;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c index 93802ac..05c984a 100644 --- a/libcfs/libcfs/watchdog.c +++ b/libcfs/libcfs/watchdog.c @@ -15,11 +15,7 @@ * * 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 */ @@ -27,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,20 +36,21 @@ #define DEBUG_SUBSYSTEM S_LNET +#include #include #include "tracefile.h" struct lc_watchdog { - spinlock_t lcw_lock; /* check or change lcw_list */ - int lcw_refcount; /* must hold lcw_pending_timers_lock */ - struct timer_list lcw_timer; /* kernel timer */ - cfs_list_t lcw_list; /* chain on pending list */ - cfs_time_t lcw_last_touched; /* last touched stamp */ - struct task_struct *lcw_task; /* owner task */ - void (*lcw_callback)(pid_t, void *); - void *lcw_data; + spinlock_t lcw_lock; /* check or change lcw_list */ + int lcw_refcount; /* must hold lcw_pending_timers_lock */ + struct timer_list lcw_timer; /* kernel timer */ + struct list_head lcw_list; /* chain on pending list */ + cfs_time_t lcw_last_touched;/* last touched stamp */ + struct task_struct *lcw_task; /* owner task */ + void (*lcw_callback)(pid_t, void *); + void *lcw_data; - pid_t lcw_pid; + pid_t lcw_pid; enum { LC_WATCHDOG_DISABLED, @@ -94,7 +91,7 @@ static DEFINE_MUTEX(lcw_refcount_mutex); */ /* BH lock! */ static DEFINE_SPINLOCK(lcw_pending_timers_lock); -static cfs_list_t lcw_pending_timers = CFS_LIST_HEAD_INIT(lcw_pending_timers); +static struct list_head lcw_pending_timers = LIST_HEAD_INIT(lcw_pending_timers); /* Last time a watchdog expired */ static cfs_time_t lcw_last_watchdog_time; @@ -106,7 +103,7 @@ lcw_dump(struct lc_watchdog *lcw) ENTRY; rcu_read_lock(); if (lcw->lcw_task == NULL) { - LCONSOLE_WARN("Process " LPPID " was not found in the task " + LCONSOLE_WARN("Process %d was not found in the task " "list; watchdog callback may be incomplete\n", (int)lcw->lcw_pid); } else { @@ -117,7 +114,7 @@ lcw_dump(struct lc_watchdog *lcw) EXIT; } -static void lcw_cb(ulong_ptr_t data) +static void lcw_cb(uintptr_t data) { struct lc_watchdog *lcw = (struct lc_watchdog *)data; ENTRY; @@ -130,11 +127,11 @@ static void lcw_cb(ulong_ptr_t data) lcw->lcw_state = LC_WATCHDOG_EXPIRED; spin_lock_bh(&lcw->lcw_lock); - LASSERT(cfs_list_empty(&lcw->lcw_list)); + LASSERT(list_empty(&lcw->lcw_list)); spin_lock_bh(&lcw_pending_timers_lock); lcw->lcw_refcount++; /* +1 for pending list */ - cfs_list_add(&lcw->lcw_list, &lcw_pending_timers); + list_add(&lcw->lcw_list, &lcw_pending_timers); wake_up(&lcw_event_waitq); spin_unlock_bh(&lcw_pending_timers_lock); @@ -150,7 +147,7 @@ static int is_watchdog_fired(void) return 1; spin_lock_bh(&lcw_pending_timers_lock); - rc = !cfs_list_empty(&lcw_pending_timers); + rc = !list_empty(&lcw_pending_timers); spin_unlock_bh(&lcw_pending_timers_lock); return rc; } @@ -202,11 +199,20 @@ static void lcw_dump_stack(struct lc_watchdog *lcw) } } +/* + * Provided watchdog handlers + */ + +static void lc_watchdog_dumplog(pid_t pid, void *data) +{ + libcfs_debug_dumplog_internal((void *)((uintptr_t)pid)); +} + static int lcw_dispatch_main(void *data) { int rc = 0; struct lc_watchdog *lcw; - CFS_LIST_HEAD (zombies); + struct list_head zombies = LIST_HEAD_INIT(zombies); ENTRY; @@ -222,7 +228,7 @@ static int lcw_dispatch_main(void *data) CDEBUG(D_INFO, "LCW_FLAG_STOP set, shutting down...\n"); spin_lock_bh(&lcw_pending_timers_lock); - rc = !cfs_list_empty(&lcw_pending_timers); + rc = !list_empty(&lcw_pending_timers); spin_unlock_bh(&lcw_pending_timers_lock); if (rc) { CERROR("pending timers list was not empty at " @@ -232,37 +238,37 @@ static int lcw_dispatch_main(void *data) } spin_lock_bh(&lcw_pending_timers_lock); - while (!cfs_list_empty(&lcw_pending_timers)) { - int is_dumplog; - - lcw = cfs_list_entry(lcw_pending_timers.next, - struct lc_watchdog, lcw_list); - /* +1 ref for callback to make sure lwc wouldn't be - * deleted after releasing lcw_pending_timers_lock */ - lcw->lcw_refcount++; + while (!list_empty(&lcw_pending_timers)) { + int is_dumplog; + + lcw = list_entry(lcw_pending_timers.next, + struct lc_watchdog, lcw_list); + /* +1 ref for callback to make sure lwc wouldn't be + * deleted after releasing lcw_pending_timers_lock */ + lcw->lcw_refcount++; spin_unlock_bh(&lcw_pending_timers_lock); /* lock ordering */ spin_lock_bh(&lcw->lcw_lock); spin_lock_bh(&lcw_pending_timers_lock); - if (cfs_list_empty(&lcw->lcw_list)) { + if (list_empty(&lcw->lcw_list)) { /* already removed from pending list */ lcw->lcw_refcount--; /* -1 ref for callback */ if (lcw->lcw_refcount == 0) - cfs_list_add(&lcw->lcw_list, &zombies); + list_add(&lcw->lcw_list, &zombies); spin_unlock_bh(&lcw->lcw_lock); - /* still hold lcw_pending_timers_lock */ - continue; - } + /* still hold lcw_pending_timers_lock */ + continue; + } - cfs_list_del_init(&lcw->lcw_list); - lcw->lcw_refcount--; /* -1 ref for pending list */ + list_del_init(&lcw->lcw_list); + lcw->lcw_refcount--; /* -1 ref for pending list */ spin_unlock_bh(&lcw_pending_timers_lock); spin_unlock_bh(&lcw->lcw_lock); - CDEBUG(D_INFO, "found lcw for pid " LPPID "\n", + CDEBUG(D_INFO, "found lcw for pid %d\n", lcw->lcw_pid); lcw_dump_stack(lcw); @@ -277,17 +283,17 @@ static int lcw_dispatch_main(void *data) spin_lock_bh(&lcw_pending_timers_lock); lcw->lcw_refcount--; /* -1 ref for callback */ if (lcw->lcw_refcount == 0) - cfs_list_add(&lcw->lcw_list, &zombies); + list_add(&lcw->lcw_list, &zombies); } spin_unlock_bh(&lcw_pending_timers_lock); - while (!cfs_list_empty(&zombies)) { - lcw = cfs_list_entry(lcw_pending_timers.next, - struct lc_watchdog, lcw_list); - cfs_list_del(&lcw->lcw_list); - LIBCFS_FREE(lcw, sizeof(*lcw)); - } - } + while (!list_empty(&zombies)) { + lcw = list_entry(zombies.next, + struct lc_watchdog, lcw_list); + list_del_init(&lcw->lcw_list); + LIBCFS_FREE(lcw, sizeof(*lcw)); + } + } complete(&lcw_stop_completion); @@ -357,20 +363,20 @@ struct lc_watchdog *lc_watchdog_add(int timeout, lcw->lcw_data = data; lcw->lcw_state = LC_WATCHDOG_DISABLED; - CFS_INIT_LIST_HEAD(&lcw->lcw_list); - cfs_timer_init(&lcw->lcw_timer, lcw_cb, lcw); + INIT_LIST_HEAD(&lcw->lcw_list); + setup_timer(&lcw->lcw_timer, lcw_cb, (unsigned long)lcw); mutex_lock(&lcw_refcount_mutex); if (++lcw_refcount == 1) lcw_dispatch_start(); mutex_unlock(&lcw_refcount_mutex); - /* Keep this working in case we enable them by default */ - if (lcw->lcw_state == LC_WATCHDOG_ENABLED) { - lcw->lcw_last_touched = cfs_time_current(); - cfs_timer_arm(&lcw->lcw_timer, cfs_time_seconds(timeout) + - cfs_time_current()); - } + /* Keep this working in case we enable them by default */ + if (lcw->lcw_state == LC_WATCHDOG_ENABLED) { + lcw->lcw_last_touched = cfs_time_current(); + mod_timer(&lcw->lcw_timer, cfs_time_seconds(timeout) + + cfs_time_current()); + } RETURN(lcw); } @@ -378,7 +384,7 @@ EXPORT_SYMBOL(lc_watchdog_add); static void lcw_update_time(struct lc_watchdog *lcw, const char *message) { - cfs_time_t newtime = cfs_time_current();; + cfs_time_t newtime = cfs_time_current(); if (lcw->lcw_state == LC_WATCHDOG_EXPIRED) { struct timeval timediff; @@ -401,9 +407,9 @@ static void lcw_update_time(struct lc_watchdog *lcw, const char *message) static void lc_watchdog_del_pending(struct lc_watchdog *lcw) { spin_lock_bh(&lcw->lcw_lock); - if (unlikely(!cfs_list_empty(&lcw->lcw_list))) { + if (unlikely(!list_empty(&lcw->lcw_list))) { spin_lock_bh(&lcw_pending_timers_lock); - cfs_list_del_init(&lcw->lcw_list); + list_del_init(&lcw->lcw_list); lcw->lcw_refcount--; /* -1 ref for pending list */ spin_unlock_bh(&lcw_pending_timers_lock); } @@ -419,10 +425,10 @@ void lc_watchdog_touch(struct lc_watchdog *lcw, int timeout) lc_watchdog_del_pending(lcw); lcw_update_time(lcw, "resumed"); - lcw->lcw_state = LC_WATCHDOG_ENABLED; - cfs_timer_arm(&lcw->lcw_timer, cfs_time_current() + - cfs_time_seconds(timeout)); + mod_timer(&lcw->lcw_timer, cfs_time_current() + + cfs_time_seconds(timeout)); + lcw->lcw_state = LC_WATCHDOG_ENABLED; EXIT; } @@ -449,14 +455,14 @@ void lc_watchdog_delete(struct lc_watchdog *lcw) ENTRY; LASSERT(lcw != NULL); - cfs_timer_disarm(&lcw->lcw_timer); + del_timer(&lcw->lcw_timer); lcw_update_time(lcw, "stopped"); spin_lock_bh(&lcw->lcw_lock); spin_lock_bh(&lcw_pending_timers_lock); - if (unlikely(!cfs_list_empty(&lcw->lcw_list))) { - cfs_list_del_init(&lcw->lcw_list); + if (unlikely(!list_empty(&lcw->lcw_list))) { + list_del_init(&lcw->lcw_list); lcw->lcw_refcount--; /* -1 ref for pending list */ } @@ -477,16 +483,6 @@ void lc_watchdog_delete(struct lc_watchdog *lcw) } EXPORT_SYMBOL(lc_watchdog_delete); -/* - * Provided watchdog handlers - */ - -void lc_watchdog_dumplog(pid_t pid, void *data) -{ - libcfs_debug_dumplog_internal((void *)((long_ptr_t)pid)); -} -EXPORT_SYMBOL(lc_watchdog_dumplog); - #else /* !defined(WITH_WATCHDOG) */ struct lc_watchdog *lc_watchdog_add(int timeout,