X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_config.c;h=8d03b7be05cc277f938a94cee924d8d36ec82784;hp=d81a9a723cca30f457b20a8853dc9c79d187ea5c;hb=ca9300e53dc2b7bcaaa5482bb4234cce7d9a344e;hpb=a44f229bcfd8636517460788753070f8af2b0ebf diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c index d81a9a7..8d03b7b 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,26 +35,24 @@ */ #define DEBUG_SUBSYSTEM S_CLASS -#ifdef __KERNEL__ -#include + +#include #include + +#include +#include #include -#else -#include -#include -#include -#include -#endif -#include +#include #include -#include -#include +#include +#include #include "llog_internal.h" -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; +static struct cfs_hash_ops uuid_hash_ops; +static struct cfs_hash_ops nid_hash_ops; +static struct cfs_hash_ops nid_stat_hash_ops; +static struct cfs_hash_ops gen_hash_ops; /*********** string parsing utils *********/ @@ -190,7 +184,7 @@ EXPORT_SYMBOL(class_get_next_param); /* 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) +int class_match_param(char *buf, const char *key, char **valp) { if (!buf) return 1; @@ -291,7 +285,6 @@ int class_parse_net(char *buf, __u32 *net, char **endh) { return class_parse_value(buf, CLASS_PARSE_NET, (void *)net, endh, 0); } -EXPORT_SYMBOL(class_parse_net); /* 1 param contains key and match * 0 param contains key and not match @@ -313,7 +306,6 @@ int class_match_nid(char *buf, char *key, lnet_nid_t nid) } return rc; } -EXPORT_SYMBOL(class_match_nid); int class_match_net(char *buf, char *key, __u32 net) { @@ -331,7 +323,40 @@ int class_match_net(char *buf, char *key, __u32 net) } return rc; } -EXPORT_SYMBOL(class_match_net); + +char *lustre_cfg_string(struct lustre_cfg *lcfg, u32 index) +{ + char *s; + + if (!lcfg->lcfg_buflens[index]) + return NULL; + + s = lustre_cfg_buf(lcfg, index); + if (!s) + return NULL; + + /* + * make sure it's NULL terminated, even if this kills a char + * of data. Try to use the padding first though. + */ + if (s[lcfg->lcfg_buflens[index] - 1] != '\0') { + size_t last = ALIGN(lcfg->lcfg_buflens[index], 8) - 1; + char lost; + + /* Use the smaller value */ + if (last > lcfg->lcfg_buflens[index]) + last = lcfg->lcfg_buflens[index]; + + lost = s[last]; + s[last] = '\0'; + if (lost != '\0') { + CWARN("Truncated buf %d to '%s' (lost '%c'...)\n", + index, s, lost); + } + } + return s; +} +EXPORT_SYMBOL(lustre_cfg_string); /********************** class fns **********************/ @@ -341,6 +366,7 @@ EXPORT_SYMBOL(class_match_net); */ int class_attach(struct lustre_cfg *lcfg) { + struct obd_export *exp; struct obd_device *obd = NULL; char *typename, *name, *uuid; int rc, len; @@ -357,98 +383,54 @@ int class_attach(struct lustre_cfg *lcfg) RETURN(-EINVAL); } name = lustre_cfg_string(lcfg, 0); - if (!LUSTRE_CFG_BUFLEN(lcfg, 2)) { CERROR("No UUID passed!\n"); RETURN(-EINVAL); } - uuid = lustre_cfg_string(lcfg, 2); - CDEBUG(D_IOCTL, "attach type %s name: %s uuid: %s\n", - MKSTR(typename), MKSTR(name), MKSTR(uuid)); + uuid = lustre_cfg_string(lcfg, 2); + len = strlen(uuid); + if (len >= sizeof(obd->obd_uuid)) { + CERROR("%s: uuid must be < %d bytes long\n", + name, (int)sizeof(obd->obd_uuid)); + RETURN(-EINVAL); + } - obd = class_newdev(typename, name); - if (IS_ERR(obd)) { - /* Already exists or out of obds */ - rc = PTR_ERR(obd); - obd = NULL; + obd = class_newdev(typename, name, uuid); + if (IS_ERR(obd)) { /* Already exists or out of obds */ + rc = PTR_ERR(obd); CERROR("Cannot create device %s of type %s : %d\n", name, typename, rc); - GOTO(out, rc); + RETURN(rc); } - LASSERTF(obd != NULL, "Cannot get obd device %s of type %s\n", - name, typename); 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); - 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); - mutex_init(&obd->obd_dev_mutex); - 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 */ - init_rwsem(&obd->obd_observer_link_sem); - /* recovery data */ - cfs_init_timer(&obd->obd_recovery_timer); - spin_lock_init(&obd->obd_recovery_task_lock); - init_waitqueue_head(&obd->obd_next_transno_waitq); - init_waitqueue_head(&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); - INIT_LIST_HEAD(&obd->obd_lwp_list); - - llog_group_init(&obd->obd_olg, FID_SEQ_LLOG); - - obd->obd_conn_inprogress = 0; - - len = strlen(uuid); - if (len >= sizeof(obd->obd_uuid)) { - CERROR("uuid must be < %d bytes long\n", - (int)sizeof(obd->obd_uuid)); - GOTO(out, rc = -EINVAL); - } - memcpy(obd->obd_uuid.uuid, uuid, len); + exp = class_new_export_self(obd, &obd->obd_uuid); + if (IS_ERR(exp)) { + rc = PTR_ERR(exp); + class_free_dev(obd); + RETURN(rc); + } - /* do the attach */ - if (OBP(obd, attach)) { - rc = OBP(obd,attach)(obd, sizeof *lcfg, lcfg); - if (rc) - GOTO(out, rc = -EINVAL); - } + obd->obd_self_export = exp; + list_del_init(&exp->exp_obd_chain_timed); + class_export_put(exp); - /* Detach drops this */ - spin_lock(&obd->obd_dev_lock); - atomic_set(&obd->obd_refcount, 1); - spin_unlock(&obd->obd_dev_lock); - lu_ref_init(&obd->obd_reference); - lu_ref_add(&obd->obd_reference, "attach", obd); + rc = class_register_device(obd); + if (rc != 0) { + class_decref(obd, "newdev", obd); + RETURN(rc); + } - obd->obd_attached = 1; - CDEBUG(D_IOCTL, "OBD: dev %d attached type %s with refcount %d\n", + 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)); - RETURN(0); - out: - if (obd != NULL) { - class_release_dev(obd); - } - return rc; + + RETURN(0); } EXPORT_SYMBOL(class_attach); @@ -458,7 +440,6 @@ EXPORT_SYMBOL(class_attach); int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) { int err = 0; - struct obd_export *exp; ENTRY; LASSERT(obd != NULL); @@ -495,6 +476,7 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) obd->obd_uuid_hash = NULL; obd->obd_nid_hash = NULL; obd->obd_nid_stats_hash = NULL; + obd->obd_gen_hash = NULL; spin_unlock(&obd->obd_dev_lock); /* create an uuid-export lustre hash */ @@ -506,7 +488,7 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) CFS_HASH_MAX_THETA, &uuid_hash_ops, CFS_HASH_DEFAULT); if (!obd->obd_uuid_hash) - GOTO(err_hash, err = -ENOMEM); + GOTO(err_exit, err = -ENOMEM); /* create a nid-export lustre hash */ obd->obd_nid_hash = cfs_hash_create("NID_HASH", @@ -517,7 +499,7 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) CFS_HASH_MAX_THETA, &nid_hash_ops, CFS_HASH_DEFAULT); if (!obd->obd_nid_hash) - GOTO(err_hash, err = -ENOMEM); + GOTO(err_exit, err = -ENOMEM); /* create a nid-stats lustre hash */ obd->obd_nid_stats_hash = cfs_hash_create("NID_STATS", @@ -527,22 +509,25 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) CFS_HASH_MIN_THETA, CFS_HASH_MAX_THETA, &nid_stat_hash_ops, CFS_HASH_DEFAULT); - if (!obd->obd_nid_stats_hash) - GOTO(err_hash, err = -ENOMEM); - - exp = class_new_export(obd, &obd->obd_uuid); - if (IS_ERR(exp)) - GOTO(err_hash, err = PTR_ERR(exp)); - - obd->obd_self_export = exp; - cfs_list_del_init(&exp->exp_obd_chain_timed); - class_export_put(exp); - - err = obd_setup(obd, lcfg); - if (err) - GOTO(err_exp, err); - - obd->obd_set_up = 1; + if (!obd->obd_nid_stats_hash) + GOTO(err_exit, err = -ENOMEM); + + /* create a client_generation-export lustre hash */ + obd->obd_gen_hash = cfs_hash_create("UUID_HASH", + HASH_GEN_CUR_BITS, + HASH_GEN_MAX_BITS, + HASH_GEN_BKT_BITS, 0, + CFS_HASH_MIN_THETA, + CFS_HASH_MAX_THETA, + &gen_hash_ops, CFS_HASH_DEFAULT); + if (!obd->obd_gen_hash) + GOTO(err_exit, err = -ENOMEM); + + err = obd_setup(obd, lcfg); + if (err) + GOTO(err_exit, err); + + obd->obd_set_up = 1; spin_lock(&obd->obd_dev_lock); /* cleanup drops this */ @@ -553,12 +538,7 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) obd->obd_name, obd->obd_uuid.uuid); RETURN(0); -err_exp: - if (obd->obd_self_export) { - class_unlink_export(obd->obd_self_export); - obd->obd_self_export = NULL; - } -err_hash: +err_exit: if (obd->obd_uuid_hash) { cfs_hash_putref(obd->obd_uuid_hash); obd->obd_uuid_hash = NULL; @@ -571,6 +551,10 @@ err_hash: cfs_hash_putref(obd->obd_nid_stats_hash); obd->obd_nid_stats_hash = NULL; } + if (obd->obd_gen_hash) { + cfs_hash_putref(obd->obd_gen_hash); + obd->obd_gen_hash = NULL; + } obd->obd_starting = 0; CERROR("setup %s failed (%d)\n", obd->obd_name, err); return err; @@ -598,10 +582,14 @@ int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg) obd->obd_attached = 0; spin_unlock(&obd->obd_dev_lock); + /* cleanup in progress. we don't like to find this device after now */ + class_unregister_device(obd); + CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n", obd->obd_name, obd->obd_uuid.uuid); - class_decref(obd, "attach", obd); + class_decref(obd, "newdev", obd); + RETURN(0); } EXPORT_SYMBOL(class_detach); @@ -612,16 +600,16 @@ EXPORT_SYMBOL(class_detach); */ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) { - int err = 0; - char *flag; - ENTRY; + int err = 0; + char *flag; + ENTRY; - OBD_RACE(OBD_FAIL_LDLM_RECOV_CLIENTS); + OBD_RACE(OBD_FAIL_LDLM_RECOV_CLIENTS); - if (!obd->obd_set_up) { - CERROR("Device %d not setup\n", obd->obd_minor); - RETURN(-ENODEV); - } + if (!obd->obd_set_up) { + CERROR("Device %d not setup\n", obd->obd_minor); + RETURN(-ENODEV); + } spin_lock(&obd->obd_dev_lock); if (obd->obd_stopping) { @@ -631,84 +619,82 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) } /* Leave this on forever */ obd->obd_stopping = 1; + /* function can't return error after that point, so clear setup flag + * as early as possible to avoid finding via obd_devs / hash */ + obd->obd_set_up = 0; + spin_unlock(&obd->obd_dev_lock); /* wait for already-arrived-connections to finish. */ - while (obd->obd_conn_inprogress > 0) { - spin_unlock(&obd->obd_dev_lock); - - cond_resched(); - - spin_lock(&obd->obd_dev_lock); + while (obd->obd_conn_inprogress > 0) + yield(); + smp_rmb(); + + if (lcfg->lcfg_bufcount >= 2 && LUSTRE_CFG_BUFLEN(lcfg, 1) > 0) { + for (flag = lustre_cfg_string(lcfg, 1); *flag != 0; flag++) + switch (*flag) { + case 'F': + obd->obd_force = 1; + break; + case 'A': + LCONSOLE_WARN("Failing over %s\n", + obd->obd_name); + obd->obd_fail = 1; + obd->obd_no_transno = 1; + obd->obd_no_recov = 1; + if (OBP(obd, iocontrol)) { + obd_iocontrol(OBD_IOC_SYNC, + obd->obd_self_export, + 0, NULL, NULL); + } + break; + default: + CERROR("Unrecognised flag '%c'\n", *flag); + } } - 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++) - switch (*flag) { - case 'F': - obd->obd_force = 1; - break; - case 'A': - LCONSOLE_WARN("Failing over %s\n", - obd->obd_name); - obd->obd_fail = 1; - obd->obd_no_transno = 1; - obd->obd_no_recov = 1; - if (OBP(obd, iocontrol)) { - obd_iocontrol(OBD_IOC_SYNC, - obd->obd_self_export, - 0, NULL, NULL); - } - break; - default: - CERROR("Unrecognised flag '%c'\n", *flag); - } - } + LASSERT(obd->obd_self_export); - 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) { - /* 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, 0); - class_disconnect_exports(obd); - } + CDEBUG(D_IOCTL, "%s: forcing exports to disconnect: %d/%d\n", + obd->obd_name, obd->obd_num_exports, + atomic_read(&obd->obd_refcount) - 2); + dump_exports(obd, 0, D_HA); + class_disconnect_exports(obd); - /* 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); + /* Precleanup, we must make sure all exports get destroyed. */ + err = obd_precleanup(obd); + if (err) + CERROR("Precleanup %s returned %d\n", + obd->obd_name, err); - /* destroy an uuid-export hash body */ - if (obd->obd_uuid_hash) { - cfs_hash_putref(obd->obd_uuid_hash); - obd->obd_uuid_hash = NULL; - } + /* destroy an uuid-export hash body */ + if (obd->obd_uuid_hash) { + cfs_hash_putref(obd->obd_uuid_hash); + obd->obd_uuid_hash = NULL; + } - /* destroy a nid-export hash body */ - if (obd->obd_nid_hash) { - cfs_hash_putref(obd->obd_nid_hash); - obd->obd_nid_hash = NULL; - } + /* destroy a nid-export hash body */ + if (obd->obd_nid_hash) { + cfs_hash_putref(obd->obd_nid_hash); + obd->obd_nid_hash = NULL; + } - /* destroy a nid-stats hash body */ - if (obd->obd_nid_stats_hash) { - cfs_hash_putref(obd->obd_nid_stats_hash); - obd->obd_nid_stats_hash = NULL; - } + /* destroy a nid-stats hash body */ + if (obd->obd_nid_stats_hash) { + cfs_hash_putref(obd->obd_nid_stats_hash); + obd->obd_nid_stats_hash = NULL; + } - class_decref(obd, "setup", obd); - obd->obd_set_up = 0; + /* destroy a client_generation-export hash body */ + if (obd->obd_gen_hash) { + cfs_hash_putref(obd->obd_gen_hash); + obd->obd_gen_hash = NULL; + } - RETURN(0); + class_decref(obd, "setup", obd); + obd->obd_set_up = 0; + + RETURN(0); } -EXPORT_SYMBOL(class_cleanup); struct obd_device *class_incref(struct obd_device *obd, const char *scope, const void *source) @@ -724,47 +710,27 @@ EXPORT_SYMBOL(class_incref); void class_decref(struct obd_device *obd, const char *scope, const void *source) { - int err; - int refs; + int last; - spin_lock(&obd->obd_dev_lock); - atomic_dec(&obd->obd_refcount); - refs = atomic_read(&obd->obd_refcount); - spin_unlock(&obd->obd_dev_lock); + CDEBUG(D_INFO, "Decref %s (%p) now %d - %s\n", obd->obd_name, obd, + atomic_read(&obd->obd_refcount), scope); + + LASSERT(obd->obd_num_exports >= 0); + last = atomic_dec_and_test(&obd->obd_refcount); lu_ref_del(&obd->obd_reference, scope, source); - CDEBUG(D_INFO, "Decref %s (%p) now %d\n", obd->obd_name, obd, refs); + if (last) { + struct obd_export *exp; - if ((refs == 1) && obd->obd_stopping) { + LASSERT(!obd->obd_attached); /* 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 |= exp_flags_from_obd(obd); - spin_unlock(&obd->obd_self_export->exp_lock); + * be no more in-progress ops by this point.*/ + exp = obd->obd_self_export; - /* note that we'll recurse into class_decref again */ - class_unlink_export(obd->obd_self_export); - return; - } - - if (refs == 0) { - CDEBUG(D_CONFIG, "finishing cleanup of obd %s (%s)\n", - obd->obd_name, obd->obd_uuid.uuid); - LASSERT(!obd->obd_attached); - if (obd->obd_stopping) { - /* If we're not stopping, we were never set up */ - err = obd_cleanup(obd); - if (err) - CERROR("Cleanup %s returned %d\n", - obd->obd_name, err); - } - if (OBP(obd, detach)) { - err = OBP(obd, detach)(obd); - if (err) - CERROR("Detach returned %d\n", err); + if (exp) { + exp->exp_flags |= exp_flags_from_obd(obd); + class_unlink_export(exp); } - class_release_dev(obd); } } EXPORT_SYMBOL(class_decref); @@ -804,11 +770,10 @@ int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(rc); } -EXPORT_SYMBOL(class_add_conn); /** Remove a failover nid location. */ -int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg) +static int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg) { struct obd_import *imp; struct obd_uuid uuid; @@ -838,19 +803,24 @@ int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(rc); } -CFS_LIST_HEAD(lustre_profile_list); +static LIST_HEAD(lustre_profile_list); +static DEFINE_SPINLOCK(lustre_profile_list_lock); struct lustre_profile *class_get_profile(const char * prof) { - struct lustre_profile *lprof; + struct lustre_profile *lprof; - ENTRY; - cfs_list_for_each_entry(lprof, &lustre_profile_list, lp_list) { - if (!strcmp(lprof->lp_profile, prof)) { - RETURN(lprof); - } - } - RETURN(NULL); + ENTRY; + spin_lock(&lustre_profile_list_lock); + list_for_each_entry(lprof, &lustre_profile_list, lp_list) { + if (!strcmp(lprof->lp_profile, prof)) { + lprof->lp_refs++; + spin_unlock(&lustre_profile_list_lock); + RETURN(lprof); + } + } + spin_unlock(&lustre_profile_list_lock); + RETURN(NULL); } EXPORT_SYMBOL(class_get_profile); @@ -858,8 +828,8 @@ EXPORT_SYMBOL(class_get_profile); * This defines the mdc and osc names to use for a client. * This also is used to define the lov to be used by a mdt. */ -int class_add_profile(int proflen, char *prof, int osclen, char *osc, - int mdclen, char *mdc) +static int class_add_profile(int proflen, char *prof, int osclen, char *osc, + int mdclen, char *mdc) { struct lustre_profile *lprof; int err = 0; @@ -870,7 +840,7 @@ int class_add_profile(int proflen, char *prof, int osclen, char *osc, OBD_ALLOC(lprof, sizeof(*lprof)); if (lprof == NULL) RETURN(-ENOMEM); - CFS_INIT_LIST_HEAD(&lprof->lp_list); + INIT_LIST_HEAD(&lprof->lp_list); LASSERT(proflen == (strlen(prof) + 1)); OBD_ALLOC(lprof->lp_profile, proflen); @@ -892,7 +862,12 @@ int class_add_profile(int proflen, char *prof, int osclen, char *osc, memcpy(lprof->lp_md, mdc, mdclen); } - cfs_list_add(&lprof->lp_list, &lustre_profile_list); + spin_lock(&lustre_profile_list_lock); + lprof->lp_refs = 1; + lprof->lp_list_deleted = false; + + list_add(&lprof->lp_list, &lustre_profile_list); + spin_unlock(&lustre_profile_list_lock); RETURN(err); out: @@ -908,76 +883,77 @@ out: void class_del_profile(const char *prof) { - struct lustre_profile *lprof; - ENTRY; + struct lustre_profile *lprof; + ENTRY; - CDEBUG(D_CONFIG, "Del profile %s\n", prof); + CDEBUG(D_CONFIG, "Del profile %s\n", prof); - lprof = class_get_profile(prof); - if (lprof) { - 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) - OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1); - OBD_FREE(lprof, sizeof *lprof); - } - EXIT; + lprof = class_get_profile(prof); + if (lprof) { + spin_lock(&lustre_profile_list_lock); + /* because get profile increments the ref counter */ + lprof->lp_refs--; + list_del(&lprof->lp_list); + lprof->lp_list_deleted = true; + spin_unlock(&lustre_profile_list_lock); + + class_put_profile(lprof); + } + EXIT; } EXPORT_SYMBOL(class_del_profile); -/* COMPAT_146 */ -void class_del_profiles(void) +void class_put_profile(struct lustre_profile *lprof) { - struct lustre_profile *lprof, *n; - ENTRY; - - 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) - OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1); - OBD_FREE(lprof, sizeof *lprof); - } - EXIT; + spin_lock(&lustre_profile_list_lock); + if ((--lprof->lp_refs) > 0) { + LASSERT(lprof->lp_refs > 0); + spin_unlock(&lustre_profile_list_lock); + return; + } + spin_unlock(&lustre_profile_list_lock); + + /* confirm not a negative number */ + LASSERT(lprof->lp_refs == 0); + + /* At least one class_del_profile/profiles must be called + * on the target profile or lustre_profile_list will corrupt */ + LASSERT(lprof->lp_list_deleted); + OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1); + OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1); + if (lprof->lp_md != NULL) + OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1); + OBD_FREE(lprof, sizeof(*lprof)); } -EXPORT_SYMBOL(class_del_profiles); +EXPORT_SYMBOL(class_put_profile); -static int class_set_global(char *ptr, int val, struct lustre_cfg *lcfg) +/* COMPAT_146 */ +void class_del_profiles(void) { + struct lustre_profile *lprof, *n; 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 if (class_match_param(ptr, PARAM_JOBID_VAR, NULL) == 0) - strlcpy(obd_jobid_var, lustre_cfg_string(lcfg, 2), - JOBSTATS_JOBID_VAR_MAX_LEN + 1); - else - RETURN(-EINVAL); - - CDEBUG(D_IOCTL, "global %s = %d\n", ptr, val); - RETURN(0); -} + spin_lock(&lustre_profile_list_lock); + list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) { + list_del(&lprof->lp_list); + lprof->lp_list_deleted = true; + spin_unlock(&lustre_profile_list_lock); -/* We can't call ll_process_config or lquota_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; -static int (*quota_process_config)(struct lustre_cfg *lcfg) = NULL; + class_put_profile(lprof); -void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg)) -{ - client_process_config = cpc; + spin_lock(&lustre_profile_list_lock); + } + spin_unlock(&lustre_profile_list_lock); + EXIT; } -EXPORT_SYMBOL(lustre_register_client_process_config); +EXPORT_SYMBOL(class_del_profiles); + +/* We can't call lquota_process_config directly because + * it lives in a module that must be loaded after this one. + */ +#ifdef HAVE_SERVER_SUPPORT +static int (*quota_process_config)(struct lustre_cfg *lcfg) = NULL; +#endif /* HAVE_SERVER_SUPPORT */ /** * Rename the proc parameter in \a cfg with a new name \a new_name. @@ -1003,12 +979,12 @@ struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg, int new_len = 0; ENTRY; - if (cfg == NULL || new_name == NULL) - RETURN(ERR_PTR(-EINVAL)); + if (!cfg || !new_name) + GOTO(out_nocfg, new_cfg = ERR_PTR(-EINVAL)); param = lustre_cfg_string(cfg, 1); - if (param == NULL) - RETURN(ERR_PTR(-EINVAL)); + if (!param) + GOTO(out_nocfg, new_cfg = ERR_PTR(-EINVAL)); value = strchr(param, '='); if (value == NULL) @@ -1019,53 +995,93 @@ struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg, new_len = LUSTRE_CFG_BUFLEN(cfg, 1) + strlen(new_name) - name_len; OBD_ALLOC(new_param, new_len); - if (new_param == NULL) - RETURN(ERR_PTR(-ENOMEM)); + if (!new_param) + GOTO(out_nocfg, new_cfg = ERR_PTR(-ENOMEM)); strcpy(new_param, new_name); if (value != NULL) strcat(new_param, value); OBD_ALLOC_PTR(bufs); - if (bufs == NULL) { - OBD_FREE(new_param, new_len); - RETURN(ERR_PTR(-ENOMEM)); - } + if (!bufs) + GOTO(out_free_param, new_cfg = ERR_PTR(-ENOMEM)); lustre_cfg_bufs_reset(bufs, NULL); lustre_cfg_bufs_init(bufs, cfg); lustre_cfg_bufs_set_string(bufs, 1, new_param); - new_cfg = lustre_cfg_new(cfg->lcfg_command, bufs); + OBD_ALLOC(new_cfg, lustre_cfg_len(bufs->lcfg_bufcount, + bufs->lcfg_buflen)); + if (!new_cfg) + GOTO(out_free_buf, new_cfg = ERR_PTR(-ENOMEM)); - OBD_FREE(new_param, new_len); - OBD_FREE_PTR(bufs); - if (new_cfg == NULL) - RETURN(ERR_PTR(-ENOMEM)); + lustre_cfg_init(new_cfg, cfg->lcfg_command, bufs); new_cfg->lcfg_num = cfg->lcfg_num; new_cfg->lcfg_flags = cfg->lcfg_flags; new_cfg->lcfg_nid = cfg->lcfg_nid; new_cfg->lcfg_nal = cfg->lcfg_nal; - +out_free_buf: + OBD_FREE_PTR(bufs); +out_free_param: + OBD_FREE(new_param, new_len); +out_nocfg: RETURN(new_cfg); } EXPORT_SYMBOL(lustre_cfg_rename); -static int process_param2_config(struct lustre_cfg *lcfg) +static ssize_t process_param2_config(struct lustre_cfg *lcfg) { char *param = lustre_cfg_string(lcfg, 1); char *upcall = lustre_cfg_string(lcfg, 2); + struct kobject *kobj = NULL; + const char *subsys = param; char *argv[] = { [0] = "/usr/sbin/lctl", [1] = "set_param", [2] = param, [3] = NULL }; - struct timeval start; - struct timeval end; - int rc; + ktime_t start; + ktime_t end; + size_t len; + int rc; + ENTRY; + print_lustre_cfg(lcfg); + + len = strcspn(param, ".="); + if (!len) + return -EINVAL; + + /* If we find '=' then its the top level sysfs directory */ + if (param[len] == '=') + return class_set_global(param); + + subsys = kstrndup(param, len, GFP_KERNEL); + if (!subsys) + return -ENOMEM; + + kobj = kset_find_obj(lustre_kset, subsys); + kfree(subsys); + if (kobj) { + char *value = param; + char *envp[3]; + int i; + + param = strsep(&value, "="); + envp[0] = kasprintf(GFP_KERNEL, "PARAM=%s", param); + envp[1] = kasprintf(GFP_KERNEL, "SETTING=%s", value); + envp[2] = NULL; + + rc = kobject_uevent_env(kobj, KOBJ_CHANGE, envp); + for (i = 0; i < ARRAY_SIZE(envp); i++) + kfree(envp[i]); + + kobject_put(kobj); + + RETURN(rc); + } /* Add upcall processing here. Now only lctl is supported */ if (strcmp(upcall, LCTL_UPCALL) != 0) { @@ -1073,29 +1089,31 @@ static int process_param2_config(struct lustre_cfg *lcfg) RETURN(-EINVAL); } - do_gettimeofday(&start); - rc = call_usermodehelper(argv[0], argv, NULL, 0); - do_gettimeofday(&end); + start = ktime_get(); + rc = call_usermodehelper(argv[0], argv, NULL, UMH_WAIT_PROC); + end = ktime_get(); if (rc < 0) { CERROR("lctl: error invoking upcall %s %s %s: rc = %d; " "time %ldus\n", argv[0], argv[1], argv[2], rc, - cfs_timeval_sub(&end, &start, NULL)); + (long)ktime_us_delta(end, start)); } else { CDEBUG(D_HA, "lctl: invoked upcall %s %s %s, time %ldus\n", argv[0], argv[1], argv[2], - cfs_timeval_sub(&end, &start, NULL)); + (long)ktime_us_delta(end, start)); rc = 0; } RETURN(rc); } +#ifdef HAVE_SERVER_SUPPORT void lustre_register_quota_process_config(int (*qpc)(struct lustre_cfg *lcfg)) { quota_process_config = qpc; } EXPORT_SYMBOL(lustre_register_quota_process_config); +#endif /* HAVE_SERVER_SUPPORT */ /** Process configuration commands given in lustre_cfg form. * These may come from direct calls (e.g. class_manual_cleanup) @@ -1116,7 +1134,7 @@ int class_process_config(struct lustre_cfg *lcfg) GOTO(out, err); } case LCFG_ADD_UUID: { - CDEBUG(D_IOCTL, "adding mapping from uuid %s to nid "LPX64 + CDEBUG(D_IOCTL, "adding mapping from uuid %s to nid %#llx" " (%s)\n", lustre_cfg_string(lcfg, 1), lcfg->lcfg_nid, libcfs_nid2str(lcfg->lcfg_nid)); @@ -1182,29 +1200,51 @@ int class_process_config(struct lustre_cfg *lcfg) } 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); + if (class_match_param(lustre_cfg_string(lcfg, 1), + PARAM_LLITE, NULL) == 0) { + struct lustre_sb_info *lsi; + unsigned long addr; + ssize_t count; + + /* The instance name contains the sb: + * lustre-client-aacfe000 + */ + tmp = strrchr(lustre_cfg_string(lcfg, 0), '-'); + if (!tmp || !*(++tmp)) + GOTO(out, err = -EINVAL); + + if (sscanf(tmp, "%lx", &addr) != 1) + GOTO(out, err = -EINVAL); + + lsi = s2lsi((struct super_block *)addr); + /* This better be a real Lustre superblock! */ + LASSERT(lsi->lsi_lmd->lmd_magic == LMD_MAGIC); + + count = class_modify_config(lcfg, PARAM_LLITE, + lsi->lsi_kobj); + err = count < 0 ? count : 0; + 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, lcfg); + err = class_set_global(tmp); /* * Client or server should not fail to mount if * it hits an unknown configuration parameter. */ - if (err != 0) + if (err < 0) CWARN("Ignoring unknown param %s\n", tmp); GOTO(out, err = 0); +#ifdef HAVE_SERVER_SUPPORT } else if ((class_match_param(lustre_cfg_string(lcfg, 1), PARAM_QUOTA, &tmp) == 0) && quota_process_config) { err = (*quota_process_config)(lcfg); GOTO(out, err); +#endif /* HAVE_SERVER_SUPPORT */ } break; @@ -1225,7 +1265,6 @@ int class_process_config(struct lustre_cfg *lcfg) GOTO(out, err = -EINVAL); } - switch(lcfg->lcfg_command) { case LCFG_SETUP: { err = class_setup(obd, lcfg); @@ -1265,12 +1304,47 @@ int class_process_config(struct lustre_cfg *lcfg) err = obd_pool_del(obd, lustre_cfg_string(lcfg, 2)); GOTO(out, err = 0); } - default: { - err = obd_process_config(obd, sizeof(*lcfg), lcfg); - GOTO(out, err); + /* Process config log ADD_MDC record twice to add MDC also to LOV + * for Data-on-MDT: + * + * add 0:lustre-clilmv 1:lustre-MDT0000_UUID 2:0 3:1 + * 4:lustre-MDT0000-mdc_UUID + */ + case LCFG_ADD_MDC: { + struct obd_device *lov_obd; + char *clilmv; + + err = obd_process_config(obd, sizeof(*lcfg), lcfg); + if (err) + GOTO(out, err); + + /* make sure this is client LMV log entry */ + clilmv = strstr(lustre_cfg_string(lcfg, 0), "clilmv"); + if (!clilmv) + GOTO(out, err); + + /* replace 'lmv' with 'lov' name to address LOV device and + * process llog record to add MDC there. */ + clilmv[4] = 'o'; + lov_obd = class_name2obd(lustre_cfg_string(lcfg, 0)); + if (lov_obd == NULL) { + err = -ENOENT; + CERROR("%s: Cannot find LOV by %s name, rc = %d\n", + obd->obd_name, lustre_cfg_string(lcfg, 0), err); + } else { + err = obd_process_config(lov_obd, sizeof(*lcfg), lcfg); + } + /* restore 'lmv' name */ + clilmv[4] = 'm'; + GOTO(out, err); + } + default: { + err = obd_process_config(obd, sizeof(*lcfg), lcfg); + GOTO(out, err); } } + EXIT; out: if ((err < 0) && !(lcfg->lcfg_command & LCFG_REQUIRED)) { CWARN("Ignoring error %d on optional command %#x\n", err, @@ -1281,102 +1355,94 @@ out: } EXPORT_SYMBOL(class_process_config); -#ifndef HAVE_ONLY_PROCFS_SEQ -int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, - struct lustre_cfg *lcfg, void *data) -{ -#ifdef __KERNEL__ - struct lprocfs_vars *var; - char *key, *sval; - int i, keylen, vallen; - int matched = 0, j = 0; - int rc = 0; - int skip = 0; - ENTRY; +ssize_t class_modify_config(struct lustre_cfg *lcfg, const char *prefix, + struct kobject *kobj) +{ + struct kobj_type *typ; + ssize_t count = 0; + int i; - if (lcfg->lcfg_command != LCFG_PARAM) { - CERROR("Unknown command: %d\n", lcfg->lcfg_command); - RETURN(-EINVAL); - } + if (lcfg->lcfg_command != LCFG_PARAM) { + CERROR("Unknown command: %d\n", lcfg->lcfg_command); + return -EINVAL; + } + + typ = get_ktype(kobj); + if (!typ || !typ->default_attrs) + return -ENODEV; - /* e.g. tunefs.lustre --param mdt.group_upcall=foo /r/tmp/lustre-mdt - or lctl conf_param lustre-MDT0000.mdt.group_upcall=bar - or lctl conf_param lustre-OST0000.osc.max_dirty_mb=36 */ - for (i = 1; i < lcfg->lcfg_bufcount; i++) { - key = lustre_cfg_buf(lcfg, i); - /* Strip off prefix */ + print_lustre_cfg(lcfg); + + /* + * e.g. tunefs.lustre --param mdt.group_upcall=foo /r/tmp/lustre-mdt + * or lctl conf_param lustre-MDT0000.mdt.group_upcall=bar + * or lctl conf_param lustre-OST0000.osc.max_dirty_mb=36 + */ + for (i = 1; i < lcfg->lcfg_bufcount; i++) { + struct attribute *attr; + size_t keylen; + char *value; + char *key; + int j; + + key = lustre_cfg_buf(lcfg, i); + /* Strip off prefix */ if (class_match_param(key, prefix, &key)) /* If the prefix doesn't match, return error so we - * can pass it down the stack */ - RETURN(-ENOSYS); - sval = strchr(key, '='); - if (!sval || (*(sval + 1) == 0)) { - CERROR("Can't parse param %s (missing '=')\n", key); - /* rc = -EINVAL; continue parsing other params */ - continue; - } - keylen = sval - key; - sval++; - vallen = strlen(sval); - matched = 0; - j = 0; - /* Search proc entries */ - while (lvars[j].name) { - var = &lvars[j]; - if (class_match_param(key, (char *)var->name, 0) == 0 && - keylen == strlen(var->name)) { - matched++; - rc = -EROFS; - - if (var->write_fptr) { - mm_segment_t oldfs; - oldfs = get_fs(); - set_fs(KERNEL_DS); - rc = (var->write_fptr)(NULL, sval, - vallen, data); - set_fs(oldfs); - } + * can pass it down the stack + */ + return -EINVAL; + + value = strchr(key, '='); + if (!value || *(value + 1) == 0) { + CERROR("%s: can't parse param '%s' (missing '=')\n", + lustre_cfg_string(lcfg, 0), + lustre_cfg_string(lcfg, i)); + /* continue parsing other params */ + continue; + } + keylen = value - key; + value++; + + attr = NULL; + for (j = 0; typ->default_attrs[j]; j++) { + if (!strncmp(typ->default_attrs[j]->name, key, + keylen)) { + attr = typ->default_attrs[j]; break; - } - j++; - } - if (!matched) { - CERROR("%.*s: %s unknown param %s\n", - (int)strlen(prefix) - 1, prefix, - (char *)lustre_cfg_string(lcfg, 0), key); - /* rc = -EINVAL; continue parsing other params */ - skip++; - } else if (rc < 0) { - CERROR("%s: error writing proc entry '%s': rc = %d\n", - prefix, var->name, rc); - rc = 0; - } else { - CDEBUG(D_CONFIG, "%s.%.*s: Set parameter %.*s=%s\n", - lustre_cfg_string(lcfg, 0), - (int)strlen(prefix) - 1, prefix, - (int)(sval - key - 1), key, sval); + } } - } - if (rc > 0) - rc = 0; - if (!rc && skip) - rc = skip; - RETURN(rc); -#else - CDEBUG(D_CONFIG, "liblustre can't process params.\n"); - /* Don't throw config error */ - RETURN(0); -#endif + if (!attr) { + char *envp[3]; + + envp[0] = kasprintf(GFP_KERNEL, "PARAM=%s.%s.%.*s", + kobject_name(kobj->parent), + kobject_name(kobj), + (int) keylen, key); + envp[1] = kasprintf(GFP_KERNEL, "SETTING=%s", value); + envp[2] = NULL; + + if (kobject_uevent_env(kobj, KOBJ_CHANGE, envp)) { + CERROR("%s: failed to send uevent %s\n", + kobject_name(kobj), key); + } + + for (i = 0; i < ARRAY_SIZE(envp); i++) + kfree(envp[i]); + } else { + count += lustre_attr_store(kobj, attr, value, + strlen(value)); + } + } + return count; } -EXPORT_SYMBOL(class_process_proc_param); -#endif +EXPORT_SYMBOL(class_modify_config); -int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars, - struct lustre_cfg *lcfg, void *data) +int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, + struct lustre_cfg *lcfg, void *data) { -#ifdef __KERNEL__ - struct lprocfs_seq_vars *var; + struct lprocfs_vars *var; struct file fakefile; struct seq_file fake_seqfile; char *key, *sval; @@ -1405,8 +1471,10 @@ int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars, * can pass it down the stack */ RETURN(-ENOSYS); sval = strchr(key, '='); - if (!sval || (*(sval + 1) == 0)) { - CERROR("Can't parse param %s (missing '=')\n", key); + if (!sval || *(sval + 1) == 0) { + CERROR("%s: can't parse param '%s' (missing '=')\n", + lustre_cfg_string(lcfg, 0), + lustre_cfg_string(lcfg, i)); /* rc = -EINVAL; continue parsing other params */ continue; } @@ -1418,7 +1486,7 @@ int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars, /* Search proc entries */ while (lvars[j].name) { var = &lvars[j]; - if (class_match_param(key, (char *)var->name, 0) == 0 && + if (class_match_param(key, var->name, NULL) == 0 && keylen == strlen(var->name)) { matched++; rc = -EROFS; @@ -1436,20 +1504,23 @@ int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars, j++; } if (!matched) { - CERROR("%.*s: %s unknown param %s\n", - (int)strlen(prefix) - 1, prefix, - (char *)lustre_cfg_string(lcfg, 0), key); + /* It was upgraded from old MDT/OST device, + * ignore the obsolete "sec_level" parameter. */ + if (strncmp("sec_level", key, keylen) == 0) + continue; + + CERROR("%s: unknown config parameter '%s'\n", + lustre_cfg_string(lcfg, 0), + lustre_cfg_string(lcfg, i)); /* rc = -EINVAL; continue parsing other params */ skip++; } else if (rc < 0) { - CERROR("%s: error writing proc entry '%s': rc = %d\n", - prefix, var->name, rc); + CERROR("%s: error writing parameter '%s': rc = %d\n", + lustre_cfg_string(lcfg, 0), key, rc); rc = 0; } else { - CDEBUG(D_CONFIG, "%s.%.*s: Set parameter %.*s=%s\n", - lustre_cfg_string(lcfg, 0), - (int)strlen(prefix) - 1, prefix, - (int)(sval - key - 1), key, sval); + CDEBUG(D_CONFIG, "%s: set parameter '%s'\n", + lustre_cfg_string(lcfg, 0), key); } } @@ -1458,19 +1529,44 @@ int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars, if (!rc && skip) rc = skip; RETURN(rc); -#else - CDEBUG(D_CONFIG, "liblustre can't process params.\n"); - /* Don't throw config error */ - RETURN(0); -#endif } -EXPORT_SYMBOL(class_process_proc_seq_param); +EXPORT_SYMBOL(class_process_proc_param); + +/* + * Supplemental functions for config logs, it allocates lustre_cfg + * buffers plus initialized llog record header at the beginning. + */ +struct llog_cfg_rec *lustre_cfg_rec_new(int cmd, struct lustre_cfg_bufs *bufs) +{ + struct llog_cfg_rec *lcr; + int reclen; -#ifdef __KERNEL__ -extern int lustre_check_exclusion(struct super_block *sb, char *svname); -#else -#define lustre_check_exclusion(a,b) 0 -#endif + ENTRY; + + reclen = lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen); + reclen = llog_data_len(reclen) + sizeof(struct llog_rec_hdr) + + sizeof(struct llog_rec_tail); + + OBD_ALLOC(lcr, reclen); + if (lcr == NULL) + RETURN(NULL); + + lustre_cfg_init(&lcr->lcr_cfg, cmd, bufs); + + lcr->lcr_hdr.lrh_len = reclen; + lcr->lcr_hdr.lrh_type = OBD_CFG_REC; + + RETURN(lcr); +} +EXPORT_SYMBOL(lustre_cfg_rec_new); + +void lustre_cfg_rec_free(struct llog_cfg_rec *lcr) +{ + ENTRY; + OBD_FREE(lcr, lcr->lcr_hdr.lrh_len); + EXIT; +} +EXPORT_SYMBOL(lustre_cfg_rec_free); /** Parse a configuration llog, doing various manipulations on them * for various reasons, (modifications for compatibility, skip obsolete @@ -1481,129 +1577,129 @@ int class_config_llog_handler(const struct lu_env *env, struct llog_handle *handle, struct llog_rec_hdr *rec, void *data) { - struct config_llog_instance *clli = data; - int cfg_len = rec->lrh_len; - char *cfg_buf = (char*) (rec + 1); - int rc = 0; - ENTRY; + struct config_llog_instance *cfg = data; + int cfg_len = rec->lrh_len; + char *cfg_buf = (char *) (rec + 1); + int rc = 0; + ENTRY; - //class_config_dump_handler(handle, rec, data); + /* class_config_dump_handler(handle, rec, data); */ - switch (rec->lrh_type) { - case OBD_CFG_REC: { - struct lustre_cfg *lcfg, *lcfg_new; - struct lustre_cfg_bufs bufs; - char *inst_name = NULL; - int inst_len = 0; - int inst = 0, swab = 0; + switch (rec->lrh_type) { + case OBD_CFG_REC: { + struct lustre_cfg *lcfg, *lcfg_new; + struct lustre_cfg_bufs bufs; + char *inst_name = NULL; + int inst_len = 0; + int swab = 0; - lcfg = (struct lustre_cfg *)cfg_buf; - if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) { - lustre_swab_lustre_cfg(lcfg); - swab = 1; - } + lcfg = (struct lustre_cfg *)cfg_buf; + 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) - GOTO(out, rc); + rc = lustre_cfg_sanity_check(cfg_buf, cfg_len); + if (rc) + GOTO(out, rc); /* 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) { + 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", + cfg->cfg_flags, marker->cm_flags); + if (marker->cm_flags & CM_START) { /* all previous flags off */ - clli->cfg_flags = CFG_F_MARKER; + cfg->cfg_flags = CFG_F_MARKER; server_name2index(marker->cm_tgtname, - &clli->cfg_lwp_idx, NULL); - if (marker->cm_flags & CM_SKIP) { - clli->cfg_flags |= CFG_F_SKIP; - CDEBUG(D_CONFIG, "SKIP #%d\n", - marker->cm_step); - } else if ((marker->cm_flags & CM_EXCLUDE) || - (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); - } - } else if (marker->cm_flags & CM_END) { - clli->cfg_flags = 0; - } - } - /* A config command without a start marker before it is - illegal (post 146) */ - if (!(clli->cfg_flags & CFG_F_COMPAT146) && - !(clli->cfg_flags & CFG_F_MARKER) && - (lcfg->lcfg_command != LCFG_MARKER)) { - CWARN("Config not inside markers, ignoring! " - "(inst: %p, uuid: %s, flags: %#x)\n", - clli->cfg_instance, - clli->cfg_uuid.uuid, clli->cfg_flags); - clli->cfg_flags |= CFG_F_SKIP; - } - if (clli->cfg_flags & CFG_F_SKIP) { - CDEBUG(D_CONFIG, "skipping %#x\n", - clli->cfg_flags); - rc = 0; - /* No processing! */ - break; - } + &cfg->cfg_lwp_idx, NULL); + if (marker->cm_flags & CM_SKIP) { + cfg->cfg_flags |= CFG_F_SKIP; + CDEBUG(D_CONFIG, "SKIP #%d\n", + marker->cm_step); + } else if ((marker->cm_flags & CM_EXCLUDE) || + (cfg->cfg_sb && + lustre_check_exclusion(cfg->cfg_sb, + marker->cm_tgtname))) { + cfg->cfg_flags |= CFG_F_EXCLUDE; + CDEBUG(D_CONFIG, "EXCLUDE %d\n", + marker->cm_step); + } + } else if (marker->cm_flags & CM_END) { + cfg->cfg_flags = 0; + } + } + /* A config command without a start marker before it is + * illegal + */ + if (!(cfg->cfg_flags & CFG_F_MARKER) && + (lcfg->lcfg_command != LCFG_MARKER)) { + CWARN("Config not inside markers, ignoring! " + "(inst: %p, uuid: %s, flags: %#x)\n", + cfg->cfg_instance, + cfg->cfg_uuid.uuid, cfg->cfg_flags); + cfg->cfg_flags |= CFG_F_SKIP; + } + if (cfg->cfg_flags & CFG_F_SKIP) { + CDEBUG(D_CONFIG, "skipping %#x\n", + cfg->cfg_flags); + rc = 0; + /* No processing! */ + 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; - } - } + { + char *typename = lustre_cfg_string(lcfg, 1); + char *index = lustre_cfg_string(lcfg, 2); -#if defined(HAVE_SERVER_SUPPORT) && defined(__KERNEL__) + 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; + } + } + +#ifdef HAVE_SERVER_SUPPORT /* newer MDS replaces LOV/OSC with LOD/OSP */ { char *typename = lustre_cfg_string(lcfg, 1); if ((lcfg->lcfg_command == LCFG_ATTACH && typename && strcmp(typename, LUSTRE_LOV_NAME) == 0) && - IS_MDT(s2lsi(clli->cfg_sb))) { + cfg->cfg_sb && IS_MDT(s2lsi(cfg->cfg_sb))) { CDEBUG(D_CONFIG, "For 2.x interoperability, rename obd " "type from lov to lod (%s)\n", - s2lsi(clli->cfg_sb)->lsi_svname); + s2lsi(cfg->cfg_sb)->lsi_svname); strcpy(typename, LUSTRE_LOD_NAME); } if ((lcfg->lcfg_command == LCFG_ATTACH && typename && strcmp(typename, LUSTRE_OSC_NAME) == 0) && - IS_MDT(s2lsi(clli->cfg_sb))) { + cfg->cfg_sb && IS_MDT(s2lsi(cfg->cfg_sb))) { CDEBUG(D_CONFIG, "For 2.x interoperability, rename obd " "type from osc to osp (%s)\n", - s2lsi(clli->cfg_sb)->lsi_svname); + s2lsi(cfg->cfg_sb)->lsi_svname); strcpy(typename, LUSTRE_OSP_NAME); } } -#endif +#endif /* HAVE_SERVER_SUPPORT */ - if (clli->cfg_flags & CFG_F_EXCLUDE) { + if (cfg->cfg_flags & CFG_F_EXCLUDE) { CDEBUG(D_CONFIG, "cmd: %x marked EXCLUDED\n", lcfg->lcfg_command); if (lcfg->lcfg_command == LCFG_LOV_ADD_OBD) @@ -1611,31 +1707,32 @@ int class_config_llog_handler(const struct lu_env *env, lcfg->lcfg_command = LCFG_LOV_ADD_INA; } - lustre_cfg_bufs_init(&bufs, lcfg); - - if (clli && clli->cfg_instance && - LUSTRE_CFG_BUFLEN(lcfg, 0) > 0){ - inst = 1; - inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) + - sizeof(clli->cfg_instance) * 2 + 4; - OBD_ALLOC(inst_name, inst_len); - if (inst_name == NULL) - GOTO(out, rc = -ENOMEM); - sprintf(inst_name, "%s-%p", - lustre_cfg_string(lcfg, 0), - clli->cfg_instance); - lustre_cfg_bufs_set_string(&bufs, 0, inst_name); - CDEBUG(D_CONFIG, "cmd %x, instance name: %s\n", - lcfg->lcfg_command, inst_name); - } + lustre_cfg_bufs_reset(&bufs, NULL); + lustre_cfg_bufs_init(&bufs, lcfg); + + if (cfg->cfg_instance && + lcfg->lcfg_command != LCFG_SPTLRPC_CONF && + LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) { + inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) + + sizeof(cfg->cfg_instance) * 2 + 4; + OBD_ALLOC(inst_name, inst_len); + if (inst_name == NULL) + GOTO(out, rc = -ENOMEM); + snprintf(inst_name, inst_len, "%s-%p", + lustre_cfg_string(lcfg, 0), + cfg->cfg_instance); + lustre_cfg_bufs_set_string(&bufs, 0, inst_name); + CDEBUG(D_CONFIG, "cmd %x, instance name: %s\n", + lcfg->lcfg_command, inst_name); + } /* we override the llog's uuid for clients, to insure they are unique */ - if (clli && clli->cfg_instance != NULL && - lcfg->lcfg_command == LCFG_ATTACH) { - lustre_cfg_bufs_set_string(&bufs, 2, - clli->cfg_uuid.uuid); - } + if (cfg->cfg_instance != NULL && + lcfg->lcfg_command == LCFG_ATTACH) { + lustre_cfg_bufs_set_string(&bufs, 2, + cfg->cfg_uuid.uuid); + } /* * sptlrpc config record, we expect 2 data segments: * [0]: fs_name/target_name, @@ -1643,67 +1740,117 @@ int class_config_llog_handler(const struct lu_env *env, * 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); + if (cfg->cfg_instance && + lcfg->lcfg_command == LCFG_SPTLRPC_CONF) { + struct obd_device *obd = cfg->cfg_instance; + + 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, + obd->obd_name); + } - lcfg_new->lcfg_num = lcfg->lcfg_num; - lcfg_new->lcfg_flags = lcfg->lcfg_flags; + /* Add net info to setup command + * if given on command line. + * So config log will be: + * [0]: client name + * [1]: client UUID + * [2]: server UUID + * [3]: inactive-on-startup + * [4]: restrictive net + */ + if (cfg && cfg->cfg_sb && s2lsi(cfg->cfg_sb) && + !IS_SERVER(s2lsi(cfg->cfg_sb))) { + struct lustre_sb_info *lsi = s2lsi(cfg->cfg_sb); + char *nidnet = lsi->lsi_lmd->lmd_nidnet; + + if (lcfg->lcfg_command == LCFG_SETUP && + lcfg->lcfg_bufcount != 2 && nidnet) { + CDEBUG(D_CONFIG, "Adding net %s info to setup " + "command for client %s\n", nidnet, + lustre_cfg_string(lcfg, 0)); + lustre_cfg_bufs_set_string(&bufs, 4, nidnet); + } + } - /* XXX Hack to try to remain binary compatible with - * pre-newconfig logs */ - if (lcfg->lcfg_nal != 0 && /* pre-newconfig log? */ - (lcfg->lcfg_nid >> 32) == 0) { - __u32 addr = (__u32)(lcfg->lcfg_nid & 0xffffffff); + /* Skip add_conn command if uuid is + * not on restricted net */ + if (cfg && cfg->cfg_sb && s2lsi(cfg->cfg_sb) && + !IS_SERVER(s2lsi(cfg->cfg_sb))) { + struct lustre_sb_info *lsi = s2lsi(cfg->cfg_sb); + char *uuid_str = lustre_cfg_string(lcfg, 1); + + if (lcfg->lcfg_command == LCFG_ADD_CONN && + lsi->lsi_lmd->lmd_nidnet && + LNET_NIDNET(libcfs_str2nid(uuid_str)) != + libcfs_str2net(lsi->lsi_lmd->lmd_nidnet)) { + CDEBUG(D_CONFIG, "skipping add_conn for %s\n", + uuid_str); + rc = 0; + /* No processing! */ + break; + } + } - lcfg_new->lcfg_nid = - LNET_MKNID(LNET_MKNET(lcfg->lcfg_nal, 0), addr); - CWARN("Converted pre-newconfig NAL %d NID %x to %s\n", - lcfg->lcfg_nal, addr, - libcfs_nid2str(lcfg_new->lcfg_nid)); - } else { - lcfg_new->lcfg_nid = lcfg->lcfg_nid; - } + OBD_ALLOC(lcfg_new, lustre_cfg_len(bufs.lcfg_bufcount, + bufs.lcfg_buflen)); + if (!lcfg_new) + GOTO(out, rc = -ENOMEM); + + lustre_cfg_init(lcfg_new, lcfg->lcfg_command, &bufs); + lcfg_new->lcfg_num = lcfg->lcfg_num; + lcfg_new->lcfg_flags = lcfg->lcfg_flags; + + /* XXX Hack to try to remain binary compatible with + * pre-newconfig logs */ + if (lcfg->lcfg_nal != 0 && /* pre-newconfig log? */ + (lcfg->lcfg_nid >> 32) == 0) { + __u32 addr = (__u32)(lcfg->lcfg_nid & 0xffffffff); + + lcfg_new->lcfg_nid = + LNET_MKNID(LNET_MKNET(lcfg->lcfg_nal, 0), addr); + CWARN("Converted pre-newconfig NAL %d NID %x to %s\n", + lcfg->lcfg_nal, addr, + libcfs_nid2str(lcfg_new->lcfg_nid)); + } else { + lcfg_new->lcfg_nid = lcfg->lcfg_nid; + } - lcfg_new->lcfg_nal = 0; /* illegal value for obsolete field */ + lcfg_new->lcfg_nal = 0; /* illegal value for obsolete field */ rc = class_process_config(lcfg_new); - lustre_cfg_free(lcfg_new); - - if (inst) - OBD_FREE(inst_name, inst_len); - break; - } - default: - CERROR("Unknown llog record type %#x encountered\n", - rec->lrh_type); - break; - } + OBD_FREE(lcfg_new, lustre_cfg_len(lcfg_new->lcfg_bufcount, + lcfg_new->lcfg_buflens)); + if (inst_name) + OBD_FREE(inst_name, inst_len); + break; + } + default: + CERROR("Unknown llog record type %#x encountered\n", + rec->lrh_type); + break; + } out: - if (rc) { + if (rc) { CERROR("%s: cfg command failed: rc = %d\n", - handle->lgh_ctxt->loc_obd->obd_name, rc); + handle->lgh_ctxt->loc_obd->obd_name, rc); class_config_dump_handler(NULL, handle, rec, data); - } - RETURN(rc); + } + RETURN(rc); } EXPORT_SYMBOL(class_config_llog_handler); int class_config_parse_llog(const struct lu_env *env, struct llog_ctxt *ctxt, char *name, struct config_llog_instance *cfg) { - struct llog_process_cat_data cd = {0, 0}; - struct llog_handle *llh; - llog_cb_t callback; - int rc; + struct llog_process_cat_data cd = { + .lpcd_first_idx = 0, + }; + struct llog_handle *llh; + llog_cb_t callback; + int rc; ENTRY; CDEBUG(D_INFO, "looking up llog %s\n", name); @@ -1739,7 +1886,7 @@ parse_out: } EXPORT_SYMBOL(class_config_parse_llog); -struct lcfg_type_data { +static struct lcfg_type_data { __u32 ltd_type; char *ltd_name; char *ltd_bufs[4]; @@ -1758,7 +1905,7 @@ struct lcfg_type_data { { LCFG_DEL_CONN, "del_conn", { "1", "2", "3", "4" } }, { LCFG_LOV_ADD_OBD, "add_osc", { "ost", "index", "gen", "UUID" } }, { LCFG_LOV_DEL_OBD, "del_osc", { "1", "2", "3", "4" } }, - { LCFG_PARAM, "set_param", { "parameter", "value", "3", "4" } }, + { LCFG_PARAM, "conf_param", { "parameter", "value", "3", "4" } }, { LCFG_MARKER, "marker", { "1", "2", "3", "4" } }, { LCFG_LOG_START, "log_start", { "1", "2", "3", "4" } }, { LCFG_LOG_END, "log_end", { "1", "2", "3", "4" } }, @@ -1772,6 +1919,7 @@ struct lcfg_type_data { { LCFG_POOL_DEL, "del_pool", { "fsname", "pool", "3", "4" } }, { LCFG_SET_LDLM_TIMEOUT, "set_ldlm_timeout", { "parameter", "2", "3", "4" } }, + { LCFG_SET_PARAM, "set_param", { "parameter", "value", "3", "4" } }, { 0, NULL, { NULL, NULL, NULL, NULL } } }; @@ -1788,13 +1936,14 @@ static struct lcfg_type_data *lcfg_cmd2data(__u32 cmd) } /** - * parse config record and output dump in supplied buffer. + * Parse config record and output dump in supplied buffer. + * * This is separated from class_config_dump_handler() to use * for ioctl needs as well * * Sample Output: - * - { event: attach, device: lustrewt-clilov, type: lov, UUID: - * lustrewt-clilov_UUID } + * - { index: 4, event: attach, device: lustrewt-clilov, type: lov, + * UUID: lustrewt-clilov_UUID } */ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size) { @@ -1817,7 +1966,8 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size) return 0; /* form YAML entity */ - ptr += snprintf(ptr, end - ptr, "- { event: %s", ldata->ltd_name); + ptr += snprintf(ptr, end - ptr, "- { index: %u, event: %s", + rec->lrh_index, ldata->ltd_name); if (lcfg->lcfg_flags) ptr += snprintf(ptr, end - ptr, ", flags: %#08x", @@ -1825,15 +1975,42 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size) if (lcfg->lcfg_num) ptr += snprintf(ptr, end - ptr, ", num: %#08x", lcfg->lcfg_num); - if (lcfg->lcfg_nid) - ptr += snprintf(ptr, end - ptr, ", nid: %s("LPX64")", - libcfs_nid2str(lcfg->lcfg_nid), - lcfg->lcfg_nid); + if (lcfg->lcfg_nid) { + char nidstr[LNET_NIDSTR_SIZE]; + + libcfs_nid2str_r(lcfg->lcfg_nid, nidstr, sizeof(nidstr)); + ptr += snprintf(ptr, end - ptr, ", nid: %s(%#llx)", + nidstr, lcfg->lcfg_nid); + } if (LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) ptr += snprintf(ptr, end - ptr, ", device: %s", lustre_cfg_string(lcfg, 0)); + if (lcfg->lcfg_command == LCFG_SET_PARAM) { + /* + * set_param -P parameters have param=val here, separate + * them through pointer magic and print them out in + * native yamlese + */ + char *cfg_str = lustre_cfg_string(lcfg, 1); + char *tmp = strchr(cfg_str, '='); + size_t len; + + if (tmp == NULL) + return -ENOTTY; + + ptr += snprintf(ptr, end - ptr, ", %s: ", ldata->ltd_bufs[0]); + len = tmp - cfg_str + 1; + snprintf(ptr, len, "%s", cfg_str); + ptr += len - 1; + + ptr += snprintf(ptr, end - ptr, ", %s: ", ldata->ltd_bufs[1]); + ptr += snprintf(ptr, end - ptr, "%s", tmp + 1); + + goto out_done; + } + for (i = 1; i < lcfg->lcfg_bufcount; i++) { if (LUSTRE_CFG_BUFLEN(lcfg, i) > 0) ptr += snprintf(ptr, end - ptr, ", %s: %s", @@ -1841,6 +2018,7 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size) lustre_cfg_string(lcfg, i)); } +out_done: ptr += snprintf(ptr, end - ptr, " }\n"); /* return consumed bytes */ rc = ptr - buf; @@ -1852,7 +2030,7 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size) * This is separated from class_config_dump_handler() to use * for ioctl needs as well */ -int class_config_parse_rec(struct llog_rec_hdr *rec, char *buf, int size) +static int class_config_parse_rec(struct llog_rec_hdr *rec, char *buf, int size) { struct lustre_cfg *lcfg = (struct lustre_cfg *)(rec + 1); char *ptr = buf; @@ -1874,10 +2052,13 @@ int class_config_parse_rec(struct llog_rec_hdr *rec, char *buf, int size) if (lcfg->lcfg_num) ptr += snprintf(ptr, end-ptr, "num=%#08x ", lcfg->lcfg_num); - if (lcfg->lcfg_nid) - ptr += snprintf(ptr, end-ptr, "nid=%s("LPX64")\n ", - libcfs_nid2str(lcfg->lcfg_nid), - lcfg->lcfg_nid); + if (lcfg->lcfg_nid) { + char nidstr[LNET_NIDSTR_SIZE]; + + libcfs_nid2str_r(lcfg->lcfg_nid, nidstr, sizeof(nidstr)); + ptr += snprintf(ptr, end-ptr, "nid=%s(%#llx)\n ", + nidstr, lcfg->lcfg_nid); + } if (lcfg->lcfg_command == LCFG_MARKER) { struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1); @@ -1914,7 +2095,7 @@ int class_config_dump_handler(const struct lu_env *env, if (rec->lrh_type == OBD_CFG_REC) { class_config_parse_rec(rec, outstr, 256); - LCONSOLE(D_WARNING, " %s", outstr); + LCONSOLE(D_WARNING, " %s\n", outstr); } else { LCONSOLE(D_WARNING, "unhandled lrh_type: %#x\n", rec->lrh_type); rc = -EINVAL; @@ -1924,33 +2105,6 @@ int class_config_dump_handler(const struct lu_env *env, RETURN(rc); } -int class_config_dump_llog(const struct lu_env *env, struct llog_ctxt *ctxt, - char *name, struct config_llog_instance *cfg) -{ - struct llog_handle *llh; - int rc; - - ENTRY; - - LCONSOLE_INFO("Dumping config log %s\n", name); - - rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS); - if (rc) - RETURN(rc); - - rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL); - if (rc) - GOTO(parse_out, rc); - - rc = llog_process(env, llh, class_config_dump_handler, cfg, NULL); -parse_out: - llog_close(env, llh); - - LCONSOLE_INFO("End config log %s\n", name); - RETURN(rc); -} -EXPORT_SYMBOL(class_config_dump_llog); - /** Call class_cleanup and class_detach. * "Manual" only in the sense that we're faking lcfg commands. */ @@ -1975,11 +2129,12 @@ int class_manual_cleanup(struct obd_device *obd) CDEBUG(D_CONFIG, "Manual cleanup of %s (flags='%s')\n", obd->obd_name, flags); - 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); + lustre_cfg_bufs_reset(&bufs, obd->obd_name); + lustre_cfg_bufs_set_string(&bufs, 1, flags); + OBD_ALLOC(lcfg, lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen)); + if (!lcfg) + RETURN(-ENOMEM); + lustre_cfg_init(lcfg, LCFG_CLEANUP, &bufs); rc = class_process_config(lcfg); if (rc) { @@ -1993,8 +2148,8 @@ int class_manual_cleanup(struct obd_device *obd) if (rc) CERROR("detach failed %d: %s\n", rc, obd->obd_name); out: - lustre_cfg_free(lcfg); - RETURN(rc); + OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens)); + RETURN(rc); } EXPORT_SYMBOL(class_manual_cleanup); @@ -2003,20 +2158,20 @@ EXPORT_SYMBOL(class_manual_cleanup); */ static unsigned -uuid_hash(cfs_hash_t *hs, const void *key, unsigned mask) +uuid_hash(struct cfs_hash *hs, const 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) +uuid_key(struct hlist_node *hnode) { - struct obd_export *exp; + struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash); - return &exp->exp_client_uuid; + return &exp->exp_client_uuid; } /* @@ -2024,42 +2179,42 @@ uuid_key(cfs_hlist_node_t *hnode) * state with this function */ static int -uuid_keycmp(const void *key, cfs_hlist_node_t *hnode) +uuid_keycmp(const void *key, struct hlist_node *hnode) { struct obd_export *exp; LASSERT(key); - exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash); return obd_uuid_equals(key, &exp->exp_client_uuid) && !exp->exp_failed; } static void * -uuid_export_object(cfs_hlist_node_t *hnode) +uuid_export_object(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + return hlist_entry(hnode, struct obd_export, exp_uuid_hash); } static void -uuid_export_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +uuid_export_get(struct cfs_hash *hs, struct hlist_node *hnode) { struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash); class_export_get(exp); } static void -uuid_export_put_locked(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +uuid_export_put_locked(struct cfs_hash *hs, struct hlist_node *hnode) { struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash); class_export_put(exp); } -static cfs_hash_ops_t uuid_hash_ops = { +static struct cfs_hash_ops uuid_hash_ops = { .hs_hash = uuid_hash, .hs_key = uuid_key, .hs_keycmp = uuid_keycmp, @@ -2074,17 +2229,17 @@ static cfs_hash_ops_t uuid_hash_ops = { */ static unsigned -nid_hash(cfs_hash_t *hs, const void *key, unsigned mask) +nid_hash(struct cfs_hash *hs, const void *key, unsigned mask) { return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask); } static void * -nid_key(cfs_hlist_node_t *hnode) +nid_key(struct hlist_node *hnode) { struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_nid_hash); RETURN(&exp->exp_connection->c_peer.nid); } @@ -2094,42 +2249,42 @@ nid_key(cfs_hlist_node_t *hnode) * state with this function */ static int -nid_kepcmp(const void *key, cfs_hlist_node_t *hnode) +nid_kepcmp(const void *key, struct hlist_node *hnode) { struct obd_export *exp; LASSERT(key); - exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + exp = 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_object(cfs_hlist_node_t *hnode) +nid_export_object(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + return hlist_entry(hnode, struct obd_export, exp_nid_hash); } static void -nid_export_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +nid_export_get(struct cfs_hash *hs, struct hlist_node *hnode) { struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_nid_hash); class_export_get(exp); } static void -nid_export_put_locked(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +nid_export_put_locked(struct cfs_hash *hs, struct hlist_node *hnode) { struct obd_export *exp; - exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + exp = hlist_entry(hnode, struct obd_export, exp_nid_hash); class_export_put(exp); } -static cfs_hash_ops_t nid_hash_ops = { +static struct cfs_hash_ops nid_hash_ops = { .hs_hash = nid_hash, .hs_key = nid_key, .hs_keycmp = nid_kepcmp, @@ -2144,46 +2299,46 @@ static cfs_hash_ops_t nid_hash_ops = { */ static void * -nidstats_key(cfs_hlist_node_t *hnode) +nidstats_key(struct hlist_node *hnode) { struct nid_stat *ns; - ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + ns = hlist_entry(hnode, struct nid_stat, nid_hash); return &ns->nid; } static int -nidstats_keycmp(const void *key, cfs_hlist_node_t *hnode) +nidstats_keycmp(const void *key, struct hlist_node *hnode) { return *(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key; } static void * -nidstats_object(cfs_hlist_node_t *hnode) +nidstats_object(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + return hlist_entry(hnode, struct nid_stat, nid_hash); } static void -nidstats_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +nidstats_get(struct cfs_hash *hs, struct hlist_node *hnode) { struct nid_stat *ns; - ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + ns = hlist_entry(hnode, struct nid_stat, nid_hash); nidstat_getref(ns); } static void -nidstats_put_locked(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +nidstats_put_locked(struct cfs_hash *hs, struct hlist_node *hnode) { struct nid_stat *ns; - ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + ns = hlist_entry(hnode, struct nid_stat, nid_hash); nidstat_putref(ns); } -static cfs_hash_ops_t nid_stat_hash_ops = { +static struct cfs_hash_ops nid_stat_hash_ops = { .hs_hash = nid_hash, .hs_key = nidstats_key, .hs_keycmp = nidstats_keycmp, @@ -2191,3 +2346,73 @@ static cfs_hash_ops_t nid_stat_hash_ops = { .hs_get = nidstats_get, .hs_put_locked = nidstats_put_locked, }; + + +/* + * client_generation<->export hash operations + */ + +static unsigned +gen_hash(struct cfs_hash *hs, const void *key, unsigned mask) +{ + return cfs_hash_djb2_hash(key, sizeof(__u32), mask); +} + +static void * +gen_key(struct hlist_node *hnode) +{ + struct obd_export *exp; + + exp = hlist_entry(hnode, struct obd_export, exp_gen_hash); + + RETURN(&exp->exp_target_data.ted_lcd->lcd_generation); +} + +/* + * NOTE: It is impossible to find an export that is in failed + * state with this function + */ +static int +gen_kepcmp(const void *key, struct hlist_node *hnode) +{ + struct obd_export *exp; + + LASSERT(key); + exp = hlist_entry(hnode, struct obd_export, exp_gen_hash); + + RETURN(exp->exp_target_data.ted_lcd->lcd_generation == *(__u32 *)key && + !exp->exp_failed); +} + +static void * +gen_export_object(struct hlist_node *hnode) +{ + return hlist_entry(hnode, struct obd_export, exp_gen_hash); +} + +static void +gen_export_get(struct cfs_hash *hs, struct hlist_node *hnode) +{ + struct obd_export *exp; + + exp = hlist_entry(hnode, struct obd_export, exp_gen_hash); + class_export_get(exp); +} + +static void +gen_export_put_locked(struct cfs_hash *hs, struct hlist_node *hnode) +{ + struct obd_export *exp; + + exp = hlist_entry(hnode, struct obd_export, exp_gen_hash); + class_export_put(exp); +} + +static struct cfs_hash_ops gen_hash_ops = { + .hs_hash = gen_hash, + .hs_key = gen_key, + .hs_keycmp = gen_kepcmp, + .hs_object = gen_export_object, + .hs_get = gen_export_get, + .hs_put_locked = gen_export_put_locked, +};