X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Flvfs%2Flvfs_lib.c;h=9b0f36792848f5fa41a9637f9c06ae1a6a3df118;hb=d5372f3cd13f5a0b527553c6310057b5d7ed01a6;hp=a83c171d0d6b95e2186595b865cc6592d7c9fcee;hpb=703a700b4135d669bac66e9b9f780ff6e72c2024;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/lvfs_lib.c b/lustre/lvfs/lvfs_lib.c index a83c171..9b0f367 100644 --- a/lustre/lvfs/lvfs_lib.c +++ b/lustre/lvfs/lvfs_lib.c @@ -1,26 +1,43 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * lustre/lvfs/lvfs_lib.c - * Lustre filesystem abstraction routines + * GPL HEADER START * - * Copyright (C) 2007 Cluster File Systems, Inc. - * Author: Andreas Dilger + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * 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. + * This program 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 version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * 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. + * 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 * - * 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. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/lvfs/lvfs_lib.c + * + * Lustre filesystem abstraction routines + * + * Author: Andreas Dilger */ #ifdef __KERNEL__ #include @@ -49,7 +66,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, obd_memory_sum(), obd_pages_sum() << CFS_PAGE_SHIFT, obd_pages_sum(), - atomic_read(&libcfs_kmemory)); + cfs_atomic_read(&libcfs_kmemory)); return 1; } return 0; @@ -58,13 +75,13 @@ EXPORT_SYMBOL(obd_alloc_fail); int __obd_fail_check_set(__u32 id, __u32 value, int set) { - static atomic_t obd_fail_count = ATOMIC_INIT(0); + static cfs_atomic_t obd_fail_count = CFS_ATOMIC_INIT(0); LASSERT(!(id & OBD_FAIL_ONCE)); if ((obd_fail_loc & (OBD_FAILED | OBD_FAIL_ONCE)) == (OBD_FAILED | OBD_FAIL_ONCE)) { - atomic_set(&obd_fail_count, 0); /* paranoia */ + cfs_atomic_set(&obd_fail_count, 0); /* paranoia */ return 0; } @@ -76,18 +93,18 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set) /* Skip the first obd_fail_val, then fail */ if (obd_fail_loc & OBD_FAIL_SKIP) { - if (atomic_inc_return(&obd_fail_count) <= obd_fail_val) + if (cfs_atomic_inc_return(&obd_fail_count) <= obd_fail_val) return 0; } /* Fail obd_fail_val times, overridden by FAIL_ONCE */ if (obd_fail_loc & OBD_FAIL_SOME && - (!(obd_fail_loc & OBD_FAIL_ONCE) || obd_fail_val <= 1)) { - int count = atomic_inc_return(&obd_fail_count); + (!(obd_fail_loc & OBD_FAIL_ONCE) || obd_fail_val <= 1)) { + int count = cfs_atomic_inc_return(&obd_fail_count); if (count >= obd_fail_val) { - set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc); - atomic_set(&obd_fail_count, 0); + cfs_set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc); + cfs_atomic_set(&obd_fail_count, 0); /* we are lost race to increase obd_fail_count */ if (count > obd_fail_val) return 0; @@ -96,10 +113,10 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set) if ((set == OBD_FAIL_LOC_ORSET || set == OBD_FAIL_LOC_RESET) && (value & OBD_FAIL_ONCE)) - set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc); + cfs_set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc); /* Lost race to set OBD_FAILED_BIT. */ - if (test_and_set_bit(OBD_FAILED_BIT, &obd_fail_loc)) { + if (cfs_test_and_set_bit(OBD_FAILED_BIT, &obd_fail_loc)) { /* If OBD_FAIL_ONCE is valid, only one process can fail, * otherwise multi-process can fail at the same time. */ if (obd_fail_loc & OBD_FAIL_ONCE) @@ -124,6 +141,23 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set) } EXPORT_SYMBOL(__obd_fail_check_set); +int __obd_fail_timeout_set(__u32 id, __u32 value, int ms, int set) +{ + int ret = 0; + + ret = __obd_fail_check_set(id, value, set); + if (ret) { + CERROR("obd_fail_timeout id %x sleeping for %dms\n", + id, ms); + cfs_schedule_timeout_and_set_state(CFS_TASK_UNINT, + cfs_time_seconds(ms) / 1000); + cfs_set_current_state(CFS_TASK_RUNNING); + CERROR("obd_fail_timeout id %x awake\n", id); + } + return ret; +} +EXPORT_SYMBOL(__obd_fail_timeout_set); + #ifdef LPROCFS void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount) @@ -139,19 +173,22 @@ void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, smp_id = lprocfs_stats_lock(stats, LPROCFS_GET_SMP_ID); percpu_cntr = &(stats->ls_percpu[smp_id]->lp_cntr[idx]); - atomic_inc(&percpu_cntr->lc_cntl.la_entry); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_entry); percpu_cntr->lc_count++; if (percpu_cntr->lc_config & LPROCFS_CNTR_AVGMINMAX) { + /* see comment in lprocfs_counter_sub */ + LASSERT(!cfs_in_interrupt()); + percpu_cntr->lc_sum += amount; if (percpu_cntr->lc_config & LPROCFS_CNTR_STDDEV) - percpu_cntr->lc_sumsquare += (__u64)amount * amount; + percpu_cntr->lc_sumsquare += (__s64)amount * amount; if (amount < percpu_cntr->lc_min) percpu_cntr->lc_min = amount; if (amount > percpu_cntr->lc_max) percpu_cntr->lc_max = amount; } - atomic_inc(&percpu_cntr->lc_cntl.la_exit); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_exit); lprocfs_stats_unlock(stats); } EXPORT_SYMBOL(lprocfs_counter_add); @@ -170,10 +207,22 @@ void lprocfs_counter_sub(struct lprocfs_stats *stats, int idx, smp_id = lprocfs_stats_lock(stats, LPROCFS_GET_SMP_ID); percpu_cntr = &(stats->ls_percpu[smp_id]->lp_cntr[idx]); - atomic_inc(&percpu_cntr->lc_cntl.la_entry); - if (percpu_cntr->lc_config & LPROCFS_CNTR_AVGMINMAX) - percpu_cntr->lc_sum -= amount; - atomic_inc(&percpu_cntr->lc_cntl.la_exit); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_entry); + if (percpu_cntr->lc_config & LPROCFS_CNTR_AVGMINMAX) { + /* + * currently lprocfs_count_add() can only be called in thread + * context; sometimes we use RCU callbacks to free memory + * which calls lprocfs_counter_sub(), and RCU callbacks may + * execute in softirq context - right now that's the only case + * we're in softirq context here, use separate counter for that. + * bz20650. + */ + if (cfs_in_interrupt()) + percpu_cntr->lc_sum_irq -= amount; + else + percpu_cntr->lc_sum -= amount; + } + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_exit); lprocfs_stats_unlock(stats); } EXPORT_SYMBOL(lprocfs_counter_sub);