X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_device.c;h=e7923f1e2ce6f4c4cbbcc087e006393068d85b2b;hp=4a7b87232269aaf5bdc91e66adc88b2d276da45b;hb=d813c75df6798efbf3228347628c0d671ca7269c;hpb=45cb603b4352a73077dcc45ec2cdea403837a7ba diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c index 4a7b872..e7923f1 100644 --- a/lustre/mdd/mdd_device.c +++ b/lustre/mdd/mdd_device.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,11 +23,10 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * * lustre/mdd/mdd_device.c * @@ -45,13 +40,14 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include +#include #include "mdd_internal.h" @@ -128,6 +124,7 @@ static int mdd_init0(const struct lu_env *env, struct mdd_device *mdd, /* LU-8040 Set defaults here, before values configs */ mdd->mdd_cl.mc_flags = 0; /* off by default */ mdd->mdd_cl.mc_mask = CHANGELOG_DEFMASK; + mdd->mdd_cl.mc_deniednext = 60; /* 60 secs by default */ dev = lustre_cfg_string(lcfg, 0); if (dev == NULL) @@ -144,8 +141,21 @@ static int mdd_init0(const struct lu_env *env, struct mdd_device *mdd, RETURN(rc); mdd->mdd_atime_diff = MAX_ATIME_DIFF; - /* sync permission changes */ - mdd->mdd_sync_permission = 1; + /* sync permission changes */ + mdd->mdd_sync_permission = 1; + /* enable changelog garbage collection */ + mdd->mdd_changelog_gc = 1; + /* with a significant amount of idle time */ + mdd->mdd_changelog_max_idle_time = CHLOG_MAX_IDLE_TIME; + /* or a significant amount of late indexes */ + mdd->mdd_changelog_max_idle_indexes = CHLOG_MAX_IDLE_INDEXES; + /* with a reasonable interval between each check */ + mdd->mdd_changelog_min_gc_interval = CHLOG_MIN_GC_INTERVAL; + /* with a very few number of free catalog entries */ + mdd->mdd_changelog_min_free_cat_entries = CHLOG_MIN_FREE_CAT_ENTRIES; + /* special default striping for files created with O_APPEND */ + mdd->mdd_append_stripe_count = 1; + mdd->mdd_append_pool[0] = '\0'; dt_conf_get(env, mdd->mdd_child, &mdd->mdd_dt_conf); @@ -181,10 +191,10 @@ static int changelog_init_cb(const struct lu_env *env, struct llog_handle *llh, LASSERT(rec->cr_hdr.lrh_type == CHANGELOG_REC); CDEBUG(D_INFO, - "seeing record at index %d/%d/"LPU64" t=%x %.*s in log" - DOSTID"\n", hdr->lrh_index, rec->cr_hdr.lrh_index, + "seeing record at index %d/%d/%llu t=%x %.*s in log" + DFID"\n", hdr->lrh_index, rec->cr_hdr.lrh_index, rec->cr.cr_index, rec->cr.cr_type, rec->cr.cr_namelen, - changelog_rec_name(&rec->cr), POSTID(&llh->lgh_id.lgl_oi)); + changelog_rec_name(&rec->cr), PFID(&llh->lgh_id.lgl_oi.oi_fid)); mdd->mdd_cl.mc_index = rec->cr.cr_index; return LLOG_PROC_BREAK; @@ -194,19 +204,20 @@ static int changelog_user_init_cb(const struct lu_env *env, struct llog_handle *llh, struct llog_rec_hdr *hdr, void *data) { - struct mdd_device *mdd = (struct mdd_device *)data; - struct llog_changelog_user_rec *rec = - (struct llog_changelog_user_rec *)hdr; + struct mdd_device *mdd = (struct mdd_device *)data; + struct llog_changelog_user_rec *rec = + (struct llog_changelog_user_rec *)hdr; - LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); - LASSERT(rec->cur_hdr.lrh_type == CHANGELOG_USER_REC); + LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); + LASSERT(rec->cur_hdr.lrh_type == CHANGELOG_USER_REC); - CDEBUG(D_INFO, "seeing user at index %d/%d id=%d endrec="LPU64 - " in log "DOSTID"\n", hdr->lrh_index, rec->cur_hdr.lrh_index, - rec->cur_id, rec->cur_endrec, POSTID(&llh->lgh_id.lgl_oi)); + CDEBUG(D_INFO, "seeing user at index %d/%d id=%d endrec=%llu" + " in log "DFID"\n", hdr->lrh_index, rec->cur_hdr.lrh_index, + rec->cur_id, rec->cur_endrec, PFID(&llh->lgh_id.lgl_oi.oi_fid)); spin_lock(&mdd->mdd_cl.mc_user_lock); mdd->mdd_cl.mc_lastuser = rec->cur_id; + mdd->mdd_cl.mc_users++; if (rec->cur_endrec > mdd->mdd_cl.mc_index) mdd->mdd_cl.mc_index = rec->cur_endrec; spin_unlock(&mdd->mdd_cl.mc_user_lock); @@ -214,38 +225,157 @@ static int changelog_user_init_cb(const struct lu_env *env, return LLOG_PROC_BREAK; } +struct changelog_orphan_data { + __u64 index; + struct mdd_device *mdd; +}; + +/* find oldest changelog record index */ +static int changelog_detect_orphan_cb(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *hdr, void *data) +{ + struct mdd_device *mdd = ((struct changelog_orphan_data *)data)->mdd; + struct llog_changelog_rec *rec = container_of(hdr, + struct llog_changelog_rec, + cr_hdr); + + LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); + + if (rec->cr_hdr.lrh_type != CHANGELOG_REC) { + CWARN("%s: invalid record at index %d in log "DFID"\n", + mdd2obd_dev(mdd)->obd_name, hdr->lrh_index, + PFID(&llh->lgh_id.lgl_oi.oi_fid)); + /* try to find some next valid record and thus allow to recover + * from a corrupted LLOG, instead to assert and force a crash + */ + return 0; + } + + CDEBUG(D_INFO, "%s: seeing record at index %d/%d/%llu t=%x %.*s in log " + DFID"\n", mdd2obd_dev(mdd)->obd_name, hdr->lrh_index, + rec->cr_hdr.lrh_index, rec->cr.cr_index, rec->cr.cr_type, + rec->cr.cr_namelen, changelog_rec_name(&rec->cr), + PFID(&llh->lgh_id.lgl_oi.oi_fid)); + + ((struct changelog_orphan_data *)data)->index = rec->cr.cr_index; + return LLOG_PROC_BREAK; +} + +/* find oldest changelog user index */ +static int changelog_user_detect_orphan_cb(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *hdr, void *data) +{ + struct mdd_device *mdd = ((struct changelog_orphan_data *)data)->mdd; + struct llog_changelog_user_rec *rec = container_of(hdr, + struct llog_changelog_user_rec, + cur_hdr); + + LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); + + if (rec->cur_hdr.lrh_type != CHANGELOG_USER_REC) { + CWARN("%s: invalid user at index %d in log "DFID"\n", + mdd2obd_dev(mdd)->obd_name, hdr->lrh_index, + PFID(&llh->lgh_id.lgl_oi.oi_fid)); + /* try to find some next valid record and thus allow to recover + * from a corrupted LLOG, instead to assert and force a crash + */ + return 0; + } + + CDEBUG(D_INFO, "%s: seeing user at index %d/%d id=%d endrec=%llu in " + "log "DFID"\n", mdd2obd_dev(mdd)->obd_name, hdr->lrh_index, + rec->cur_hdr.lrh_index, rec->cur_id, rec->cur_endrec, + PFID(&llh->lgh_id.lgl_oi.oi_fid)); + + if (((struct changelog_orphan_data *)data)->index == 0 || + rec->cur_endrec < ((struct changelog_orphan_data *)data)->index) + ((struct changelog_orphan_data *)data)->index = rec->cur_endrec; + + return 0; +} + +struct changelog_cancel_cookie { + long long endrec; + struct mdd_device *mdd; +}; + static int llog_changelog_cancel_cb(const struct lu_env *env, struct llog_handle *llh, struct llog_rec_hdr *hdr, void *data) { struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr; - struct llog_cookie cookie; - long long endrec = *(long long *)data; - int rc; + struct changelog_cancel_cookie *cl_cookie = + (struct changelog_cancel_cookie *)data; ENTRY; /* This is always a (sub)log, not the catalog */ LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); - if (rec->cr.cr_index > endrec) + /* if current context is GC-thread allow it to stop upon umount + * remaining records cleanup will occur upon next mount + * + * also during testing, wait for GC-thread to be released + * + * XXX this requires the GC-thread to not fork a sub-thread via + * llog[_cat]_process_or_fork() and we may think to also implement + * this shutdown mechanism for manually started user unregister which + * can also take a long time if huge backlog of records + */ + if (unlikely(cl_cookie->mdd->mdd_cl.mc_gc_task == current)) { + /* wait to be released */ + while (CFS_FAIL_CHECK_QUIET(OBD_FAIL_FORCE_GC_THREAD)) + schedule(); + + if (kthread_should_stop()) + RETURN(LLOG_PROC_BREAK); + } + + if (rec->cr.cr_index > cl_cookie->endrec) /* records are in order, so we're done */ RETURN(LLOG_PROC_BREAK); - cookie.lgc_lgl = llh->lgh_id; - cookie.lgc_index = hdr->lrh_index; + if (unlikely(OBD_FAIL_PRECHECK(OBD_FAIL_MDS_CHANGELOG_RACE))) { + if (cfs_fail_val == 0) + cfs_fail_val = hdr->lrh_index; + if (cfs_fail_val == hdr->lrh_index) + OBD_RACE(OBD_FAIL_MDS_CHANGELOG_RACE); + } + + /* Records folow one by one, cr_index++. We could calculate the + * last cr_index at this plain llog. And if it less then cookie endrec + * cancel the whole file. + */ + if ((LLOG_HDR_BITMAP_SIZE(llh->lgh_hdr) - hdr->lrh_index + + rec->cr.cr_index) < cl_cookie->endrec) { + int rc; + + if (unlikely(OBD_FAIL_PRECHECK(OBD_FAIL_MDS_CHANGELOG_DEL))) { + if (cfs_fail_val == 0) { + cfs_fail_val = (unsigned long)llh & 0xFFFFFFFF; + OBD_RACE(OBD_FAIL_MDS_CHANGELOG_DEL); + } + } + rc = llog_destroy(env, llh); + if (!rc) { + CDEBUG(D_HA, "Changelog destroyed plain "DFID"\n", + PFID(&llh->lgh_id.lgl_oi.oi_fid)); + RETURN(LLOG_DEL_PLAIN); + } + } /* cancel them one at a time. I suppose we could store up the cookies * and cancel them all at once; probably more efficient, but this is * done as a user call, so who cares... */ - rc = llog_cat_cancel_records(env, llh->u.phd.phd_cat_handle, 1, - &cookie); - RETURN(rc < 0 ? rc : 0); + + RETURN(LLOG_DEL_RECORD); } static int llog_changelog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt, - struct llog_cookie *cookies, int flags) + struct changelog_cancel_cookie *cookie) { struct llog_handle *cathandle = ctxt->loc_handle; int rc; @@ -256,14 +386,14 @@ static int llog_changelog_cancel(const struct lu_env *env, LASSERT(cathandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT); rc = llog_cat_process(env, cathandle, llog_changelog_cancel_cb, - (void *)cookies, 0, 0); + cookie, 0, 0); if (rc >= 0) /* 0 or 1 means we're done */ rc = 0; else - CERROR("%s: cancel idx %u of catalog "DOSTID" rc=%d\n", + CERROR("%s: cancel idx %u of catalog "DFID": rc = %d\n", ctxt->loc_obd->obd_name, cathandle->lgh_last_idx, - POSTID(&cathandle->lgh_id.lgl_oi), rc); + PFID(&cathandle->lgh_id.lgl_oi.oi_fid), rc); RETURN(rc); } @@ -319,6 +449,10 @@ static int mdd_changelog_llog_init(const struct lu_env *env, { struct obd_device *obd = mdd2obd_dev(mdd); struct llog_ctxt *ctxt = NULL, *uctxt = NULL; + struct changelog_orphan_data changelog_orphan = { .index = 0, + .mdd = mdd }, + user_orphan = { .index = 0, + .mdd = mdd }; int rc; ENTRY; @@ -358,7 +492,7 @@ static int mdd_changelog_llog_init(const struct lu_env *env, GOTO(out_close, rc); } - CDEBUG(D_IOCTL, "changelog starting index="LPU64"\n", + CDEBUG(D_IOCTL, "changelog starting index=%llu\n", mdd->mdd_cl.mc_index); /* setup user changelog */ @@ -378,9 +512,6 @@ static int mdd_changelog_llog_init(const struct lu_env *env, if (rc) GOTO(out_ucleanup, rc); - uctxt->loc_handle->lgh_logops->lop_add = llog_cat_add_rec; - uctxt->loc_handle->lgh_logops->lop_declare_add = llog_cat_declare_add_rec; - rc = llog_init_handle(env, uctxt->loc_handle, LLOG_F_IS_CAT, NULL); if (rc) GOTO(out_uclose, rc); @@ -399,6 +530,51 @@ static int mdd_changelog_llog_init(const struct lu_env *env, if (rc < 0) GOTO(out_uclose, rc); } + + /* find and clear any orphan changelog records (1st record index < + * smallest of all users current index), likely to come from an + * interrupted manual or GC-thread purge, as its user record had + * been deleted first + * XXX we may wait for a still registered user clear operation to + * do the job, but it may then take a long time to reach the user's + * real targetted records if a huge purge backlog is still to be + * processed as a long time idle user record could have been deleted + * XXX we may need to run end of purge as a separate thread + */ + rc = llog_cat_process(env, ctxt->loc_handle, changelog_detect_orphan_cb, + &changelog_orphan, 0, 0); + if (rc < 0) { + CERROR("%s: changelog detect orphan failed: rc = %d\n", + obd->obd_name, rc); + GOTO(out_uclose, rc); + } + rc = llog_cat_process(env, uctxt->loc_handle, + changelog_user_detect_orphan_cb, + &user_orphan, 0, 0); + if (rc < 0) { + CERROR("%s: changelog user detect orphan failed: rc = %d\n", + obd->obd_name, rc); + GOTO(out_uclose, rc); + } + if (unlikely(changelog_orphan.index < user_orphan.index)) { + struct changelog_cancel_cookie cl_cookie = { + .endrec = user_orphan.index, + .mdd = mdd, + }; + + CWARN("%s : orphan changelog records found, starting from " + "index %llu to index %llu, being cleared now\n", + obd->obd_name, changelog_orphan.index, user_orphan.index); + + /* XXX we may need to run end of purge as a separate thread */ + rc = llog_changelog_cancel(env, ctxt, &cl_cookie); + if (rc < 0) { + CERROR("%s: purge of changelog orphan records failed: " + "rc = %d\n", obd->obd_name, rc); + GOTO(out_uclose, rc); + } + } + llog_ctxt_put(ctxt); llog_ctxt_put(uctxt); RETURN(0); @@ -420,10 +596,14 @@ static int mdd_changelog_init(const struct lu_env *env, struct mdd_device *mdd) mdd->mdd_cl.mc_index = 0; spin_lock_init(&mdd->mdd_cl.mc_lock); - mdd->mdd_cl.mc_starttime = cfs_time_current_64(); + mdd->mdd_cl.mc_starttime = ktime_get(); spin_lock_init(&mdd->mdd_cl.mc_user_lock); mdd->mdd_cl.mc_lastuser = 0; + /* ensure a GC check will, and a thread run may, occur upon start */ + mdd->mdd_cl.mc_gc_time = 0; + mdd->mdd_cl.mc_gc_task = MDD_CHLG_GC_NONE; + rc = mdd_changelog_llog_init(env, mdd); if (rc) { CERROR("%s: changelog setup during init failed: rc = %d\n", @@ -440,7 +620,42 @@ static void mdd_changelog_fini(const struct lu_env *env, struct obd_device *obd = mdd2obd_dev(mdd); struct llog_ctxt *ctxt; - mdd->mdd_cl.mc_flags = 0; + if (mdd->mdd_cl.mc_flags & CLM_CLEANUP_DONE) + return; + mdd->mdd_cl.mc_flags = CLM_CLEANUP_DONE; + +again: + /* stop GC-thread if running */ + spin_lock(&mdd->mdd_cl.mc_lock); + if (likely(mdd->mdd_cl.mc_gc_task == MDD_CHLG_GC_NONE)) { + /* avoid any attempt to run a GC-thread */ + mdd->mdd_cl.mc_gc_task = current; + spin_unlock(&mdd->mdd_cl.mc_lock); + } else { + struct task_struct *gc_task; + + if (unlikely(mdd->mdd_cl.mc_gc_task == MDD_CHLG_GC_NEED || + mdd->mdd_cl.mc_gc_task == MDD_CHLG_GC_START)) { + /* need to wait for birthing GC-thread to be started + * and to have set mc_gc_task to itself + */ + spin_unlock(&mdd->mdd_cl.mc_lock); + /* Add a tiny sleep */ + schedule_timeout_uninterruptible(1); + /* go back to fully check if GC-thread has started or + * even already exited or if a new one is starting... + */ + goto again; + } + /* take a reference on task_struct to avoid it to be freed + * upon exit + */ + gc_task = mdd->mdd_cl.mc_gc_task; + get_task_struct(gc_task); + spin_unlock(&mdd->mdd_cl.mc_lock); + kthread_stop(gc_task); + put_task_struct(gc_task); + } ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT); if (ctxt) { @@ -467,6 +682,7 @@ mdd_changelog_llog_cancel(const struct lu_env *env, struct mdd_device *mdd, struct obd_device *obd = mdd2obd_dev(mdd); struct llog_ctxt *ctxt; long long unsigned cur; + struct changelog_cancel_cookie cookie; int rc; ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT); @@ -497,9 +713,11 @@ mdd_changelog_llog_cancel(const struct lu_env *env, struct mdd_device *mdd, /* Some records were purged, so reset repeat-access time (so we record new mtime update records, so users can see a file has been changed since the last purge) */ - mdd->mdd_cl.mc_starttime = cfs_time_current_64(); + mdd->mdd_cl.mc_starttime = ktime_get(); - rc = llog_cancel(env, ctxt, (struct llog_cookie *)&endrec, 0); + cookie.endrec = endrec; + cookie.mdd = mdd; + rc = llog_changelog_cancel(env, ctxt, &cookie); out: llog_ctxt_put(ctxt); return rc; @@ -523,13 +741,13 @@ int mdd_changelog_write_header(const struct lu_env *env, ENTRY; - if (mdd->mdd_cl.mc_mask & (1 << CL_MARK)) { - mdd->mdd_cl.mc_starttime = cfs_time_current_64(); + if (mdd->mdd_cl.mc_mask & BIT(CL_MARK)) { + mdd->mdd_cl.mc_starttime = ktime_get(); RETURN(0); } reclen = llog_data_len(sizeof(*rec) + len); - buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_big_buf, reclen); + buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_chlg_buf, reclen); if (buf->lb_buf == NULL) RETURN(-ENOMEM); rec = buf->lb_buf; @@ -544,9 +762,6 @@ int mdd_changelog_write_header(const struct lu_env *env, rec->cr.cr_namelen); rec->cr_hdr.lrh_type = CHANGELOG_REC; rec->cr.cr_time = cl_time(); - spin_lock(&mdd->mdd_cl.mc_lock); - rec->cr.cr_index = ++mdd->mdd_cl.mc_index; - spin_unlock(&mdd->mdd_cl.mc_lock); ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT); LASSERT(ctxt); @@ -557,7 +772,7 @@ int mdd_changelog_write_header(const struct lu_env *env, llog_ctxt_put(ctxt); /* assume on or off event; reset repeat-access time */ - mdd->mdd_cl.mc_starttime = cfs_time_current_64(); + mdd->mdd_cl.mc_starttime = ktime_get(); RETURN(rc); } @@ -578,23 +793,12 @@ static int obf_lookup(const struct lu_env *env, struct md_object *p, name++; sscanf(name, SFID, RFID(f)); - if (!fid_is_sane(f)) { - CWARN("%s: Trying to lookup invalid FID [%s] in %s/%s, FID " - "format should be "DFID"\n", mdd2obd_dev(mdd)->obd_name, - lname->ln_name, dot_lustre_name, mdd_obf_dir_name, - (__u64)FID_SEQ_NORMAL, 1, 0); - GOTO(out, rc = -EINVAL); - } + if (!fid_is_sane(f)) + GOTO(out, rc = -ENOENT); if (!fid_is_norm(f) && !fid_is_igif(f) && !fid_is_root(f) && - !fid_seq_is_dot(f->f_seq)) { - CWARN("%s: Trying to lookup invalid FID "DFID" in %s/%s, " - "sequence should be >= "LPX64" or within ["LPX64"," - ""LPX64"].\n", mdd2obd_dev(mdd)->obd_name, PFID(f), - dot_lustre_name, mdd_obf_dir_name, (__u64)FID_SEQ_NORMAL, - (__u64)FID_SEQ_IGIF, (__u64)FID_SEQ_IGIF_MAX); - GOTO(out, rc = -EINVAL); - } + !fid_seq_is_dot(f->f_seq)) + GOTO(out, rc = -ENOENT); /* Check if object with this fid exists */ child = mdd_object_find(env, mdd, f); @@ -651,15 +855,27 @@ static int mdd_dummy_unlink(const struct lu_env *env, return -EPERM; } -static struct md_dir_operations mdd_obf_dir_ops = { +int mdd_create(const struct lu_env *env, struct md_object *pobj, + const struct lu_name *lname, struct md_object *child, + struct md_op_spec *spec, struct md_attr *ma); +static int mdd_obf_create(const struct lu_env *env, struct md_object *pobj, + const struct lu_name *lname, struct md_object *child, + struct md_op_spec *spec, struct md_attr *ma) +{ + if (spec->sp_cr_flags & MDS_OPEN_VOLATILE) + return mdd_create(env, pobj, lname, child, spec, ma); + RETURN(-EPERM); +} + +static const struct md_dir_operations mdd_obf_dir_ops = { .mdo_lookup = obf_lookup, - .mdo_create = mdd_dummy_create, + .mdo_create = mdd_obf_create, .mdo_rename = mdd_dummy_rename, .mdo_link = mdd_dummy_link, .mdo_unlink = mdd_dummy_unlink }; -static struct md_dir_operations mdd_lpf_dir_ops = { +static const struct md_dir_operations mdd_lpf_dir_ops = { .mdo_lookup = mdd_lookup, .mdo_create = mdd_dummy_create, .mdo_rename = mdd_dummy_rename, @@ -680,7 +896,7 @@ static struct md_object *mdo_locate(const struct lu_env *env, LASSERT(obj != NULL); mdo = lu2md(obj); } else { - mdo = ERR_PTR(PTR_ERR(obj)); + mdo = ERR_CAST(obj); } return mdo; } @@ -802,9 +1018,6 @@ out: return rc; } - -static struct llog_operations hsm_actions_logops; - /** * set llog methods and create LLOG_AGENT_ORIG_CTXT llog * object in obd_device @@ -821,7 +1034,7 @@ static int mdd_hsm_actions_llog_init(const struct lu_env *env, obd->obd_lvfs_ctxt.dt = m->mdd_bottom; rc = llog_setup(env, obd, &obd->obd_olg, LLOG_AGENT_ORIG_CTXT, - obd, &hsm_actions_logops); + obd, &llog_common_cat_ops); if (rc) { CERROR("%s: hsm actions llog setup failed: rc = %d\n", obd->obd_name, rc); @@ -878,13 +1091,17 @@ static int mdd_hsm_actions_llog_fini(const struct lu_env *env, static void mdd_device_shutdown(const struct lu_env *env, struct mdd_device *m, struct lustre_cfg *cfg) { - mdd_generic_thread_stop(&m->mdd_orph_cleanup_thread); + barrier_deregister(m->mdd_bottom); lfsck_degister(env, m->mdd_bottom); mdd_hsm_actions_llog_fini(env, m); mdd_changelog_fini(env, m); - orph_index_fini(env, m); + mdd_orphan_index_fini(env, m); mdd_dot_lustre_cleanup(env, m); - nm_config_file_deregister_tgt(env, mdd2obd_dev(m)->u.obt.obt_nodemap_config_file); + if (mdd2obd_dev(m)->u.obt.obt_nodemap_config_file) { + nm_config_file_deregister_tgt(env, + mdd2obd_dev(m)->u.obt.obt_nodemap_config_file); + mdd2obd_dev(m)->u.obt.obt_nodemap_config_file = NULL; + } if (m->mdd_los != NULL) { local_oid_storage_fini(env, m->mdd_los); m->mdd_los = NULL; @@ -906,10 +1123,11 @@ static int mdd_process_config(const struct lu_env *env, switch (cfg->lcfg_command) { case LCFG_PARAM: { - struct obd_device *obd = mdd2obd_dev(m); + ssize_t count; - rc = class_process_proc_param(PARAM_MDD, obd->obd_vars, cfg, m); - if (rc > 0 || rc == -ENOSYS) + count = class_modify_config(cfg, PARAM_MDD, &m->mdd_kobj); + rc = count > 0 ? 0 : count; + if (rc) /* we don't understand; pass it on */ rc = next->ld_ops->ldo_process_config(env, next, cfg); break; @@ -920,7 +1138,11 @@ static int mdd_process_config(const struct lu_env *env, GOTO(out, rc); dt_conf_get(env, dt, &m->mdd_dt_conf); break; - case LCFG_CLEANUP: + case LCFG_PRE_CLEANUP: + rc = next->ld_ops->ldo_process_config(env, next, cfg); + mdd_generic_thread_stop(&m->mdd_orphan_cleanup_thread); + break; + case LCFG_CLEANUP: rc = next->ld_ops->ldo_process_config(env, next, cfg); lu_dev_del_linkage(d->ld_site, d); mdd_device_shutdown(env, m, cfg); @@ -934,21 +1156,21 @@ out: } static int mdd_recovery_complete(const struct lu_env *env, - struct lu_device *d) + struct lu_device *d) { - struct mdd_device *mdd = lu2mdd_dev(d); + struct mdd_device *mdd = lu2mdd_dev(d); struct lu_device *next; - int rc; - ENTRY; + int rc; + ENTRY; - LASSERT(mdd != NULL); + LASSERT(mdd != NULL); next = &mdd->mdd_child->dd_lu_dev; - /* XXX: orphans handling. */ - mdd_orphan_cleanup(env, mdd); - rc = next->ld_ops->ldo_recovery_complete(env, next); + if (!mdd->mdd_bottom->dd_rdonly) + mdd_orphan_cleanup(env, mdd); + rc = next->ld_ops->ldo_recovery_complete(env, next); - RETURN(rc); + RETURN(rc); } int mdd_local_file_create(const struct lu_env *env, struct mdd_device *mdd, @@ -956,7 +1178,7 @@ int mdd_local_file_create(const struct lu_env *env, struct mdd_device *mdd, __u32 mode, struct lu_fid *fid) { struct dt_object *parent, *dto; - int rc; + int rc = 0; ENTRY; @@ -978,11 +1200,11 @@ int mdd_local_file_create(const struct lu_env *env, struct mdd_device *mdd, *fid = *lu_object_fid(&dto->do_lu); /* since stack is not fully set up the local_storage uses own stack * and we should drop its object from cache */ - lu_object_put_nocache(env, &dto->do_lu); + dt_object_put_nocache(env, dto); EXIT; out_put: - lu_object_put(env, &parent->do_lu); - return 0; + dt_object_put(env, parent); + return rc; } static int mdd_lfsck_out_notify(const struct lu_env *env, void *data, @@ -998,6 +1220,7 @@ static int mdd_prepare(const struct lu_env *env, struct mdd_device *mdd = lu2mdd_dev(cdev); struct lu_device *next = &mdd->mdd_child->dd_lu_dev; struct nm_config_file *nodemap_config; + struct obd_device_target *obt = &mdd2obd_dev(mdd)->u.obt; struct lu_fid fid; int rc; @@ -1044,7 +1267,7 @@ static int mdd_prepare(const struct lu_env *env, mdd->mdd_root_fid = fid; } - rc = orph_index_init(env, mdd); + rc = mdd_orphan_index_init(env, mdd); if (rc < 0) GOTO(out_dot, rc); @@ -1061,10 +1284,13 @@ static int mdd_prepare(const struct lu_env *env, nodemap_config = nm_config_file_register_tgt(env, mdd->mdd_bottom, mdd->mdd_los); - if (IS_ERR(nodemap_config)) - GOTO(out_hsm, rc = PTR_ERR(nodemap_config)); - - mdd2obd_dev(mdd)->u.obt.obt_nodemap_config_file = nodemap_config; + if (IS_ERR(nodemap_config)) { + rc = PTR_ERR(nodemap_config); + if (rc != -EROFS) + GOTO(out_hsm, rc); + } else { + obt->obt_nodemap_config_file = nodemap_config; + } rc = lfsck_register(env, mdd->mdd_bottom, mdd->mdd_child, mdd2obd_dev(mdd), mdd_lfsck_out_notify, @@ -1075,17 +1301,26 @@ static int mdd_prepare(const struct lu_env *env, GOTO(out_nodemap, rc); } + rc = barrier_register(mdd->mdd_bottom, mdd->mdd_child); + if (rc) { + CERROR("%s: failed to register to barrier: rc = %d\n", + mdd2obd_dev(mdd)->obd_name, rc); + GOTO(out_lfsck, rc); + } + RETURN(0); +out_lfsck: + lfsck_degister(env, mdd->mdd_bottom); out_nodemap: - nm_config_file_deregister_tgt(env, mdd2obd_dev(mdd)->u.obt.obt_nodemap_config_file); - mdd2obd_dev(mdd)->u.obt.obt_nodemap_config_file = NULL; + nm_config_file_deregister_tgt(env, obt->obt_nodemap_config_file); + obt->obt_nodemap_config_file = NULL; out_hsm: mdd_hsm_actions_llog_fini(env, mdd); out_changelog: mdd_changelog_fini(env, mdd); out_orph: - orph_index_fini(env, mdd); + mdd_orphan_index_fini(env, mdd); out_dot: if (mdd_seq_site(mdd)->ss_node_id == 0) mdd_dot_lustre_cleanup(env, mdd); @@ -1096,11 +1331,30 @@ out_los: return rc; } +/** + * Implementation of lu_device_operations::ldo_fid_alloc() for MDD. + * + * Find corresponding device by passed parent and name, and allocate FID from + * there. + * + * see include/lu_object.h for the details. + */ +static int mdd_fid_alloc(const struct lu_env *env, struct lu_device *d, + struct lu_fid *fid, struct lu_object *parent, + const struct lu_name *name) +{ + struct mdd_device *mdd = lu2mdd_dev(d); + struct lu_object *o = lu_object_next(parent); + + return dt_fid_alloc(env, mdd->mdd_child, fid, o, name); +} + const struct lu_device_operations mdd_lu_ops = { .ldo_object_alloc = mdd_object_alloc, .ldo_process_config = mdd_process_config, .ldo_recovery_complete = mdd_recovery_complete, .ldo_prepare = mdd_prepare, + .ldo_fid_alloc = mdd_fid_alloc, }; static int mdd_root_get(const struct lu_env *env, @@ -1124,22 +1378,19 @@ static int mdd_statfs(const struct lu_env *env, struct md_device *m, ENTRY; - rc = mdd_child_ops(mdd)->dt_statfs(env, mdd->mdd_child, sfs); + rc = mdd_child_ops(mdd)->dt_statfs(env, mdd->mdd_child, sfs, NULL); sfs->os_namelen = min_t(__u32, sfs->os_namelen, NAME_MAX); RETURN(rc); } -static int mdd_maxeasize_get(const struct lu_env *env, struct md_device *m, - int *easize) +static const struct dt_device_param *mdd_dtconf_get(const struct lu_env *env, + struct md_device *m) { struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev); - ENTRY; - *easize = mdd->mdd_dt_conf.ddp_max_ea_size; - - RETURN(0); + return &mdd->mdd_dt_conf; } static int mdd_llog_ctxt_get(const struct lu_env *env, struct md_device *m, @@ -1279,7 +1530,7 @@ static int mdd_obd_set_info_async(const struct lu_env *env, RETURN(rc); } -static struct obd_ops mdd_obd_device_ops = { +static const struct obd_ops mdd_obd_device_ops = { .o_owner = THIS_MODULE, .o_connect = mdd_obd_connect, .o_disconnect = mdd_obd_disconnect, @@ -1306,10 +1557,7 @@ static int mdd_changelog_user_register(const struct lu_env *env, RETURN(-ENOMEM); } - /* Assume we want it on since somebody registered */ - rc = mdd_changelog_on(env, mdd); - if (rc) - GOTO(out, rc); + CFS_RACE(CFS_FAIL_CHLOG_USER_REG_UNREG_RACE); rec->cur_hdr.lrh_len = sizeof(*rec); rec->cur_hdr.lrh_type = CHANGELOG_USER_REC; @@ -1320,147 +1568,307 @@ static int mdd_changelog_user_register(const struct lu_env *env, GOTO(out, rc = -EOVERFLOW); } *id = rec->cur_id = ++mdd->mdd_cl.mc_lastuser; + mdd->mdd_cl.mc_users++; rec->cur_endrec = mdd->mdd_cl.mc_index; + + rec->cur_time = (__u32)ktime_get_real_seconds(); + if (OBD_FAIL_CHECK(OBD_FAIL_TIME_IN_CHLOG_USER)) + rec->cur_time = 0; + spin_unlock(&mdd->mdd_cl.mc_user_lock); rc = llog_cat_add(env, ctxt->loc_handle, &rec->cur_hdr, NULL); + if (rc) { + CWARN("%s: Failed to register changelog user %d: rc=%d\n", + mdd2obd_dev(mdd)->obd_name, *id, rc); + spin_lock(&mdd->mdd_cl.mc_user_lock); + mdd->mdd_cl.mc_users--; + spin_unlock(&mdd->mdd_cl.mc_user_lock); + GOTO(out, rc); + } CDEBUG(D_IOCTL, "Registered changelog user %d\n", *id); + + /* Assume we want it on since somebody registered */ + rc = mdd_changelog_on(env, mdd); + if (rc) + GOTO(out, rc); + out: OBD_FREE_PTR(rec); llog_ctxt_put(ctxt); RETURN(rc); } -struct mdd_changelog_user_data { - __u64 mcud_endrec; /**< purge record for this user */ - __u64 mcud_minrec; /**< lowest changelog recno still referenced */ - __u32 mcud_id; - __u32 mcud_minid; /**< user id with lowest rec reference */ - __u32 mcud_usercount; - unsigned int mcud_found:1; +struct mdd_changelog_user_purge { + struct mdd_device *mcup_mdd; + __u32 mcup_id; + __u32 mcup_usercount; + __u64 mcup_minrec; + bool mcup_found; }; -#define MCUD_UNREGISTER -1LL -/** Two things: - * 1. Find the smallest record everyone is willing to purge - * 2. Update the last purgeable record for this user +/** + * changelog_user_purge callback + * + * Is called once per user. + * + * Check to see the user requested is available from rec. + * Truncate the changelog. + * Keep track of the total number of users (calls). */ static int mdd_changelog_user_purge_cb(const struct lu_env *env, struct llog_handle *llh, struct llog_rec_hdr *hdr, void *data) { struct llog_changelog_user_rec *rec; - struct mdd_changelog_user_data *mcud = data; + struct mdd_changelog_user_purge *mcup = data; + struct llog_cookie cookie; int rc; - ENTRY; + ENTRY; - LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN); + if ((llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) == 0) + RETURN(-ENXIO); - rec = (struct llog_changelog_user_rec *)hdr; + rec = container_of(hdr, struct llog_changelog_user_rec, cur_hdr); - mcud->mcud_usercount++; + mcup->mcup_usercount++; - /* If we have a new endrec for this id, use it for the following - min check instead of its old value */ - if (rec->cur_id == mcud->mcud_id) - rec->cur_endrec = max(rec->cur_endrec, mcud->mcud_endrec); + if (rec->cur_id != mcup->mcup_id) { + /* truncate to the lowest endrec that is not this user */ + mcup->mcup_minrec = min(mcup->mcup_minrec, + rec->cur_endrec); + RETURN(0); + } - /* Track the minimum referenced record */ - if (mcud->mcud_minid == 0 || mcud->mcud_minrec > rec->cur_endrec) { - mcud->mcud_minid = rec->cur_id; - mcud->mcud_minrec = rec->cur_endrec; - } + /* Unregister this user */ + cookie.lgc_lgl = llh->lgh_id; + cookie.lgc_index = hdr->lrh_index; + + rc = llog_cat_cancel_records(env, llh->u.phd.phd_cat_handle, + 1, &cookie); + if (rc == 0) { + mcup->mcup_found = true; + mcup->mcup_usercount--; + spin_lock(&mcup->mcup_mdd->mdd_cl.mc_user_lock); + mcup->mcup_mdd->mdd_cl.mc_users--; + spin_unlock(&mcup->mcup_mdd->mdd_cl.mc_user_lock); + } - if (rec->cur_id != mcud->mcud_id) - RETURN(0); + RETURN(rc); +} - /* Update this user's record */ - mcud->mcud_found = 1; +int mdd_changelog_user_purge(const struct lu_env *env, + struct mdd_device *mdd, __u32 id) +{ + struct mdd_changelog_user_purge mcup = { + .mcup_mdd = mdd, + .mcup_id = id, + .mcup_found = false, + .mcup_usercount = 0, + .mcup_minrec = ULLONG_MAX, + }; + struct llog_ctxt *ctxt; + int rc; - /* Special case: unregister this user */ - if (mcud->mcud_endrec == MCUD_UNREGISTER) { - struct llog_cookie cookie; + ENTRY; - cookie.lgc_lgl = llh->lgh_id; - cookie.lgc_index = hdr->lrh_index; + CDEBUG(D_IOCTL, "%s: Purge request: id=%u\n", + mdd2obd_dev(mdd)->obd_name, id); - rc = llog_cat_cancel_records(env, llh->u.phd.phd_cat_handle, - 1, &cookie); - if (rc == 0) - mcud->mcud_usercount--; + ctxt = llog_get_context(mdd2obd_dev(mdd), + LLOG_CHANGELOG_USER_ORIG_CTXT); + if (ctxt == NULL || + (ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) == 0) + GOTO(out, rc = -ENXIO); - RETURN(rc); - } + rc = llog_cat_process(env, ctxt->loc_handle, + mdd_changelog_user_purge_cb, &mcup, + 0, 0); + + OBD_FAIL_TIMEOUT(OBD_FAIL_LLOG_PURGE_DELAY, cfs_fail_val); + + if ((rc == 0) && (mcup.mcup_usercount == 0)) { + spin_lock(&mdd->mdd_cl.mc_user_lock); + if (mdd->mdd_cl.mc_users == 0) { + /* No more users; turn changelogs off */ + CDEBUG(D_IOCTL, "turning off changelogs\n"); + rc = mdd_changelog_off(env, mdd); + } + spin_unlock(&mdd->mdd_cl.mc_user_lock); + } - /* Update the endrec */ - CDEBUG(D_IOCTL, "Rewriting changelog user %d endrec to "LPU64"\n", - mcud->mcud_id, rec->cur_endrec); + if ((rc == 0) && mcup.mcup_found) { + CDEBUG(D_IOCTL, "%s: Purging changelog entries for user %d " + "record=%llu\n", + mdd2obd_dev(mdd)->obd_name, id, mcup.mcup_minrec); + /* Cancelling record 0 destroys the entire changelog, make sure + we don't do that unless we mean it. */ + if (mcup.mcup_minrec != 0 || mcup.mcup_usercount == 0) { + rc = mdd_changelog_llog_cancel(env, mdd, + mcup.mcup_minrec); + } + } else { + CWARN("%s: No changelog for user %u; rc=%d\n", + mdd2obd_dev(mdd)->obd_name, id, rc); + GOTO(out, rc = -ENOENT); + } + + CFS_RACE(CFS_FAIL_CHLOG_USER_REG_UNREG_RACE); + + EXIT; +out: + if (ctxt != NULL) + llog_ctxt_put(ctxt); + + return rc; +} + +struct mdd_changelog_user_clear { + __u64 mcuc_endrec; + __u64 mcuc_minrec; + __u32 mcuc_id; + bool mcuc_flush; +}; + +/** + * changelog_clear callback + * + * Is called once per user. + * + * Check to see the user requested is available from rec. + * Check the oldest (smallest) record for boundary conditions. + * Truncate the changelog. + */ +static int mdd_changelog_clear_cb(const struct lu_env *env, + struct llog_handle *llh, + struct llog_rec_hdr *hdr, + void *data) +{ + struct llog_changelog_user_rec *rec; + struct mdd_changelog_user_clear *mcuc = data; + int rc; + + ENTRY; + + if ((llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) == 0) + RETURN(-ENXIO); + + rec = container_of(hdr, struct llog_changelog_user_rec, cur_hdr); + + /* Does the changelog id match the requested id? */ + if (rec->cur_id != mcuc->mcuc_id) { + mcuc->mcuc_minrec = min(mcuc->mcuc_minrec, + rec->cur_endrec); + RETURN(0); + } + + /* cur_endrec is the oldest purgeable record, make sure we're newer */ + if (rec->cur_endrec > mcuc->mcuc_endrec) { + CDEBUG(D_IOCTL, "Request %llu out of range: %llu\n", + mcuc->mcuc_endrec, rec->cur_endrec); + RETURN(-EINVAL); + } + /* Flag that we've met all the range and user checks. + * We now know the record to flush. + */ + rec->cur_endrec = mcuc->mcuc_endrec; + + rec->cur_time = (__u32)ktime_get_real_seconds(); + if (OBD_FAIL_CHECK(OBD_FAIL_TIME_IN_CHLOG_USER)) + rec->cur_time = 0; + + mcuc->mcuc_flush = true; + + CDEBUG(D_IOCTL, "Rewriting changelog user %u endrec to %llu\n", + mcuc->mcuc_id, rec->cur_endrec); + + /* Update the endrec */ rc = llog_write(env, llh, hdr, hdr->lrh_index); - RETURN(rc); + RETURN(rc); } -static int mdd_changelog_user_purge(const struct lu_env *env, - struct mdd_device *mdd, int id, - long long endrec) +/** + * Clear a changelog up to entry specified by endrec for user id. + */ +static int mdd_changelog_clear(const struct lu_env *env, + struct mdd_device *mdd, __u32 id, + __u64 endrec) { - struct mdd_changelog_user_data data; - struct llog_ctxt *ctxt; - int rc; - ENTRY; + struct mdd_changelog_user_clear mcuc = { + .mcuc_id = id, + .mcuc_minrec = endrec, + .mcuc_flush = false, + }; + struct llog_ctxt *ctxt; + __u64 start_rec; + int rc; - CDEBUG(D_IOCTL, "Purge request: id=%d, endrec=%lld\n", id, endrec); + ENTRY; - data.mcud_id = id; - data.mcud_minid = 0; - data.mcud_minrec = 0; - data.mcud_usercount = 0; - data.mcud_endrec = endrec; + CDEBUG(D_IOCTL, "%s: Purge request: id=%u, endrec=%llu\n", + mdd2obd_dev(mdd)->obd_name, id, endrec); + /* start_rec is the newest (largest value) entry in the changelogs*/ spin_lock(&mdd->mdd_cl.mc_lock); - endrec = mdd->mdd_cl.mc_index; + start_rec = mdd->mdd_cl.mc_index; spin_unlock(&mdd->mdd_cl.mc_lock); - if ((data.mcud_endrec == 0) || - ((data.mcud_endrec > endrec) && - (data.mcud_endrec != MCUD_UNREGISTER))) - data.mcud_endrec = endrec; - ctxt = llog_get_context(mdd2obd_dev(mdd), - LLOG_CHANGELOG_USER_ORIG_CTXT); - if (ctxt == NULL) - return -ENXIO; + if (start_rec < endrec) { + CDEBUG(D_IOCTL, "%s: Could not clear changelog, requested "\ + "address out of range\n", mdd2obd_dev(mdd)->obd_name); + RETURN(-EINVAL); + } - LASSERT(ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT); + if (endrec == 0) { + mcuc.mcuc_endrec = start_rec; + mcuc.mcuc_minrec = ULLONG_MAX; + } else { + mcuc.mcuc_endrec = endrec; + } + + ctxt = llog_get_context(mdd2obd_dev(mdd), + LLOG_CHANGELOG_USER_ORIG_CTXT); + if (ctxt == NULL || + (ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) == 0) + GOTO(out, rc = -ENXIO); rc = llog_cat_process(env, ctxt->loc_handle, - mdd_changelog_user_purge_cb, (void *)&data, + mdd_changelog_clear_cb, (void *)&mcuc, 0, 0); - if ((rc >= 0) && (data.mcud_minrec > 0)) { - CDEBUG(D_IOCTL, "Purging changelog entries up to "LPD64 - ", referenced by "CHANGELOG_USER_PREFIX"%d\n", - data.mcud_minrec, data.mcud_minid); - rc = mdd_changelog_llog_cancel(env, mdd, data.mcud_minrec); - } else { - CWARN("Could not determine changelog records to purge; rc=%d\n", - rc); - } - - llog_ctxt_put(ctxt); - if (!data.mcud_found) { - CWARN("No entry for user %d. Last changelog reference is " - LPD64" by changelog user %d\n", data.mcud_id, - data.mcud_minrec, data.mcud_minid); - rc = -ENOENT; - } + if (rc == -EINVAL) { + CDEBUG(D_IOCTL, "%s: No changelog recnum <= %llu to clear\n", + mdd2obd_dev(mdd)->obd_name, (unsigned long long) endrec); + RETURN(-EINVAL); + } else if (rc < 0) { + CWARN("%s: Failure to clear the changelog for user %d: %d\n", + mdd2obd_dev(mdd)->obd_name, id, rc); + } else if (mcuc.mcuc_flush) { + /* Cancelling record 0 destroys the entire changelog, make sure + we don't do that unless we mean it. */ + if (mcuc.mcuc_minrec != 0) { + CDEBUG(D_IOCTL, "%s: Purging changelog entries up "\ + "to %llu\n", mdd2obd_dev(mdd)->obd_name, + mcuc.mcuc_minrec); + + rc = mdd_changelog_llog_cancel(env, mdd, + mcuc.mcuc_minrec); + } + } else { + CDEBUG(D_IOCTL, "%s: No entry for user %d\n", + mdd2obd_dev(mdd)->obd_name, id); + rc = -ENOENT; + } - if (!rc && data.mcud_usercount == 0) - /* No more users; turn changelogs off */ - rc = mdd_changelog_off(env, mdd); + EXIT; +out: + if (ctxt != NULL) + llog_ctxt_put(ctxt); - RETURN(rc); + return rc; } /** mdd_iocontrol @@ -1474,26 +1882,24 @@ static int mdd_changelog_user_purge(const struct lu_env *env, static int mdd_iocontrol(const struct lu_env *env, struct md_device *m, unsigned int cmd, int len, void *karg) { - struct mdd_device *mdd; - struct obd_ioctl_data *data = karg; - int rc; - ENTRY; + struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev); + struct obd_ioctl_data *data = karg; + int rc; + ENTRY; - mdd = lu2mdd_dev(&m->md_lu_dev); + /* Doesn't use obd_ioctl_data */ + switch (cmd) { + case OBD_IOC_CHANGELOG_CLEAR: { + struct changelog_setinfo *cs = karg; - /* Doesn't use obd_ioctl_data */ - switch (cmd) { - case OBD_IOC_CHANGELOG_CLEAR: { - struct changelog_setinfo *cs = karg; - rc = mdd_changelog_user_purge(env, mdd, cs->cs_id, - cs->cs_recno); - RETURN(rc); - } - case OBD_IOC_GET_MNTOPT: { - mntopt_t *mntopts = (mntopt_t *)karg; - *mntopts = mdd->mdd_dt_conf.ddp_mntopts; - RETURN(0); - } + if (unlikely(!barrier_entry(mdd->mdd_bottom))) + RETURN(-EINPROGRESS); + + rc = mdd_changelog_clear(env, mdd, cs->cs_id, + cs->cs_recno); + barrier_exit(mdd->mdd_bottom); + RETURN(rc); + } case OBD_IOC_START_LFSCK: { rc = lfsck_start(env, mdd->mdd_bottom, (struct lfsck_start_param *)karg); @@ -1511,30 +1917,45 @@ static int mdd_iocontrol(const struct lu_env *env, struct md_device *m, } } - /* Below ioctls use obd_ioctl_data */ - if (len != sizeof(*data)) { - CERROR("Bad ioctl size %d\n", len); - RETURN(-EINVAL); - } - if (data->ioc_version != OBD_IOCTL_VERSION) { - CERROR("Bad magic %x != %x\n", data->ioc_version, - OBD_IOCTL_VERSION); - RETURN(-EINVAL); - } + /* Below ioctls use obd_ioctl_data */ + if (len != sizeof(*data)) { + CERROR("Bad ioctl size %d\n", len); + RETURN(-EINVAL); + } + if (data->ioc_version != OBD_IOCTL_VERSION) { + CERROR("Bad magic %x != %x\n", data->ioc_version, + OBD_IOCTL_VERSION); + RETURN(-EINVAL); + } - switch (cmd) { - case OBD_IOC_CHANGELOG_REG: - rc = mdd_changelog_user_register(env, mdd, &data->ioc_u32_1); - break; - case OBD_IOC_CHANGELOG_DEREG: - rc = mdd_changelog_user_purge(env, mdd, data->ioc_u32_1, - MCUD_UNREGISTER); - break; - default: - rc = -ENOTTY; - } + switch (cmd) { + case OBD_IOC_CHANGELOG_REG: + if (unlikely(!barrier_entry(mdd->mdd_bottom))) + RETURN(-EINPROGRESS); - RETURN (rc); + rc = mdd_changelog_user_register(env, mdd, &data->ioc_u32_1); + barrier_exit(mdd->mdd_bottom); + break; + case OBD_IOC_CHANGELOG_DEREG: + if (unlikely(!barrier_entry(mdd->mdd_bottom))) + RETURN(-EINPROGRESS); + + /* explicitly clear changelog first, to protect from crash in + * the middle of purge that would lead to unregistered consumer + * but pending changelog entries + */ + rc = mdd_changelog_clear(env, mdd, data->ioc_u32_1, 0); + if (!rc) + rc = mdd_changelog_user_purge(env, + mdd, data->ioc_u32_1); + + barrier_exit(mdd->mdd_bottom); + break; + default: + rc = -ENOTTY; + } + + RETURN(rc); } /* type constructor/destructor: mdd_type_init, mdd_type_fini */ @@ -1545,20 +1966,20 @@ static const struct md_device_operations mdd_ops = { .mdo_root_get = mdd_root_get, .mdo_llog_ctxt_get = mdd_llog_ctxt_get, .mdo_iocontrol = mdd_iocontrol, - .mdo_maxeasize_get = mdd_maxeasize_get, + .mdo_dtconf_get = mdd_dtconf_get, }; -static struct lu_device_type_operations mdd_device_type_ops = { - .ldto_init = mdd_type_init, - .ldto_fini = mdd_type_fini, +static const struct lu_device_type_operations mdd_device_type_ops = { + .ldto_init = mdd_type_init, + .ldto_fini = mdd_type_fini, - .ldto_start = mdd_type_start, - .ldto_stop = mdd_type_stop, + .ldto_start = mdd_type_start, + .ldto_stop = mdd_type_stop, - .ldto_device_alloc = mdd_device_alloc, - .ldto_device_free = mdd_device_free, + .ldto_device_alloc = mdd_device_alloc, + .ldto_device_free = mdd_device_free, - .ldto_device_fini = mdd_device_fini + .ldto_device_fini = mdd_device_fini }; static struct lu_device_type mdd_device_type = { @@ -1572,14 +1993,16 @@ static struct lu_device_type mdd_device_type = { LU_KEY_INIT(mdd, struct mdd_thread_info); static void mdd_key_fini(const struct lu_context *ctx, - struct lu_context_key *key, void *data) + struct lu_context_key *key, void *data) { - struct mdd_thread_info *info = data; + struct mdd_thread_info *info = data; lu_buf_free(&info->mti_big_buf); lu_buf_free(&info->mti_link_buf); + lu_buf_free(&info->mti_xattr_buf); + lu_buf_free(&info->mti_chlg_buf); - OBD_FREE_PTR(info); + OBD_FREE_PTR(info); } /* context key: mdd_thread_key */ @@ -1622,16 +2045,10 @@ static int __init mdd_init(void) if (rc) return rc; - changelog_orig_logops = llog_osd_ops; - changelog_orig_logops.lop_cancel = llog_changelog_cancel; - changelog_orig_logops.lop_add = llog_cat_add_rec; - changelog_orig_logops.lop_declare_add = llog_cat_declare_add_rec; - - hsm_actions_logops = llog_osd_ops; - hsm_actions_logops.lop_add = llog_cat_add_rec; - hsm_actions_logops.lop_declare_add = llog_cat_declare_add_rec; + changelog_orig_logops = llog_common_cat_ops; + changelog_orig_logops.lop_write_rec = mdd_changelog_write_rec; - rc = class_register_type(&mdd_obd_device_ops, NULL, true, NULL, + rc = class_register_type(&mdd_obd_device_ops, NULL, false, LUSTRE_MDD_NAME, &mdd_device_type); if (rc) lu_kmem_fini(mdd_caches);