X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_config.c;h=8a6766f8b12cdf74a29b68952cdf6ac178e2b47c;hp=4ed54804de542a9e4248b0d03d3da29e5709e87c;hb=b3f5156084edcebb714bb6d77fca4152fe3b045f;hpb=08c53e15cbaa8a31032a52234e79b9ea769e2013 diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c index 4ed5480..8a6766f 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -51,10 +51,10 @@ #include #include #include -#include -extern struct lustre_hash_operations uuid_hash_operations; -extern struct lustre_hash_operations nid_hash_operations; +static cfs_hash_ops_t uuid_hash_ops; +static cfs_hash_ops_t nid_hash_ops; +static cfs_hash_ops_t nid_stat_hash_ops; /*********** string parsing utils *********/ @@ -75,6 +75,72 @@ int class_find_param(char *buf, char *key, char **valp) return 0; } +/** + * Finds a parameter in \a params and copies it to \a copy. + * + * Leading spaces are skipped. Next space or end of string is the + * parameter terminator with the exception that spaces inside single or double + * quotes get included into a parameter. The parameter is copied into \a copy + * which has to be allocated big enough by a caller, quotes are stripped in + * the copy and the copy is terminated by 0. + * + * On return \a params is set to next parameter or to NULL if last + * parameter is returned. + * + * \retval 0 if parameter is returned in \a copy + * \retval 1 otherwise + * \retval -EINVAL if unbalanced quota is found + */ +int class_get_next_param(char **params, char *copy) +{ + char *q1, *q2, *str; + int len; + + str = *params; + while (*str == ' ') + str++; + + if (*str == '\0') { + *params = NULL; + return 1; + } + + while (1) { + q1 = strpbrk(str, " '\""); + if (q1 == NULL) { + len = strlen(str); + memcpy(copy, str, len); + copy[len] = '\0'; + *params = NULL; + return 0; + } + len = q1 - str; + if (*q1 == ' ') { + memcpy(copy, str, len); + copy[len] = '\0'; + *params = str + len; + return 0; + } + + memcpy(copy, str, len); + copy += len; + + /* search for the matching closing quote */ + str = q1 + 1; + q2 = strchr(str, *q1); + if (q2 == NULL) { + CERROR("Unbalanced quota in parameters: \"%s\"\n", + *params); + return -EINVAL; + } + len = q2 - str; + memcpy(copy, str, len); + copy += len; + str = q2 + 1; + } + return 1; +} + /* returns 0 if this is the first key in the buffer, else 1. valp points to first char after key. */ int class_match_param(char *buf, char *key, char **valp) @@ -128,6 +194,7 @@ int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh) } EXPORT_SYMBOL(class_find_param); +EXPORT_SYMBOL(class_get_next_param); EXPORT_SYMBOL(class_match_param); EXPORT_SYMBOL(class_parse_nid); @@ -179,38 +246,39 @@ int class_attach(struct lustre_cfg *lcfg) LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC, "obd %p obd_magic %08X != %08X\n", obd, obd->obd_magic, OBD_DEVICE_MAGIC); - LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0, "%p obd_name %s != %s\n", - obd, obd->obd_name, name); + LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0, + "%p obd_name %s != %s\n", obd, obd->obd_name, name); - rwlock_init(&obd->obd_pool_lock); + cfs_rwlock_init(&obd->obd_pool_lock); obd->obd_pool_limit = 0; obd->obd_pool_slv = 0; CFS_INIT_LIST_HEAD(&obd->obd_exports); + CFS_INIT_LIST_HEAD(&obd->obd_unlinked_exports); + CFS_INIT_LIST_HEAD(&obd->obd_delayed_exports); CFS_INIT_LIST_HEAD(&obd->obd_exports_timed); CFS_INIT_LIST_HEAD(&obd->obd_nid_stats); - spin_lock_init(&obd->obd_nid_lock); - spin_lock_init(&obd->obd_dev_lock); - sema_init(&obd->obd_dev_sem, 1); - spin_lock_init(&obd->obd_osfs_lock); + cfs_spin_lock_init(&obd->obd_nid_lock); + cfs_spin_lock_init(&obd->obd_dev_lock); + cfs_sema_init(&obd->obd_dev_sem, 1); + cfs_spin_lock_init(&obd->obd_osfs_lock); /* obd->obd_osfs_age must be set to a value in the distant * past to guarantee a fresh statfs is fetched on mount. */ obd->obd_osfs_age = cfs_time_shift_64(-1000); /* XXX belongs in setup not attach */ + cfs_init_rwsem(&obd->obd_observer_link_sem); /* recovery data */ cfs_init_timer(&obd->obd_recovery_timer); - spin_lock_init(&obd->obd_processing_task_lock); + cfs_spin_lock_init(&obd->obd_processing_task_lock); cfs_waitq_init(&obd->obd_next_transno_waitq); cfs_waitq_init(&obd->obd_evict_inprogress_waitq); CFS_INIT_LIST_HEAD(&obd->obd_req_replay_queue); CFS_INIT_LIST_HEAD(&obd->obd_lock_replay_queue); CFS_INIT_LIST_HEAD(&obd->obd_final_req_queue); + CFS_INIT_LIST_HEAD(&obd->obd_evict_list); - llog_group_init(&obd->obd_olg, OBD_LLOG_GROUP); - - spin_lock_init(&obd->obd_uncommitted_replies_lock); - CFS_INIT_LIST_HEAD(&obd->obd_uncommitted_replies); + llog_group_init(&obd->obd_olg, FILTER_GROUP_LLOG); len = strlen(uuid); if (len >= sizeof(obd->obd_uuid)) { @@ -228,13 +296,15 @@ int class_attach(struct lustre_cfg *lcfg) } /* Detach drops this */ - spin_lock(&obd->obd_dev_lock); - atomic_set(&obd->obd_refcount, 1); - spin_unlock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); + cfs_atomic_set(&obd->obd_refcount, 1); + cfs_spin_unlock(&obd->obd_dev_lock); + lu_ref_init(&obd->obd_reference); + lu_ref_add(&obd->obd_reference, "attach", obd); obd->obd_attached = 1; CDEBUG(D_IOCTL, "OBD: dev %d attached type %s with refcount %d\n", - obd->obd_minor, typename, atomic_read(&obd->obd_refcount)); + obd->obd_minor, typename, cfs_atomic_read(&obd->obd_refcount)); RETURN(0); out: if (obd != NULL) { @@ -270,9 +340,9 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) } /* is someone else setting us up right now? (attach inits spinlock) */ - spin_lock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); if (obd->obd_starting) { - spin_unlock(&obd->obd_dev_lock); + cfs_spin_unlock(&obd->obd_dev_lock); CERROR("Device %d setup in progress (type %s)\n", obd->obd_minor, obd->obd_type->typ_name); RETURN(-EEXIST); @@ -280,32 +350,41 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) /* just leave this on forever. I can't use obd_set_up here because other fns check that status, and we're not actually set up yet. */ obd->obd_starting = 1; - spin_unlock(&obd->obd_dev_lock); - - /* create an uuid-export hash body */ - err = lustre_hash_init(&obd->obd_uuid_hash_body, "UUID_HASH", - 128, &uuid_hash_operations); - if (err) - GOTO(err_hash, err); - - /* create a nid-export hash body */ - err = lustre_hash_init(&obd->obd_nid_hash_body, "NID_HASH", - 128, &nid_hash_operations); - if (err) - GOTO(err_hash, err); - - /* create a nid-stats hash body */ - err = lustre_hash_init(&obd->obd_nid_stats_hash_body, "NID_STATS", - 128, &nid_stat_hash_operations); - if (err) - GOTO(err_hash, err); + obd->obd_uuid_hash = NULL; + obd->obd_nid_hash = NULL; + obd->obd_nid_stats_hash = NULL; + cfs_spin_unlock(&obd->obd_dev_lock); + + /* create an uuid-export lustre hash */ + obd->obd_uuid_hash = cfs_hash_create("UUID_HASH", + HASH_UUID_CUR_BITS, + HASH_UUID_MAX_BITS, + &uuid_hash_ops, CFS_HASH_REHASH); + if (!obd->obd_uuid_hash) + GOTO(err_hash, err = -ENOMEM); + + /* create a nid-export lustre hash */ + obd->obd_nid_hash = cfs_hash_create("NID_HASH", + HASH_NID_CUR_BITS, + HASH_NID_MAX_BITS, + &nid_hash_ops, CFS_HASH_REHASH); + if (!obd->obd_nid_hash) + GOTO(err_hash, err = -ENOMEM); + + /* create a nid-stats lustre hash */ + obd->obd_nid_stats_hash = cfs_hash_create("NID_STATS", + HASH_NID_STATS_CUR_BITS, + HASH_NID_STATS_MAX_BITS, + &nid_stat_hash_ops, CFS_HASH_REHASH); + if (!obd->obd_nid_stats_hash) + GOTO(err_hash, err = -ENOMEM); exp = class_new_export(obd, &obd->obd_uuid); if (IS_ERR(exp)) - RETURN(PTR_ERR(exp)); + GOTO(err_hash, err = PTR_ERR(exp)); obd->obd_self_export = exp; - list_del_init(&exp->exp_obd_chain_timed); + cfs_list_del_init(&exp->exp_obd_chain_timed); class_export_put(exp); err = obd_setup(obd, lcfg); @@ -314,26 +393,36 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) obd->obd_set_up = 1; - spin_lock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); /* cleanup drops this */ - class_incref(obd); - spin_unlock(&obd->obd_dev_lock); + class_incref(obd, "setup", obd); + cfs_spin_unlock(&obd->obd_dev_lock); CDEBUG(D_IOCTL, "finished setup of obd %s (uuid %s)\n", obd->obd_name, obd->obd_uuid.uuid); RETURN(0); - err_exp: - class_unlink_export(obd->obd_self_export); - obd->obd_self_export = NULL; + if (obd->obd_self_export) { + class_unlink_export(obd->obd_self_export); + obd->obd_self_export = NULL; + } err_hash: - lustre_hash_exit(&obd->obd_uuid_hash_body); - lustre_hash_exit(&obd->obd_nid_hash_body); - lustre_hash_exit(&obd->obd_nid_stats_hash_body); + if (obd->obd_uuid_hash) { + cfs_hash_destroy(obd->obd_uuid_hash); + obd->obd_uuid_hash = NULL; + } + if (obd->obd_nid_hash) { + cfs_hash_destroy(obd->obd_nid_hash); + obd->obd_nid_hash = NULL; + } + if (obd->obd_nid_stats_hash) { + cfs_hash_destroy(obd->obd_nid_stats_hash); + obd->obd_nid_stats_hash = NULL; + } obd->obd_starting = 0; CERROR("setup %s failed (%d)\n", obd->obd_name, err); - RETURN(err); + return err; } int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg) @@ -345,19 +434,19 @@ int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(-EBUSY); } - spin_lock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); if (!obd->obd_attached) { - spin_unlock(&obd->obd_dev_lock); + cfs_spin_unlock(&obd->obd_dev_lock); CERROR("OBD device %d not attached\n", obd->obd_minor); RETURN(-ENODEV); } obd->obd_attached = 0; - spin_unlock(&obd->obd_dev_lock); + cfs_spin_unlock(&obd->obd_dev_lock); CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n", obd->obd_name, obd->obd_uuid.uuid); - class_decref(obd); + class_decref(obd, "attach", obd); /* not strictly necessary, but cleans up eagerly */ obd_zombie_impexp_cull(); @@ -365,31 +454,6 @@ int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(0); } -static void dump_exports(struct obd_device *obd) -{ - struct obd_export *exp, *n; - - list_for_each_entry_safe(exp, n, &obd->obd_exports, exp_obd_chain) { - struct ptlrpc_reply_state *rs; - struct ptlrpc_reply_state *first_reply = NULL; - int nreplies = 0; - - list_for_each_entry (rs, &exp->exp_outstanding_replies, - rs_exp_list) { - if (nreplies == 0) - first_reply = rs; - nreplies++; - } - - CDEBUG(D_IOCTL, "%s: %p %s %s %d %d %d: %p %s\n", - obd->obd_name, exp, exp->exp_client_uuid.uuid, - obd_export_nid2str(exp), - atomic_read(&exp->exp_refcount), - exp->exp_failed, nreplies, first_reply, - nreplies > 3 ? "..." : ""); - } -} - int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) { int err = 0; @@ -403,15 +467,15 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(-ENODEV); } - spin_lock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); if (obd->obd_stopping) { - spin_unlock(&obd->obd_dev_lock); + cfs_spin_unlock(&obd->obd_dev_lock); CERROR("OBD %d already stopping\n", obd->obd_minor); RETURN(-ENODEV); } /* Leave this on forever */ obd->obd_stopping = 1; - spin_unlock(&obd->obd_dev_lock); + cfs_spin_unlock(&obd->obd_dev_lock); if (lcfg->lcfg_bufcount >= 2 && LUSTRE_CFG_BUFLEN(lcfg, 1) > 0) { for (flag = lustre_cfg_string(lcfg, 1); *flag != 0; flag++) @@ -425,79 +489,84 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) obd->obd_fail = 1; obd->obd_no_transno = 1; obd->obd_no_recov = 1; - /* Set the obd readonly if we can */ - if (OBP(obd, iocontrol)) + if (OBP(obd, iocontrol)) { + obd_iocontrol(OBD_IOC_SYNC, + obd->obd_self_export, + 0, NULL, NULL); + /* Set the obd readonly if we can */ obd_iocontrol(OBD_IOC_SET_READONLY, obd->obd_self_export, 0, NULL, NULL); + } break; default: - CERROR("unrecognised flag '%c'\n", - *flag); + CERROR("Unrecognised flag '%c'\n", *flag); } } + LASSERT(obd->obd_self_export); + /* The three references that should be remaining are the * obd_self_export and the attach and setup references. */ - if (atomic_read(&obd->obd_refcount) > 3) { -#if 0 /* We should never fail to cleanup with mountconf */ - if (!(obd->obd_fail || obd->obd_force)) { - CERROR("OBD %s is still busy with %d references\n" - "You should stop active file system users," - " or use the --force option to cleanup.\n", - obd->obd_name, atomic_read(&obd->obd_refcount)); - dump_exports(obd); - /* Allow a failed cleanup to try again. */ - obd->obd_stopping = 0; - } -#endif + if (cfs_atomic_read(&obd->obd_refcount) > 3) { /* refcounf - 3 might be the number of real exports (excluding self export). But class_incref is called by other things as well, so don't count on it. */ CDEBUG(D_IOCTL, "%s: forcing exports to disconnect: %d\n", - obd->obd_name, atomic_read(&obd->obd_refcount) - 3); - dump_exports(obd); + obd->obd_name, cfs_atomic_read(&obd->obd_refcount) - 3); + dump_exports(obd, 0); class_disconnect_exports(obd); } - LASSERT(obd->obd_self_export); /* destroy an uuid-export hash body */ - lustre_hash_exit(&obd->obd_uuid_hash_body); + if (obd->obd_uuid_hash) { + cfs_hash_destroy(obd->obd_uuid_hash); + obd->obd_uuid_hash = NULL; + } /* destroy a nid-export hash body */ - lustre_hash_exit(&obd->obd_nid_hash_body); + if (obd->obd_nid_hash) { + cfs_hash_destroy(obd->obd_nid_hash); + obd->obd_nid_hash = NULL; + } /* destroy a nid-stats hash body */ - lustre_hash_exit(&obd->obd_nid_stats_hash_body); + if (obd->obd_nid_stats_hash) { + cfs_hash_destroy(obd->obd_nid_stats_hash); + obd->obd_nid_stats_hash = NULL; + } /* Precleanup, we must make sure all exports get destroyed. */ err = obd_precleanup(obd, OBD_CLEANUP_EXPORTS); if (err) CERROR("Precleanup %s returned %d\n", obd->obd_name, err); - class_decref(obd); + class_decref(obd, "setup", obd); obd->obd_set_up = 0; RETURN(0); } -struct obd_device *class_incref(struct obd_device *obd) +struct obd_device *class_incref(struct obd_device *obd, + const char *scope, const void *source) { - atomic_inc(&obd->obd_refcount); + lu_ref_add_atomic(&obd->obd_reference, scope, source); + cfs_atomic_inc(&obd->obd_refcount); CDEBUG(D_INFO, "incref %s (%p) now %d\n", obd->obd_name, obd, - atomic_read(&obd->obd_refcount)); + cfs_atomic_read(&obd->obd_refcount)); return obd; } -void class_decref(struct obd_device *obd) +void class_decref(struct obd_device *obd, const char *scope, const void *source) { int err; int refs; - spin_lock(&obd->obd_dev_lock); - atomic_dec(&obd->obd_refcount); - refs = atomic_read(&obd->obd_refcount); - spin_unlock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_dev_lock); + cfs_atomic_dec(&obd->obd_refcount); + refs = cfs_atomic_read(&obd->obd_refcount); + cfs_spin_unlock(&obd->obd_dev_lock); + lu_ref_del(&obd->obd_reference, scope, source); CDEBUG(D_INFO, "Decref %s (%p) now %d\n", obd->obd_name, obd, refs); @@ -505,11 +574,9 @@ void class_decref(struct obd_device *obd) /* All exports have been destroyed; there should be no more in-progress ops by this point.*/ - spin_lock(&obd->obd_self_export->exp_lock); - obd->obd_self_export->exp_flags |= - (obd->obd_fail ? OBD_OPT_FAILOVER : 0) | - (obd->obd_force ? OBD_OPT_FORCE : 0); - spin_unlock(&obd->obd_self_export->exp_lock); + cfs_spin_lock(&obd->obd_self_export->exp_lock); + obd->obd_self_export->exp_flags |= exp_flags_from_obd(obd); + cfs_spin_unlock(&obd->obd_self_export->exp_lock); /* note that we'll recurse into class_decref again */ class_unlink_export(obd->obd_self_export); @@ -528,7 +595,7 @@ void class_decref(struct obd_device *obd) obd->obd_name, err); } if (OBP(obd, detach)) { - err = OBP(obd,detach)(obd); + err = OBP(obd, detach)(obd); if (err) CERROR("Detach returned %d\n", err); } @@ -604,7 +671,7 @@ struct lustre_profile *class_get_profile(const char * prof) struct lustre_profile *lprof; ENTRY; - list_for_each_entry(lprof, &lustre_profile_list, lp_list) { + cfs_list_for_each_entry(lprof, &lustre_profile_list, lp_list) { if (!strcmp(lprof->lp_profile, prof)) { RETURN(lprof); } @@ -646,7 +713,7 @@ int class_add_profile(int proflen, char *prof, int osclen, char *osc, memcpy(lprof->lp_md, mdc, mdclen); } - list_add(&lprof->lp_list, &lustre_profile_list); + cfs_list_add(&lprof->lp_list, &lustre_profile_list); RETURN(err); out: @@ -669,7 +736,7 @@ void class_del_profile(const char *prof) lprof = class_get_profile(prof); if (lprof) { - list_del(&lprof->lp_list); + cfs_list_del(&lprof->lp_list); OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1); OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1); if (lprof->lp_md) @@ -685,8 +752,8 @@ void class_del_profiles(void) struct lustre_profile *lprof, *n; ENTRY; - list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) { - list_del(&lprof->lp_list); + cfs_list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) { + cfs_list_del(&lprof->lp_list); OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1); OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1); if (lprof->lp_md) @@ -696,6 +763,28 @@ void class_del_profiles(void) EXIT; } +static int class_set_global(char *ptr, int val) { + ENTRY; + + if (class_match_param(ptr, PARAM_AT_MIN, NULL) == 0) + at_min = val; + else if (class_match_param(ptr, PARAM_AT_MAX, NULL) == 0) + at_max = val; + else if (class_match_param(ptr, PARAM_AT_EXTRA, NULL) == 0) + at_extra = val; + else if (class_match_param(ptr, PARAM_AT_EARLY_MARGIN, NULL) == 0) + at_early_margin = val; + else if (class_match_param(ptr, PARAM_AT_HISTORY, NULL) == 0) + at_history = val; + else + RETURN(-EINVAL); + + CDEBUG(D_IOCTL, "global %s = %d\n", ptr, val); + + RETURN(0); +} + + /* We can't call ll_process_config directly because it lives in a module that must be loaded after this one. */ static int (*client_process_config)(struct lustre_cfg *lcfg) = NULL; @@ -763,6 +852,15 @@ int class_process_config(struct lustre_cfg *lcfg) obd_timeout = max(lcfg->lcfg_num, 1U); GOTO(out, err = 0); } + case LCFG_SET_LDLM_TIMEOUT: { + CDEBUG(D_IOCTL, "changing lustre ldlm_timeout from %d to %d\n", + ldlm_timeout, lcfg->lcfg_num); + ldlm_timeout = max(lcfg->lcfg_num, 1U); + if (ldlm_timeout >= obd_timeout) + ldlm_timeout = max(obd_timeout / 3, 1U); + + GOTO(out, err = 0); + } case LCFG_SET_UPCALL: { LCONSOLE_ERROR_MSG(0x15a, "recovery upcall is deprecated\n"); /* COMPAT_146 Don't fail on old configs */ @@ -776,13 +874,24 @@ int class_process_config(struct lustre_cfg *lcfg) GOTO(out, err = 0); } case LCFG_PARAM: { + char *tmp; /* llite has no obd */ if ((class_match_param(lustre_cfg_string(lcfg, 1), PARAM_LLITE, 0) == 0) && client_process_config) { err = (*client_process_config)(lcfg); GOTO(out, err); + } else if ((class_match_param(lustre_cfg_string(lcfg, 1), + PARAM_SYS, &tmp) == 0)) { + /* Global param settings */ + err = class_set_global(tmp, lcfg->lcfg_num); + /* Note that since LCFG_PARAM is LCFG_REQUIRED, new + unknown globals would cause config to fail */ + if (err) + CWARN("Ignoring unknown param %s\n", tmp); + GOTO(out, 0); } + /* Fall through */ break; } @@ -821,6 +930,28 @@ int class_process_config(struct lustre_cfg *lcfg) err = class_del_conn(obd, lcfg); GOTO(out, err = 0); } + case LCFG_POOL_NEW: { + err = obd_pool_new(obd, lustre_cfg_string(lcfg, 2)); + GOTO(out, err = 0); + break; + } + case LCFG_POOL_ADD: { + err = obd_pool_add(obd, lustre_cfg_string(lcfg, 2), + lustre_cfg_string(lcfg, 3)); + GOTO(out, err = 0); + break; + } + case LCFG_POOL_REM: { + err = obd_pool_rem(obd, lustre_cfg_string(lcfg, 2), + lustre_cfg_string(lcfg, 3)); + GOTO(out, err = 0); + break; + } + case LCFG_POOL_DEL: { + err = obd_pool_del(obd, lustre_cfg_string(lcfg, 2)); + GOTO(out, err = 0); + break; + } default: { err = obd_process_config(obd, sizeof(*lcfg), lcfg); GOTO(out, err); @@ -845,6 +976,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, int i, keylen, vallen; int matched = 0, j = 0; int rc = 0; + int skip = 0; ENTRY; if (lcfg->lcfg_command != LCFG_PARAM) { @@ -861,8 +993,8 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, class_match_param(key, prefix, &key); sval = strchr(key, '='); if (!sval || (*(sval + 1) == 0)) { - CERROR("Can't parse param %s\n", key); - /* rc = -EINVAL; continue parsing other params */ + CERROR("Can't parse param %s (missing '=')\n", key); + /* rc = -EINVAL; continue parsing other params */ continue; } keylen = sval - key; @@ -885,17 +1017,23 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, vallen, data); set_fs(oldfs); } - if (rc < 0) - CERROR("writing proc entry %s err %d\n", - var->name, rc); break; } j++; } if (!matched) { + /* If the prefix doesn't match, return error so we + can pass it down the stack */ + if (strnchr(key, keylen, '.')) + RETURN(-ENOSYS); CERROR("%s: unknown param %s\n", (char *)lustre_cfg_string(lcfg, 0), key); - /* rc = -EINVAL; continue parsing other params */ + /* rc = -EINVAL; continue parsing other params */ + skip++; + } else if (rc < 0) { + CERROR("writing proc entry %s err %d\n", + var->name, rc); + rc = 0; } else { LCONSOLE_INFO("%s.%.*s: set parameter %.*s=%s\n", lustre_cfg_string(lcfg, 0), @@ -906,6 +1044,8 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, if (rc > 0) rc = 0; + if (!rc && skip) + rc = skip; RETURN(rc); #else CDEBUG(D_CONFIG, "liblustre can't process params.\n"); @@ -940,11 +1080,13 @@ static int class_config_llog_handler(struct llog_handle * handle, struct lustre_cfg_bufs bufs; char *inst_name = NULL; int inst_len = 0; - int inst = 0; + int inst = 0, swab = 0; lcfg = (struct lustre_cfg *)cfg_buf; - if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) + if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) { lustre_swab_lustre_cfg(lcfg); + swab = 1; + } rc = lustre_cfg_sanity_check(cfg_buf, cfg_len); if (rc) @@ -953,6 +1095,8 @@ static int class_config_llog_handler(struct llog_handle * handle, /* Figure out config state info */ if (lcfg->lcfg_command == LCFG_MARKER) { struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1); + lustre_swab_cfg_marker(marker, swab, + LUSTRE_CFG_BUFLEN(lcfg, 1)); CDEBUG(D_CONFIG, "Marker, inst_flg=%#x mark_flg=%#x\n", clli->cfg_flags, marker->cm_flags); if (marker->cm_flags & CM_START) { @@ -963,8 +1107,9 @@ static int class_config_llog_handler(struct llog_handle * handle, CDEBUG(D_CONFIG, "SKIP #%d\n", marker->cm_step); } else if ((marker->cm_flags & CM_EXCLUDE) || - lustre_check_exclusion(clli->cfg_sb, - marker->cm_tgtname)) { + (clli->cfg_sb && + lustre_check_exclusion(clli->cfg_sb, + marker->cm_tgtname))) { clli->cfg_flags |= CFG_F_EXCLUDE; CDEBUG(D_CONFIG, "EXCLUDE %d\n", marker->cm_step); @@ -992,6 +1137,29 @@ static int class_config_llog_handler(struct llog_handle * handle, break; } + /* + * For interoperability between 1.8 and 2.0, + * rename "mds" obd device type to "mdt". + */ + { + char *typename = lustre_cfg_string(lcfg, 1); + char *index = lustre_cfg_string(lcfg, 2); + + if ((lcfg->lcfg_command == LCFG_ATTACH && typename && + strcmp(typename, "mds") == 0)) { + CWARN("For 1.8 interoperability, rename obd " + "type from mds to mdt\n"); + typename[2] = 't'; + } + if ((lcfg->lcfg_command == LCFG_SETUP && index && + strcmp(index, "type") == 0)) { + CDEBUG(D_INFO, "For 1.8 interoperability, " + "set this index to '0'\n"); + index[0] = '0'; + index[1] = 0; + } + } + if ((clli->cfg_flags & CFG_F_EXCLUDE) && (lcfg->lcfg_command == LCFG_LOV_ADD_OBD)) /* Add inactive instead */ @@ -1022,6 +1190,22 @@ static int class_config_llog_handler(struct llog_handle * handle, lustre_cfg_bufs_set_string(&bufs, 2, clli->cfg_uuid.uuid); } + /* + * sptlrpc config record, we expect 2 data segments: + * [0]: fs_name/target_name, + * [1]: rule string + * moving them to index [1] and [2], and insert MGC's + * obdname at index [0]. + */ + if (clli && clli->cfg_instance == NULL && + lcfg->lcfg_command == LCFG_SPTLRPC_CONF) { + lustre_cfg_bufs_set(&bufs, 2, bufs.lcfg_buf[1], + bufs.lcfg_buflen[1]); + lustre_cfg_bufs_set(&bufs, 1, bufs.lcfg_buf[0], + bufs.lcfg_buflen[0]); + lustre_cfg_bufs_set_string(&bufs, 0, + clli->cfg_obdname); + } lcfg_new = lustre_cfg_new(lcfg->lcfg_command, &bufs); @@ -1194,10 +1378,10 @@ parse_out: /* Cleanup and detach */ int class_manual_cleanup(struct obd_device *obd) { - struct lustre_cfg *lcfg; - struct lustre_cfg_bufs bufs; - int rc; - char flags[3]=""; + char flags[3] = ""; + struct lustre_cfg *lcfg; + struct lustre_cfg_bufs bufs; + int rc; ENTRY; if (!obd) { @@ -1216,6 +1400,8 @@ int class_manual_cleanup(struct obd_device *obd) lustre_cfg_bufs_reset(&bufs, obd->obd_name); lustre_cfg_bufs_set_string(&bufs, 1, flags); lcfg = lustre_cfg_new(LCFG_CLEANUP, &bufs); + if (!lcfg) + RETURN(-ENOMEM); rc = class_process_config(lcfg); if (rc) { @@ -1232,3 +1418,188 @@ out: lustre_cfg_free(lcfg); RETURN(rc); } + +/* + * uuid<->export lustre hash operations + */ + +static unsigned +uuid_hash(cfs_hash_t *hs, void *key, unsigned mask) +{ + return cfs_hash_djb2_hash(((struct obd_uuid *)key)->uuid, + sizeof(((struct obd_uuid *)key)->uuid), mask); +} + +static void * +uuid_key(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + + RETURN(&exp->exp_client_uuid); +} + +/* + * NOTE: It is impossible to find an export that is in failed + * state with this function + */ +static int +uuid_compare(void *key, cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + LASSERT(key); + exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + + RETURN(obd_uuid_equals((struct obd_uuid *)key,&exp->exp_client_uuid) && + !exp->exp_failed); +} + +static void * +uuid_export_get(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + class_export_get(exp); + + RETURN(exp); +} + +static void * +uuid_export_put(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + class_export_put(exp); + + RETURN(exp); +} + +static cfs_hash_ops_t uuid_hash_ops = { + .hs_hash = uuid_hash, + .hs_key = uuid_key, + .hs_compare = uuid_compare, + .hs_get = uuid_export_get, + .hs_put = uuid_export_put, +}; + + +/* + * nid<->export hash operations + */ + +static unsigned +nid_hash(cfs_hash_t *hs, void *key, unsigned mask) +{ + return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask); +} + +static void * +nid_key(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + + RETURN(&exp->exp_connection->c_peer.nid); +} + +/* + * NOTE: It is impossible to find an export that is in failed + * state with this function + */ +static int +nid_compare(void *key, cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + LASSERT(key); + exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + + RETURN(exp->exp_connection->c_peer.nid == *(lnet_nid_t *)key && + !exp->exp_failed); +} + +static void * +nid_export_get(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + class_export_get(exp); + + RETURN(exp); +} + +static void * +nid_export_put(cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + class_export_put(exp); + + RETURN(exp); +} + +static cfs_hash_ops_t nid_hash_ops = { + .hs_hash = nid_hash, + .hs_key = nid_key, + .hs_compare = nid_compare, + .hs_get = nid_export_get, + .hs_put = nid_export_put, +}; + + +/* + * nid<->nidstats hash operations + */ + +static void * +nidstats_key(cfs_hlist_node_t *hnode) +{ + struct nid_stat *ns; + + ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + + RETURN(&ns->nid); +} + +static int +nidstats_compare(void *key, cfs_hlist_node_t *hnode) +{ + RETURN(*(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key); +} + +static void * +nidstats_get(cfs_hlist_node_t *hnode) +{ + struct nid_stat *ns; + + ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + nidstat_getref(ns); + + RETURN(ns); +} + +static void * +nidstats_put(cfs_hlist_node_t *hnode) +{ + struct nid_stat *ns; + + ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + nidstat_putref(ns); + + RETURN(ns); +} + +static cfs_hash_ops_t nid_stat_hash_ops = { + .hs_hash = nid_hash, + .hs_key = nidstats_key, + .hs_compare = nidstats_compare, + .hs_get = nidstats_get, + .hs_put = nidstats_put, +};