X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_obd.c;h=2bb97a73e307bd39fd5205e4f0ceaa67b2ff39f5;hb=4f53536d002c13886210b672b657795baa067144;hp=a5e7a2d3856cb9583144f4e9d44403a828cc37a5;hpb=b6a1b9470e7acccd731d97b7c9409a9f61befb0c;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c index a5e7a2d..2bb97a7 100644 --- a/lustre/ofd/ofd_obd.c +++ b/lustre/ofd/ofd_obd.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) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014 Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,9 +31,14 @@ * * lustre/ofd/ofd_obd.c * - * Author: Andreas Dilger - * Author: Alex Zhuravlev - * Author: Mike Pershin + * This file contains OBD API methods for OBD Filter Device (OFD) which are + * used for export handling, configuration purposes and recovery. + * Several methods are used by ECHO client only since it still uses OBD API. + * Such methods have _echo_ prefix in name. + * + * Author: Andreas Dilger + * Author: Alexey Zhuravlev + * Author: Mikhail Pershin */ #define DEBUG_SUBSYSTEM S_FILTER @@ -45,17 +46,31 @@ #include #include "ofd_internal.h" #include +#include #include #include +#include +/** + * Initialize OFD per-export statistics. + * + * This function sets up procfs entries for various OFD export counters. These + * counters are for per-client statistics tracked on the server. + * + * \param[in] ofd OFD device + * \param[in] exp OBD export + * \param[in] client_nid NID of client + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_export_stats_init(struct ofd_device *ofd, - struct obd_export *exp, void *client_nid) + struct obd_export *exp, + lnet_nid_t *client_nid) { struct obd_device *obd = ofd_obd(ofd); struct nid_stat *stats; - int num_stats; - int rc, newnid = 0; - + int rc; ENTRY; LASSERT(obd->obd_uses_nid_stats); @@ -64,46 +79,61 @@ static int ofd_export_stats_init(struct ofd_device *ofd, /* Self-export gets no proc entry */ RETURN(0); - rc = lprocfs_exp_setup(exp, client_nid, &newnid); - if (rc) { - /* Mask error for already created - * /proc entries */ - if (rc == -EALREADY) - rc = 0; - RETURN(rc); - } - - if (newnid == 0) - RETURN(0); + rc = lprocfs_exp_setup(exp, client_nid); + if (rc != 0) + /* Mask error for already created /proc entries */ + RETURN(rc == -EALREADY ? 0 : rc); stats = exp->exp_nid_stats; - LASSERT(stats != NULL); - - num_stats = NUM_OBD_STATS + LPROC_OFD_STATS_LAST; - - stats->nid_stats = lprocfs_alloc_stats(num_stats, - LPROCFS_STATS_FLAG_NOPERCPU); + stats->nid_stats = lprocfs_alloc_stats(NUM_OBD_STATS + + LPROC_OFD_STATS_LAST, + LPROCFS_STATS_FLAG_NOPERCPU); if (stats->nid_stats == NULL) - return -ENOMEM; + RETURN(-ENOMEM); lprocfs_init_ops_stats(LPROC_OFD_STATS_LAST, stats->nid_stats); + ofd_stats_counter_init(stats->nid_stats); - rc = lprocfs_register_stats(stats->nid_proc, "stats", - stats->nid_stats); - if (rc) - GOTO(clean, rc); - rc = lprocfs_nid_ldlm_stats_init(stats); - if (rc) { + rc = lprocfs_register_stats(stats->nid_proc, "stats", stats->nid_stats); + if (rc != 0) { lprocfs_free_stats(&stats->nid_stats); - GOTO(clean, rc); + GOTO(out, rc); } - RETURN(0); -clean: - return rc; + rc = lprocfs_nid_ldlm_stats_init(stats); + if (rc != 0) + GOTO(out, rc); + +out: + RETURN(rc); } +/** + * Match client and OST server connection feature flags. + * + * Compute the compatibility flags for a connection request based on + * features mutually supported by client and server. + * + * The obd_export::exp_connect_data.ocd_connect_flags field in \a exp + * must not be updated here, otherwise a partially initialized value may + * be exposed. After the connection request is successfully processed, + * the top-level tgt_connect() request handler atomically updates the export + * connect flags from the obd_connect_data::ocd_connect_flags field of the + * reply. \see tgt_connect(). + * + * \param[in] env execution environment + * \param[in] exp the obd_export associated with this + * client/target pair + * \param[in] data stores data for this connect request + * \param[in] new_connection is this connection new or not + * + * \retval 0 if success + * \retval -EPROTO client and server feature requirements are + * incompatible + * \retval -EBADF OST index in connect request doesn't match + * real OST index + */ static int ofd_parse_connect_data(const struct lu_env *env, struct obd_export *exp, struct obd_connect_data *data, @@ -126,7 +156,7 @@ static int ofd_parse_connect_data(const struct lu_env *env, CWARN("!!! This export (nid %s) used object group %d " "earlier; now it's trying to use group %d! This could " "be a bug in the MDS. Please report to " - "http://bugs.whamcloud.com/\n", + "https://jira.hpdd.intel.com/\n", obd_export_nid2str(exp), fed->fed_group, data->ocd_group); RETURN(-EPROTO); @@ -238,9 +268,26 @@ static int ofd_parse_connect_data(const struct lu_env *env, RETURN(0); } +/** + * Re-initialize export upon client reconnection. + * + * This function parses connection data from reconnect and resets + * export statistics. + * + * \param[in] env execution environment + * \param[in] exp OBD export + * \param[in] obd OFD device + * \param[in] cluuid NID of client + * \param[in] data connection data from request + * \param[in] localdata client NID + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_obd_reconnect(const struct lu_env *env, struct obd_export *exp, struct obd_device *obd, struct obd_uuid *cluuid, - struct obd_connect_data *data, void *localdata) + struct obd_connect_data *data, + void *client_nid) { struct ofd_device *ofd; int rc; @@ -254,11 +301,30 @@ static int ofd_obd_reconnect(const struct lu_env *env, struct obd_export *exp, rc = ofd_parse_connect_data(env, exp, data, false); if (rc == 0) - ofd_export_stats_init(ofd, exp, localdata); + ofd_export_stats_init(ofd, exp, client_nid); + + nodemap_add_member(*(lnet_nid_t *)client_nid, exp); RETURN(rc); } +/** + * Initialize new client connection. + * + * This function handles new connection to the OFD. The new export is + * created (in context of class_connect()) and persistent client data is + * initialized on storage. + * + * \param[in] env execution environment + * \param[out] _exp stores pointer to new export + * \param[in] obd OFD device + * \param[in] cluuid client UUID + * \param[in] data connection data from request + * \param[in] localdata client NID + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp, struct obd_device *obd, struct obd_uuid *cluuid, struct obd_connect_data *data, void *localdata) @@ -267,6 +333,7 @@ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp, struct ofd_device *ofd; struct lustre_handle conn = { 0 }; int rc; + lnet_nid_t *client_nid; ENTRY; if (_exp == NULL || obd == NULL || cluuid == NULL) @@ -285,6 +352,11 @@ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp, if (rc) GOTO(out, rc); + if (localdata != NULL) { + client_nid = localdata; + nodemap_add_member(*client_nid, exp); + } + if (obd->obd_replayable) { struct tg_export_data *ted = &exp->exp_target_data; @@ -301,6 +373,7 @@ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp, out: if (rc != 0) { + nodemap_del_member(exp); class_disconnect(exp); *_exp = NULL; } else { @@ -309,9 +382,20 @@ out: RETURN(rc); } +/** + * Disconnect a connected client. + * + * This function terminates the client connection. The client export is + * disconnected (cleaned up) and client data on persistent storage is removed. + * + * \param[in] exp OBD export + * + * \retval 0 if successful + * \retval negative value on error + */ int ofd_obd_disconnect(struct obd_export *exp) { - struct ofd_device *ofd = ofd_dev(exp->exp_obd->obd_lu_dev); + struct ofd_device *ofd = ofd_exp(exp); struct lu_env env; int rc; @@ -323,6 +407,7 @@ int ofd_obd_disconnect(struct obd_export *exp) if (!(exp->exp_flags & OBD_OPT_FORCE)) ofd_grant_sanity_check(ofd_obd(ofd), __FUNCTION__); + nodemap_del_member(exp); rc = server_disconnect_export(exp); ofd_grant_discard(exp); @@ -342,12 +427,23 @@ out: RETURN(rc); } +/** + * Implementation of obd_ops::o_init_export. + * + * This function is called from class_new_export() and initializes + * the OFD-specific data for new export. + * + * \param[in] exp OBD export + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_init_export(struct obd_export *exp) { int rc; spin_lock_init(&exp->exp_filter_data.fed_lock); - CFS_INIT_LIST_HEAD(&exp->exp_filter_data.fed_mod_list); + INIT_LIST_HEAD(&exp->exp_filter_data.fed_mod_list); atomic_set(&exp->exp_filter_data.fed_soft_sync_count, 0); spin_lock(&exp->exp_lock); exp->exp_connecting = 1; @@ -367,9 +463,20 @@ static int ofd_init_export(struct obd_export *exp) return rc; } +/** + * Implementation of obd_ops::o_destroy_export. + * + * This function is called from class_export_destroy() to cleanup + * the OFD-specific data for export being destroyed. + * + * \param[in] exp OBD export + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_destroy_export(struct obd_export *exp) { - struct ofd_device *ofd = ofd_dev(exp->exp_obd->obd_lu_dev); + struct ofd_device *ofd = ofd_exp(exp); if (exp->exp_filter_data.fed_pending) CERROR("%s: cli %s/%p has %lu pending on destroyed export" @@ -402,19 +509,52 @@ static int ofd_destroy_export(struct obd_export *exp) if (!(exp->exp_flags & OBD_OPT_FORCE)) ofd_grant_sanity_check(exp->exp_obd, __FUNCTION__); - LASSERT(cfs_list_empty(&exp->exp_filter_data.fed_mod_list)); + LASSERT(list_empty(&exp->exp_filter_data.fed_mod_list)); return 0; } +/** + * Notify all devices in server stack about recovery completion. + * + * This function calls ldo_recovery_complete() for all lower devices in the + * server stack so they will be prepared for normal operations. + * + * \param[in] env execution environment + * \param[in] ofd OFD device + * + * \retval 0 if successful + * \retval negative value on error + */ int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd) { struct lu_device *ldev = &ofd->ofd_dt_dev.dd_lu_dev; + struct lfsck_start_param lsp; + int rc; + + CDEBUG(D_HA, "%s: recovery is over\n", ofd_name(ofd)); + + lsp.lsp_start = NULL; + lsp.lsp_index_valid = 0; + rc = lfsck_start(env, ofd->ofd_osd, &lsp); + if (rc != 0 && rc != -EALREADY) + CWARN("%s: auto trigger paused LFSCK failed: rc = %d\n", + ofd_name(ofd), rc); - CDEBUG(D_HA, "%s: recovery is over\n", ofd_obd(ofd)->obd_name); return ldev->ld_ops->ldo_recovery_complete(env, ldev); } -int ofd_obd_postrecov(struct obd_device *obd) +/** + * Implementation of obd_ops::o_postrecov. + * + * This function is called from target_finish_recovery() upon recovery + * completion. + * + * \param[in] obd OBD device of OFD + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_obd_postrecov(struct obd_device *obd) { struct lu_env env; struct lu_device *ldev = obd->obd_lu_dev; @@ -433,9 +573,24 @@ int ofd_obd_postrecov(struct obd_device *obd) RETURN(rc); } -/* This is not called from request handler, check ofd_set_info_hdl() instead - * this OBD functions is only used by class_notify_sptlrpc_conf() locally - * by direct obd_set_info_async() call */ +/** + * Implementation of obd_ops::o_set_info_async. + * + * This function is not called from request handler, it is only used by + * class_notify_sptlrpc_conf() locally by direct obd_set_info_async() call. + * \see ofd_set_info_hdl() for request handler function. + * + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in] keylen length of \a key + * \param[in] key key name + * \param[in] vallen length of \a val + * \param[in] val the \a key value + * \param[in] set not used in OFD + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_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) @@ -459,15 +614,31 @@ static int ofd_set_info_async(const struct lu_env *env, struct obd_export *exp, RETURN(rc); } -/* used by nrs_orr_range_fill_physical() in ptlrpc, see LU-3239 */ +/** + * Implementation of obd_ops::o_get_info. + * + * This function is not called from request handler, it is only used by + * direct call from nrs_orr_range_fill_physical() in ptlrpc, see LU-3239. + * + * \see ofd_get_info_hdl() for request handler function. + * + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in] keylen length of \a key + * \param[in] key key name + * \param[out] vallen length of key value + * \param[out] val the key value to return + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp, - __u32 keylen, void *key, __u32 *vallen, void *val, - struct lov_stripe_md *lsm) + __u32 keylen, void *key, __u32 *vallen, void *val) { struct ofd_thread_info *info; struct ofd_device *ofd; struct ll_fiemap_info_key *fm_key = key; - struct ll_user_fiemap *fiemap = val; + struct fiemap *fiemap = val; int rc = 0; ENTRY; @@ -482,7 +653,7 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp, if (KEY_IS(KEY_FIEMAP)) { info = ofd_info_init(env, exp); - rc = ostid_to_fid(&info->fti_fid, &fm_key->oa.o_oi, + rc = ostid_to_fid(&info->fti_fid, &fm_key->lfik_oa.o_oi, ofd->ofd_lut.lut_lsd.lsd_osd_index); if (rc != 0) RETURN(rc); @@ -496,7 +667,21 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp, RETURN(rc); } -/** helper function for statfs, also used by grant code */ +/** + * Get file system statistics of OST server. + * + * Helper function for ofd_statfs(), also used by grant code. + * Implements caching for statistics to avoid calling OSD device each time. + * + * \param[in] env execution environment + * \param[in] ofd OFD device + * \param[out] osfs statistic data to return + * \param[in] max_age maximum age for cached data + * \param[in] from_cache show that data was get from cache or not + * + * \retval 0 if successful + * \retval negative value on error + */ int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd, struct obd_statfs *osfs, __u64 max_age, int *from_cache) { @@ -512,7 +697,7 @@ int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd, spin_lock(&ofd->ofd_osfs_lock); if (cfs_time_before_64(ofd->ofd_osfs_age, max_age) || max_age == 0) { - obd_size unstable; + u64 unstable; /* statfs data are too old, get up-to-date one. * we must be cautious here since multiple threads might be @@ -548,7 +733,7 @@ int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd, * w/o the ofd_osfs_lock. Those ones got added to * the cached statfs data that we are about to crunch. * Take them into account in the new statfs data */ - osfs->os_bavail -= min_t(obd_size, osfs->os_bavail, + osfs->os_bavail -= min_t(u64, osfs->os_bavail, unstable >> ofd->ofd_blockbits); /* However, we don't really know if those writes got * accounted in the statfs call, so tell @@ -591,11 +776,32 @@ out: return rc; } +/** + * Implementation of obd_ops::o_statfs. + * + * This function returns information about a storage file system. + * It is called from several places by using the OBD API as well as + * by direct call, e.g. from request handler. + * + * \see ofd_statfs_hdl() for request handler function. + * + * Report also the state of the OST to the caller in osfs->os_state + * (OS_STATE_READONLY, OS_STATE_DEGRADED). + * + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[out] osfs statistic data to return + * \param[in] max_age maximum age for cached data + * \param[in] flags not used in OFD + * + * \retval 0 if successful + * \retval negative value on error + */ int ofd_statfs(const struct lu_env *env, struct obd_export *exp, struct obd_statfs *osfs, __u64 max_age, __u32 flags) { struct obd_device *obd = class_exp2obd(exp); - struct ofd_device *ofd = ofd_dev(exp->exp_obd->obd_lu_dev); + struct ofd_device *ofd = ofd_exp(exp); int rc; ENTRY; @@ -614,7 +820,7 @@ int ofd_statfs(const struct lu_env *env, struct obd_export *exp, osfs->os_bfree << ofd->ofd_blockbits, osfs->os_bavail << ofd->ofd_blockbits); - osfs->os_bavail -= min_t(obd_size, osfs->os_bavail, + osfs->os_bavail -= min_t(u64, osfs->os_bavail, ((ofd->ofd_tot_dirty + ofd->ofd_tot_pending + osfs->os_bsize - 1) >> ofd->ofd_blockbits)); @@ -624,7 +830,7 @@ int ofd_statfs(const struct lu_env *env, struct obd_export *exp, struct filter_export_data *fed; fed = &obd->obd_self_export->exp_filter_data; - osfs->os_bavail -= min_t(obd_size, osfs->os_bavail, + osfs->os_bavail -= min_t(u64, osfs->os_bavail, fed->fed_grant >> ofd->ofd_blockbits); } @@ -663,16 +869,27 @@ out: return rc; } -/* needed by echo client only for now, RPC handler uses ofd_setattr_hdl() */ -int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp, - struct obd_info *oinfo, struct obd_trans_info *oti) +/** + * Implementation of obd_ops::o_setattr. + * + * This function is only used by ECHO client when it is run on top of OFD, + * \see ofd_setattr_hdl() for request handler function. + + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in] oa setattr parameters + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp, + struct obdo *oa) { struct ofd_thread_info *info; struct ofd_device *ofd = ofd_exp(exp); struct ldlm_namespace *ns = ofd->ofd_namespace; struct ldlm_resource *res; struct ofd_object *fo; - struct obdo *oa = oinfo->oi_oa; struct lu_fid *fid = &oa->o_oi.oi_fid; struct filter_fid *ff = NULL; int rc = 0; @@ -685,8 +902,7 @@ int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp, /* This would be very bad - accidentally truncating a file when * changing the time or similar - bug 12203. */ - if (oa->o_valid & OBD_MD_FLSIZE && - oinfo->oi_policy.l_extent.end != OBD_OBJECT_EOF) { + if (oa->o_valid & OBD_MD_FLSIZE) { static char mdsinum[48]; if (oa->o_valid & OBD_MD_FLFID) @@ -734,7 +950,7 @@ out: * for 2nd lu_object_find() waiting for the first reference * to go... deadlock! */ res = ldlm_resource_get(ns, NULL, &info->fti_resid, LDLM_EXTENT, 0); - if (res != NULL) { + if (!IS_ERR(res)) { ldlm_res_lvbo_update(res, NULL, 0); ldlm_resource_putref(res); } @@ -743,6 +959,21 @@ out: return rc; } +/** + * Destroy OFD object by its FID. + * + * Supplemental function to destroy object by FID, it is used by request + * handler and by ofd_echo_destroy() below to find object by FID, lock it + * and call ofd_object_destroy() finally. + * + * \param[in] env execution environment + * \param[in] ofd OFD device + * \param[in] fid FID of object + * \param[in] orphan set if object being destroyed is an orphan + * + * \retval 0 if successful + * \retval negative value on error + */ int ofd_destroy_by_fid(const struct lu_env *env, struct ofd_device *ofd, const struct lu_fid *fid, int orphan) { @@ -782,11 +1013,25 @@ int ofd_destroy_by_fid(const struct lu_env *env, struct ofd_device *ofd, RETURN(rc); } -/* needed by echo client only for now, RPC handler uses ofd_destroy_hdl() */ -int ofd_echo_destroy(const struct lu_env *env, struct obd_export *exp, - struct obdo *oa, struct lov_stripe_md *md, - struct obd_trans_info *oti, struct obd_export *md_exp, - void *capa) +/** + * Implementation of obd_ops::o_destroy. + * + * This function is only used by ECHO client when it is run on top of OFD, + * \see ofd_destroy_hdl() for request handler function. + + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in] oa obdo structure with FID + * + * Note: this is OBD API method which is common API for server OBDs and + * client OBDs. Thus some parameters used in client OBDs may not be used + * on server OBDs and vice versa. + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_echo_destroy(const struct lu_env *env, struct obd_export *exp, + struct obdo *oa) { struct ofd_device *ofd = ofd_exp(exp); struct lu_fid *fid = &oa->o_oi.oi_fid; @@ -813,18 +1058,33 @@ out: return rc; } -/* needed by echo client only for now, RPC handler uses ofd_create_hdl() - * It is much simpler and just create objects */ -int ofd_echo_create(const struct lu_env *env, struct obd_export *exp, - struct obdo *oa, struct lov_stripe_md **ea, - struct obd_trans_info *oti) +/** + * Implementation of obd_ops::o_create. + * + * This function is only used by ECHO client when it is run on top of OFD + * and just creates an object. + * \see ofd_create_hdl() for request handler function. + * + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in] oa obdo structure with FID sequence to use + * + * Note: this is OBD API method which is common API for server OBDs and + * client OBDs. Thus some parameters used in client OBDs may not be used + * on server OBDs and vice versa. + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_echo_create(const struct lu_env *env, struct obd_export *exp, + struct obdo *oa) { struct ofd_device *ofd = ofd_exp(exp); struct ofd_thread_info *info; - obd_seq seq = ostid_seq(&oa->o_oi); + u64 seq = ostid_seq(&oa->o_oi); struct ofd_seq *oseq; int rc = 0, diff = 1; - obd_id next_id; + u64 next_id; int count; ENTRY; @@ -875,11 +1135,6 @@ int ofd_echo_create(const struct lu_env *env, struct obd_export *exp, ofd_grant_commit(env, ofd_obd(ofd)->obd_self_export, rc); out: mutex_unlock(&oseq->os_create_lock); - if (rc == 0 && ea != NULL) { - struct lov_stripe_md *lsm = *ea; - - lsm->lsm_oi = oa->o_oi; - } ofd_seq_put(env, oseq); out_sem: @@ -887,13 +1142,27 @@ out_sem: RETURN(rc); } -/* needed by echo client only for now, RPC handler uses ofd_getattr_hdl() */ -int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp, - struct obd_info *oinfo) +/** + * Implementation of obd_ops::o_getattr. + * + * This function is only used by ECHO client when it is run on top of OFD + * and returns attributes of object. + * \see ofd_getattr_hdl() for request handler function. + * + * \param[in] env execution environment + * \param[in] exp OBD export of OFD device + * \param[in,out] oa contains FID of object to get attributes from and + * is used to return attributes back + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp, + struct obdo *oa) { struct ofd_device *ofd = ofd_exp(exp); struct ofd_thread_info *info; - struct lu_fid *fid = &oinfo->oi_oa->o_oi.oi_fid; + struct lu_fid *fid = &oa->o_oi.oi_fid; struct ofd_object *fo; int rc = 0; @@ -907,18 +1176,18 @@ int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp, LASSERT(fo != NULL); rc = ofd_attr_get(env, fo, &info->fti_attr); - oinfo->oi_oa->o_valid = OBD_MD_FLID; + oa->o_valid = OBD_MD_FLID; if (rc == 0) { __u64 curr_version; - obdo_from_la(oinfo->oi_oa, &info->fti_attr, + obdo_from_la(oa, &info->fti_attr, OFD_VALID_FLAGS | LA_UID | LA_GID); /* Store object version in reply */ curr_version = dt_version_get(env, ofd_object_child(fo)); if ((__s64)curr_version != -EOPNOTSUPP) { - oinfo->oi_oa->o_valid |= OBD_MD_FLDATAVERSION; - oinfo->oi_oa->o_data_version = curr_version; + oa->o_valid |= OBD_MD_FLDATAVERSION; + oa->o_data_version = curr_version; } } @@ -927,6 +1196,19 @@ out: RETURN(rc); } +/** + * Get object version for OBD_IOC_GET_OBJ_VERSION ioctl. + * + * This is supplemental function for ofd_iocontrol() to return object + * version for lctl tool. + * + * \param[in] env execution environment + * \param[in] ofd OFD device + * \param[out] karg ioctl data + * + * \retval 0 if successful + * \retval negative value on error + */ static int ofd_ioc_get_obj_version(const struct lu_env *env, struct ofd_device *ofd, void *karg) { @@ -985,8 +1267,23 @@ out: return rc; } -int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, - void *karg, void *uarg) +/** + * Implementation of obd_ops::o_iocontrol. + * + * This is OFD ioctl handling function which is primary interface for + * Lustre tools like lfs, lctl and lfsck. + * + * \param[in] cmd ioctl command + * \param[in] exp OBD export of OFD + * \param[in] len not used + * \param[in,out] karg buffer with data + * \param[in] uarg not used + * + * \retval 0 if successful + * \retval negative value on error + */ +static int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, + void *karg, void *uarg) { struct lu_env env; struct ofd_device *ofd = ofd_exp(exp); @@ -1003,6 +1300,7 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, switch (cmd) { case OBD_IOC_ABORT_RECOVERY: CERROR("%s: aborting recovery\n", obd->obd_name); + obd->obd_force_abort_recovery = 1; target_stop_recovery_thread(obd); break; case OBD_IOC_SYNC: @@ -1023,7 +1321,6 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, break; } - lsp.lsp_namespace = ofd->ofd_namespace; lsp.lsp_start = (struct lfsck_start *)(data->ioc_inlbuf1); lsp.lsp_index_valid = 0; rc = lfsck_start(&env, ofd->ofd_osd, &lsp); @@ -1031,16 +1328,24 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, } case OBD_IOC_STOP_LFSCK: { struct obd_ioctl_data *data = karg; + struct lfsck_stop stop; + + stop.ls_status = LS_STOPPED; + /* Old lfsck utils may pass NULL @stop. */ + if (data->ioc_inlbuf1 == NULL) + stop.ls_flags = 0; + else + stop.ls_flags = + ((struct lfsck_stop *)(data->ioc_inlbuf1))->ls_flags; - rc = lfsck_stop(&env, ofd->ofd_osd, - (struct lfsck_stop *)(data->ioc_inlbuf1)); + rc = lfsck_stop(&env, ofd->ofd_osd, &stop); break; } case OBD_IOC_GET_OBJ_VERSION: rc = ofd_ioc_get_obj_version(&env, ofd, karg); break; default: - CERROR("%s: not supported cmd = %d\n", obd->obd_name, cmd); + CERROR("%s: not supported cmd = %#x\n", obd->obd_name, cmd); rc = -ENOTTY; } @@ -1048,6 +1353,18 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len, RETURN(rc); } +/** + * Implementation of obd_ops::o_precleanup. + * + * This function stops device activity before shutting it down. It is called + * from a cleanup function upon forceful device cleanup. For OFD there are no + * special actions, it just invokes target_recovery_cleanup(). + * + * \param[in] obd OBD device of OFD + * \param[in] stage cleanup stage + * + * \retval 0 + */ static int ofd_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage) { int rc = 0; @@ -1064,12 +1381,44 @@ static int ofd_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage) RETURN(rc); } +/** + * Implementation of obd_ops::o_ping. + * + * This is OFD-specific part of OBD_PING request handling. + * It controls Filter Modification Data (FMD) expiration each time PING is + * received. + * + * \see ofd_fmd_expire() and ofd_fmd.c for details + * + * \param[in] env execution environment + * \param[in] exp OBD export of client + * + * \retval 0 + */ static int ofd_ping(const struct lu_env *env, struct obd_export *exp) { ofd_fmd_expire(exp); return 0; } +/** + * Implementation of obd_ops::o_health_check. + * + * This function checks the OFD device health - ability to respond on + * incoming requests. There are two health_check methods: + * - get statfs from the OSD. It checks just responsiveness of + * bottom device + * - do write attempt on bottom device to check it is fully operational and + * is not stuck. This is expensive method and requires special configuration + * option --enable-health-write while building Lustre, it is turned off + * by default. + * + * \param[in] nul not used + * \param[in] obd OBD device of OFD + * + * \retval 0 if successful + * \retval negative value in case of error + */ static int ofd_health_check(const struct lu_env *nul, struct obd_device *obd) { struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev); @@ -1106,7 +1455,7 @@ static int ofd_health_check(const struct lu_env *nul, struct obd_device *obd) GOTO(out, rc = PTR_ERR(th)); rc = dt_declare_record_write(&env, ofd->ofd_health_check_file, - info->fti_buf.lb_len, info->fti_off, th); + &info->fti_buf, info->fti_off, th); if (rc == 0) { th->th_sync = 1; /* sync IO is needed */ rc = dt_trans_start_local(&env, ofd->ofd_osd, th); @@ -1126,42 +1475,13 @@ out: return !!rc; } -/* - * Handle quota control requests to consult current usage/limit. - * - * \param obd - is the obd device associated with the ofd - * \param exp - is the client's export - * \param oqctl - is the obd_quotactl request to be processed - */ -static int ofd_quotactl(struct obd_device *obd, struct obd_export *exp, - struct obd_quotactl *oqctl) -{ - struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev); - struct lu_env env; - int rc; - ENTRY; - - /* report success for quota on/off for interoperability with current MDT - * stack */ - if (oqctl->qc_cmd == Q_QUOTAON || oqctl->qc_cmd == Q_QUOTAOFF) - RETURN(0); - - rc = lu_env_init(&env, LCT_DT_THREAD); - if (rc) - RETURN(rc); - - rc = lquotactl_slv(&env, ofd->ofd_osd, oqctl); - lu_env_fini(&env); - - RETURN(rc); -} - struct obd_ops ofd_obd_ops = { .o_owner = THIS_MODULE, .o_connect = ofd_obd_connect, .o_reconnect = ofd_obd_reconnect, .o_disconnect = ofd_obd_disconnect, .o_create = ofd_echo_create, + .o_statfs = ofd_statfs, .o_setattr = ofd_echo_setattr, .o_preprw = ofd_preprw, .o_commitrw = ofd_commitrw, @@ -1174,7 +1494,6 @@ struct obd_ops ofd_obd_ops = { .o_precleanup = ofd_precleanup, .o_ping = ofd_ping, .o_health_check = ofd_health_check, - .o_quotactl = ofd_quotactl, .o_set_info_async = ofd_set_info_async, .o_get_info = ofd_get_info, };