X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=ae146684031613e4a467a2b94d8520924bc00997;hb=e5849abd06bf5ec6a636b1608ec82901fd6447a9;hp=5bc65e6993ce66e403794e9d20fb46bc035c611e;hpb=79353de5c7c8f23730abac4bb9c298672d4639ba;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index 5bc65e6..ae14668 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -74,10 +74,15 @@ extern unsigned int obd_dump_on_eviction; networking / disk / timings affected by load (use Adaptive Timeouts) */ extern unsigned int obd_timeout; /* seconds */ extern unsigned int ldlm_timeout; /* seconds */ +extern unsigned int at_min; +extern unsigned int at_max; +extern unsigned int at_history; +extern int at_early_margin; +extern int at_extra; extern unsigned int obd_sync_filter; extern unsigned int obd_max_dirty_pages; -extern atomic_t obd_dirty_pages; -extern atomic_t obd_dirty_transit_pages; +extern cfs_atomic_t obd_dirty_pages; +extern cfs_atomic_t obd_dirty_transit_pages; extern cfs_waitq_t obd_race_waitq; extern int obd_race_state; extern unsigned int obd_alloc_fail_rate; @@ -89,6 +94,22 @@ int __obd_fail_timeout_set(__u32 id, __u32 value, int ms, int set); int obd_alloc_fail(const void *ptr, const char *name, const char *type, size_t size, const char *file, int line); +/* Some hash init argument constants */ +#define HASH_POOLS_CUR_BITS 3 +#define HASH_POOLS_MAX_BITS 7 +#define HASH_UUID_CUR_BITS 7 +#define HASH_UUID_MAX_BITS 12 +#define HASH_NID_CUR_BITS 7 +#define HASH_NID_MAX_BITS 12 +#define HASH_NID_STATS_CUR_BITS 7 +#define HASH_NID_STATS_MAX_BITS 12 +#define HASH_LQS_CUR_BITS 7 +#define HASH_LQS_MAX_BITS 12 +#define HASH_CONN_CUR_BITS 5 +#define HASH_CONN_MAX_BITS 15 +#define HASH_EXP_LOCK_CUR_BITS 7 +#define HASH_EXP_LOCK_MAX_BITS 16 + /* Timeout definitions */ #define OBD_TIMEOUT_DEFAULT 100 #define LDLM_TIMEOUT_DEFAULT 20 @@ -132,8 +153,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, * Time interval of shrink, if the client is "idle" more than this interval, * then the ll_grant thread will return the requested grant space to filter */ -#define GRANT_SHRINK_INTERVAL 360/*6 minutes*/ - +#define GRANT_SHRINK_INTERVAL 1200/*20 minutes*/ #define OBD_FAIL_MDS 0x100 #define OBD_FAIL_MDS_HANDLE_UNPACK 0x101 @@ -199,8 +219,11 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_MDS_DROP_QUOTA_REQ 0x13d #define OBD_FAIL_MDS_REMOVE_COMMON_EA 0x13e #define OBD_FAIL_MDS_ALLOW_COMMON_EA_SETTING 0x13f +#define OBD_FAIL_MDS_FAIL_LOV_LOG_ADD 0x140 #define OBD_FAIL_MDS_LOV_PREP_CREATE 0x141 #define OBD_FAIL_MDS_REINT_DELAY 0x142 +#define OBD_FAIL_MDS_READLINK_EPROTO 0x143 +#define OBD_FAIL_MDS_OPEN_WAIT_CREATE 0x144 /* CMD */ #define OBD_FAIL_MDS_IS_SUBDIR_NET 0x180 @@ -250,6 +273,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_OST_BRW_PAUSE_PACK 0x224 #define OBD_FAIL_OST_CONNECT_NET2 0x225 #define OBD_FAIL_OST_NOMEM 0x226 +#define OBD_FAIL_OST_BRW_PAUSE_BULK2 0x227 #define OBD_FAIL_LDLM 0x300 #define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301 @@ -309,12 +333,12 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_PTLRPC_PAUSE_REQ 0x50a #define OBD_FAIL_PTLRPC_PAUSE_REP 0x50c #define OBD_FAIL_PTLRPC_IMP_DEACTIVE 0x50d - #define OBD_FAIL_PTLRPC_DUMP_LOG 0x50e #define OBD_FAIL_PTLRPC_LONG_REPL_UNLINK 0x50f #define OBD_FAIL_PTLRPC_LONG_BULK_UNLINK 0x510 #define OBD_FAIL_PTLRPC_HPREQ_TIMEOUT 0x511 #define OBD_FAIL_PTLRPC_HPREQ_NOTIMEOUT 0x512 +#define OBD_FAIL_PTLRPC_DROP_REQ_OPC 0x513 #define OBD_FAIL_OBD_PING_NET 0x600 #define OBD_FAIL_OBD_LOG_CANCEL_NET 0x601 @@ -335,6 +359,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_TGT_FAKE_EXP 0x708 #define OBD_FAIL_TGT_REPLAY_DELAY 0x709 #define OBD_FAIL_TGT_LAST_REPLAY 0x710 +#define OBD_FAIL_TGT_CLIENT_ADD 0x711 #define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800 #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 @@ -350,6 +375,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_QUOTA_RET_QDATA 0xA02 #define OBD_FAIL_QUOTA_DELAY_REL 0xA03 +#define OBD_FAIL_QUOTA_DELAY_SD 0xA04 #define OBD_FAIL_LPROC_REMOVE 0xB00 @@ -480,7 +506,7 @@ static inline void obd_race(__u32 id) } else { CERROR("obd_fail_race id %x waking\n", id); obd_race_state = 1; - wake_up(&obd_race_waitq); + cfs_waitq_signal(&obd_race_waitq); } } } @@ -492,7 +518,7 @@ static inline void obd_race(__u32 id) #define fixme() CDEBUG(D_OTHER, "FIXME\n"); -extern atomic_t libcfs_kmemory; +extern cfs_atomic_t libcfs_kmemory; #ifdef LPROCFS #define obd_memory_add(size) \ @@ -641,7 +667,7 @@ do { \ CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \ (int)(size)); \ CERROR(LPU64" total bytes allocated by Lustre, %d by LNET\n", \ - obd_memory_sum(), atomic_read(&libcfs_kmemory)); \ + obd_memory_sum(), cfs_atomic_read(&libcfs_kmemory)); \ } else { \ memset(ptr, 0, size); \ OBD_ALLOC_POST(ptr, size, "vmalloced"); \ @@ -723,7 +749,7 @@ do { \ }) #define OBD_SLAB_ALLOC(ptr, slab, type, size) \ do { \ - LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !in_interrupt())); \ + LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !cfs_in_interrupt())); \ (ptr) = cfs_mem_cache_alloc(slab, (type)); \ if (likely((ptr) != NULL && \ (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \ @@ -768,7 +794,7 @@ do { \ obd_memory_sum(), \ obd_pages_sum() << CFS_PAGE_SHIFT, \ obd_pages_sum(), \ - atomic_read(&libcfs_kmemory)); \ + cfs_atomic_read(&libcfs_kmemory)); \ } else { \ obd_pages_add(order); \ CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / " \