X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=ded9dc633dc6ee7c2881f9c7b5f2d228cafc73bf;hb=369e02e84f39565195e08f043ab0421d2d3bd185;hp=1c8eccf9f95ec4b513484406b5822046804af4de;hpb=c4f5d67193d61a3948bc1e01c5d602b8ffb7d011;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 1c8eccf..ded9dc6 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,17 +36,12 @@ #define DEBUG_SUBSYSTEM S_LOG -#ifndef EXPORT_SYMTAB -#define EXPORT_SYMTAB -#endif - #ifndef __KERNEL__ #include #endif #include #include -#include #include "llog_internal.h" /* helper functions for calling the llog obd methods */ @@ -74,31 +69,27 @@ static void llog_ctxt_destroy(struct llog_ctxt *ctxt) class_import_put(ctxt->loc_imp); ctxt->loc_imp = NULL; } - LASSERT(ctxt->loc_llcd == NULL); OBD_FREE_PTR(ctxt); } -int __llog_ctxt_put(struct llog_ctxt *ctxt) +int __llog_ctxt_put(const struct lu_env *env, struct llog_ctxt *ctxt) { struct obd_llog_group *olg = ctxt->loc_olg; struct obd_device *obd; int rc = 0; - cfs_spin_lock(&olg->olg_lock); - if (!cfs_atomic_dec_and_test(&ctxt->loc_refcount)) { - cfs_spin_unlock(&olg->olg_lock); - return rc; - } - olg->olg_ctxts[ctxt->loc_idx] = NULL; - cfs_spin_unlock(&olg->olg_lock); - - if (ctxt->loc_lcm) - lcm_put(ctxt->loc_lcm); + spin_lock(&olg->olg_lock); + if (!cfs_atomic_dec_and_test(&ctxt->loc_refcount)) { + spin_unlock(&olg->olg_lock); + return rc; + } + olg->olg_ctxts[ctxt->loc_idx] = NULL; + spin_unlock(&olg->olg_lock); - obd = ctxt->loc_obd; - cfs_spin_lock(&obd->obd_dev_lock); - /* sync with llog ctxt user thread */ - cfs_spin_unlock(&obd->obd_dev_lock); + obd = ctxt->loc_obd; + spin_lock(&obd->obd_dev_lock); + /* sync with llog ctxt user thread */ + spin_unlock(&obd->obd_dev_lock); /* obd->obd_starting is needed for the case of cleanup * in error case while obd is starting up. */ @@ -109,15 +100,15 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) /* cleanup the llog ctxt here */ if (CTXTP(ctxt, cleanup)) - rc = CTXTP(ctxt, cleanup)(ctxt); + rc = CTXTP(ctxt, cleanup)(env, ctxt); - llog_ctxt_destroy(ctxt); - cfs_waitq_signal(&olg->olg_waitq); - return rc; + llog_ctxt_destroy(ctxt); + wake_up(&olg->olg_waitq); + return rc; } EXPORT_SYMBOL(__llog_ctxt_put); -int llog_cleanup(struct llog_ctxt *ctxt) +int llog_cleanup(const struct lu_env *env, struct llog_ctxt *ctxt) { struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL); struct obd_llog_group *olg; @@ -133,17 +124,17 @@ int llog_cleanup(struct llog_ctxt *ctxt) idx = ctxt->loc_idx; - /* + /* * Banlance the ctxt get when calling llog_cleanup() */ - LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < LI_POISON); LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 1); llog_ctxt_put(ctxt); - /* - * Try to free the ctxt. - */ - rc = __llog_ctxt_put(ctxt); + /* + * Try to free the ctxt. + */ + rc = __llog_ctxt_put(env, ctxt); if (rc) CERROR("Error %d while cleaning up ctxt %p\n", rc, ctxt); @@ -155,10 +146,9 @@ int llog_cleanup(struct llog_ctxt *ctxt) } EXPORT_SYMBOL(llog_cleanup); -int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, - int index, struct obd_device *disk_obd, int count, - struct llog_logid *logid, const char *logname, - struct llog_operations *op) +int llog_setup(const struct lu_env *env, struct obd_device *obd, + struct obd_llog_group *olg, int index, + struct obd_device *disk_obd, struct llog_operations *op) { struct llog_ctxt *ctxt; int rc = 0; @@ -177,7 +167,7 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, ctxt->loc_olg = olg; ctxt->loc_idx = index; ctxt->loc_logops = op; - cfs_sema_init(&ctxt->loc_sem, 1); + mutex_init(&ctxt->loc_mutex); ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED; @@ -205,18 +195,18 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, RETURN(rc); } - if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) { - rc = -ENOTSUPP; - } else { - if (op->lop_setup) - rc = op->lop_setup(obd, olg, index, disk_obd, count, - logid, logname); - } - - if (rc) { - CERROR("obd %s ctxt %d lop_setup=%p failed %d\n", - obd->obd_name, index, op->lop_setup, rc); - llog_ctxt_put(ctxt); + if (op->lop_setup) { + if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) + rc = -EOPNOTSUPP; + else + rc = op->lop_setup(env, obd, olg, index, disk_obd); + } + + if (rc) { + CERROR("%s: ctxt %d lop_setup=%p failed: rc = %d\n", + obd->obd_name, index, op->lop_setup, rc); + llog_group_clear_ctxt(olg, index); + llog_ctxt_destroy(ctxt); } else { CDEBUG(D_CONFIG, "obd %s ctxt %d is initialized\n", obd->obd_name, index); @@ -225,17 +215,9 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, RETURN(rc); } -EXPORT_SYMBOL(llog_setup_named); - -int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, - int index, struct obd_device *disk_obd, int count, - struct llog_logid *logid, struct llog_operations *op) -{ - return llog_setup_named(obd,olg,index,disk_obd,count,logid,NULL,op); -} EXPORT_SYMBOL(llog_setup); -int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) +int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags) { int rc = 0; ENTRY; @@ -244,15 +226,15 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) RETURN(0); if (CTXTP(ctxt, sync)) - rc = CTXTP(ctxt, sync)(ctxt, exp); + rc = CTXTP(ctxt, sync)(ctxt, exp, flags); RETURN(rc); } EXPORT_SYMBOL(llog_sync); -int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, - struct lov_stripe_md *lsm, struct llog_cookie *logcookies, - int numcookies) +int llog_obd_add(const struct lu_env *env, struct llog_ctxt *ctxt, + struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, + struct llog_cookie *logcookies, int numcookies) { int raised, rc; ENTRY; @@ -265,20 +247,21 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, if (ctxt->loc_flags & LLOG_CTXT_FLAG_UNINITIALIZED) RETURN(-ENXIO); - - CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP); + CTXT_CHECK_OP(ctxt, obd_add, -EOPNOTSUPP); raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); if (!raised) cfs_cap_raise(CFS_CAP_SYS_RESOURCE); - rc = CTXTP(ctxt, add)(ctxt, rec, lsm, logcookies, numcookies); + rc = CTXTP(ctxt, obd_add)(env, ctxt, rec, lsm, logcookies, + numcookies); if (!raised) cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_add); +EXPORT_SYMBOL(llog_obd_add); -int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, - int count, struct llog_cookie *cookies, int flags) +int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt, + struct lov_stripe_md *lsm, int count, + struct llog_cookie *cookies, int flags) { int rc; ENTRY; @@ -289,173 +272,11 @@ int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, } CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP); - rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags); + rc = CTXTP(ctxt, cancel)(env, ctxt, lsm, count, cookies, flags); RETURN(rc); } EXPORT_SYMBOL(llog_cancel); -/* callback func for llog_process in llog_obd_origin_setup */ -static int cat_cancel_cb(struct llog_handle *cathandle, - struct llog_rec_hdr *rec, void *data) -{ - struct llog_logid_rec *lir = (struct llog_logid_rec *)rec; - struct llog_handle *loghandle; - struct llog_log_hdr *llh; - int rc, index; - ENTRY; - - if (rec->lrh_type != LLOG_LOGID_MAGIC) { - CERROR("invalid record in catalog\n"); - RETURN(-EINVAL); - } - CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog " - LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen, - rec->lrh_index, cathandle->lgh_id.lgl_oid); - - rc = llog_cat_id2handle(cathandle, &loghandle, &lir->lid_id); - if (rc) { - CERROR("Cannot find handle for log "LPX64"\n", - lir->lid_id.lgl_oid); - if (rc == -ENOENT) { - index = rec->lrh_index; - goto cat_cleanup; - } - RETURN(rc); - } - - llh = loghandle->lgh_hdr; - if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) && - (llh->llh_count == 1)) { - rc = llog_destroy(loghandle); - if (rc) - CERROR("failure destroying log in postsetup: %d\n", rc); - - index = loghandle->u.phd.phd_cookie.lgc_index; - llog_free_handle(loghandle); - -cat_cleanup: - LASSERT(index); - llog_cat_set_first_idx(cathandle, index); - rc = llog_cancel_rec(cathandle, index); - if (rc == 0) - CDEBUG(D_HA, "cancel log "LPX64":%x at index %u of catalog " - LPX64"\n", lir->lid_id.lgl_oid, - lir->lid_id.lgl_ogen, rec->lrh_index, - cathandle->lgh_id.lgl_oid); - } - - RETURN(rc); -} - -/* lop_setup method for filter/osc */ -// XXX how to set exports -int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, - int index, struct obd_device *disk_obd, int count, - struct llog_logid *logid, const char *name) -{ - struct llog_ctxt *ctxt; - struct llog_handle *handle; - struct lvfs_run_ctxt saved; - int rc; - ENTRY; - - if (count == 0) - RETURN(0); - - LASSERT(count == 1); - - LASSERT(olg != NULL); - ctxt = llog_group_get_ctxt(olg, index); - if (!ctxt) - RETURN(-ENODEV); - - if (logid && logid->lgl_oid) { - rc = llog_create(ctxt, &handle, logid, NULL); - } else { - rc = llog_create(ctxt, &handle, NULL, (char *)name); - if (!rc && logid) - *logid = handle->lgh_id; - } - if (rc) - GOTO(out, rc); - - ctxt->loc_handle = handle; - push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - rc = llog_init_handle(handle, LLOG_F_IS_CAT, NULL); - pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - if (rc) - GOTO(out, rc); - - rc = llog_process(handle, (llog_cb_t)cat_cancel_cb, NULL, NULL); - if (rc) - CERROR("llog_process() with cat_cancel_cb failed: %d\n", rc); - GOTO(out, rc); -out: - llog_ctxt_put(ctxt); - return rc; -} -EXPORT_SYMBOL(llog_obd_origin_setup); - -int llog_obd_origin_cleanup(struct llog_ctxt *ctxt) -{ - struct llog_handle *cathandle, *n, *loghandle; - struct llog_log_hdr *llh; - int rc, index; - ENTRY; - - if (!ctxt) - RETURN(0); - - cathandle = ctxt->loc_handle; - if (cathandle) { - cfs_list_for_each_entry_safe(loghandle, n, - &cathandle->u.chd.chd_head, - u.phd.phd_entry) { - llh = loghandle->lgh_hdr; - if ((llh->llh_flags & - LLOG_F_ZAP_WHEN_EMPTY) && - (llh->llh_count == 1)) { - rc = llog_destroy(loghandle); - if (rc) - CERROR("failure destroying log during " - "cleanup: %d\n", rc); - - index = loghandle->u.phd.phd_cookie.lgc_index; - llog_free_handle(loghandle); - - LASSERT(index); - llog_cat_set_first_idx(cathandle, index); - rc = llog_cancel_rec(cathandle, index); - if (rc == 0) - CDEBUG(D_RPCTRACE, "cancel plain log at" - "index %u of catalog "LPX64"\n", - index,cathandle->lgh_id.lgl_oid); - } - } - llog_cat_put(ctxt->loc_handle); - } - RETURN(0); -} -EXPORT_SYMBOL(llog_obd_origin_cleanup); - -/* add for obdfilter/sz and mds/unlink */ -int llog_obd_origin_add(struct llog_ctxt *ctxt, - struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, - struct llog_cookie *logcookies, int numcookies) -{ - struct llog_handle *cathandle; - int rc; - ENTRY; - - cathandle = ctxt->loc_handle; - LASSERT(cathandle != NULL); - rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL); - if (rc != 0 && rc != 1) - CERROR("write one catalog record failed: %d\n", rc); - RETURN(rc); -} -EXPORT_SYMBOL(llog_obd_origin_add); - int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg, struct obd_device *disk_obd, int *index) { @@ -480,3 +301,22 @@ int obd_llog_finish(struct obd_device *obd, int count) RETURN(rc); } EXPORT_SYMBOL(obd_llog_finish); + +/* context key constructor/destructor: llog_key_init, llog_key_fini */ +LU_KEY_INIT_FINI(llog, struct llog_thread_info); +/* context key: llog_thread_key */ +LU_CONTEXT_KEY_DEFINE(llog, LCT_MD_THREAD | LCT_MG_THREAD | LCT_LOCAL); +LU_KEY_INIT_GENERIC(llog); +EXPORT_SYMBOL(llog_thread_key); + +int llog_info_init(void) +{ + llog_key_init_generic(&llog_thread_key, NULL); + lu_context_key_register(&llog_thread_key); + return 0; +} + +void llog_info_fini(void) +{ + lu_context_key_degister(&llog_thread_key); +}