LU-8703 libcfs: make tolerant to offline CPUs and empty NUMA nodes

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-prim.c

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index 0a617df..1d07692 100644 (file)
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.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
  */
@@ -46,58 +42,59 @@
 #include <asm/kgdb.h>
 #endif
 
-void cfs_init_timer(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_TS64
+void ktime_get_ts64(struct timespec64 *ts)
 {
-       init_timer(t);
-}
-EXPORT_SYMBOL(cfs_init_timer);
+       struct timespec now;
 
-void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg)
-{
-       init_timer(t);
-       t->function = func;
-       t->data = (unsigned long)arg;
+       ktime_get_ts(&now);
+       *ts = timespec_to_timespec64(now);
 }
-EXPORT_SYMBOL(cfs_timer_init);
+EXPORT_SYMBOL(ktime_get_ts64);
+#endif /* HAVE_KTIME_GET_TS64 */
 
-void cfs_timer_done(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_REAL_TS64
+void ktime_get_real_ts64(struct timespec64 *ts)
 {
-       return;
-}
-EXPORT_SYMBOL(cfs_timer_done);
-
-void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline)
-{
-       mod_timer(t, deadline);
-}
-EXPORT_SYMBOL(cfs_timer_arm);
+       struct timespec now;
 
-void cfs_timer_disarm(struct timer_list *t)
-{
-       del_timer(t);
+       getnstimeofday(&now);
+       *ts = timespec_to_timespec64(now);
 }
-EXPORT_SYMBOL(cfs_timer_disarm);
+EXPORT_SYMBOL(ktime_get_real_ts64);
+#endif /* HAVE_KTIME_GET_REAL_TS64 */
 
-int  cfs_timer_is_armed(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_REAL_SECONDS
+/*
+ * Get the seconds portion of CLOCK_REALTIME (wall clock).
+ * This is the clock that can be altered by NTP and is
+ * independent of a reboot.
+ */
+time64_t ktime_get_real_seconds(void)
 {
-       return timer_pending(t);
+       return (time64_t)get_seconds();
 }
-EXPORT_SYMBOL(cfs_timer_is_armed);
+EXPORT_SYMBOL(ktime_get_real_seconds);
+#endif /* HAVE_KTIME_GET_REAL_SECONDS */
 
-cfs_time_t cfs_timer_deadline(struct timer_list *t)
+#ifndef HAVE_KTIME_GET_SECONDS
+/*
+ * Get the seconds portion of CLOCK_MONOTONIC
+ * This clock is immutable and is reset across
+ * reboots. For older platforms this is a
+ * wrapper around get_seconds which is valid
+ * until 2038. By that time this will be gone
+ * one would hope.
+ */
+time64_t ktime_get_seconds(void)
 {
-       return t->expires;
-}
-EXPORT_SYMBOL(cfs_timer_deadline);
+       struct timespec64 now;
 
-void cfs_enter_debugger(void)
-{
-#if defined(CONFIG_KGDB)
-//        BREAKPOINT();
-#else
-        /* nothing */
-#endif
+       ktime_get_ts64(&now);
+       return now.tv_sec;
 }
+EXPORT_SYMBOL(ktime_get_seconds);
+#endif /* HAVE_KTIME_GET_SECONDS */
 
 sigset_t
 cfs_block_allsigs(void)
@@ -112,6 +109,7 @@ cfs_block_allsigs(void)
        spin_unlock_irqrestore(&current->sighand->siglock, flags);
        return old;
 }
+EXPORT_SYMBOL(cfs_block_allsigs);
 
 sigset_t cfs_block_sigs(unsigned long sigs)
 {
@@ -125,6 +123,7 @@ sigset_t cfs_block_sigs(unsigned long sigs)
        spin_unlock_irqrestore(&current->sighand->siglock, flags);
        return old;
 }
+EXPORT_SYMBOL(cfs_block_sigs);
 
 /* Block all signals except for the @sigs */
 sigset_t cfs_block_sigsinv(unsigned long sigs)
@@ -139,6 +138,7 @@ sigset_t cfs_block_sigsinv(unsigned long sigs)
        spin_unlock_irqrestore(&current->sighand->siglock, flags);
        return old;
 }
+EXPORT_SYMBOL(cfs_block_sigsinv);
 
 void
 cfs_restore_sigs(sigset_t old)
@@ -150,12 +150,7 @@ cfs_restore_sigs(sigset_t old)
        recalc_sigpending();
        spin_unlock_irqrestore(&current->sighand->siglock, flags);
 }
-
-int
-cfs_signal_pending(void)
-{
-       return signal_pending(current);
-}
+EXPORT_SYMBOL(cfs_restore_sigs);
 
 void
 cfs_clear_sigpending(void)
@@ -166,11 +161,4 @@ cfs_clear_sigpending(void)
        clear_tsk_thread_flag(current, TIF_SIGPENDING);
        spin_unlock_irqrestore(&current->sighand->siglock, flags);
 }
-
-EXPORT_SYMBOL(cfs_enter_debugger);
-EXPORT_SYMBOL(cfs_block_allsigs);
-EXPORT_SYMBOL(cfs_block_sigs);
-EXPORT_SYMBOL(cfs_block_sigsinv);
-EXPORT_SYMBOL(cfs_restore_sigs);
-EXPORT_SYMBOL(cfs_signal_pending);
 EXPORT_SYMBOL(cfs_clear_sigpending);