X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_config.c;h=9220ac706734ac36d0ea993b1d577f6cd2746892;hp=646e7fec36ca7c200f745de87c8e745b182ab96c;hb=f52ece3201af131a7bb8a7b2766d3f0a98c00fca;hpb=3192e52a89946f12fd36d28a686c169d01d36e64 diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c index 646e7fe..9220ac7 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -1,28 +1,41 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (c) 2001-2006 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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 * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * 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. * - * Config API + * GPL HEADER END + */ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/obdclass/obd_config.c + * + * Config API */ #define DEBUG_SUBSYSTEM S_CLASS @@ -31,17 +44,17 @@ #include #else #include +#include #include #include #endif -#include -#include -#include #include -#include -extern struct lustre_hash_operations uuid_hash_operations; -extern struct lustre_hash_operations nid_hash_operations; +#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; /*********** string parsing utils *********/ @@ -50,78 +63,269 @@ int class_find_param(char *buf, char *key, char **valp) { char *ptr; - if (!buf) + if (!buf) return 1; - if ((ptr = strstr(buf, key)) == NULL) + if ((ptr = strstr(buf, key)) == NULL) return 1; - if (valp) + if (valp) *valp = ptr + strlen(key); - + return 0; } +EXPORT_SYMBOL(class_find_param); + +/** + * Check whether the proc parameter \a param is an old parameter or not from + * the array \a ptr which contains the mapping from old parameters to new ones. + * If it's an old one, then return the pointer to the cfg_interop_param struc- + * ture which contains both the old and new parameters. + * + * \param param proc parameter + * \param ptr an array which contains the mapping from + * old parameters to new ones + * + * \retval valid-pointer pointer to the cfg_interop_param structure + * which contains the old and new parameters + * \retval NULL \a param or \a ptr is NULL, + * or \a param is not an old parameter + */ +struct cfg_interop_param *class_find_old_param(const char *param, + struct cfg_interop_param *ptr) +{ + char *value = NULL; + int name_len = 0; + + if (param == NULL || ptr == NULL) + RETURN(NULL); + + value = strchr(param, '='); + if (value == NULL) + name_len = strlen(param); + else + name_len = value - param; + + while (ptr->old_param != NULL) { + if (strncmp(param, ptr->old_param, name_len) == 0 && + name_len == strlen(ptr->old_param)) + RETURN(ptr); + ptr++; + } + + RETURN(NULL); +} +EXPORT_SYMBOL(class_find_old_param); + +/** + * 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; +} +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) { - if (!buf) + if (!buf) return 1; - if (memcmp(buf, key, strlen(key)) != 0) + if (memcmp(buf, key, strlen(key)) != 0) return 1; - if (valp) + if (valp) *valp = buf + strlen(key); - + + return 0; +} +EXPORT_SYMBOL(class_match_param); + +static int parse_nid(char *buf, void *value) +{ + lnet_nid_t *nid = (lnet_nid_t *)value; + + *nid = libcfs_str2nid(buf); + if (*nid != LNET_NID_ANY) + return 0; + + LCONSOLE_ERROR_MSG(0x159, "Can't parse NID '%s'\n", buf); + return -EINVAL; +} + +static int parse_net(char *buf, void *value) +{ + __u32 *net = (__u32 *)value; + + *net = libcfs_str2net(buf); + CDEBUG(D_INFO, "Net %s\n", libcfs_net2str(*net)); return 0; } -/* 0 is good nid, +enum { + CLASS_PARSE_NID = 1, + CLASS_PARSE_NET, +}; + +/* 0 is good nid, 1 not found < 0 error endh is set to next separator */ -int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh) +static int class_parse_value(char *buf, int opc, void *value, char **endh) { - char tmp, *endp; + char *endp; + char tmp; + int rc = 0; - if (!buf) + if (!buf) return 1; - while (*buf == ',' || *buf == ':') + while (*buf == ',' || *buf == ':') buf++; - if (*buf == ' ' || *buf == '/' || *buf == '\0') + if (*buf == ' ' || *buf == '/' || *buf == '\0') return 1; /* nid separators or end of nids */ endp = strpbrk(buf, ",: /"); - if (endp == NULL) + if (endp == NULL) endp = buf + strlen(buf); tmp = *endp; *endp = '\0'; - *nid = libcfs_str2nid(buf); - if (*nid == LNET_NID_ANY) { - LCONSOLE_ERROR_MSG(0x159, "Can't parse NID '%s'\n", buf); - *endp = tmp; - return -EINVAL; + switch (opc) { + default: + LBUG(); + case CLASS_PARSE_NID: + rc = parse_nid(buf, value); + break; + case CLASS_PARSE_NET: + rc = parse_net(buf, value); + break; } *endp = tmp; - - if (endh) + if (rc != 0) + return rc; + if (endh) *endh = endp; - CDEBUG(D_INFO, "Nid %s\n", libcfs_nid2str(*nid)); return 0; } -EXPORT_SYMBOL(class_find_param); -EXPORT_SYMBOL(class_match_param); +int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh) +{ + return class_parse_value(buf, CLASS_PARSE_NID, (void *)nid, endh); +} EXPORT_SYMBOL(class_parse_nid); +int class_parse_net(char *buf, __u32 *net, char **endh) +{ + return class_parse_value(buf, CLASS_PARSE_NET, (void *)net, endh); +} +EXPORT_SYMBOL(class_parse_net); + +/* 1 param contains key and match + * 0 param contains key and not match + * -1 param does not contain key + */ +int class_match_nid(char *buf, char *key, lnet_nid_t nid) +{ + lnet_nid_t tmp; + int rc = -1; + + while (class_find_param(buf, key, &buf) == 0) { + /* please restrict to the nids pertaining to + * the specified nids */ + while (class_parse_nid(buf, &tmp, &buf) == 0) { + if (tmp == nid) + return 1; + } + rc = 0; + } + return rc; +} +EXPORT_SYMBOL(class_match_nid); + +int class_match_net(char *buf, char *key, __u32 net) +{ + __u32 tmp; + int rc = -1; + + while (class_find_param(buf, key, &buf) == 0) { + /* please restrict to the nids pertaining to + * the specified networks */ + while (class_parse_net(buf, &tmp, &buf) == 0) { + if (tmp == net) + return 1; + } + rc = 0; + } + return rc; +} +EXPORT_SYMBOL(class_match_net); + /********************** class fns **********************/ -/* Create a new device and set the type, name and uuid. If - * successful, the new device can be accessed by either name or uuid. +/** + * Create a new obd device and set the type, name and uuid. If successful, + * the new device can be accessed by either name or uuid. */ int class_attach(struct lustre_cfg *lcfg) { @@ -162,39 +366,49 @@ int class_attach(struct lustre_cfg *lcfg) } LASSERTF(obd != NULL, "Cannot get obd device %s of type %s\n", name, typename); - LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC, + 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); + + 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); - spin_lock_init(&obd->obd_dev_lock); - sema_init(&obd->obd_dev_sem, 1); - sema_init(&obd->obd_proc_exp_sem, 1); - spin_lock_init(&obd->obd_osfs_lock); + CFS_INIT_LIST_HEAD(&obd->obd_nid_stats); + cfs_spin_lock_init(&obd->obd_nid_lock); + cfs_spin_lock_init(&obd->obd_dev_lock); + cfs_mutex_init(&obd->obd_dev_mutex); + 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_recovery_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, FID_SEQ_LLOG); - spin_lock_init(&obd->obd_uncommitted_replies_lock); - CFS_INIT_LIST_HEAD(&obd->obd_uncommitted_replies); + obd->obd_conn_inprogress = 0; len = strlen(uuid); if (len >= sizeof(obd->obd_uuid)) { - CERROR("uuid must be < "LPSZ" bytes long\n", - 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); @@ -207,13 +421,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) { @@ -221,7 +437,11 @@ int class_attach(struct lustre_cfg *lcfg) } return rc; } +EXPORT_SYMBOL(class_attach); +/** Create hashes, self-export, and call type-specific setup. + * Setup is effectively the "start this obd" call. + */ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) { int err = 0; @@ -229,9 +449,11 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) ENTRY; LASSERT(obd != NULL); - LASSERTF(obd == class_num2obd(obd->obd_minor), "obd %p != obd_devs[%d] %p\n", + LASSERTF(obd == class_num2obd(obd->obd_minor), + "obd %p != obd_devs[%d] %p\n", obd, obd->obd_minor, class_num2obd(obd->obd_minor)); - LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC, "obd %p obd_magic %08x != %08x\n", + LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC, + "obd %p obd_magic %08x != %08x\n", obd, obd->obd_magic, OBD_DEVICE_MAGIC); /* have we attached a type to this device? */ @@ -247,9 +469,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); @@ -257,26 +479,50 @@ 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); + 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, + HASH_UUID_BKT_BITS, 0, + CFS_HASH_MIN_THETA, + CFS_HASH_MAX_THETA, + &uuid_hash_ops, CFS_HASH_DEFAULT); + 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, + HASH_NID_BKT_BITS, 0, + CFS_HASH_MIN_THETA, + CFS_HASH_MAX_THETA, + &nid_hash_ops, CFS_HASH_DEFAULT); + 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, + HASH_NID_STATS_BKT_BITS, 0, + 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)) - 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); @@ -284,28 +530,43 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg) GOTO(err_exp, err); 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); + if (obd->obd_uuid_hash) { + cfs_hash_putref(obd->obd_uuid_hash); + obd->obd_uuid_hash = NULL; + } + if (obd->obd_nid_hash) { + cfs_hash_putref(obd->obd_nid_hash); + obd->obd_nid_hash = NULL; + } + if (obd->obd_nid_stats_hash) { + cfs_hash_putref(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; } +EXPORT_SYMBOL(class_setup); +/** We have finished using this obd and are ready to destroy it. + * There can be no more references to this obd. + */ int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg) { ENTRY; @@ -315,51 +576,27 @@ 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); - - /* not strictly necessary, but cleans up eagerly */ - obd_zombie_impexp_cull(); - + class_decref(obd, "attach", obd); RETURN(0); } +EXPORT_SYMBOL(class_detach); -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 ? "..." : ""); - } -} - +/** Start shutting down the obd. There may be in-progess ops when + * this is called. We tell them to start shutting down with a call + * to class_disconnect_exports(). + */ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) { int err = 0; @@ -373,15 +610,24 @@ 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); + + /* wait for already-arrived-connections to finish. */ + while (obd->obd_conn_inprogress > 0) { + cfs_spin_unlock(&obd->obd_dev_lock); + + cfs_cond_resched(); + + cfs_spin_lock(&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++) @@ -395,98 +641,94 @@ 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)) - obd_iocontrol(OBD_IOC_SET_READONLY, + if (OBP(obd, iocontrol)) { + obd_iocontrol(OBD_IOC_SYNC, 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 - /* refcounf - 3 might be the number of real exports + 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); - - /* destroy a nid-export hash body */ - lustre_hash_exit(&obd->obd_nid_hash_body); - /* Precleanup stage 1, we must make sure all exports (other than the - self-export) get destroyed. */ + /* 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); + /* 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-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; + RETURN(0); } +EXPORT_SYMBOL(class_cleanup); -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; } +EXPORT_SYMBOL(class_incref); -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); if ((refs == 1) && obd->obd_stopping) { - /* All exports (other than the self-export) have been - destroyed; there should be no more in-progress ops - by this point.*/ - /* if we're not stopping, we didn't finish setup */ - /* Precleanup stage 2, do other type-specific - cleanup requiring the self-export. */ - err = obd_precleanup(obd, OBD_CLEANUP_SELF_EXP); - if (err) - CERROR("Precleanup %s returned %d\n", - obd->obd_name, err); - - 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); + /* All exports have been destroyed; there should + be no more in-progress ops by this point.*/ + + 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); @@ -505,14 +747,18 @@ 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); } class_release_dev(obd); } } +EXPORT_SYMBOL(class_decref); +/** Add a failover nid location. + * Client obd types contact server obd types using this nid list. + */ int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg) { struct obd_import *imp; @@ -544,6 +790,8 @@ int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(rc); } +/** Remove a failover nid location. + */ int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg) { struct obd_import *imp; @@ -581,14 +829,19 @@ 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); } } RETURN(NULL); } +EXPORT_SYMBOL(class_get_profile); +/** Create a named "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) { @@ -623,7 +876,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: @@ -633,7 +886,7 @@ out: OBD_FREE(lprof->lp_dt, osclen); if (lprof->lp_profile) OBD_FREE(lprof->lp_profile, proflen); - OBD_FREE(lprof, sizeof(*lprof)); + OBD_FREE(lprof, sizeof(*lprof)); RETURN(err); } @@ -646,7 +899,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) @@ -655,6 +908,7 @@ void class_del_profile(const char *prof) } EXIT; } +EXPORT_SYMBOL(class_del_profile); /* COMPAT_146 */ void class_del_profiles(void) @@ -662,8 +916,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) @@ -672,10 +926,36 @@ void class_del_profiles(void) } EXIT; } +EXPORT_SYMBOL(class_del_profiles); + +static int class_set_global(char *ptr, int val, struct lustre_cfg *lcfg) +{ + 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); +} -/* We can't call ll_process_config directly because it lives in a module that - must be loaded after this one. */ + +/* 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; void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg)) { @@ -683,6 +963,89 @@ void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg)) } EXPORT_SYMBOL(lustre_register_client_process_config); +/** + * Rename the proc parameter in \a cfg with a new name \a new_name. + * + * \param cfg config structure which contains the proc parameter + * \param new_name new name of the proc parameter + * + * \retval valid-pointer pointer to the newly-allocated config structure + * which contains the renamed proc parameter + * \retval ERR_PTR(-EINVAL) if \a cfg or \a new_name is NULL, or \a cfg does + * not contain a proc parameter + * \retval ERR_PTR(-ENOMEM) if memory allocation failure occurs + */ +struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg, + const char *new_name) +{ + struct lustre_cfg_bufs *bufs = NULL; + struct lustre_cfg *new_cfg = NULL; + char *param = NULL; + char *new_param = NULL; + char *value = NULL; + int name_len = 0; + int new_len = 0; + ENTRY; + + if (cfg == NULL || new_name == NULL) + RETURN(ERR_PTR(-EINVAL)); + + param = lustre_cfg_string(cfg, 1); + if (param == NULL) + RETURN(ERR_PTR(-EINVAL)); + + value = strchr(param, '='); + if (value == NULL) + name_len = strlen(param); + else + name_len = value - param; + + 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)); + + 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)); + } + + 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_FREE(new_param, new_len); + OBD_FREE_PTR(bufs); + if (new_cfg == NULL) + RETURN(ERR_PTR(-ENOMEM)); + + 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; + + RETURN(new_cfg); +} +EXPORT_SYMBOL(lustre_cfg_rename); + +void lustre_register_quota_process_config(int (*qpc)(struct lustre_cfg *lcfg)) +{ + quota_process_config = qpc; +} +EXPORT_SYMBOL(lustre_register_quota_process_config); + +/** Process configuration commands given in lustre_cfg form. + * These may come from direct calls (e.g. class_manual_cleanup) + * or processing the config llog, or ioctl from lctl. + */ int class_process_config(struct lustre_cfg *lcfg) { struct obd_device *obd; @@ -738,7 +1101,16 @@ int class_process_config(struct lustre_cfg *lcfg) CDEBUG(D_IOCTL, "changing lustre timeout from %d to %d\n", obd_timeout, lcfg->lcfg_num); obd_timeout = max(lcfg->lcfg_num, 1U); - obd_health_check_timeout = HEALTH_CHECK_TIMEOUT; + obd_timeout_set = 1; + 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); + ldlm_timeout_set = 1; GOTO(out, err = 0); } case LCFG_SET_UPCALL: { @@ -754,13 +1126,28 @@ 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), + 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, lcfg); + /* 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); + } 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); + } /* Fall through */ break; } @@ -799,6 +1186,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); @@ -807,14 +1216,15 @@ int class_process_config(struct lustre_cfg *lcfg) } out: if ((err < 0) && !(lcfg->lcfg_command & LCFG_REQUIRED)) { - CWARN("Ignoring error %d on optional command %#x\n", err, + CWARN("Ignoring error %d on optional command %#x\n", err, lcfg->lcfg_command); err = 0; } return err; } +EXPORT_SYMBOL(class_process_config); -int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, +int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, struct lustre_cfg *lcfg, void *data) { #ifdef __KERNEL__ @@ -823,6 +1233,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) { @@ -839,9 +1250,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; @@ -864,28 +1274,35 @@ 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", - (char *)lustre_cfg_string(lcfg, 0), + 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) + + if (rc > 0) rc = 0; + if (!rc && skip) + rc = skip; RETURN(rc); #else CDEBUG(D_CONFIG, "liblustre can't process params.\n"); @@ -893,9 +1310,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, RETURN(0); #endif } - -int class_config_dump_handler(struct llog_handle * handle, - struct llog_rec_hdr *rec, void *data); +EXPORT_SYMBOL(class_process_proc_param); #ifdef __KERNEL__ extern int lustre_check_exclusion(struct super_block *sb, char *svname); @@ -903,8 +1318,14 @@ extern int lustre_check_exclusion(struct super_block *sb, char *svname); #define lustre_check_exclusion(a,b) 0 #endif -static int class_config_llog_handler(struct llog_handle * handle, - struct llog_rec_hdr *rec, void *data) +/** Parse a configuration llog, doing various manipulations on them + * for various reasons, (modifications for compatibility, skip obsolete + * records, change uuids, etc), then class_process_config() resulting + * net records. + */ +static 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; @@ -920,11 +1341,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) @@ -933,18 +1356,21 @@ 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) { /* all previous flags off */ clli->cfg_flags = CFG_F_MARKER; - if (marker->cm_flags & CM_SKIP) { + 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) || - 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); @@ -953,14 +1379,14 @@ static int class_config_llog_handler(struct llog_handle * handle, clli->cfg_flags = 0; } } - /* A config command without a start marker before it is + /* 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) && + !(clli->cfg_flags & CFG_F_MARKER) && (lcfg->lcfg_command != LCFG_MARKER)) { CWARN("Config not inside markers, ignoring! " - "(inst: %s, uuid: %s, flags: %#x)\n", - clli->cfg_instance ? clli->cfg_instance : "", + "(inst: %p, uuid: %s, flags: %#x)\n", + clli->cfg_instance, clli->cfg_uuid.uuid, clli->cfg_flags); clli->cfg_flags |= CFG_F_SKIP; } @@ -972,22 +1398,45 @@ static int class_config_llog_handler(struct llog_handle * handle, break; } - if ((clli->cfg_flags & CFG_F_EXCLUDE) && + /* + * 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 */ lcfg->lcfg_command = LCFG_LOV_ADD_INA; lustre_cfg_bufs_init(&bufs, lcfg); - if (clli && clli->cfg_instance && + if (clli && clli->cfg_instance && LUSTRE_CFG_BUFLEN(lcfg, 0) > 0){ inst = 1; inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) + - strlen(clli->cfg_instance) + 1; + sizeof(clli->cfg_instance) * 2 + 4; OBD_ALLOC(inst_name, inst_len); if (inst_name == NULL) GOTO(out, rc = -ENOMEM); - sprintf(inst_name, "%s-%s", + sprintf(inst_name, "%s-%p", lustre_cfg_string(lcfg, 0), clli->cfg_instance); lustre_cfg_bufs_set_string(&bufs, 0, inst_name); @@ -997,11 +1446,27 @@ static int class_config_llog_handler(struct llog_handle * handle, /* we override the llog's uuid for clients, to insure they are unique */ - if (clli && clli->cfg_instance && + if (clli && clli->cfg_instance != NULL && lcfg->lcfg_command == LCFG_ATTACH) { 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); @@ -1040,7 +1505,7 @@ static int class_config_llog_handler(struct llog_handle * handle, out: if (rc) { CERROR("Err %d on cfg command:\n", rc); - class_config_dump_handler(handle, rec, data); + class_config_dump_handler(NULL, handle, rec, data); } RETURN(rc); } @@ -1054,37 +1519,39 @@ int class_config_parse_llog(struct llog_ctxt *ctxt, char *name, ENTRY; CDEBUG(D_INFO, "looking up llog %s\n", name); - rc = llog_create(ctxt, &llh, NULL, name); + rc = llog_create(NULL, ctxt, &llh, NULL, name); if (rc) RETURN(rc); - rc = llog_init_handle(llh, LLOG_F_IS_PLAIN, NULL); + rc = llog_init_handle(NULL, llh, LLOG_F_IS_PLAIN, NULL); if (rc) GOTO(parse_out, rc); /* continue processing from where we last stopped to end-of-log */ if (cfg) - cd.first_idx = cfg->cfg_last_idx; - cd.last_idx = 0; + cd.lpcd_first_idx = cfg->cfg_last_idx; + cd.lpcd_last_idx = 0; - rc = llog_process(llh, class_config_llog_handler, cfg, &cd); + rc = llog_process(NULL, llh, class_config_llog_handler, cfg, &cd); - CDEBUG(D_CONFIG, "Processed log %s gen %d-%d (rc=%d)\n", name, - cd.first_idx + 1, cd.last_idx, rc); + CDEBUG(D_CONFIG, "Processed log %s gen %d-%d (rc=%d)\n", name, + cd.lpcd_first_idx + 1, cd.lpcd_last_idx, rc); if (cfg) - cfg->cfg_last_idx = cd.last_idx; + cfg->cfg_last_idx = cd.lpcd_last_idx; parse_out: - rc2 = llog_close(llh); + rc2 = llog_close(NULL, llh); if (rc == 0) rc = rc2; RETURN(rc); } +EXPORT_SYMBOL(class_config_parse_llog); -int class_config_dump_handler(struct llog_handle * handle, - struct llog_rec_hdr *rec, void *data) +int class_config_dump_handler(const struct lu_env *env, + struct llog_handle *handle, + struct llog_rec_hdr *rec, void *data) { int cfg_len = rec->lrh_len; char *cfg_buf = (char*) (rec + 1); @@ -1152,17 +1619,17 @@ int class_config_dump_llog(struct llog_ctxt *ctxt, char *name, LCONSOLE_INFO("Dumping config log %s\n", name); - rc = llog_create(ctxt, &llh, NULL, name); + rc = llog_create(NULL, ctxt, &llh, NULL, name); if (rc) RETURN(rc); - rc = llog_init_handle(llh, LLOG_F_IS_PLAIN, NULL); + rc = llog_init_handle(NULL, llh, LLOG_F_IS_PLAIN, NULL); if (rc) GOTO(parse_out, rc); - rc = llog_process(llh, class_config_dump_handler, cfg, NULL); + rc = llog_process(NULL, llh, class_config_dump_handler, cfg, NULL); parse_out: - rc2 = llog_close(llh); + rc2 = llog_close(NULL, llh); if (rc == 0) rc = rc2; @@ -1170,14 +1637,17 @@ parse_out: RETURN(rc); } +EXPORT_SYMBOL(class_config_dump_llog); -/* Cleanup and detach */ +/** Call class_cleanup and class_detach. + * "Manual" only in the sense that we're faking lcfg commands. + */ 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) { @@ -1196,6 +1666,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) { @@ -1212,4 +1684,198 @@ out: lustre_cfg_free(lcfg); RETURN(rc); } +EXPORT_SYMBOL(class_manual_cleanup); + +/* + * uuid<->export lustre hash operations + */ + +static unsigned +uuid_hash(cfs_hash_t *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) +{ + 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_keycmp(const 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(key, &exp->exp_client_uuid) && + !exp->exp_failed; +} + +static void * +uuid_export_object(cfs_hlist_node_t *hnode) +{ + return cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); +} + +static void +uuid_export_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_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) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_uuid_hash); + class_export_put(exp); +} + +static cfs_hash_ops_t uuid_hash_ops = { + .hs_hash = uuid_hash, + .hs_key = uuid_key, + .hs_keycmp = uuid_keycmp, + .hs_object = uuid_export_object, + .hs_get = uuid_export_get, + .hs_put_locked = uuid_export_put_locked, +}; + + +/* + * nid<->export hash operations + */ + +static unsigned +nid_hash(cfs_hash_t *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) +{ + 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_kepcmp(const 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_object(cfs_hlist_node_t *hnode) +{ + return cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); +} + +static void +nid_export_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +{ + struct obd_export *exp; + + exp = cfs_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) +{ + struct obd_export *exp; + + exp = cfs_hlist_entry(hnode, struct obd_export, exp_nid_hash); + class_export_put(exp); +} + +static cfs_hash_ops_t nid_hash_ops = { + .hs_hash = nid_hash, + .hs_key = nid_key, + .hs_keycmp = nid_kepcmp, + .hs_object = nid_export_object, + .hs_get = nid_export_get, + .hs_put_locked = nid_export_put_locked, +}; + + +/* + * 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_keycmp(const void *key, cfs_hlist_node_t *hnode) +{ + return *(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key; +} + +static void * +nidstats_object(cfs_hlist_node_t *hnode) +{ + return cfs_hlist_entry(hnode, struct nid_stat, nid_hash); +} + +static void +nidstats_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +{ + struct nid_stat *ns; + + ns = cfs_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) +{ + struct nid_stat *ns; + + ns = cfs_hlist_entry(hnode, struct nid_stat, nid_hash); + nidstat_putref(ns); +} +static cfs_hash_ops_t nid_stat_hash_ops = { + .hs_hash = nid_hash, + .hs_key = nidstats_key, + .hs_keycmp = nidstats_keycmp, + .hs_object = nidstats_object, + .hs_get = nidstats_get, + .hs_put_locked = nidstats_put_locked, +};