X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=7f01d0f35f35e8b79c4fb99a968c494b64304340;hp=dc86177cccd190c18475b5f22f42751cab2031e4;hb=295968fa7257978bba7aa4fedb28cd3563d4a5e0;hpb=c34e6323a3804477dca7441901e1bf75de4b8c3a;ds=sidebyside diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index dc86177..7f01d0f 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -239,7 +239,9 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_MDS_HSM_REQUEST_NET 0x14c #define OBD_FAIL_MDS_HSM_CT_REGISTER_NET 0x14d #define OBD_FAIL_MDS_HSM_CT_UNREGISTER_NET 0x14e +#define OBD_FAIL_MDS_SWAP_LAYOUTS_NET 0x14f #define OBD_FAIL_MDS_HSM_ACTION_NET 0x150 +#define OBD_FAIL_MDS_CHANGELOG_INIT 0x151 /* layout lock */ #define OBD_FAIL_MDS_NO_LL_GETATTR 0x170 @@ -261,6 +263,9 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_OSD_SCRUB_CRASH 0x191 #define OBD_FAIL_OSD_SCRUB_FATAL 0x192 #define OBD_FAIL_OSD_FID_MAPPING 0x193 +#define OBD_FAIL_OSD_LMA_INCOMPAT 0x194 +#define OBD_FAIL_OSD_COMPAT_INVALID_ENTRY 0x195 +#define OBD_FAIL_OSD_COMPAT_NO_ENTRY 0x196 #define OBD_FAIL_OST 0x200 #define OBD_FAIL_OST_CONNECT_NET 0x201 @@ -335,6 +340,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_LDLM_NEW_LOCK 0x319 #define OBD_FAIL_LDLM_AGL_DELAY 0x31a #define OBD_FAIL_LDLM_AGL_NOLOCK 0x31b +#define OBD_FAIL_LDLM_OST_LVB 0x31c /* LOCKLESS IO */ #define OBD_FAIL_LDLM_SET_CONTENTION 0x385 @@ -391,6 +397,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_OBD_LOG_CANCEL_REP 0x606 #define OBD_FAIL_OBD_IDX_READ_NET 0x607 #define OBD_FAIL_OBD_IDX_READ_BREAK 0x608 +#define OBD_FAIL_OBD_NO_LRU 0x609 #define OBD_FAIL_TGT_REPLY_NET 0x700 #define OBD_FAIL_TGT_CONN_RACE 0x701 @@ -419,6 +426,13 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #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_MGS_CONNECT_NET 0x906 +#define OBD_FAIL_MGS_DISCONNECT_NET 0x907 +#define OBD_FAIL_MGS_SET_INFO_NET 0x908 +#define OBD_FAIL_MGS_EXCEPTION_NET 0x909 +#define OBD_FAIL_MGS_TARGET_REG_NET 0x90a +#define OBD_FAIL_MGS_TARGET_DEL_NET 0x90b +#define OBD_FAIL_MGS_CONFIG_READ_NET 0x90c #define OBD_FAIL_QUOTA_DQACQ_NET 0xA01 #define OBD_FAIL_QUOTA_EDQUOT 0xA02 @@ -460,8 +474,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_LOCK_STATE_WAIT_INTR 0x1402 #define OBD_FAIL_LOV_INIT 0x1403 #define OBD_FAIL_GLIMPSE_DELAY 0x1404 - -#define OBD_FAIL_UPDATE_OBJ_NET 0x1500 +#define OBD_FAIL_LLITE_XATTR_ENOMEM 0x1405 #define OBD_FAIL_FID_INDIR 0x1501 #define OBD_FAIL_FID_INLMA 0x1502 @@ -472,8 +485,20 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, /* LFSCK */ #define OBD_FAIL_LFSCK_DELAY1 0x1600 #define OBD_FAIL_LFSCK_DELAY2 0x1601 +#define OBD_FAIL_LFSCK_DELAY3 0x1602 +#define OBD_FAIL_LFSCK_LINKEA_CRASH 0x1603 +#define OBD_FAIL_LFSCK_LINKEA_MORE 0x1604 +#define OBD_FAIL_LFSCK_LINKEA_MORE2 0x1605 #define OBD_FAIL_LFSCK_FATAL1 0x1608 #define OBD_FAIL_LFSCK_FATAL2 0x1609 +#define OBD_FAIL_LFSCK_CRASH 0x160a +#define OBD_FAIL_LFSCK_NO_AUTO 0x160b +#define OBD_FAIL_LFSCK_NO_DOUBLESCAN 0x160c + +/* UPDATE */ +#define OBD_FAIL_UPDATE_OBJ_NET 0x1700 +#define OBD_FAIL_UPDATE_OBJ_NET_REP 0x1701 + /* Assign references to moved code to reduce code changes */ #define OBD_FAIL_PRECHECK(id) CFS_FAIL_PRECHECK(id) @@ -589,13 +614,12 @@ static inline void obd_pages_sub(int order) #define __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, flags) \ do { \ (ptr) = (cptab) == NULL ? \ - cfs_alloc(size, flags) : \ - cfs_cpt_malloc(cptab, cpt, size, flags); \ + kmalloc(size, flags | __GFP_ZERO) : \ + cfs_cpt_malloc(cptab, cpt, size, flags | __GFP_ZERO); \ if (unlikely((ptr) == NULL)) { \ CERROR("kmalloc of '" #ptr "' (%d bytes) failed at %s:%d\n", \ (int)(size), __FILE__, __LINE__); \ } else { \ - memset(ptr, 0, size); \ CDEBUG(D_MALLOC, "kmalloced '" #ptr "': %d at %p\n", \ (int)(size), ptr); \ } \ @@ -604,7 +628,7 @@ do { \ #else /* this version is for the kernel and liblustre */ #define OBD_FREE_RTN0(ptr) \ ({ \ - cfs_free(ptr); \ + kfree(ptr); \ (ptr) = NULL; \ 0; \ }) @@ -612,14 +636,13 @@ do { \ #define __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, flags) \ do { \ (ptr) = (cptab) == NULL ? \ - cfs_alloc(size, flags) : \ - cfs_cpt_malloc(cptab, cpt, size, flags); \ + kmalloc(size, flags | __GFP_ZERO) : \ + cfs_cpt_malloc(cptab, cpt, size, flags | __GFP_ZERO); \ if (likely((ptr) != NULL && \ (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \ !obd_alloc_fail(ptr, #ptr, "km", size, \ __FILE__, __LINE__) || \ OBD_FREE_RTN0(ptr)))){ \ - memset(ptr, 0, size); \ OBD_ALLOC_POST(ptr, size, "kmalloced"); \ } \ } while (0) @@ -628,8 +651,8 @@ do { \ #define OBD_ALLOC_GFP(ptr, size, gfp_mask) \ __OBD_MALLOC_VERBOSE(ptr, NULL, 0, size, gfp_mask) -#define OBD_ALLOC(ptr, size) OBD_ALLOC_GFP(ptr, size, CFS_ALLOC_IO) -#define OBD_ALLOC_WAIT(ptr, size) OBD_ALLOC_GFP(ptr, size, CFS_ALLOC_STD) +#define OBD_ALLOC(ptr, size) OBD_ALLOC_GFP(ptr, size, __GFP_IO) +#define OBD_ALLOC_WAIT(ptr, size) OBD_ALLOC_GFP(ptr, size, GFP_IOFS) #define OBD_ALLOC_PTR(ptr) OBD_ALLOC(ptr, sizeof *(ptr)) #define OBD_ALLOC_PTR_WAIT(ptr) OBD_ALLOC_WAIT(ptr, sizeof *(ptr)) @@ -637,24 +660,15 @@ do { \ __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, gfp_mask) #define OBD_CPT_ALLOC(ptr, cptab, cpt, size) \ - OBD_CPT_ALLOC_GFP(ptr, cptab, cpt, size, CFS_ALLOC_IO) + OBD_CPT_ALLOC_GFP(ptr, cptab, cpt, size, __GFP_IO) #define OBD_CPT_ALLOC_PTR(ptr, cptab, cpt) \ OBD_CPT_ALLOC(ptr, cptab, cpt, sizeof *(ptr)) -#ifdef __arch_um__ - -# define OBD_VMALLOC(ptr, size) \ - OBD_ALLOC(ptr, size) -# define OBD_CPT_VMALLOC(ptr, cptab, cpt, size) \ - OBD_CPT_ALLOC(ptr, cptab, cpt, size) - -#else /* !__arch_um__ */ - # define __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size) \ do { \ (ptr) = cptab == NULL ? \ - cfs_alloc_large(size) : \ + vmalloc(size) : \ cfs_cpt_vmalloc(cptab, cpt, size); \ if (unlikely((ptr) == NULL)) { \ CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \ @@ -672,8 +686,6 @@ do { \ # define OBD_CPT_VMALLOC(ptr, cptab, cpt, size) \ __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size) -#endif - #ifdef __KERNEL__ /* Allocations above this size are considered too big and could not be done @@ -683,7 +695,7 @@ do { \ * since vmalloc in Linux doesn't perform well on multi-cores system, calling * vmalloc in critical path would hurt peformance badly. See LU-66. */ -#define OBD_ALLOC_BIG (4 * CFS_PAGE_SIZE) +#define OBD_ALLOC_BIG (4 * PAGE_CACHE_SIZE) #define OBD_ALLOC_LARGE(ptr, size) \ do { \ @@ -729,7 +741,7 @@ do { \ #endif #ifdef POISON_BULK -#define POISON_PAGE(page, val) do { memset(kmap(page), val, CFS_PAGE_SIZE); \ +#define POISON_PAGE(page, val) do { memset(kmap(page), val, PAGE_CACHE_SIZE); \ kunmap(page); } while (0) #else #define POISON_PAGE(page, val) do { } while (0) @@ -739,7 +751,7 @@ do { \ #define OBD_FREE(ptr, size) \ do { \ OBD_FREE_PRE(ptr, size, "kfreed"); \ - cfs_free(ptr); \ + kfree(ptr); \ POISON_PTR(ptr); \ } while(0) @@ -760,39 +772,34 @@ do { \ #define OBD_FREE_RCU(ptr, size, handle) (OBD_FREE(ptr, size)) #endif /* ifdef __KERNEL__ */ -#ifdef __arch_um__ -# define OBD_VFREE(ptr, size) OBD_FREE(ptr, size) -#else -# define OBD_VFREE(ptr, size) \ -do { \ - OBD_FREE_PRE(ptr, size, "vfreed"); \ - cfs_free_large(ptr); \ - POISON_PTR(ptr); \ -} while(0) -#endif +#define OBD_VFREE(ptr, size) \ + do { \ + OBD_FREE_PRE(ptr, size, "vfreed"); \ + vfree(ptr); \ + POISON_PTR(ptr); \ + } while (0) /* we memset() the slab object to 0 when allocation succeeds, so DO NOT * HAVE A CTOR THAT DOES ANYTHING. its work will be cleared here. we'd * love to assert on that, but slab.c keeps kmem_cache_s all to itself. */ #define OBD_SLAB_FREE_RTN0(ptr, slab) \ ({ \ - cfs_mem_cache_free((slab), (ptr)); \ + kmem_cache_free((slab), (ptr)); \ (ptr) = NULL; \ 0; \ }) #define __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, cptab, cpt, size, type) \ do { \ - LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !cfs_in_interrupt())); \ + LASSERT(ergo((type) != GFP_ATOMIC, !cfs_in_interrupt())); \ (ptr) = (cptab) == NULL ? \ - cfs_mem_cache_alloc(slab, type) : \ - cfs_mem_cache_cpt_alloc(slab, cptab, cpt, type); \ + kmem_cache_alloc(slab, type | __GFP_ZERO) : \ + cfs_mem_cache_cpt_alloc(slab, cptab, cpt, type | __GFP_ZERO); \ if (likely((ptr) != NULL && \ (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \ !obd_alloc_fail(ptr, #ptr, "slab-", size, \ __FILE__, __LINE__) || \ OBD_SLAB_FREE_RTN0(ptr, slab)))) { \ - memset(ptr, 0, size); \ OBD_ALLOC_POST(ptr, size, "slab-alloced"); \ } \ } while(0) @@ -807,15 +814,15 @@ do { \ #define OBD_SLAB_FREE(ptr, slab, size) \ do { \ OBD_FREE_PRE(ptr, size, "slab-freed"); \ - cfs_mem_cache_free(slab, ptr); \ + kmem_cache_free(slab, ptr); \ POISON_PTR(ptr); \ } while(0) #define OBD_SLAB_ALLOC(ptr, slab, size) \ - OBD_SLAB_ALLOC_GFP(ptr, slab, size, CFS_ALLOC_IO) + OBD_SLAB_ALLOC_GFP(ptr, slab, size, __GFP_IO) #define OBD_SLAB_CPT_ALLOC(ptr, slab, cptab, cpt, size) \ - OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size, CFS_ALLOC_IO) + OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size, __GFP_IO) #define OBD_SLAB_ALLOC_PTR(ptr, slab) \ OBD_SLAB_ALLOC(ptr, slab, sizeof *(ptr)) @@ -826,7 +833,7 @@ do { \ #define OBD_SLAB_ALLOC_PTR_GFP(ptr, slab, flags) \ OBD_SLAB_ALLOC_GFP(ptr, slab, sizeof *(ptr), flags) -#define OBD_SLAB_CPT_ALLOC_PTR_GFP(ptr, slab, ctab, cpt, flags) \ +#define OBD_SLAB_CPT_ALLOC_PTR_GFP(ptr, slab, cptab, cpt, flags) \ OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, sizeof *(ptr), flags) #define OBD_SLAB_FREE_PTR(ptr, slab) \ @@ -839,17 +846,17 @@ do { \ #define __OBD_PAGE_ALLOC_VERBOSE(ptr, cptab, cpt, gfp_mask) \ do { \ (ptr) = (cptab) == NULL ? \ - cfs_alloc_page(gfp_mask) : \ + alloc_page(gfp_mask) : \ cfs_page_cpt_alloc(cptab, cpt, gfp_mask); \ if (unlikely((ptr) == NULL)) { \ CERROR("alloc_pages of '" #ptr "' %d page(s) / "LPU64" bytes "\ "failed\n", (int)1, \ - (__u64)(1 << CFS_PAGE_SHIFT)); \ + (__u64)(1 << PAGE_CACHE_SHIFT)); \ CERROR(LPU64" total bytes and "LPU64" total pages " \ "("LPU64" bytes) allocated by Lustre, " \ "%d total bytes by LNET\n", \ obd_memory_sum(), \ - obd_pages_sum() << CFS_PAGE_SHIFT, \ + obd_pages_sum() << PAGE_CACHE_SHIFT, \ obd_pages_sum(), \ cfs_atomic_read(&libcfs_kmemory)); \ } else { \ @@ -857,7 +864,7 @@ do { \ CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / " \ LPU64" bytes at %p.\n", \ (int)1, \ - (__u64)(1 << CFS_PAGE_SHIFT), ptr); \ + (__u64)(1 << PAGE_CACHE_SHIFT), ptr); \ } \ } while (0) @@ -872,9 +879,9 @@ do { \ obd_pages_sub(0); \ CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / "LPU64" bytes " \ "at %p.\n", \ - (int)1, (__u64)(1 << CFS_PAGE_SHIFT), \ + (int)1, (__u64)(1 << PAGE_CACHE_SHIFT), \ ptr); \ - cfs_free_page(ptr); \ + __free_page(ptr); \ (ptr) = (void *)0xdeadbeef; \ } while (0)