X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fclass_obd.c;h=2747e10eff2681fa154a1649c1b548f55b1caf0a;hp=e2a0521ab9c24f639ed92300af7c5d815384a802;hb=29e98f581ab68ecdfc1b923925eda2ec5b251f3a;hpb=ef6225af104b9138638c71b80e87786b8e5e75e5 diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index e2a0521..2747e10 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -27,7 +27,7 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -48,6 +48,11 @@ #include #include #include +#include +#ifdef HAVE_SERVER_SUPPORT +# include +# include +#endif /* HAVE_SERVER_SUPPORT */ #include "llog_internal.h" #ifndef __KERNEL__ @@ -60,14 +65,17 @@ EXPORT_SYMBOL(obd_devs); cfs_list_t obd_types; DEFINE_RWLOCK(obd_dev_lock); -#ifndef __KERNEL__ __u64 obd_max_pages = 0; __u64 obd_max_alloc = 0; +#ifndef __KERNEL__ __u64 obd_alloc; __u64 obd_pages; #endif +DEFINE_SPINLOCK(obd_updatemax_lock); /* The following are visible and mutable through /proc/sys/lustre/. */ +unsigned int obd_alloc_fail_rate = 0; +EXPORT_SYMBOL(obd_alloc_fail_rate); unsigned int obd_debug_peer_on_timeout; EXPORT_SYMBOL(obd_debug_peer_on_timeout); unsigned int obd_dump_on_timeout; @@ -82,6 +90,10 @@ unsigned int obd_timeout = OBD_TIMEOUT_DEFAULT; /* seconds */ EXPORT_SYMBOL(obd_timeout); unsigned int ldlm_timeout = LDLM_TIMEOUT_DEFAULT; /* seconds */ EXPORT_SYMBOL(ldlm_timeout); +unsigned int obd_timeout_set; +EXPORT_SYMBOL(obd_timeout_set); +unsigned int ldlm_timeout_set; +EXPORT_SYMBOL(ldlm_timeout_set); /* Adaptive timeout defs here instead of ptlrpc module for /proc/sys/ access */ unsigned int at_min = 0; EXPORT_SYMBOL(at_min); @@ -114,38 +126,71 @@ EXPORT_SYMBOL(obd_jobid_var); */ int lustre_get_jobid(char *jobid) { -#ifdef __KERNEL__ int jobid_len = JOBSTATS_JOBID_SIZE; -#endif - int ret = 0; + int rc = 0; ENTRY; memset(jobid, 0, JOBSTATS_JOBID_SIZE); /* Jobstats isn't enabled */ - if (!memcmp(obd_jobid_var, JOBSTATS_DISABLE, - strlen(JOBSTATS_DISABLE))) { + if (strcmp(obd_jobid_var, JOBSTATS_DISABLE) == 0) RETURN(0); - } /* Use process name + fsuid as jobid */ - if (!memcmp(obd_jobid_var, JOBSTATS_PROCNAME_UID, - strlen(JOBSTATS_PROCNAME_UID))) { - snprintf(jobid, JOBSTATS_JOBID_SIZE, "%s_%u", + if (strcmp(obd_jobid_var, JOBSTATS_PROCNAME_UID) == 0) { + snprintf(jobid, JOBSTATS_JOBID_SIZE, "%s.%u", cfs_curproc_comm(), cfs_curproc_fsuid()); RETURN(0); } -#ifdef __KERNEL__ - ret = cfs_get_environ(obd_jobid_var, jobid, &jobid_len); - if (ret) { - CDEBUG((ret != -ENOENT && ret != -EINVAL) ? D_ERROR : D_INFO, - "Get jobid for (%s) failed(%d).\n", obd_jobid_var, ret); + rc = cfs_get_environ(obd_jobid_var, jobid, &jobid_len); + if (rc) { + if (rc == -EOVERFLOW) { + /* For the PBS_JOBID and LOADL_STEP_ID keys (which are + * variable length strings instead of just numbers), it + * might make sense to keep the unique parts for JobID, + * instead of just returning an error. That means a + * larger temp buffer for cfs_get_environ(), then + * truncating the string at some separator to fit into + * the specified jobid_len. Fix later if needed. */ + static bool printed; + if (unlikely(!printed)) { + LCONSOLE_ERROR_MSG(0x16b, "%s value too large " + "for JobID buffer (%d)\n", + obd_jobid_var, jobid_len); + printed = true; + } + } else { + CDEBUG((rc == -ENOENT || rc == -EINVAL || + rc == -EDEADLK) ? D_INFO : D_ERROR, + "Get jobid for (%s) failed: rc = %d\n", + obd_jobid_var, rc); + } } -#endif - RETURN(ret); + RETURN(rc); } EXPORT_SYMBOL(lustre_get_jobid); +int obd_alloc_fail(const void *ptr, const char *name, const char *type, + size_t size, const char *file, int line) +{ + if (ptr == NULL || + (cfs_rand() & OBD_ALLOC_FAIL_MASK) < obd_alloc_fail_rate) { + CERROR("%s%salloc of %s ("LPU64" bytes) failed at %s:%d\n", + ptr ? "force " :"", type, name, (__u64)size, file, + line); + 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(), + cfs_atomic_read(&libcfs_kmemory)); + return 1; + } + return 0; +} +EXPORT_SYMBOL(obd_alloc_fail); + static inline void obd_data2conn(struct lustre_handle *conn, struct obd_ioctl_data *data) { @@ -481,7 +526,7 @@ int obd_init_checks(void) #define obd_init_checks() do {} while(0) #endif -extern cfs_spinlock_t obd_types_lock; +extern spinlock_t obd_types_lock; extern int class_procfs_init(void); extern int class_procfs_clean(void); @@ -501,7 +546,7 @@ int init_obdclass(void) LCONSOLE_INFO("Lustre: Build Version: "BUILD_VERSION"\n"); - cfs_spin_lock_init(&obd_types_lock); + spin_lock_init(&obd_types_lock); obd_zombie_impexp_init(); #ifdef LPROCFS obd_memory = lprocfs_alloc_stats(OBD_STATS_NUM, @@ -561,6 +606,24 @@ int init_obdclass(void) if (err) return err; + err = cl_global_init(); + if (err != 0) + return err; + +#if defined(__KERNEL__) && defined(HAVE_SERVER_SUPPORT) + err = dt_global_init(); + if (err != 0) + return err; + + err = lu_ucred_global_init(); + if (err != 0) + return err; +#endif + + err = llog_info_init(); + if (err) + return err; + #ifdef __KERNEL__ err = lustre_register_fs(); #endif @@ -568,6 +631,48 @@ int init_obdclass(void) return err; } +void obd_update_maxusage(void) +{ + __u64 max1, max2; + + max1 = obd_pages_sum(); + max2 = obd_memory_sum(); + + spin_lock(&obd_updatemax_lock); + if (max1 > obd_max_pages) + obd_max_pages = max1; + if (max2 > obd_max_alloc) + obd_max_alloc = max2; + spin_unlock(&obd_updatemax_lock); +} +EXPORT_SYMBOL(obd_update_maxusage); + +#ifdef LPROCFS +__u64 obd_memory_max(void) +{ + __u64 ret; + + spin_lock(&obd_updatemax_lock); + ret = obd_max_alloc; + spin_unlock(&obd_updatemax_lock); + + return ret; +} +EXPORT_SYMBOL(obd_memory_max); + +__u64 obd_pages_max(void) +{ + __u64 ret; + + spin_lock(&obd_updatemax_lock); + ret = obd_max_pages; + spin_unlock(&obd_updatemax_lock); + + return ret; +} +EXPORT_SYMBOL(obd_pages_max); +#endif + /* liblustre doesn't call cleanup_obdclass, apparently. we carry on in this * ifdef to the end of the file to cover module and versioning goo.*/ #ifdef __KERNEL__ @@ -591,6 +696,12 @@ static void cleanup_obdclass(void) OBP(obd, detach)(obd); } } + llog_info_fini(); +#ifdef HAVE_SERVER_SUPPORT + lu_ucred_global_fini(); + dt_global_fini(); +#endif + cl_global_fini(); lu_global_fini(); obd_cleanup_caches();