X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=295ab00f1fa0bc6b0fbb1ac3c841f3daf9b47eae;hp=8f0143f0d2fb59c1dbd92513d0645dbda854394a;hb=bc4f27deaf66091c9ecd6e4944cba88bcf846e75;hpb=022b102258cd85314f4fa1fb8322638cc79f4634 diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index 8f0143f..295ab00 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -1,29 +1,43 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 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 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. + * 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). * - * 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. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. 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. */ #ifndef _OBD_SUPPORT #define _OBD_SUPPORT -#include +#include #include #include @@ -56,26 +70,90 @@ extern unsigned int obd_fail_val; extern unsigned int obd_debug_peer_on_timeout; extern unsigned int obd_dump_on_timeout; extern unsigned int obd_dump_on_eviction; +/* obd_timeout should only be used for recovery, not for + networking / disk / timings affected by load (use Adaptive Timeouts) */ extern unsigned int obd_timeout; /* seconds */ -#define PING_INTERVAL max(obd_timeout / 4, 1U) -#define RECONNECT_INTERVAL max(obd_timeout / 10, 10U) -extern unsigned int ldlm_timeout; -extern unsigned int obd_health_check_timeout; +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_waitq_t obd_race_waitq; extern int obd_race_state; extern unsigned int obd_alloc_fail_rate; int __obd_fail_check_set(__u32 id, __u32 value, int set); +int __obd_fail_timeout_set(__u32 id, __u32 value, int ms, int set); + +/* lvfs.c */ +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 LDLM_TIMEOUT_DEFAULT 20 -#define OBD_TIMEOUT_DEFAULT 100 -#define HEALTH_CHECK_COEF 3 / 2 -#define HEALTH_CHECK_TIMEOUT_DEFAULT (OBD_TIMEOUT_DEFAULT * HEALTH_CHECK_COEF) -#define HEALTH_CHECK_TIMEOUT (obd_timeout * HEALTH_CHECK_COEF) +#define OBD_TIMEOUT_DEFAULT 100 +#define LDLM_TIMEOUT_DEFAULT 20 +#define MDS_LDLM_TIMEOUT_DEFAULT 6 +/* Time to wait for all clients to reconnect during recovery */ +/* Should be very conservative; must catch the first reconnect after reboot */ +#define OBD_RECOVERY_FACTOR (3) /* times obd_timeout */ +/* Change recovery-small 26b time if you change this */ +#define PING_INTERVAL max(obd_timeout / 4, 1U) +/* Client may skip 1 ping; we must wait at least 2.5. But for multiple + * failover targets the client only pings one server at a time, and pings + * can be lost on a loaded network. Since eviction has serious consequences, + * and there's no urgent need to evict a client just because it's idle, we + * should be very conservative here. */ +#define PING_EVICT_TIMEOUT (PING_INTERVAL * 6) +#define DISK_TIMEOUT 50 /* Beyond this we warn about disk speed */ +#define CONNECTION_SWITCH_MIN 5U /* Connection switching rate limiter */ + /* Max connect interval for nonresponsive servers; ~50s to avoid building up + connect requests in the LND queues, but within obd_timeout so we don't + miss the recovery window */ +#define CONNECTION_SWITCH_MAX min(50U, max(CONNECTION_SWITCH_MIN,obd_timeout)) +#define CONNECTION_SWITCH_INC 5 /* Connection timeout backoff */ +#ifndef CRAY_XT3 +/* In general this should be low to have quick detection of a system + running on a backup server. (If it's too low, import_select_connection + will increase the timeout anyhow.) */ +#define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20) +#else +/* ...but for very large systems (e.g. CRAY) we need to keep the initial + connect t.o. high (bz 10803), because they will nearly ALWAYS be doing the + connects for the first time (clients "reboot" after every process, so no + chance to generate adaptive timeout data. */ +#define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/2) +#endif +/* The max delay between connects is SWITCH_MAX + SWITCH_INC + INITIAL */ +#define RECONNECT_DELAY_MAX (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + \ + INITIAL_CONNECT_TIMEOUT) +#define LONG_UNLINK 300 /* Unlink should happen before now */ + +/** + * 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 1200/*20 minutes*/ #define OBD_FAIL_MDS 0x100 #define OBD_FAIL_MDS_HANDLE_UNPACK 0x101 @@ -132,16 +210,29 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_MDS_SETXATTR_WRITE 0x134 #define OBD_FAIL_MDS_FS_SETUP 0x135 #define OBD_FAIL_MDS_RESEND 0x136 -#define OBD_FAIL_MDS_IS_SUBDIR_NET 0x137 -#define OBD_FAIL_MDS_IS_SUBDIR_PACK 0x138 -#define OBD_FAIL_MDS_SET_INFO_NET 0x139 -#define OBD_FAIL_MDS_WRITEPAGE_NET 0x13a -#define OBD_FAIL_MDS_WRITEPAGE_PACK 0x13b -#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x13c -#define OBD_FAIL_MDS_OSC_PRECREATE 0x13d -#define OBD_FAIL_MDS_LOV_SYNC_RACE 0x13e -#define OBD_FAIL_MDS_CLOSE_NET_REP 0x13f -#define OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x140 +#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x137 +#define OBD_FAIL_MDS_LOV_SYNC_RACE 0x138 +#define OBD_FAIL_MDS_OSC_PRECREATE 0x139 +#define OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x13a +#define OBD_FAIL_MDS_CLOSE_NET_REP 0x13b +#define OBD_FAIL_MDS_BLOCK_QUOTA_REQ 0x13c +#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_OPEN_WAIT_CREATE 0x143 +#define OBD_FAIL_MDS_READLINK_EPROTO 0x144 + +/* CMD */ +#define OBD_FAIL_MDS_IS_SUBDIR_NET 0x180 +#define OBD_FAIL_MDS_IS_SUBDIR_PACK 0x181 +#define OBD_FAIL_MDS_SET_INFO_NET 0x182 +#define OBD_FAIL_MDS_WRITEPAGE_NET 0x183 +#define OBD_FAIL_MDS_WRITEPAGE_PACK 0x184 +#define OBD_FAIL_MDS_RECOVERY_ACCEPTS_GAPS 0x185 +#define OBD_FAIL_MDS_GET_INFO_NET 0x186 #define OBD_FAIL_OST 0x200 #define OBD_FAIL_OST_CONNECT_NET 0x201 @@ -161,7 +252,7 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_OST_BRW_READ_BULK 0x20f #define OBD_FAIL_OST_SYNC_NET 0x210 #define OBD_FAIL_OST_ALL_REPLY_NET 0x211 -#define OBD_FAIL_OST_ALL_REQUESTS_NET 0x212 +#define OBD_FAIL_OST_ALL_REQUEST_NET 0x212 #define OBD_FAIL_OST_LDLM_REPLY_NET 0x213 #define OBD_FAIL_OST_BRW_PAUSE_BULK 0x214 #define OBD_FAIL_OST_ENOSPC 0x215 @@ -178,6 +269,10 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_OST_BRW_WRITE_BULK2 0x220 #define OBD_FAIL_OST_LLOG_RECOVERY_TIMEOUT 0x221 #define OBD_FAIL_OST_CANCEL_COOKIE_TIMEOUT 0x222 +#define OBD_FAIL_OST_PAUSE_CREATE 0x223 +#define OBD_FAIL_OST_BRW_PAUSE_PACK 0x224 +#define OBD_FAIL_OST_CONNECT_NET2 0x225 +#define OBD_FAIL_OST_NOMEM 0x226 #define OBD_FAIL_LDLM 0x300 #define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301 @@ -197,11 +292,16 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_LDLM_GLIMPSE 0x30f #define OBD_FAIL_LDLM_CANCEL_RACE 0x310 #define OBD_FAIL_LDLM_CANCEL_EVICT_RACE 0x311 -/* #define OBD_FAIL_LDLM_PAUSE_CANCEL 0x312 #define OBD_FAIL_LDLM_CLOSE_THREAD 0x313 -*/ #define OBD_FAIL_LDLM_CANCEL_BL_CB_RACE 0x314 +#define OBD_FAIL_LDLM_CP_CB_WAIT 0x315 +#define OBD_FAIL_LDLM_OST_FAIL_RACE 0x316 +#define OBD_FAIL_LDLM_INTR_CP_AST 0x317 +#define OBD_FAIL_LDLM_CP_BL_RACE 0x318 + +/* LOCKLESS IO */ +#define OBD_FAIL_LDLM_SET_CONTENTION 0x385 #define OBD_FAIL_OSC 0x400 #define OBD_FAIL_OSC_BRW_READ_BULK 0x401 @@ -214,6 +314,11 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_OSC_CHECKSUM_RECEIVE 0x408 #define OBD_FAIL_OSC_CHECKSUM_SEND 0x409 #define OBD_FAIL_OSC_BRW_PREP_REQ2 0x40a +#define OBD_FAIL_OSC_CONNECT_CKSUM 0x40b +#define OBD_FAIL_OSC_CKSUM_ADLER_ONLY 0x40c +#define OBD_FAIL_OSC_DIO_PAUSE 0x40d +#define OBD_FAIL_OSC_OBJECT_CONTENTION 0x40e +#define OBD_FAIL_OSC_CP_CANCEL_RACE 0x40f #define OBD_FAIL_PTLRPC 0x500 #define OBD_FAIL_PTLRPC_ACK 0x501 @@ -223,12 +328,24 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_PTLRPC_DROP_RPC 0x505 #define OBD_FAIL_PTLRPC_DELAY_SEND 0x506 #define OBD_FAIL_PTLRPC_DELAY_RECOV 0x507 +#define OBD_FAIL_PTLRPC_CLIENT_BULK_CB 0x508 +#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 #define OBD_FAIL_OBD_LOGD_NET 0x602 #define OBD_FAIL_OBD_QC_CALLBACK_NET 0x603 #define OBD_FAIL_OBD_DQACQ 0x604 +#define OBD_FAIL_OBD_LLOG_SETUP 0x605 +#define OBD_FAIL_OBD_LOG_CANCEL_REP 0x606 #define OBD_FAIL_TGT_REPLY_NET 0x700 #define OBD_FAIL_TGT_CONN_RACE 0x701 @@ -236,22 +353,30 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_TGT_DELAY_CONNECT 0x703 #define OBD_FAIL_TGT_DELAY_RECONNECT 0x704 #define OBD_FAIL_TGT_DELAY_PRECREATE 0x705 +#define OBD_FAIL_TGT_TOOMANY_THREADS 0x706 +#define OBD_FAIL_TGT_REPLAY_DROP 0x707 +#define OBD_FAIL_TGT_FAKE_EXP 0x708 +#define OBD_FAIL_TGT_REPLAY_DELAY 0x709 +#define OBD_FAIL_TGT_LAST_REPLAY 0x710 #define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800 #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 +#define OBD_FAIL_MDC_OLD_EXT_FLAGS 0x802 +#define OBD_FAIL_MDC_GETATTR_ENQUEUE 0x803 #define OBD_FAIL_MGS 0x900 #define OBD_FAIL_MGS_ALL_REQUEST_NET 0x901 #define OBD_FAIL_MGS_ALL_REPLY_NET 0x902 -#define OBD_FAIL_MGC_PROCESS_LOG 0x903 -#define OBD_FAIL_MGS_SLOW_REQUEST_NET 0x904 -#define OBD_FAIL_MGS_SLOW_TARGET_REG 0x905 +#define OBD_FAIL_MGC_PAUSE_PROCESS_LOG 0x903 +#define OBD_FAIL_MGS_PAUSE_REQ 0x904 +#define OBD_FAIL_MGS_PAUSE_TARGET_REG 0x905 -#define OBD_FAIL_QUOTA_QD_COUNT_32BIT 0xa00 +#define OBD_FAIL_QUOTA_RET_QDATA 0xA02 +#define OBD_FAIL_QUOTA_DELAY_REL 0xA03 -#define OBD_FAIL_LPROC_REMOVE 0xb00 +#define OBD_FAIL_LPROC_REMOVE 0xB00 -#define OBD_FAIL_GENERAL_ALLOC 0xc00 +#define OBD_FAIL_GENERAL_ALLOC 0xC00 #define OBD_FAIL_SEQ 0x1000 #define OBD_FAIL_SEQ_QUERY_NET 0x1001 @@ -263,6 +388,19 @@ int __obd_fail_check_set(__u32 id, __u32 value, int set); #define OBD_FAIL_SEC_CTX_INIT_NET 0x1201 #define OBD_FAIL_SEC_CTX_INIT_CONT_NET 0x1202 #define OBD_FAIL_SEC_CTX_FINI_NET 0x1203 +#define OBD_FAIL_SEC_CTX_HDL_PAUSE 0x1204 + +#define OBD_FAIL_LLOG 0x1300 +#define OBD_FAIL_LLOG_ORIGIN_CONNECT_NET 0x1301 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_CREATE_NET 0x1302 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_DESTROY_NET 0x1303 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_READ_HEADER_NET 0x1304 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_NEXT_BLOCK_NET 0x1305 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_PREV_BLOCK_NET 0x1306 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_WRITE_REC_NET 0x1307 +#define OBD_FAIL_LLOG_ORIGIN_HANDLE_CLOSE_NET 0x1308 +#define OBD_FAIL_LLOG_CATINFO_NET 0x1309 + /* Failure injection control */ #define OBD_FAIL_MASK_SYS 0x0000FF00 @@ -311,28 +449,28 @@ static inline int obd_fail_check_set(__u32 id, __u32 value, int set) obd_fail_check_set(id, value, OBD_FAIL_LOC_RESET) -static inline int obd_fail_timeout_set(__u32 id, __u32 value, int secs, int set) +static inline int obd_fail_timeout_set(__u32 id, __u32 value, int ms, int set) { - int ret = 0; - if (unlikely(OBD_FAIL_PRECHECK(id) && - (ret = __obd_fail_check_set(id, value, set)))) { - CERROR("obd_fail_timeout id %x sleeping for %d secs\n", - id, secs); - set_current_state(TASK_UNINTERRUPTIBLE); - cfs_schedule_timeout(CFS_TASK_UNINT, cfs_time_seconds(secs)); - set_current_state(TASK_RUNNING); - CERROR("obd_fail_timeout id %x awake\n", id); - } - return ret; + if (unlikely(OBD_FAIL_PRECHECK(id))) + return __obd_fail_timeout_set(id, value, ms, set); + else + return 0; } -/* If id hit obd_fail_loc, sleep secs */ +/* If id hit obd_fail_loc, sleep for seconds or milliseconds */ #define OBD_FAIL_TIMEOUT(id, secs) \ - obd_fail_timeout_set(id, 0, secs, OBD_FAIL_LOC_NOSET) + obd_fail_timeout_set(id, 0, secs * 1000, OBD_FAIL_LOC_NOSET) + +#define OBD_FAIL_TIMEOUT_MS(id, ms) \ + obd_fail_timeout_set(id, 0, ms, OBD_FAIL_LOC_NOSET) -/* If id hit obd_fail_loc, obd_fail_loc |= value and sleep secs */ +/* If id hit obd_fail_loc, obd_fail_loc |= value and + * sleep seconds or milliseconds */ #define OBD_FAIL_TIMEOUT_ORSET(id, value, secs) \ - obd_fail_timeout_set(id, value, secs, OBD_FAIL_LOC_ORSET) + obd_fail_timeout_set(id, value, secs * 1000, OBD_FAIL_LOC_ORSET) + +#define OBD_FAIL_TIMEOUT_MS_ORSET(id, value, ms) \ + obd_fail_timeout_set(id, value, ms, OBD_FAIL_LOC_ORSET) #ifdef __KERNEL__ static inline void obd_fail_write(int id, struct super_block *sb) @@ -441,129 +579,16 @@ static inline void obd_pages_sub(int order) #endif -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - -#define OBD_MT_WRONG_SIZE (1 << 0) -#define OBD_MT_ALREADY_FREED (1 << 1) -#define OBD_MT_LOC_LEN 128 - -struct obd_mem_track { - struct hlist_node mt_hash; - char mt_loc[OBD_MT_LOC_LEN]; - int mt_flags; - void *mt_ptr; - int mt_size; -}; - -void lvfs_memdbg_show(void); -void lvfs_memdbg_insert(struct obd_mem_track *mt); -void lvfs_memdbg_remove(struct obd_mem_track *mt); -struct obd_mem_track *lvfs_memdbg_find(void *ptr); - -int lvfs_memdbg_check_insert(struct obd_mem_track *mt); -struct obd_mem_track *lvfs_memdbg_check_remove(void *ptr); - -static inline struct obd_mem_track * -__new_mem_track(void *ptr, int size, - char *file, int line) -{ - struct obd_mem_track *mt; - - mt = kmalloc(sizeof(*mt), GFP_KERNEL); - if (unlikely(!mt)) - return NULL; - - snprintf(mt->mt_loc, sizeof(mt->mt_loc) - 1, - "%s:%d", file, line); - - mt->mt_size = size; - mt->mt_ptr = ptr; - mt->mt_flags = 0; - return mt; -} - -static inline void -__free_mem_track(struct obd_mem_track *mt) -{ - kfree(mt); -} - -static inline int -__get_mem_track(void *ptr, int size, - char *file, int line) -{ - struct obd_mem_track *mt; - - mt = __new_mem_track(ptr, size, file, line); - if (unlikely(!mt)) { - CWARN("Can't allocate new memory track\n"); - return 0; - } - - if (!lvfs_memdbg_check_insert(mt)) - __free_mem_track(mt); - - return 1; -} - -static inline int -__put_mem_track(void *ptr, int size, - char *file, int line) -{ - struct obd_mem_track *mt; - - if (unlikely(!(mt = lvfs_memdbg_check_remove(ptr)))) { - CWARN("Ptr 0x%p is not allocated. Attempt to free " - "not allocated memory at %s:%d\n", ptr, - file, line); - LBUG(); - return 0; - } else { - if (unlikely(mt->mt_size != size)) { - if (!(mt->mt_flags & OBD_MT_ALREADY_FREED)) { - mt->mt_flags |= (OBD_MT_WRONG_SIZE | - OBD_MT_ALREADY_FREED); - - CWARN("Freeing memory chunk (at 0x%p) of " - "different size than allocated " - "(%d != %d) at %s:%d, allocated at %s\n", - ptr, mt->mt_size, size, file, line, - mt->mt_loc); - } - } else { - __free_mem_track(mt); - } - return 1; - } -} - -#define get_mem_track(ptr, size, file, line) \ - __get_mem_track((ptr), (size), (file), (line)) - -#define put_mem_track(ptr, size, file, line) \ - __put_mem_track((ptr), (size), (file), (line)) - -#else /* !CONFIG_DEBUG_MEMORY */ - -#define get_mem_track(ptr, size, file, line) \ - do {} while (0) - -#define put_mem_track(ptr, size, file, line) \ - do {} while (0) -#endif /* !CONFIG_DEBUG_MEMORY */ - #define OBD_DEBUG_MEMUSAGE (1) #if OBD_DEBUG_MEMUSAGE #define OBD_ALLOC_POST(ptr, size, name) \ obd_memory_add(size); \ - get_mem_track((ptr), (size), __FILE__, __LINE__); \ CDEBUG(D_MALLOC, name " '" #ptr "': %d at %p.\n", \ (int)(size), ptr) #define OBD_FREE_PRE(ptr, size, name) \ LASSERT(ptr); \ - put_mem_track((ptr), (size), __FILE__, __LINE__); \ obd_memory_sub(size); \ CDEBUG(D_MALLOC, name " '" #ptr "': %d at %p.\n", \ (int)(size), ptr); \ @@ -721,7 +746,7 @@ do { \ }) #define OBD_SLAB_ALLOC(ptr, slab, type, size) \ do { \ - LASSERT(!in_interrupt()); \ + LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !in_interrupt())); \ (ptr) = cfs_mem_cache_alloc(slab, (type)); \ if (likely((ptr) != NULL && \ (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \ @@ -746,8 +771,11 @@ do { \ OBD_SLAB_ALLOC((ptr), (slab), CFS_ALLOC_STD, sizeof *(ptr)) #define OBD_SLAB_FREE_PTR(ptr, slab) \ OBD_SLAB_FREE((ptr), (slab), sizeof *(ptr)) +#define OBD_SLAB_ALLOC_PTR_GFP(ptr, slab, gfp) \ + OBD_SLAB_ALLOC((ptr), (slab), (gfp), sizeof *(ptr)) -#define KEY_IS(str) (keylen >= strlen(str) && strncmp(key, str, keylen) == 0) +#define KEY_IS(str) \ + (keylen >= (sizeof(str)-1) && memcmp(key, str, (sizeof(str)-1)) == 0) /* Wrapper for contiguous page frame allocation */ #define OBD_PAGES_ALLOC(ptr, order, gfp_mask) \