X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=83e9f0999c3c3ff2ab604a02b89cdf3e3cea7d7a;hp=74842e2397257f786d17f387c44d43227153f45b;hb=c0a7f78529e21c9cafa986abea255925b4b41244;hpb=48457868a02ae5a0407f304c9028f7e80e7fb574 diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index 74842e2..83e9f09 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -27,7 +27,6 @@ */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef _OBD_SUPPORT @@ -71,9 +70,6 @@ extern atomic_long_t obd_dirty_pages; extern char obd_jobid_var[]; /* Some hash init argument constants */ -#define HASH_NID_BKT_BITS 5 -#define HASH_NID_CUR_BITS 7 -#define HASH_NID_MAX_BITS 12 #define HASH_NID_STATS_BKT_BITS 5 #define HASH_NID_STATS_CUR_BITS 7 #define HASH_NID_STATS_MAX_BITS 12 @@ -83,9 +79,6 @@ extern char obd_jobid_var[]; #define HASH_LQE_BKT_BITS 5 #define HASH_LQE_CUR_BITS 7 #define HASH_LQE_MAX_BITS 12 -#define HASH_CONN_BKT_BITS 5 -#define HASH_CONN_CUR_BITS 5 -#define HASH_CONN_MAX_BITS 15 #define HASH_EXP_LOCK_BKT_BITS 5 #define HASH_EXP_LOCK_CUR_BITS 7 #define HASH_EXP_LOCK_MAX_BITS 16 @@ -127,13 +120,14 @@ extern char obd_jobid_var[]; #define RECONNECT_DELAY_MAX (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + \ INITIAL_CONNECT_TIMEOUT) /* The min time a target should wait for clients to reconnect in recovery */ -#define OBD_RECOVERY_TIME_MIN (2*RECONNECT_DELAY_MAX) -#define OBD_IR_FACTOR_MIN 1 -#define OBD_IR_FACTOR_MAX 10 -#define OBD_IR_FACTOR_DEFAULT (OBD_IR_FACTOR_MAX/2) +#define OBD_RECOVERY_TIME_MIN (2*RECONNECT_DELAY_MAX) +#define OBD_IR_FACTOR_MIN 1 +#define OBD_IR_FACTOR_MAX 10 +#define OBD_IR_FACTOR_DEFAULT (OBD_IR_FACTOR_MAX/2) /* default timeout for the MGS to become IR_FULL */ -#define OBD_IR_MGS_TIMEOUT (4*obd_timeout) -#define LONG_UNLINK 300 /* Unlink should happen before now */ +#define OBD_IR_MGS_TIMEOUT (4*obd_timeout) +/* Unlink should happen within this many seconds. */ +#define PTLRPC_REQ_LONG_UNLINK 300 /** * Time interval of shrink, if the client is "idle" more than this interval, @@ -238,6 +232,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDS_FLD_LOOKUP 0x15c #define OBD_FAIL_MDS_CHANGELOG_REORDER 0x15d #define OBD_FAIL_MDS_LLOG_UMOUNT_RACE 0x15e +#define OBD_FAIL_MDS_CHANGELOG_RACE 0x15f #define OBD_FAIL_MDS_INTENT_DELAY 0x160 #define OBD_FAIL_MDS_XATTR_REP 0x161 #define OBD_FAIL_MDS_TRACK_OVERFLOW 0x162 @@ -247,6 +242,10 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDS_RMFID_NET 0x166 #define OBD_FAIL_MDS_CREATE_RACE 0x167 #define OBD_FAIL_MDS_STATFS_SPOOF 0x168 +#define OBD_FAIL_MDS_REINT_OPEN 0x169 +#define OBD_FAIL_MDS_REINT_OPEN2 0x16a +#define OBD_FAIL_MDS_COMMITRW_DELAY 0x16b +#define OBD_FAIL_MDS_CHANGELOG_DEL 0x16c /* layout lock */ #define OBD_FAIL_MDS_NO_LL_GETATTR 0x170 @@ -264,6 +263,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDS_DQACQ_NET 0x187 #define OBD_FAIL_MDS_STRIPE_CREATE 0x188 #define OBD_FAIL_MDS_STRIPE_FID 0x189 +#define OBD_FAIL_MDS_LINK_RENAME_RACE 0x18a /* OI scrub */ #define OBD_FAIL_OSD_SCRUB_DELAY 0x190 @@ -276,10 +276,11 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSD_OST_EA_FID_SET 0x197 #define OBD_FAIL_OSD_NO_OI_ENTRY 0x198 #define OBD_FAIL_OSD_INDEX_CRASH 0x199 - #define OBD_FAIL_OSD_TXN_START 0x19a - #define OBD_FAIL_OSD_DUPLICATE_MAP 0x19b +#define OBD_FAIL_OSD_REF_DEL 0x19c +#define OBD_FAIL_OSD_OI_ENOSPC 0x19d +#define OBD_FAIL_OSD_DOTDOT_ENOSPC 0x19e #define OBD_FAIL_OFD_SET_OID 0x1e0 @@ -345,6 +346,9 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OST_PREPARE_DELAY 0x247 #define OBD_FAIL_OST_2BIG_NIOBUF 0x248 #define OBD_FAIL_OST_FALLOCATE_NET 0x249 +#define OBD_FAIL_OST_SEEK_NET 0x24a +#define OBD_FAIL_OST_WR_ATTR_DELAY 0x250 +#define OBD_FAIL_OST_RESTART_IO 0x251 #define OBD_FAIL_LDLM 0x300 #define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301 @@ -392,6 +396,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LDLM_GRANT_CHECK 0x32a #define OBD_FAIL_LDLM_PROLONG_PAUSE 0x32b #define OBD_FAIL_LDLM_LOCAL_CANCEL_PAUSE 0x32c +#define OBD_FAIL_LDLM_LOCK_REPLAY 0x32d +#define OBD_FAIL_LDLM_REPLAY_PAUSE 0x32e /* LOCKLESS IO */ #define OBD_FAIL_LDLM_SET_CONTENTION 0x385 @@ -419,6 +425,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSC_DELAY_IO 0x414 #define OBD_FAIL_OSC_NO_SIZE_DATA 0x415 #define OBD_FAIL_OSC_DELAY_CANCEL 0x416 +#define OBD_FAIL_OSC_SLOW_PAGE_EVICT 0x417 #define OBD_FAIL_PTLRPC 0x500 #define OBD_FAIL_PTLRPC_ACK 0x501 @@ -447,9 +454,13 @@ extern char obd_jobid_var[]; #define OBD_FAIL_PTLRPC_LONG_BOTH_UNLINK 0x51c #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3 0x520 #define OBD_FAIL_PTLRPC_BULK_ATTACH 0x521 +#define OBD_FAIL_PTLRPC_BULK_REPLY_ATTACH 0x522 #define OBD_FAIL_PTLRPC_RESEND_RACE 0x525 #define OBD_FAIL_PTLRPC_ROUND_XID 0x530 #define OBD_FAIL_PTLRPC_CONNECT_RACE 0x531 +#define OBD_FAIL_NET_ERROR_RPC 0x532 +#define OBD_FAIL_PTLRPC_IDLE_RACE 0x533 +#define OBD_FAIL_PTLRPC_ENQ_RESEND 0x534 #define OBD_FAIL_OBD_PING_NET 0x600 /* OBD_FAIL_OBD_LOG_CANCEL_NET 0x601 obsolete since 1.5 */ @@ -490,6 +501,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_TGT_RECOVERY_REQ_RACE 0x721 #define OBD_FAIL_TGT_REPLY_DATA_RACE 0x722 #define OBD_FAIL_TGT_RECOVERY_CONNECT 0x724 +#define OBD_FAIL_TGT_NO_GRANT 0x725 #define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800 #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 @@ -561,6 +573,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LLOG_PURGE_DELAY 0x1318 #define OBD_FAIL_PLAIN_RECORDS 0x1319 #define OBD_FAIL_CATALOG_FULL_CHECK 0x131a +#define OBD_FAIL_CATLIST 0x131b +#define OBD_FAIL_LLOG_PAUSE_AFTER_PAD 0x131c #define OBD_FAIL_LLITE 0x1400 #define OBD_FAIL_LLITE_FAULT_TRUNC_RACE 0x1401 @@ -584,6 +598,10 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LLITE_PCC_MKWRITE_PAUSE 0x1413 #define OBD_FAIL_LLITE_PCC_ATTACH_PAUSE 0x1414 #define OBD_FAIL_LLITE_SHORT_COMMIT 0x1415 +#define OBD_FAIL_LLITE_CREATE_FILE_PAUSE2 0x1416 +#define OBD_FAIL_LLITE_RACE_MOUNT 0x1417 +#define OBD_FAIL_LLITE_PAGE_ALLOC 0x1418 +#define OBD_FAIL_LLITE_OPEN_DELAY 0x1419 #define OBD_FAIL_FID_INDIR 0x1501 #define OBD_FAIL_FID_INLMA 0x1502 @@ -648,6 +666,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LARGE_STRIPE 0x1703 #define OBD_FAIL_OUT_ENOSPC 0x1704 #define OBD_FAIL_INVALIDATE_UPDATE 0x1705 +#define OBD_FAIL_OUT_UPDATE_DROP 0x1707 +#define OBD_FAIL_OUT_OBJECT_MISS 0x1708 /* MIGRATE */ #define OBD_FAIL_MIGRATE_ENTRIES 0x1801 @@ -695,6 +715,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSP_RPCS_SEM 0x2104 #define OBD_FAIL_OSP_CANT_PROCESS_LLOG 0x2105 #define OBD_FAIL_OSP_INVALID_LOGID 0x2106 +#define OBD_FAIL_OSP_CON_EVENT_DELAY 0x2107 +#define OBD_FAIL_OSP_PRECREATE_PAUSE 0x2108 /* barrier */ #define OBD_FAIL_MGS_BARRIER_READ_NET 0x2200 @@ -725,7 +747,7 @@ extern char obd_jobid_var[]; #define LUT_FAIL_MDT LUT_FAIL_CLASS(OBD_FAIL_MDS) #define LUT_FAIL_OST LUT_FAIL_CLASS(OBD_FAIL_OST) -extern atomic_t libcfs_kmemory; +extern atomic64_t libcfs_kmem; #ifdef CONFIG_PROC_FS #define obd_memory_add(size) \ @@ -822,14 +844,13 @@ do { \ #define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \ do { \ (ptr) = cptab == NULL ? \ - __vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO, \ - PAGE_KERNEL) : \ + __ll_vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO) : \ cfs_cpt_vzalloc(cptab, cpt, size); \ if (unlikely((ptr) == NULL)) { \ CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \ (int)(size)); \ - CERROR("%llu total bytes allocated by Lustre, %d by LNET\n", \ - obd_memory_sum(), atomic_read(&libcfs_kmemory)); \ + CERROR("%llu total bytes allocated by Lustre, %lld by LNET\n",\ + obd_memory_sum(), libcfs_kmem_read());\ } else { \ OBD_ALLOC_POST(ptr, size, "vmalloced"); \ } \ @@ -889,7 +910,7 @@ do { \ if (is_vmalloc_addr(ptr)) { \ OBD_FREE_PRE(ptr, size, "vfreed"); \ POISON(ptr, 0x5a, size); \ - vfree(ptr); \ + libcfs_vfree_atomic(ptr); \ POISON_PTR(ptr); \ } else { \ OBD_FREE(ptr, size); \ @@ -913,7 +934,7 @@ do { \ do { \ LASSERT(ergo((type) != GFP_ATOMIC, !in_interrupt())); \ (ptr) = (cptab) == NULL ? \ - kmem_cache_alloc(slab, (type) | __GFP_ZERO) : \ + kmem_cache_zalloc(slab, (type)) : \ cfs_mem_cache_cpt_alloc(slab, cptab, cpt, (type) | __GFP_ZERO); \ if (likely((ptr))) \ OBD_ALLOC_POST(ptr, size, "slab-alloced"); \ @@ -959,17 +980,21 @@ do { \ #define KEY_IS(str) \ (keylen >= (sizeof(str)-1) && memcmp(key, str, (sizeof(str)-1)) == 0) +#ifdef HAVE_SERVER_SUPPORT /* LUSTRE_LMA_FL_MASKS defines which flags will be stored in LMA */ static inline int lma_to_lustre_flags(__u32 lma_flags) { - return (lma_flags & LMAI_ORPHAN) ? LUSTRE_ORPHAN_FL : 0; + return (((lma_flags & LMAI_ORPHAN) ? LUSTRE_ORPHAN_FL : 0) | + ((lma_flags & LMAI_ENCRYPT) ? LUSTRE_ENCRYPT_FL : 0)); } static inline int lustre_to_lma_flags(__u32 la_flags) { - return (la_flags & LUSTRE_ORPHAN_FL) ? LMAI_ORPHAN : 0; + return (((la_flags & LUSTRE_ORPHAN_FL) ? LMAI_ORPHAN : 0) | + ((la_flags & LUSTRE_ENCRYPT_FL) ? LMAI_ENCRYPT : 0)); } +#endif /* HAVE_SERVER_SUPPORT */ /* Convert wire LUSTRE_*_FL to corresponding client local VFS S_* values * for the client inode i_flags. The LUSTRE_*_FL are the Lustre wire @@ -978,22 +1003,28 @@ static inline int lustre_to_lma_flags(__u32 la_flags) * versions. These flags are set/cleared via FSFILT_IOC_{GET,SET}_FLAGS. * See b=16526 for a full history. */ -static inline int ll_ext_to_inode_flags(int flags) +static inline int ll_ext_to_inode_flags(int ext_flags) { - return (((flags & LUSTRE_SYNC_FL) ? S_SYNC : 0) | - ((flags & LUSTRE_NOATIME_FL) ? S_NOATIME : 0) | - ((flags & LUSTRE_APPEND_FL) ? S_APPEND : 0) | - ((flags & LUSTRE_DIRSYNC_FL) ? S_DIRSYNC : 0) | - ((flags & LUSTRE_IMMUTABLE_FL) ? S_IMMUTABLE : 0)); + return (((ext_flags & LUSTRE_SYNC_FL) ? S_SYNC : 0) | + ((ext_flags & LUSTRE_NOATIME_FL) ? S_NOATIME : 0) | + ((ext_flags & LUSTRE_APPEND_FL) ? S_APPEND : 0) | + ((ext_flags & LUSTRE_DIRSYNC_FL) ? S_DIRSYNC : 0) | +#if defined(S_ENCRYPTED) + ((ext_flags & LUSTRE_ENCRYPT_FL) ? S_ENCRYPTED : 0) | +#endif + ((ext_flags & LUSTRE_IMMUTABLE_FL) ? S_IMMUTABLE : 0)); } -static inline int ll_inode_to_ext_flags(int iflags) +static inline int ll_inode_to_ext_flags(int inode_flags) { - return (((iflags & S_SYNC) ? LUSTRE_SYNC_FL : 0) | - ((iflags & S_NOATIME) ? LUSTRE_NOATIME_FL : 0) | - ((iflags & S_APPEND) ? LUSTRE_APPEND_FL : 0) | - ((iflags & S_DIRSYNC) ? LUSTRE_DIRSYNC_FL : 0) | - ((iflags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0)); + return (((inode_flags & S_SYNC) ? LUSTRE_SYNC_FL : 0) | + ((inode_flags & S_NOATIME) ? LUSTRE_NOATIME_FL : 0) | + ((inode_flags & S_APPEND) ? LUSTRE_APPEND_FL : 0) | + ((inode_flags & S_DIRSYNC) ? LUSTRE_DIRSYNC_FL : 0) | +#if defined(S_ENCRYPTED) + ((inode_flags & S_ENCRYPTED) ? LUSTRE_ENCRYPT_FL : 0) | +#endif + ((inode_flags & S_IMMUTABLE) ? LUSTRE_IMMUTABLE_FL : 0)); } struct obd_heat_instance { @@ -1002,4 +1033,9 @@ struct obd_heat_instance { __u64 ohi_count; }; +/* Define a fixed 4096-byte encryption unit size */ +#define LUSTRE_ENCRYPTION_BLOCKBITS 12 +#define LUSTRE_ENCRYPTION_UNIT_SIZE ((size_t)1 << LUSTRE_ENCRYPTION_BLOCKBITS) +#define LUSTRE_ENCRYPTION_MASK (~(LUSTRE_ENCRYPTION_UNIT_SIZE - 1)) + #endif