X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosp%2Fosp_dev.c;h=0aaf16292aeb6abe9094680f52be2023fc7b18ce;hp=af5adf6b691aba13973d6a777647ef38611aefa7;hb=392dab3c01bb802892466f9a05ef1b56406b8522;hpb=dd16884e8e367007e792708901bdf55ffeac665b;ds=sidebyside diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c index af5adf6..0aaf162 100644 --- a/lustre/osp/osp_dev.c +++ b/lustre/osp/osp_dev.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) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -75,10 +71,12 @@ #define DEBUG_SUBSYSTEM S_MDS #include -#include -#include -#include + +#include #include +#include +#include +#include #include "osp_internal.h" @@ -185,7 +183,7 @@ static struct dt_object if (rc) { CERROR("%s: can't be initialized: rc = %d\n", osp->opd_obd->obd_name, rc); - lu_object_put(env, &dto->do_lu); + dt_object_put(env, dto); RETURN(ERR_PTR(rc)); } RETURN(dto); @@ -213,6 +211,9 @@ static int osp_write_local_file(const struct lu_env *env, struct thandle *th; int rc; + if (osp->opd_storage->dd_rdonly) + RETURN(0); + th = dt_trans_create(env, osp->opd_storage); if (IS_ERR(th)) RETURN(PTR_ERR(th)); @@ -257,20 +258,23 @@ static int osp_init_last_objid(const struct lu_env *env, struct osp_device *osp) if (IS_ERR(dto)) RETURN(PTR_ERR(dto)); + osp_objid_buf_prep(&osi->osi_lb, &osi->osi_off, &osp->opd_last_id, + osp->opd_index); + /* object will be released in device cleanup path */ - if (osi->osi_attr.la_size >= - sizeof(osi->osi_id) * (osp->opd_index + 1)) { - osp_objid_buf_prep(&osi->osi_lb, &osi->osi_off, &fid->f_oid, - osp->opd_index); + if (osi->osi_attr.la_size >= (osi->osi_off + osi->osi_lb.lb_len)) { rc = dt_record_read(env, dto, &osi->osi_lb, &osi->osi_off); if (rc != 0 && rc != -EFAULT) GOTO(out, rc); + /* In case of idif bits 32-48 go to f_seq + * (see osp_init_last_seq). So don't care + * about u64->u32 convertion. */ + fid->f_oid = osp->opd_last_id; } if (rc == -EFAULT) { /* fresh LAST_ID */ + osp->opd_last_id = 0; fid->f_oid = 0; - osp_objid_buf_prep(&osi->osi_lb, &osi->osi_off, &fid->f_oid, - osp->opd_index); rc = osp_write_local_file(env, osp, dto, &osi->osi_lb, osi->osi_off); if (rc != 0) @@ -282,7 +286,7 @@ out: /* object will be released in device cleanup path */ CERROR("%s: can't initialize lov_objid: rc = %d\n", osp->opd_obd->obd_name, rc); - lu_object_put(env, &dto->do_lu); + dt_object_put(env, dto); osp->opd_last_used_oid_file = NULL; RETURN(rc); } @@ -314,20 +318,21 @@ static int osp_init_last_seq(const struct lu_env *env, struct osp_device *osp) if (IS_ERR(dto)) RETURN(PTR_ERR(dto)); + osp_objseq_buf_prep(&osi->osi_lb, &osi->osi_off, &fid->f_seq, + osp->opd_index); + /* object will be released in device cleanup path */ - if (osi->osi_attr.la_size >= - sizeof(osi->osi_id) * (osp->opd_index + 1)) { - osp_objseq_buf_prep(&osi->osi_lb, &osi->osi_off, &fid->f_seq, - osp->opd_index); + if (osi->osi_attr.la_size >= (osi->osi_off + osi->osi_lb.lb_len)) { rc = dt_record_read(env, dto, &osi->osi_lb, &osi->osi_off); if (rc != 0 && rc != -EFAULT) GOTO(out, rc); + if (fid_is_idif(fid)) + fid->f_seq = fid_idif_seq(osp->opd_last_id, + osp->opd_index); } if (rc == -EFAULT) { /* fresh OSP */ fid->f_seq = 0; - osp_objseq_buf_prep(&osi->osi_lb, &osi->osi_off, &fid->f_seq, - osp->opd_index); rc = osp_write_local_file(env, osp, dto, &osi->osi_lb, osi->osi_off); if (rc != 0) @@ -339,7 +344,7 @@ out: /* object will be released in device cleanup path */ CERROR("%s: can't initialize lov_seq: rc = %d\n", osp->opd_obd->obd_name, rc); - lu_object_put(env, &dto->do_lu); + dt_object_put(env, dto); osp->opd_last_used_seq_file = NULL; RETURN(rc); } @@ -373,7 +378,7 @@ static int osp_last_used_init(const struct lu_env *env, struct osp_device *osp) rc = osp_init_last_seq(env, osp); if (rc < 0) { - CERROR("%s: Can not get ids %d from old objid!\n", + CERROR("%s: Can not get sequence %d from old objseq!\n", osp->opd_obd->obd_name, rc); GOTO(out, rc); } @@ -404,16 +409,17 @@ static int osp_last_used_init(const struct lu_env *env, struct osp_device *osp) GOTO(out, rc = -EINVAL); } + osp_fid_to_obdid(&osp->opd_last_used_fid, &osp->opd_last_id); CDEBUG(D_INFO, "%s: Init last used fid "DFID"\n", osp->opd_obd->obd_name, PFID(&osp->opd_last_used_fid)); out: if (rc != 0) { if (osp->opd_last_used_oid_file != NULL) { - lu_object_put(env, &osp->opd_last_used_oid_file->do_lu); + dt_object_put(env, osp->opd_last_used_oid_file); osp->opd_last_used_oid_file = NULL; } if (osp->opd_last_used_seq_file != NULL) { - lu_object_put(env, &osp->opd_last_used_seq_file->do_lu); + dt_object_put(env, osp->opd_last_used_seq_file); osp->opd_last_used_seq_file = NULL; } } @@ -431,12 +437,12 @@ static void osp_last_used_fini(const struct lu_env *env, struct osp_device *osp) { /* release last_used file */ if (osp->opd_last_used_oid_file != NULL) { - lu_object_put(env, &osp->opd_last_used_oid_file->do_lu); + dt_object_put(env, osp->opd_last_used_oid_file); osp->opd_last_used_oid_file = NULL; } if (osp->opd_last_used_seq_file != NULL) { - lu_object_put(env, &osp->opd_last_used_seq_file->do_lu); + dt_object_put(env, osp->opd_last_used_seq_file); osp->opd_last_used_seq_file = NULL; } } @@ -453,10 +459,11 @@ static void osp_last_used_fini(const struct lu_env *env, struct osp_device *osp) */ static int osp_disconnect(struct osp_device *d) { + struct obd_device *obd = d->opd_obd; struct obd_import *imp; int rc = 0; - imp = d->opd_obd->u.cli.cl_import; + imp = obd->u.cli.cl_import; /* Mark import deactivated now, so we don't try to reconnect if any * of the cleanup RPCs fails (e.g. ldlm cancel, etc). We don't @@ -475,8 +482,7 @@ static int osp_disconnect(struct osp_device *d) rc = ptlrpc_disconnect_import(imp, 0); if (rc != 0) - CERROR("%s: can't disconnect: rc = %d\n", - d->opd_obd->obd_name, rc); + CERROR("%s: can't disconnect: rc = %d\n", obd->obd_name, rc); ptlrpc_invalidate_import(imp); @@ -502,6 +508,9 @@ static int osp_update_init(struct osp_device *osp) LASSERT(osp->opd_connect_mdt); + if (osp->opd_storage->dd_rdonly) + RETURN(0); + OBD_ALLOC_PTR(osp->opd_update); if (osp->opd_update == NULL) RETURN(-ENOMEM); @@ -512,6 +521,7 @@ static int osp_update_init(struct osp_device *osp) INIT_LIST_HEAD(&osp->opd_update->ou_list); osp->opd_update->ou_rpc_version = 1; osp->opd_update->ou_version = 1; + osp->opd_update->ou_generation = 0; /* start thread handling sending updates to the remote MDT */ task = kthread_run(osp_send_update_thread, osp, @@ -564,7 +574,7 @@ static void osp_update_fini(const struct lu_env *env, struct osp_device *osp) LASSERT(our->our_th != NULL); osp_trans_callback(env, our->our_th, -EIO); /* our will be destroyed in osp_thandle_put() */ - osp_thandle_put(our->our_th); + osp_thandle_put(env, our->our_th); } spin_unlock(&ou->ou_lock); @@ -591,6 +601,8 @@ static int osp_shutdown(const struct lu_env *env, struct osp_device *d) rc = osp_disconnect(d); + osp_statfs_fini(d); + if (!d->opd_connect_mdt) { /* stop sync thread */ osp_sync_fini(d); @@ -624,9 +636,11 @@ static int osp_shutdown(const struct lu_env *env, struct osp_device *d) static int osp_process_config(const struct lu_env *env, struct lu_device *dev, struct lustre_cfg *lcfg) { - struct osp_device *d = lu2osp_dev(dev); - struct obd_device *obd = d->opd_obd; - int rc; + struct osp_device *d = lu2osp_dev(dev); + struct dt_device *dt = lu2dt_dev(dev); + struct obd_device *obd = d->opd_obd; + ssize_t count; + int rc; ENTRY; @@ -634,28 +648,28 @@ static int osp_process_config(const struct lu_env *env, case LCFG_PRE_CLEANUP: rc = osp_disconnect(d); osp_update_fini(env, d); + if (obd->obd_namespace != NULL) + ldlm_namespace_free_prior(obd->obd_namespace, NULL, 1); break; case LCFG_CLEANUP: lu_dev_del_linkage(dev->ld_site, dev); rc = osp_shutdown(env, d); break; case LCFG_PARAM: - LASSERT(obd); - rc = class_process_proc_param(d->opd_connect_mdt ? - PARAM_OSP : PARAM_OSC, - obd->obd_vars, lcfg, obd); - if (rc > 0) - rc = 0; - if (rc == -ENOSYS) { - /* class_process_proc_param() haven't found matching - * parameter and returned ENOSYS so that layer(s) + count = class_modify_config(lcfg, d->opd_connect_mdt ? + PARAM_OSP : PARAM_OSC, + &dt->dd_kobj); + if (count < 0) { + /* class_modify_config() haven't found matching + * parameter and returned an error so that layer(s) * below could use that. But OSP is the bottom, so - * just ignore it */ + * just ignore it + */ CERROR("%s: unknown param %s\n", (char *)lustre_cfg_string(lcfg, 0), (char *)lustre_cfg_string(lcfg, 1)); - rc = 0; } + rc = 0; break; default: CERROR("%s: unknown command %u\n", @@ -719,18 +733,22 @@ static int osp_statfs(const struct lu_env *env, struct dt_device *dev, struct obd_statfs *sfs) { struct osp_device *d = dt2osp_dev(dev); + struct obd_import *imp = d->opd_obd->u.cli.cl_import; ENTRY; + if (imp->imp_state == LUSTRE_IMP_CLOSED) + RETURN(-ESHUTDOWN); + if (unlikely(d->opd_imp_active == 0)) RETURN(-ENOTCONN); - if (d->opd_pre == NULL) - RETURN(0); - /* return recently updated data */ *sfs = d->opd_statfs; + if (d->opd_pre == NULL) + RETURN(0); + /* * layer above osp (usually lod) can use ffree to estimate * how many objects are available for immediate creation @@ -744,12 +762,14 @@ static int osp_statfs(const struct lu_env *env, struct dt_device *dev, sfs->os_fprecreated = fid_oid(&d->opd_pre_last_created_fid) - fid_oid(&d->opd_pre_used_fid); sfs->os_fprecreated -= d->opd_pre_reserved; + LASSERTF(sfs->os_fprecreated <= OST_MAX_PRECREATE * 2, + "last_created "DFID", next_fid "DFID", reserved %llu\n", + PFID(&d->opd_pre_last_created_fid), PFID(&d->opd_pre_used_fid), + d->opd_pre_reserved); spin_unlock(&d->opd_pre_lock); - LASSERT(sfs->os_fprecreated <= OST_MAX_PRECREATE * 2); - - CDEBUG(D_OTHER, "%s: "LPU64" blocks, "LPU64" free, "LPU64" avail, " - LPU64" files, "LPU64" free files\n", d->opd_obd->obd_name, + CDEBUG(D_OTHER, "%s: %llu blocks, %llu free, %llu avail, " + "%llu files, %llu free files\n", d->opd_obd->obd_name, sfs->os_blocks, sfs->os_bfree, sfs->os_bavail, sfs->os_files, sfs->os_ffree); RETURN(0); @@ -775,56 +795,55 @@ static int osp_sync_timeout(void *data) static int osp_sync(const struct lu_env *env, struct dt_device *dev) { struct osp_device *d = dt2osp_dev(dev); - cfs_time_t expire; struct l_wait_info lwi = { 0 }; - unsigned long id, old; - int rc = 0; - unsigned long start = cfs_time_current(); + time64_t start = ktime_get_seconds(); + int recs, rc = 0; + u64 old; + ENTRY; /* No Sync between MDTs yet. */ if (d->opd_connect_mdt) RETURN(0); + recs = atomic_read(&d->opd_sync_changes); + old = atomic64_read(&d->opd_sync_processed_recs); + + osp_sync_force(env, dt2osp_dev(dev)); + if (unlikely(d->opd_imp_active == 0)) RETURN(-ENOTCONN); - id = d->opd_syn_last_used_id; down_write(&d->opd_async_updates_rwsem); CDEBUG(D_OTHER, "%s: async updates %d\n", d->opd_obd->obd_name, atomic_read(&d->opd_async_updates_count)); /* make sure the connection is fine */ - expire = cfs_time_shift(obd_timeout); - lwi = LWI_TIMEOUT(expire - cfs_time_current(), osp_sync_timeout, d); - rc = l_wait_event(d->opd_syn_barrier_waitq, + lwi = LWI_TIMEOUT(cfs_time_seconds(obd_timeout), osp_sync_timeout, d); + rc = l_wait_event(d->opd_sync_barrier_waitq, atomic_read(&d->opd_async_updates_count) == 0, &lwi); up_write(&d->opd_async_updates_rwsem); if (rc != 0) GOTO(out, rc); - CDEBUG(D_CACHE, "%s: id: used %lu, processed %lu\n", - d->opd_obd->obd_name, id, d->opd_syn_last_processed_id); - - /* wait till all-in-line are processed */ - while (d->opd_syn_last_processed_id < id) { - - old = d->opd_syn_last_processed_id; + CDEBUG(D_CACHE, "%s: processed %lu\n", d->opd_obd->obd_name, + atomic64_read(&d->opd_sync_processed_recs)); + while (atomic64_read(&d->opd_sync_processed_recs) < old + recs) { + __u64 last = atomic64_read(&d->opd_sync_processed_recs); /* make sure the connection is fine */ - expire = cfs_time_shift(obd_timeout); - lwi = LWI_TIMEOUT(expire - cfs_time_current(), + lwi = LWI_TIMEOUT(cfs_time_seconds(obd_timeout), osp_sync_timeout, d); - l_wait_event(d->opd_syn_barrier_waitq, - d->opd_syn_last_processed_id >= id, - &lwi); + l_wait_event(d->opd_sync_barrier_waitq, + atomic64_read(&d->opd_sync_processed_recs) + >= old + recs, &lwi); - if (d->opd_syn_last_processed_id >= id) + if (atomic64_read(&d->opd_sync_processed_recs) >= old + recs) break; - if (d->opd_syn_last_processed_id != old) { + if (atomic64_read(&d->opd_sync_processed_recs) != last) { /* some progress have been made, * keep trying... */ continue; @@ -835,29 +854,28 @@ static int osp_sync(const struct lu_env *env, struct dt_device *dev) } /* block new processing (barrier>0 - few callers are possible */ - atomic_inc(&d->opd_syn_barrier); + atomic_inc(&d->opd_sync_barrier); CDEBUG(D_CACHE, "%s: %u in flight\n", d->opd_obd->obd_name, - d->opd_syn_rpc_in_flight); + atomic_read(&d->opd_sync_rpcs_in_flight)); /* wait till all-in-flight are replied, so executed by the target */ /* XXX: this is used by LFSCK at the moment, which doesn't require * all the changes to be committed, but in general it'd be * better to wait till commit */ - while (d->opd_syn_rpc_in_flight > 0) { - - old = d->opd_syn_rpc_in_flight; + while (atomic_read(&d->opd_sync_rpcs_in_flight) > 0) { + old = atomic_read(&d->opd_sync_rpcs_in_flight); - expire = cfs_time_shift(obd_timeout); - lwi = LWI_TIMEOUT(expire - cfs_time_current(), + lwi = LWI_TIMEOUT(cfs_time_seconds(obd_timeout), osp_sync_timeout, d); - l_wait_event(d->opd_syn_barrier_waitq, - d->opd_syn_rpc_in_flight == 0, &lwi); + l_wait_event(d->opd_sync_barrier_waitq, + atomic_read(&d->opd_sync_rpcs_in_flight) == 0, + &lwi); - if (d->opd_syn_rpc_in_flight == 0) + if (atomic_read(&d->opd_sync_rpcs_in_flight) == 0) break; - if (d->opd_syn_rpc_in_flight != old) { + if (atomic_read(&d->opd_sync_rpcs_in_flight) != old) { /* some progress have been made */ continue; } @@ -868,11 +886,11 @@ static int osp_sync(const struct lu_env *env, struct dt_device *dev) out: /* resume normal processing (barrier=0) */ - atomic_dec(&d->opd_syn_barrier); - __osp_sync_check_for_work(d); + atomic_dec(&d->opd_sync_barrier); + osp_sync_check_for_work(d); - CDEBUG(D_CACHE, "%s: done in %lu: rc = %d\n", d->opd_obd->obd_name, - cfs_time_current() - start, rc); + CDEBUG(D_CACHE, "%s: done in %lld: rc = %d\n", d->opd_obd->obd_name, + ktime_get_seconds() - start, rc); RETURN(rc); } @@ -992,7 +1010,6 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp, { struct obd_device *obd; struct obd_import *imp; - class_uuid_t uuid; char *src, *tgt, *mdt, *osdname = NULL; int rc; long idx; @@ -1113,14 +1130,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp, strcat(osdname, "-osd"); CDEBUG(D_HA, "%s: connect to %s (%s)\n", obd->obd_name, osdname, src); - if (osp->opd_connect_mdt) { - struct client_obd *cli = &osp->opd_obd->u.cli; - - OBD_ALLOC(cli->cl_rpc_lock, sizeof(*cli->cl_rpc_lock)); - if (!cli->cl_rpc_lock) - GOTO(out_fini, rc = -ENOMEM); - osp_init_rpc_lock(cli->cl_rpc_lock); - } + osp_init_rpc_lock(osp); osp->opd_dt_dev.dd_lu_dev.ld_ops = &osp_lu_ops; osp->opd_dt_dev.dd_ops = &osp_dt_ops; @@ -1142,7 +1152,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp, GOTO(out_ref, rc); } - osp_lprocfs_init(osp); + osp_tunables_init(osp); rc = obd_fid_init(osp->opd_obd, NULL, osp->opd_connect_mdt ? LUSTRE_SEQ_METADATA : LUSTRE_SEQ_DATA); @@ -1155,10 +1165,11 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp, if (!osp->opd_connect_mdt) { /* Initialize last id from the storage - will be * used in orphan cleanup. */ - rc = osp_last_used_init(env, osp); - if (rc) - GOTO(out_fid, rc); - + if (!osp->opd_storage->dd_rdonly) { + rc = osp_last_used_init(env, osp); + if (rc) + GOTO(out_fid, rc); + } /* Initialize precreation thread, it handles new * connections as well. */ @@ -1175,19 +1186,21 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp, if (rc < 0) GOTO(out_precreat, rc); } else { + osp->opd_got_disconnected = 1; rc = osp_update_init(osp); if (rc != 0) GOTO(out_fid, rc); } + rc = osp_init_statfs(osp); + if (rc) + GOTO(out_precreat, rc); + ns_register_cancel(obd->obd_namespace, osp_cancel_weight); /* * Initiate connect to OST */ - ll_generate_random_uuid(uuid); - class_uuid_unparse(uuid, &osp->opd_cluuid); - imp = obd->u.cli.cl_import; rc = ptlrpc_init_import(imp); @@ -1213,21 +1226,11 @@ out_last_used: out_fid: obd_fid_fini(osp->opd_obd); out_proc: - ptlrpc_lprocfs_unregister_obd(obd); - lprocfs_obd_cleanup(obd); - if (osp->opd_symlink) - lprocfs_remove(&osp->opd_symlink); + osp_tunables_fini(osp); client_obd_cleanup(obd); out_ref: ptlrpcd_decref(); out_disconnect: - if (osp->opd_connect_mdt) { - struct client_obd *cli = &osp->opd_obd->u.cli; - if (cli->cl_rpc_lock != NULL) { - OBD_FREE_PTR(cli->cl_rpc_lock); - cli->cl_rpc_lock = NULL; - } - } obd_disconnect(osp->opd_storage_exp); out_fini: if (osdname) @@ -1314,35 +1317,24 @@ static struct lu_device *osp_device_fini(const struct lu_env *env, struct lu_device *ld) { struct osp_device *osp = lu2osp_dev(ld); - struct obd_import *imp; int rc; ENTRY; if (osp->opd_async_requests != NULL) { - osp_update_request_destroy(osp->opd_async_requests); + osp_update_request_destroy(env, osp->opd_async_requests); osp->opd_async_requests = NULL; } - if (osp->opd_storage_exp) + if (osp->opd_storage_exp) { + /* wait for the commit callbacks to complete */ + wait_event(osp->opd_sync_waitq, + atomic_read(&osp->opd_commits_registered) == 0); obd_disconnect(osp->opd_storage_exp); - - imp = osp->opd_obd->u.cli.cl_import; - - if (osp->opd_symlink) - lprocfs_remove(&osp->opd_symlink); + } LASSERT(osp->opd_obd); - ptlrpc_lprocfs_unregister_obd(osp->opd_obd); - lprocfs_obd_cleanup(osp->opd_obd); - - if (osp->opd_connect_mdt) { - struct client_obd *cli = &osp->opd_obd->u.cli; - if (cli->cl_rpc_lock != NULL) { - OBD_FREE_PTR(cli->cl_rpc_lock); - cli->cl_rpc_lock = NULL; - } - } + osp_tunables_fini(osp); rc = client_obd_cleanup(osp->opd_obd); if (rc != 0) { @@ -1423,10 +1415,10 @@ static int osp_obd_connect(const struct lu_env *env, struct obd_export **exp, *ocd = *data; imp->imp_connect_flags_orig = ocd->ocd_connect_flags; + imp->imp_connect_flags2_orig = ocd->ocd_connect_flags2; ocd->ocd_version = LUSTRE_VERSION_CODE; ocd->ocd_index = data->ocd_index; - imp->imp_connect_flags_orig = ocd->ocd_connect_flags; rc = ptlrpc_connect_import(imp); if (rc) { @@ -1495,7 +1487,7 @@ static int osp_obd_disconnect(struct obd_export *exp) * \retval negative negative errno if statfs failed. */ static int osp_obd_statfs(const struct lu_env *env, struct obd_export *exp, - struct obd_statfs *osfs, __u64 unused, __u32 flags) + struct obd_statfs *osfs, time64_t unused, __u32 flags) { struct obd_statfs *msfs; struct ptlrpc_request *req; @@ -1569,6 +1561,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp, enum obd_import_event event) { struct osp_device *d = lu2osp_dev(obd->obd_lu_dev); + int rc; switch (event) { case IMP_EVENT_DISCON: @@ -1586,11 +1579,15 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp, break; case IMP_EVENT_INACTIVE: d->opd_imp_active = 0; + d->opd_imp_connected = 0; + d->opd_obd->obd_inactive = 1; if (d->opd_connect_mdt) break; - if (d->opd_pre != NULL) { - osp_pre_update_status(d, -ENODEV); + /* Import is invalid, we can`t get stripes so + * wakeup waiters */ + rc = imp->imp_deactive ? -ESHUTDOWN : -ENODEV; + osp_pre_update_status(d, rc); wake_up(&d->opd_pre_waitq); } @@ -1603,16 +1600,18 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp, d->opd_new_connection = 1; d->opd_imp_connected = 1; d->opd_imp_seen_connected = 1; + d->opd_obd->obd_inactive = 0; + wake_up(&d->opd_pre_waitq); if (d->opd_connect_mdt) break; - if (d->opd_pre != NULL) - wake_up(&d->opd_pre_waitq); - - __osp_sync_check_for_work(d); + osp_sync_check_for_work(d); CDEBUG(D_HA, "got connected\n"); break; case IMP_EVENT_INVALIDATE: + if (d->opd_connect_mdt) + osp_invalidate_request(d); + if (obd->obd_namespace == NULL) break; ldlm_namespace_cleanup(obd->obd_namespace, LDLM_FL_LOCAL_ONLY); @@ -1646,7 +1645,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp, * \retval negative negative errno if the ioctl handling failed. */ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len, - void *karg, void *uarg) + void *karg, void __user *uarg) { struct obd_device *obd = exp->exp_obd; struct osp_device *d; @@ -1676,9 +1675,6 @@ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len, rc = ptlrpc_set_import_active(obd->u.cli.cl_import, data->ioc_offset); break; - case OBD_IOC_PING_TARGET: - rc = ptlrpc_obd_ping(obd); - break; default: CERROR("%s: unrecognized ioctl %#x by %s\n", obd->obd_name, cmd, current_comm()); @@ -1689,23 +1685,6 @@ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len, } -static int osp_set_info_async(const struct lu_env *env, - struct obd_export *exp, - u32 keylen, void *key, - u32 vallen, void *val, - struct ptlrpc_request_set *set) -{ - ENTRY; - - if (KEY_IS(KEY_SPTLRPC_CONF)) { - sptlrpc_conf_client_adapt(exp->exp_obd); - RETURN(0); - } - - CERROR("Unknown key %s\n", (char *)key); - RETURN(-EINVAL); -} - /** * Implementation of obd_ops::o_get_info * @@ -1748,6 +1727,58 @@ static int osp_obd_get_info(const struct lu_env *env, struct obd_export *exp, RETURN(rc); } +static int osp_obd_set_info_async(const struct lu_env *env, + struct obd_export *exp, + u32 keylen, void *key, + u32 vallen, void *val, + struct ptlrpc_request_set *set) +{ + struct obd_device *obd = exp->exp_obd; + struct obd_import *imp = obd->u.cli.cl_import; + struct osp_device *osp; + struct ptlrpc_request *req; + char *tmp; + int rc; + + if (KEY_IS(KEY_SPTLRPC_CONF)) { + sptlrpc_conf_client_adapt(exp->exp_obd); + RETURN(0); + } + + LASSERT(set != NULL); + if (!obd->obd_set_up || obd->obd_stopping) + RETURN(-EAGAIN); + osp = lu2osp_dev(obd->obd_lu_dev); + + req = ptlrpc_request_alloc(imp, &RQF_OBD_SET_INFO); + if (req == NULL) + RETURN(-ENOMEM); + + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_KEY, + RCL_CLIENT, keylen); + req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_VAL, + RCL_CLIENT, vallen); + if (osp->opd_connect_mdt) + rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_SET_INFO); + else + rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_SET_INFO); + if (rc) { + ptlrpc_request_free(req); + RETURN(rc); + } + + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_KEY); + memcpy(tmp, key, keylen); + tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_VAL); + memcpy(tmp, val, vallen); + + ptlrpc_request_set_replen(req); + ptlrpc_set_add_req(set, req); + ptlrpc_check_set(NULL, set); + + RETURN(0); +} + /** * Implementation of obd_ops: o_fid_alloc * @@ -1807,7 +1838,7 @@ struct lu_context_key osp_thread_key = { LU_KEY_INIT_FINI(osp_txn, struct osp_txn_info); struct lu_context_key osp_txn_key = { - .lct_tags = LCT_OSP_THREAD | LCT_TX_HANDLE, + .lct_tags = LCT_OSP_THREAD, .lct_init = osp_txn_key_init, .lct_fini = osp_txn_key_fini }; @@ -1841,16 +1872,16 @@ static struct obd_ops osp_obd_device_ops = { .o_connect = osp_obd_connect, .o_disconnect = osp_obd_disconnect, .o_get_info = osp_obd_get_info, + .o_set_info_async = osp_obd_set_info_async, .o_import_event = osp_import_event, .o_iocontrol = osp_iocontrol, .o_statfs = osp_obd_statfs, .o_fid_init = client_fid_init, .o_fid_fini = client_fid_fini, .o_fid_alloc = osp_fid_alloc, - .o_set_info_async = osp_set_info_async, }; -struct llog_operations osp_mds_ost_orig_logops; +static struct obd_type *sym; /** * Initialize OSP module. @@ -1864,16 +1895,17 @@ struct llog_operations osp_mds_ost_orig_logops; * \retval 0 0 if initialization succeeds. * \retval negative negative errno if initialization failed. */ -static int __init osp_mod_init(void) +static int __init osp_init(void) { + struct dentry *symlink; struct obd_type *type; + struct qstr dname; int rc; rc = lu_kmem_init(osp_caches); if (rc) return rc; - rc = class_register_type(&osp_obd_device_ops, NULL, true, NULL, LUSTRE_OSP_NAME, &osp_device_type); if (rc != 0) { @@ -1881,7 +1913,7 @@ static int __init osp_mod_init(void) return rc; } - rc = class_register_type(&lwp_obd_device_ops, NULL, true, NULL, + rc = class_register_type(&lwp_obd_device_ops, NULL, false, NULL, LUSTRE_LWP_NAME, &lwp_device_type); if (rc != 0) { class_unregister_type(LUSTRE_OSP_NAME); @@ -1889,15 +1921,36 @@ static int __init osp_mod_init(void) return rc; } - /* Note: add_rec/delcare_add_rec will be only used by catalogs */ - osp_mds_ost_orig_logops = llog_osd_ops; - osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec; - osp_mds_ost_orig_logops.lop_declare_add = llog_cat_declare_add_rec; + sym = class_setup_tunables(LUSTRE_OSC_NAME); + if (IS_ERR(sym)) { + rc = PTR_ERR(sym); + /* does real "osc" already exist ? */ + if (rc == -EEXIST) + GOTO(try_proc, rc = 0); + GOTO(no_osc, rc); + } - /* create "osc" entry in procfs for compatibility purposes */ + /* create "osc" entry for compatibility purposes */ + dname.name = "osc"; + dname.len = strlen(dname.name); + dname.hash = ll_full_name_hash(debugfs_lustre_root, dname.name, + dname.len); + symlink = d_lookup(debugfs_lustre_root, &dname); + if (!symlink) { + symlink = debugfs_create_dir(dname.name, debugfs_lustre_root); + if (IS_ERR_OR_NULL(symlink)) { + rc = symlink ? PTR_ERR(symlink) : -ENOMEM; + GOTO(no_osc, rc); + } + sym->typ_debugfs_entry = symlink; + } else { + dput(symlink); + } + +try_proc: type = class_search_type(LUSTRE_OSC_NAME); if (type != NULL && type->typ_procroot != NULL) - return rc; + GOTO(no_osc, rc); type = class_search_type(LUSTRE_OSP_NAME); type->typ_procsym = lprocfs_register("osc", proc_lustre_root, @@ -1907,6 +1960,7 @@ static int __init osp_mod_init(void) (int) PTR_ERR(type->typ_procsym)); type->typ_procsym = NULL; } +no_osc: return rc; } @@ -1916,17 +1970,21 @@ static int __init osp_mod_init(void) * This callback is called when kernel unloads OSP module from memory, and * it will deregister OSP and LWP device type from obd_types (\see class_obd.c). */ -static void __exit osp_mod_exit(void) +static void __exit osp_exit(void) { + if (!IS_ERR_OR_NULL(sym)) { + ldebugfs_remove(&sym->typ_debugfs_entry); + kobject_put(&sym->typ_kobj); + } class_unregister_type(LUSTRE_LWP_NAME); class_unregister_type(LUSTRE_OSP_NAME); lu_kmem_fini(osp_caches); } MODULE_AUTHOR("OpenSFS, Inc. "); -MODULE_DESCRIPTION("Lustre OST Proxy Device ("LUSTRE_OSP_NAME")"); +MODULE_DESCRIPTION("Lustre OSD Storage Proxy ("LUSTRE_OSP_NAME")"); MODULE_VERSION(LUSTRE_VERSION_STRING); MODULE_LICENSE("GPL"); -module_init(osp_mod_init); -module_exit(osp_mod_exit); +module_init(osp_init); +module_exit(osp_exit);