X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lib.c;h=3b96a4bc357f3b08e0e710120aa04476996723d6;hp=04dcd77ee9b88826bd5fe86d0e5340301f6d8f16;hb=8da33c6cc5192303fcd18f45892e1f115004e662;hpb=e184f98f8c3e4316996fff3f7c0cf69096be6684 diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 04dcd77..3b96a4b 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -26,10 +26,13 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ @@ -80,18 +83,19 @@ static int import_set_conn(struct obd_import *imp, struct obd_uuid *uuid, } } - spin_lock(&imp->imp_lock); - list_for_each_entry(item, &imp->imp_conn_list, oic_item) { + cfs_spin_lock(&imp->imp_lock); + cfs_list_for_each_entry(item, &imp->imp_conn_list, oic_item) { if (obd_uuid_equals(uuid, &item->oic_uuid)) { if (priority) { - list_del(&item->oic_item); - list_add(&item->oic_item, &imp->imp_conn_list); + cfs_list_del(&item->oic_item); + cfs_list_add(&item->oic_item, + &imp->imp_conn_list); item->oic_last_attempt = 0; } CDEBUG(D_HA, "imp %p@%s: found existing conn %s%s\n", imp, imp->imp_obd->obd_name, uuid->uuid, (priority ? ", moved to head" : "")); - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); GOTO(out_free, rc = 0); } } @@ -101,18 +105,19 @@ static int import_set_conn(struct obd_import *imp, struct obd_uuid *uuid, imp_conn->oic_uuid = *uuid; imp_conn->oic_last_attempt = 0; if (priority) - list_add(&imp_conn->oic_item, &imp->imp_conn_list); + cfs_list_add(&imp_conn->oic_item, &imp->imp_conn_list); else - list_add_tail(&imp_conn->oic_item, &imp->imp_conn_list); + cfs_list_add_tail(&imp_conn->oic_item, + &imp->imp_conn_list); CDEBUG(D_HA, "imp %p@%s: add connection %s at %s\n", imp, imp->imp_obd->obd_name, uuid->uuid, (priority ? "head" : "tail")); } else { - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); GOTO(out_free, rc = -ENOENT); } - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); RETURN(0); out_free: if (imp_conn) @@ -140,13 +145,13 @@ int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid) int rc = -ENOENT; ENTRY; - spin_lock(&imp->imp_lock); - if (list_empty(&imp->imp_conn_list)) { + cfs_spin_lock(&imp->imp_lock); + if (cfs_list_empty(&imp->imp_conn_list)) { LASSERT(!imp->imp_connection); GOTO(out, rc); } - list_for_each_entry(imp_conn, &imp->imp_conn_list, oic_item) { + cfs_list_for_each_entry(imp_conn, &imp->imp_conn_list, oic_item) { if (!obd_uuid_equals(uuid, &imp_conn->oic_uuid)) continue; LASSERT(imp_conn->oic_conn); @@ -173,7 +178,7 @@ int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid) } } - list_del(&imp_conn->oic_item); + cfs_list_del(&imp_conn->oic_item); ptlrpc_connection_put(imp_conn->oic_conn); OBD_FREE(imp_conn, sizeof(*imp_conn)); CDEBUG(D_HA, "imp %p@%s: remove connection %s\n", @@ -182,12 +187,37 @@ int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid) break; } out: - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); if (rc == -ENOENT) CERROR("connection %s not found\n", uuid->uuid); RETURN(rc); } +/** + * Find conn uuid by peer nid. @peer is a server nid. This function is used + * to find a conn uuid of @imp which can reach @peer. + */ +int client_import_find_conn(struct obd_import *imp, lnet_nid_t peer, + struct obd_uuid *uuid) +{ + struct obd_import_conn *conn; + int rc = -ENOENT; + ENTRY; + + cfs_spin_lock(&imp->imp_lock); + cfs_list_for_each_entry(conn, &imp->imp_conn_list, oic_item) { + /* check if conn uuid does have this peer nid */ + if (class_check_uuid(&conn->oic_uuid, peer)) { + *uuid = conn->oic_uuid; + rc = 0; + break; + } + } + cfs_spin_unlock(&imp->imp_lock); + RETURN(rc); +} +EXPORT_SYMBOL(client_import_find_conn); + void client_destroy_import(struct obd_import *imp) { /* drop security policy instance after all rpc finished/aborted @@ -212,6 +242,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) struct obd_uuid server_uuid; int rq_portal, rp_portal, connect_op; char *name = obddev->obd_type->typ_name; + ldlm_ns_type_t ns_type = LDLM_NS_TYPE_UNKNOWN; int rc; ENTRY; @@ -223,12 +254,16 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) connect_op = OST_CONNECT; cli->cl_sp_me = LUSTRE_SP_CLI; cli->cl_sp_to = LUSTRE_SP_OST; + ns_type = LDLM_NS_TYPE_OSC; + } else if (!strcmp(name, LUSTRE_MDC_NAME)) { rq_portal = MDS_REQUEST_PORTAL; rp_portal = MDC_REPLY_PORTAL; connect_op = MDS_CONNECT; cli->cl_sp_me = LUSTRE_SP_CLI; cli->cl_sp_to = LUSTRE_SP_MDT; + ns_type = LDLM_NS_TYPE_MDC; + } else if (!strcmp(name, LUSTRE_MGC_NAME)) { rq_portal = MGS_REQUEST_PORTAL; rp_portal = MGC_REPLY_PORTAL; @@ -236,6 +271,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_sp_me = LUSTRE_SP_MGC; cli->cl_sp_to = LUSTRE_SP_MGS; cli->cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_INVALID; + ns_type = LDLM_NS_TYPE_MGC; + } else { CERROR("unknown client OBD type \"%s\", can't setup\n", name); @@ -262,8 +299,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) RETURN(-EINVAL); } - init_rwsem(&cli->cl_sem); - sema_init(&cli->cl_mgc_sem, 1); + cfs_init_rwsem(&cli->cl_sem); + cfs_sema_init(&cli->cl_mgc_sem, 1); cli->cl_conn_count = 0; memcpy(server_uuid.uuid, lustre_cfg_buf(lcfg, 2), min_t(unsigned int, LUSTRE_CFG_BUFLEN(lcfg, 2), @@ -273,8 +310,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_avail_grant = 0; /* FIXME: should limit this for the sum of all cl_dirty_max */ cli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024; - if (cli->cl_dirty_max >> CFS_PAGE_SHIFT > num_physpages / 8) - cli->cl_dirty_max = num_physpages << (CFS_PAGE_SHIFT - 3); + if (cli->cl_dirty_max >> CFS_PAGE_SHIFT > cfs_num_physpages / 8) + cli->cl_dirty_max = cfs_num_physpages << (CFS_PAGE_SHIFT - 3); CFS_INIT_LIST_HEAD(&cli->cl_cache_waiters); CFS_INIT_LIST_HEAD(&cli->cl_loi_ready_list); CFS_INIT_LIST_HEAD(&cli->cl_loi_hp_ready_list); @@ -284,14 +321,14 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_r_in_flight = 0; cli->cl_w_in_flight = 0; - spin_lock_init(&cli->cl_read_rpc_hist.oh_lock); - spin_lock_init(&cli->cl_write_rpc_hist.oh_lock); - spin_lock_init(&cli->cl_read_page_hist.oh_lock); - spin_lock_init(&cli->cl_write_page_hist.oh_lock); - spin_lock_init(&cli->cl_read_offset_hist.oh_lock); - spin_lock_init(&cli->cl_write_offset_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_read_rpc_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_write_rpc_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_read_page_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_write_page_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_read_offset_hist.oh_lock); + cfs_spin_lock_init(&cli->cl_write_offset_hist.oh_lock); cfs_waitq_init(&cli->cl_destroy_waitq); - atomic_set(&cli->cl_destroy_in_flight, 0); + cfs_atomic_set(&cli->cl_destroy_in_flight, 0); #ifdef ENABLE_CHECKSUM /* Turn on checksumming by default. */ cli->cl_checksum = 1; @@ -302,8 +339,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) */ cli->cl_cksum_type = cli->cl_supp_cksum_types = OBD_CKSUM_CRC32; #endif - atomic_set(&cli->cl_resends, OSC_DEFAULT_RESENDS); - atomic_set(&cli->cl_quota_resends, CLIENT_QUOTA_DEFAULT_RESENDS); + cfs_atomic_set(&cli->cl_resends, OSC_DEFAULT_RESENDS); /* This value may be changed at connect time in ptlrpc_connect_interpret. */ @@ -312,11 +348,11 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) if (!strcmp(name, LUSTRE_MDC_NAME)) { cli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT; - } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 128 /* MB */) { + } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 128 /* MB */) { cli->cl_max_rpcs_in_flight = 2; - } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 256 /* MB */) { + } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 256 /* MB */) { cli->cl_max_rpcs_in_flight = 3; - } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) { + } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) { cli->cl_max_rpcs_in_flight = 4; } else { cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT; @@ -336,8 +372,6 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) GOTO(err_ldlm, rc = -ENOENT); imp->imp_client = &obddev->obd_ldlm_client; imp->imp_connect_op = connect_op; - imp->imp_initial_recov = 1; - imp->imp_initial_recov_bk = 0; CFS_INIT_LIST_HEAD(&imp->imp_pinger_chain); memcpy(cli->cl_target_uuid.uuid, lustre_cfg_buf(lcfg, 1), LUSTRE_CFG_BUFLEN(lcfg, 1)); @@ -359,15 +393,16 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) CDEBUG(D_HA, "marking %s %s->%s as inactive\n", name, obddev->obd_name, cli->cl_target_uuid.uuid); - spin_lock(&imp->imp_lock); + cfs_spin_lock(&imp->imp_lock); imp->imp_deactive = 1; - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); } } obddev->obd_namespace = ldlm_namespace_new(obddev, obddev->obd_name, LDLM_NAMESPACE_CLIENT, - LDLM_NAMESPACE_GREEDY); + LDLM_NAMESPACE_GREEDY, + ns_type); if (obddev->obd_namespace == NULL) { CERROR("Unable to create client namespace - %s\n", obddev->obd_name); @@ -412,7 +447,7 @@ int client_connect_import(const struct lu_env *env, ENTRY; *exp = NULL; - down_write(&cli->cl_sem); + cfs_down_write(&cli->cl_sem); if (cli->cl_conn_count > 0 ) GOTO(out_sem, rc = -EALREADY); @@ -436,7 +471,7 @@ int client_connect_import(const struct lu_env *env, imp->imp_connect_flags_orig = data->ocd_connect_flags; } - rc = ptlrpc_connect_import(imp, NULL); + rc = ptlrpc_connect_import(imp); if (rc != 0) { LASSERT (imp->imp_state == LUSTRE_IMP_DISCON); GOTO(out_ldlm, rc); @@ -461,7 +496,7 @@ out_ldlm: *exp = NULL; } out_sem: - up_write(&cli->cl_sem); + cfs_up_write(&cli->cl_sem); return rc; } @@ -483,7 +518,7 @@ int client_disconnect_export(struct obd_export *exp) cli = &obd->u.cli; imp = cli->cl_import; - down_write(&cli->cl_sem); + cfs_down_write(&cli->cl_sem); CDEBUG(D_INFO, "disconnect %s - %d\n", obd->obd_name, cli->cl_conn_count); @@ -500,9 +535,9 @@ int client_disconnect_export(struct obd_export *exp) /* 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 * fully deactivate the import, or that would drop all requests. */ - spin_lock(&imp->imp_lock); + cfs_spin_lock(&imp->imp_lock); imp->imp_deactive = 1; - spin_unlock(&imp->imp_lock); + cfs_spin_unlock(&imp->imp_lock); /* Some non-replayable imports (MDS's OSCs) are pinged, so just * delete it regardless. (It's safe to delete an import that was @@ -512,8 +547,7 @@ int client_disconnect_export(struct obd_export *exp) if (obd->obd_namespace != NULL) { /* obd_force == local only */ ldlm_cli_cancel_unused(obd->obd_namespace, NULL, - obd->obd_force ? LDLM_FL_LOCAL_ONLY:0, - NULL); + obd->obd_force ? LCF_LOCAL : 0, NULL); ldlm_namespace_free_prior(obd->obd_namespace, imp, obd->obd_force); } @@ -521,9 +555,9 @@ int client_disconnect_export(struct obd_export *exp) * there's no need to hold sem during disconnecting an import, * and actually it may cause deadlock in gss. */ - up_write(&cli->cl_sem); + cfs_up_write(&cli->cl_sem); rc = ptlrpc_disconnect_import(imp, 0); - down_write(&cli->cl_sem); + cfs_down_write(&cli->cl_sem); ptlrpc_invalidate_import(imp); @@ -543,7 +577,7 @@ int client_disconnect_export(struct obd_export *exp) if (!rc && err) rc = err; - up_write(&cli->cl_sem); + cfs_up_write(&cli->cl_sem); RETURN(rc); } @@ -563,24 +597,21 @@ int server_disconnect_export(struct obd_export *exp) ldlm_cancel_locks_for_export(exp); /* complete all outstanding replies */ - spin_lock(&exp->exp_lock); - while (!list_empty(&exp->exp_outstanding_replies)) { + cfs_spin_lock(&exp->exp_lock); + while (!cfs_list_empty(&exp->exp_outstanding_replies)) { struct ptlrpc_reply_state *rs = - list_entry(exp->exp_outstanding_replies.next, - struct ptlrpc_reply_state, rs_exp_list); + cfs_list_entry(exp->exp_outstanding_replies.next, + struct ptlrpc_reply_state, rs_exp_list); struct ptlrpc_service *svc = rs->rs_service; - spin_lock(&svc->srv_lock); - list_del_init(&rs->rs_exp_list); - spin_lock(&rs->rs_lock); + cfs_spin_lock(&svc->srv_rs_lock); + cfs_list_del_init(&rs->rs_exp_list); + cfs_spin_lock(&rs->rs_lock); ptlrpc_schedule_difficult_reply(rs); - spin_unlock(&rs->rs_lock); - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&rs->rs_lock); + cfs_spin_unlock(&svc->srv_rs_lock); } - spin_unlock(&exp->exp_lock); - - /* release nid stat refererence */ - lprocfs_exp_cleanup(exp); + cfs_spin_unlock(&exp->exp_lock); RETURN(rc); } @@ -634,17 +665,24 @@ void target_client_add_cb(struct obd_device *obd, __u64 transno, void *cb_data, CDEBUG(D_RPCTRACE, "%s: committing for initial connect of %s\n", obd->obd_name, exp->exp_client_uuid.uuid); - spin_lock(&exp->exp_lock); + cfs_spin_lock(&exp->exp_lock); exp->exp_need_sync = 0; - spin_unlock(&exp->exp_lock); + cfs_spin_unlock(&exp->exp_lock); class_export_cb_put(exp); } EXPORT_SYMBOL(target_client_add_cb); +#ifdef __KERNEL__ static void -target_start_and_reset_recovery_timer(struct obd_device *obd, - struct ptlrpc_request *req, - int new_client); +check_and_start_recovery_timer(struct obd_device *obd, + struct ptlrpc_request *req, int new_client); +#else +static inline void +check_and_start_recovery_timer(struct obd_device *obd, + struct ptlrpc_request *req, int new_client) +{ +} +#endif int target_handle_connect(struct ptlrpc_request *req) { @@ -660,6 +698,7 @@ int target_handle_connect(struct ptlrpc_request *req) int rc = 0; int mds_conn = 0; struct obd_connect_data *data, *tmpdata; + int size, tmpsize; lnet_nid_t *client_nid = NULL; ENTRY; @@ -678,7 +717,7 @@ int target_handle_connect(struct ptlrpc_request *req) if (!target || target->obd_stopping || !target->obd_set_up) { LCONSOLE_ERROR_MSG(0x137, "UUID '%s' is not available " - " for connect (%s)\n", str, + "for connect (%s)\n", str, !target ? "no target" : (target->obd_stopping ? "stopping" : "not set up")); @@ -727,6 +766,8 @@ int target_handle_connect(struct ptlrpc_request *req) conn = *tmp; + size = req_capsule_get_size(&req->rq_pill, &RMF_CONNECT_DATA, + RCL_CLIENT); data = req_capsule_client_get(&req->rq_pill, &RMF_CONNECT_DATA); if (!data) GOTO(out, rc = -EPROTO); @@ -772,7 +813,7 @@ int target_handle_connect(struct ptlrpc_request *req) if (obd_uuid_equals(&cluuid, &target->obd_uuid)) goto dont_check_exports; - export = lustre_hash_lookup(target->obd_uuid_hash, &cluuid); + export = cfs_hash_lookup(target->obd_uuid_hash, &cluuid); if (!export) goto no_export; @@ -814,9 +855,9 @@ int target_handle_connect(struct ptlrpc_request *req) class_export_put(export); export = NULL; } else { - spin_lock(&export->exp_lock); + cfs_spin_lock(&export->exp_lock); export->exp_connecting = 1; - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); class_export_put(export); LASSERT(export->exp_obd == target); @@ -828,25 +869,25 @@ int target_handle_connect(struct ptlrpc_request *req) no_export: OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_CONNECT, 2 * obd_timeout); } else if (req->rq_export == NULL && - atomic_read(&export->exp_rpc_count) > 0) { + cfs_atomic_read(&export->exp_rpc_count) > 0) { CWARN("%s: refuse connection from %s/%s to 0x%p/%d\n", target->obd_name, cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), - export, atomic_read(&export->exp_refcount)); + export, cfs_atomic_read(&export->exp_refcount)); GOTO(out, rc = -EBUSY); } else if (req->rq_export != NULL && - (atomic_read(&export->exp_rpc_count) > 1)) { + (cfs_atomic_read(&export->exp_rpc_count) > 1)) { /* the current connect rpc has increased exp_rpc_count */ CWARN("%s: refuse reconnection from %s@%s to 0x%p/%d\n", target->obd_name, cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), - export, atomic_read(&export->exp_rpc_count) - 1); - spin_lock(&export->exp_lock); + export, cfs_atomic_read(&export->exp_rpc_count) - 1); + cfs_spin_lock(&export->exp_lock); if (req->rq_export->exp_conn_cnt < lustre_msg_get_conn_cnt(req->rq_reqmsg)) /* try to abort active requests */ req->rq_export->exp_abort_active_req = 1; - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); GOTO(out, rc = -EBUSY); } else if (lustre_msg_get_conn_cnt(req->rq_reqmsg) == 1) { CERROR("%s: NID %s (%s) reconnected with 1 conn_cnt; " @@ -867,15 +908,10 @@ no_export: export, (long)cfs_time_current_sec(), export ? (long)export->exp_last_request_time : 0); - /* Tell the client if we're in recovery. */ - if (target->obd_recovering) { - lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECOVERING); - /* If this is the first time a client connects, - reset the recovery timer */ - if (rc == 0) - target_start_and_reset_recovery_timer(target, req, - !export); - } + /* If this is the first time a client connects, reset the recovery + * timer */ + if (rc == 0 && target->obd_recovering) + check_and_start_recovery_timer(target, req, export == NULL); /* We want to handle EALREADY but *not* -EALREADY from * target_handle_reconnect(), return reconnection state in a flag */ @@ -901,7 +937,8 @@ no_export: "%d clients in recovery for "CFS_TIME_T"s\n", target->obd_name, libcfs_nid2str(req->rq_peer.nid), cluuid.uuid, - atomic_read(&target->obd_lock_replay_clients), + cfs_atomic_read(&target-> \ + obd_lock_replay_clients), cfs_duration_sec(t)); rc = -EBUSY; } else { @@ -921,13 +958,21 @@ dont_check_exports: } if (rc) GOTO(out, rc); + + LASSERT(target->u.obt.obt_magic == OBT_MAGIC); + data->ocd_instance = target->u.obt.obt_instance; + /* Return only the parts of obd_connect_data that we understand, so the * client knows that we don't understand the rest. */ if (data) { - tmpdata = req_capsule_server_get(&req->rq_pill, - &RMF_CONNECT_DATA); - //data->ocd_connect_flags &= OBD_CONNECT_SUPPORTED; - *tmpdata = *data; + tmpsize = req_capsule_get_size(&req->rq_pill, &RMF_CONNECT_DATA, + RCL_SERVER); + tmpdata = req_capsule_server_get(&req->rq_pill, + &RMF_CONNECT_DATA); + /* Don't use struct assignment here, because the client reply + * buffer may be smaller/larger than the local struct + * obd_connect_data. */ + memcpy(tmpdata, data, min(tmpsize, size)); } /* If all else goes well, this is our RPC return code. */ @@ -947,9 +992,9 @@ dont_check_exports: req->rq_export = export; - spin_lock(&export->exp_lock); + cfs_spin_lock(&export->exp_lock); if (export->exp_conn_cnt >= lustre_msg_get_conn_cnt(req->rq_reqmsg)) { - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); CERROR("%s: %s already connected at higher conn_cnt: %d > %d\n", cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), export->exp_conn_cnt, @@ -957,28 +1002,29 @@ dont_check_exports: GOTO(out, rc = -EALREADY); } + LASSERT(lustre_msg_get_conn_cnt(req->rq_reqmsg) > 0); export->exp_conn_cnt = lustre_msg_get_conn_cnt(req->rq_reqmsg); export->exp_abort_active_req = 0; /* request from liblustre? Don't evict it for not pinging. */ if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_LIBCLIENT) { export->exp_libclient = 1; - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); - spin_lock(&target->obd_dev_lock); - list_del_init(&export->exp_obd_chain_timed); - spin_unlock(&target->obd_dev_lock); + cfs_spin_lock(&target->obd_dev_lock); + cfs_list_del_init(&export->exp_obd_chain_timed); + cfs_spin_unlock(&target->obd_dev_lock); } else { - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); } if (export->exp_connection != NULL) { /* Check to see if connection came from another NID */ if ((export->exp_connection->c_peer.nid != req->rq_peer.nid) && - !hlist_unhashed(&export->exp_nid_hash)) - lustre_hash_del(export->exp_obd->obd_nid_hash, - &export->exp_connection->c_peer.nid, - &export->exp_nid_hash); + !cfs_hlist_unhashed(&export->exp_nid_hash)) + cfs_hash_del(export->exp_obd->obd_nid_hash, + &export->exp_connection->c_peer.nid, + &export->exp_nid_hash); ptlrpc_connection_put(export->exp_connection); } @@ -986,34 +1032,49 @@ dont_check_exports: export->exp_connection = ptlrpc_connection_get(req->rq_peer, req->rq_self, &remote_uuid); - if (hlist_unhashed(&export->exp_nid_hash)) { - lustre_hash_add_unique(export->exp_obd->obd_nid_hash, - &export->exp_connection->c_peer.nid, - &export->exp_nid_hash); + if (cfs_hlist_unhashed(&export->exp_nid_hash)) { + cfs_hash_add(export->exp_obd->obd_nid_hash, + &export->exp_connection->c_peer.nid, + &export->exp_nid_hash); } - spin_lock_bh(&target->obd_processing_task_lock); if (target->obd_recovering && !export->exp_in_recovery) { - spin_lock(&export->exp_lock); + int has_transno; + __u64 transno = data->ocd_transno; + + cfs_spin_lock(&export->exp_lock); export->exp_in_recovery = 1; export->exp_req_replay_needed = 1; export->exp_lock_replay_needed = 1; - spin_unlock(&export->exp_lock); - if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_TRANSNO) - && (data->ocd_transno == 0)) + cfs_spin_unlock(&export->exp_lock); + + has_transno = !!(lustre_msg_get_op_flags(req->rq_reqmsg) & + MSG_CONNECT_TRANSNO); + if (has_transno && transno == 0) CWARN("Connect with zero transno!\n"); - if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_TRANSNO) - && data->ocd_transno < target->obd_next_recovery_transno) - target->obd_next_recovery_transno = data->ocd_transno; - target->obd_connected_clients++; - atomic_inc(&target->obd_req_replay_clients); - atomic_inc(&target->obd_lock_replay_clients); - if (target->obd_connected_clients == + if (has_transno && transno > 0 && + transno < target->obd_next_recovery_transno && + transno > target->obd_last_committed) { + /* another way is to use cmpxchg() so it will be + * lock free */ + cfs_spin_lock(&target->obd_recovery_task_lock); + if (transno < target->obd_next_recovery_transno) + target->obd_next_recovery_transno = transno; + cfs_spin_unlock(&target->obd_recovery_task_lock); + } + + cfs_atomic_inc(&target->obd_req_replay_clients); + cfs_atomic_inc(&target->obd_lock_replay_clients); + if (cfs_atomic_inc_return(&target->obd_connected_clients) == target->obd_max_recoverable_clients) cfs_waitq_signal(&target->obd_next_transno_waitq); } - spin_unlock_bh(&target->obd_processing_task_lock); + + /* Tell the client we're in recovery, when client is involved in it. */ + if (target->obd_recovering) + lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECOVERING); + tmp = req_capsule_client_get(&req->rq_pill, &RMF_CONN); conn = *tmp; @@ -1050,6 +1111,12 @@ dont_check_exports: else revimp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT; + if ((export->exp_connect_flags & OBD_CONNECT_FULL20) && + (revimp->imp_msg_magic != LUSTRE_MSG_MAGIC_V1)) + revimp->imp_msghdr_flags |= MSGHDR_CKSUM_INCOMPAT18; + else + revimp->imp_msghdr_flags &= ~MSGHDR_CKSUM_INCOMPAT18; + rc = sptlrpc_import_sec_adapt(revimp, req->rq_svc_ctx, &req->rq_flvr); if (rc) { CERROR("Failed to get sec for reverse import: %d\n", rc); @@ -1060,9 +1127,9 @@ dont_check_exports: class_import_put(revimp); out: if (export) { - spin_lock(&export->exp_lock); + cfs_spin_lock(&export->exp_lock); export->exp_connecting = 0; - spin_unlock(&export->exp_lock); + cfs_spin_unlock(&export->exp_lock); } if (targref) class_decref(targref, __FUNCTION__, cfs_current()); @@ -1093,10 +1160,10 @@ void target_destroy_export(struct obd_export *exp) if (exp->exp_imp_reverse != NULL) client_destroy_import(exp->exp_imp_reverse); - LASSERT(atomic_read(&exp->exp_locks_count) == 0); - LASSERT(atomic_read(&exp->exp_rpc_count) == 0); - LASSERT(atomic_read(&exp->exp_cb_count) == 0); - LASSERT(atomic_read(&exp->exp_replay_count) == 0); + LASSERT_ATOMIC_ZERO(&exp->exp_locks_count); + LASSERT_ATOMIC_ZERO(&exp->exp_rpc_count); + LASSERT_ATOMIC_ZERO(&exp->exp_cb_count); + LASSERT_ATOMIC_ZERO(&exp->exp_replay_count); } /* @@ -1105,20 +1172,21 @@ void target_destroy_export(struct obd_export *exp) static void target_request_copy_get(struct ptlrpc_request *req) { class_export_rpc_get(req->rq_export); - LASSERT(list_empty(&req->rq_list)); + LASSERT(cfs_list_empty(&req->rq_list)); CFS_INIT_LIST_HEAD(&req->rq_replay_list); + /* increase refcount to keep request in queue */ - LASSERT(atomic_read(&req->rq_refcount)); - atomic_inc(&req->rq_refcount); + cfs_atomic_inc(&req->rq_refcount); /** let export know it has replays to be handled */ - atomic_inc(&req->rq_export->exp_replay_count); + cfs_atomic_inc(&req->rq_export->exp_replay_count); } static void target_request_copy_put(struct ptlrpc_request *req) { - LASSERT(list_empty(&req->rq_replay_list)); - LASSERT(atomic_read(&req->rq_export->exp_replay_count) > 0); - atomic_dec(&req->rq_export->exp_replay_count); + LASSERT(cfs_list_empty(&req->rq_replay_list)); + LASSERT_ATOMIC_POS(&req->rq_export->exp_replay_count); + + cfs_atomic_dec(&req->rq_export->exp_replay_count); class_export_rpc_put(req->rq_export); ptlrpc_server_drop_request(req); } @@ -1132,9 +1200,9 @@ static int target_exp_enqueue_req_replay(struct ptlrpc_request *req) LASSERT(exp); - spin_lock(&exp->exp_lock); - list_for_each_entry(reqiter, &exp->exp_req_replay_queue, - rq_replay_list) { + cfs_spin_lock(&exp->exp_lock); + cfs_list_for_each_entry(reqiter, &exp->exp_req_replay_queue, + rq_replay_list) { if (lustre_msg_get_transno(reqiter->rq_reqmsg) == transno) { dup = 1; break; @@ -1148,44 +1216,55 @@ static int target_exp_enqueue_req_replay(struct ptlrpc_request *req) CERROR("invalid flags %x of resent replay\n", lustre_msg_get_flags(req->rq_reqmsg)); } else { - list_add_tail(&req->rq_replay_list, &exp->exp_req_replay_queue); + cfs_list_add_tail(&req->rq_replay_list, + &exp->exp_req_replay_queue); } - spin_unlock(&exp->exp_lock); + cfs_spin_unlock(&exp->exp_lock); return dup; } static void target_exp_dequeue_req_replay(struct ptlrpc_request *req) { - LASSERT(!list_empty(&req->rq_replay_list)); + LASSERT(!cfs_list_empty(&req->rq_replay_list)); LASSERT(req->rq_export); - spin_lock(&req->rq_export->exp_lock); - list_del_init(&req->rq_replay_list); - spin_unlock(&req->rq_export->exp_lock); + cfs_spin_lock(&req->rq_export->exp_lock); + cfs_list_del_init(&req->rq_replay_list); + cfs_spin_unlock(&req->rq_export->exp_lock); } #ifdef __KERNEL__ static void target_finish_recovery(struct obd_device *obd) { + time_t elapsed_time = max_t(time_t, 1, cfs_time_current_sec() - + obd->obd_recovery_start); ENTRY; - LCONSOLE_INFO("%s: sending delayed replies to recovered clients\n", - obd->obd_name); + + LCONSOLE_INFO("%s: Recovery over after %d:%.02d, of %d clients " + "%d recovered and %d %s evicted.\n", obd->obd_name, + (int)elapsed_time / 60, (int)elapsed_time % 60, + obd->obd_max_recoverable_clients, + cfs_atomic_read(&obd->obd_connected_clients), + obd->obd_stale_clients, + obd->obd_stale_clients == 1 ? "was" : "were"); ldlm_reprocess_all_ns(obd->obd_namespace); - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_req_replay_queue) || - !list_empty(&obd->obd_lock_replay_queue) || - !list_empty(&obd->obd_final_req_queue)) { + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_req_replay_queue) || + !cfs_list_empty(&obd->obd_lock_replay_queue) || + !cfs_list_empty(&obd->obd_final_req_queue)) { CERROR("%s: Recovery queues ( %s%s%s) are not empty\n", obd->obd_name, - list_empty(&obd->obd_req_replay_queue) ? "" : "req ", - list_empty(&obd->obd_lock_replay_queue) ? "" : "lock ", - list_empty(&obd->obd_final_req_queue) ? "" : "final "); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_list_empty(&obd->obd_req_replay_queue) ? "" : "req ", + cfs_list_empty(&obd->obd_lock_replay_queue) ? \ + "" : "lock ", + cfs_list_empty(&obd->obd_final_req_queue) ? \ + "" : "final "); + cfs_spin_unlock(&obd->obd_recovery_task_lock); LBUG(); } - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); obd->obd_recovery_end = cfs_time_current_sec(); @@ -1202,13 +1281,13 @@ static void target_finish_recovery(struct obd_device *obd) static void abort_req_replay_queue(struct obd_device *obd) { struct ptlrpc_request *req, *n; - struct list_head abort_list; + cfs_list_t abort_list; CFS_INIT_LIST_HEAD(&abort_list); - spin_lock_bh(&obd->obd_processing_task_lock); - list_splice_init(&obd->obd_req_replay_queue, &abort_list); - spin_unlock_bh(&obd->obd_processing_task_lock); - list_for_each_entry_safe(req, n, &abort_list, rq_list) { + cfs_spin_lock(&obd->obd_recovery_task_lock); + cfs_list_splice_init(&obd->obd_req_replay_queue, &abort_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); + cfs_list_for_each_entry_safe(req, n, &abort_list, rq_list) { DEBUG_REQ(D_WARNING, req, "aborted:"); req->rq_status = -ENOTCONN; if (ptlrpc_error(req)) { @@ -1223,13 +1302,13 @@ static void abort_req_replay_queue(struct obd_device *obd) static void abort_lock_replay_queue(struct obd_device *obd) { struct ptlrpc_request *req, *n; - struct list_head abort_list; + cfs_list_t abort_list; CFS_INIT_LIST_HEAD(&abort_list); - spin_lock_bh(&obd->obd_processing_task_lock); - list_splice_init(&obd->obd_lock_replay_queue, &abort_list); - spin_unlock_bh(&obd->obd_processing_task_lock); - list_for_each_entry_safe(req, n, &abort_list, rq_list){ + cfs_spin_lock(&obd->obd_recovery_task_lock); + cfs_list_splice_init(&obd->obd_lock_replay_queue, &abort_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); + cfs_list_for_each_entry_safe(req, n, &abort_list, rq_list){ DEBUG_REQ(D_ERROR, req, "aborted:"); req->rq_status = -ENOTCONN; if (ptlrpc_error(req)) { @@ -1239,7 +1318,6 @@ static void abort_lock_replay_queue(struct obd_device *obd) target_request_copy_put(req); } } -#endif /* Called from a cleanup function if the device is being cleaned up forcefully. The exports should all have been disconnected already, @@ -1253,34 +1331,36 @@ static void abort_lock_replay_queue(struct obd_device *obd) void target_cleanup_recovery(struct obd_device *obd) { struct ptlrpc_request *req, *n; - struct list_head clean_list; + cfs_list_t clean_list; ENTRY; CFS_INIT_LIST_HEAD(&clean_list); - spin_lock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_dev_lock); if (!obd->obd_recovering) { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_dev_lock); EXIT; return; } obd->obd_recovering = obd->obd_abort_recovery = 0; - target_cancel_recovery_timer(obd); + cfs_spin_unlock(&obd->obd_dev_lock); - list_splice_init(&obd->obd_req_replay_queue, &clean_list); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_recovery_task_lock); + target_cancel_recovery_timer(obd); + cfs_list_splice_init(&obd->obd_req_replay_queue, &clean_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); - list_for_each_entry_safe(req, n, &clean_list, rq_list) { + cfs_list_for_each_entry_safe(req, n, &clean_list, rq_list) { LASSERT(req->rq_reply_state == 0); target_exp_dequeue_req_replay(req); target_request_copy_put(req); } - spin_lock_bh(&obd->obd_processing_task_lock); - list_splice_init(&obd->obd_lock_replay_queue, &clean_list); - list_splice_init(&obd->obd_final_req_queue, &clean_list); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_recovery_task_lock); + cfs_list_splice_init(&obd->obd_lock_replay_queue, &clean_list); + cfs_list_splice_init(&obd->obd_final_req_queue, &clean_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); - list_for_each_entry_safe(req, n, &clean_list, rq_list){ + cfs_list_for_each_entry_safe(req, n, &clean_list, rq_list){ LASSERT(req->rq_reply_state == 0); target_request_copy_put(req); } @@ -1288,69 +1368,78 @@ void target_cleanup_recovery(struct obd_device *obd) EXIT; } -/* obd_processing_task_lock should be held */ +/* obd_recovery_task_lock should be held */ void target_cancel_recovery_timer(struct obd_device *obd) { CDEBUG(D_HA, "%s: cancel recovery timer\n", obd->obd_name); cfs_timer_disarm(&obd->obd_recovery_timer); } -/* extend = 1 means require at least "duration" seconds left in the timer, - extend = 0 means set the total duration (start_recovery_timer) */ -static void reset_recovery_timer(struct obd_device *obd, int duration, - int extend) +static void target_start_recovery_timer(struct obd_device *obd) { - cfs_time_t now = cfs_time_current_sec(); - cfs_duration_t left; + if (obd->obd_recovery_start != 0) + return; - spin_lock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_dev_lock); if (!obd->obd_recovering || obd->obd_abort_recovery) { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_dev_lock); return; } - left = cfs_time_sub(obd->obd_recovery_end, now); + LASSERT(obd->obd_recovery_timeout != 0); - if (extend && (duration > left)) - obd->obd_recovery_timeout += duration - left; - else if (!extend && (duration > obd->obd_recovery_timeout)) - /* Track the client's largest expected replay time */ - obd->obd_recovery_timeout = duration; -#ifdef CRAY_XT3 - /* - * If total recovery time already exceed the - * obd_recovery_max_time, then CRAY XT3 will - * abort the recovery - */ - if(obd->obd_recovery_timeout > obd->obd_recovery_max_time) - obd->obd_recovery_timeout = obd->obd_recovery_max_time; -#endif - obd->obd_recovery_end = obd->obd_recovery_start + - obd->obd_recovery_timeout; - if (!cfs_timer_is_armed(&obd->obd_recovery_timer) || - cfs_time_before(now, obd->obd_recovery_end)) { - left = cfs_time_sub(obd->obd_recovery_end, now); - cfs_timer_arm(&obd->obd_recovery_timer, cfs_time_shift(left)); - } - spin_unlock_bh(&obd->obd_processing_task_lock); - CDEBUG(D_HA, "%s: recovery timer will expire in %u seconds\n", - obd->obd_name, (unsigned)left); + if (obd->obd_recovery_start != 0) { + cfs_spin_unlock(&obd->obd_dev_lock); + return; + } + + cfs_timer_arm(&obd->obd_recovery_timer, + cfs_time_shift(obd->obd_recovery_timeout)); + obd->obd_recovery_start = cfs_time_current_sec(); + cfs_spin_unlock(&obd->obd_dev_lock); + + LCONSOLE_WARN("%s: Will be in recovery for at least %d:%.02d, " + "or until %d client%s reconnect%s\n", + obd->obd_name, + obd->obd_recovery_timeout / 60, + obd->obd_recovery_timeout % 60, + obd->obd_max_recoverable_clients, + (obd->obd_max_recoverable_clients == 1) ? "" : "s", + (obd->obd_max_recoverable_clients == 1) ? "s": ""); } -static void check_and_start_recovery_timer(struct obd_device *obd) +/* extend recovery window to have extra @duration seconds at least. */ +static void extend_recovery_timer(struct obd_device *obd, int drt) { - spin_lock_bh(&obd->obd_processing_task_lock); - if (cfs_timer_is_armed(&obd->obd_recovery_timer)) { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_time_t now; + cfs_time_t end; + cfs_duration_t left; + + cfs_spin_lock(&obd->obd_dev_lock); + if (!obd->obd_recovering || obd->obd_abort_recovery) { + cfs_spin_unlock(&obd->obd_dev_lock); return; } - CDEBUG(D_HA, "%s: starting recovery timer\n", obd->obd_name); - obd->obd_recovery_start = cfs_time_current_sec(); - /* minimum */ - obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout; - spin_unlock_bh(&obd->obd_processing_task_lock); - reset_recovery_timer(obd, obd->obd_recovery_timeout, 0); + LASSERT(obd->obd_recovery_start != 0); + + now = cfs_time_current_sec(); + end = obd->obd_recovery_start + obd->obd_recovery_timeout; + left = cfs_time_sub(end, now); + if (left < 0) { + obd->obd_recovery_timeout += drt - left; + } else if (left < drt) { + drt -= left; + obd->obd_recovery_timeout += drt; + } else { + drt = left; + } + + cfs_timer_arm(&obd->obd_recovery_timer, cfs_time_shift(drt)); + cfs_spin_unlock(&obd->obd_dev_lock); + + CDEBUG(D_HA, "%s: recovery timer will expire in %u seconds\n", + obd->obd_name, (unsigned)drt); } /* Reset the timer with each new client connection */ @@ -1365,19 +1454,21 @@ static void check_and_start_recovery_timer(struct obd_device *obd) */ static void -target_start_and_reset_recovery_timer(struct obd_device *obd, - struct ptlrpc_request *req, - int new_client) +check_and_start_recovery_timer(struct obd_device *obd, + struct ptlrpc_request *req, + int new_client) { int service_time = lustre_msg_get_service_time(req->rq_reqmsg); + struct obd_device_target *obt = &obd->u.obt; + struct lustre_sb_info *lsi; if (!new_client && service_time) /* Teach server about old server's estimates, as first guess * at how long new requests will take. */ - at_add(&req->rq_rqbd->rqbd_service->srv_at_estimate, - service_time); + at_measured(&req->rq_rqbd->rqbd_service->srv_at_estimate, + service_time); - check_and_start_recovery_timer(obd); + target_start_recovery_timer(obd); /* convert the service time to rpc timeout, * reuse service_time to limit stack usage */ @@ -1386,14 +1477,18 @@ target_start_and_reset_recovery_timer(struct obd_device *obd, /* We expect other clients to timeout within service_time, then try * to reconnect, then try the failover server. The max delay between * connect attempts is SWITCH_MAX + SWITCH_INC + INITIAL */ - service_time += 2 * (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + - INITIAL_CONNECT_TIMEOUT); - if (service_time > obd->obd_recovery_timeout && !new_client) - reset_recovery_timer(obd, service_time, 0); + service_time += 2 * INITIAL_CONNECT_TIMEOUT; + + LASSERT(obt->obt_magic == OBT_MAGIC); + lsi = s2lsi(obt->obt_sb); + if (!(lsi->lsi_flags | LSI_IR_CAPABLE)) + service_time += 2 * (CONNECTION_SWITCH_MAX + + CONNECTION_SWITCH_INC); + service_time -= obd->obd_recovery_timeout; + if (service_time > 0) + extend_recovery_timer(obd, service_time); } -#ifdef __KERNEL__ - /** Health checking routines */ static inline int exp_connect_healthy(struct obd_export *exp) { @@ -1404,13 +1499,13 @@ static inline int exp_connect_healthy(struct obd_export *exp) static inline int exp_req_replay_healthy(struct obd_export *exp) { return (!exp->exp_req_replay_needed || - atomic_read(&exp->exp_replay_count) > 0); + cfs_atomic_read(&exp->exp_replay_count) > 0); } /** if export done lock_replay or has replay in queue */ static inline int exp_lock_replay_healthy(struct obd_export *exp) { return (!exp->exp_lock_replay_needed || - atomic_read(&exp->exp_replay_count) > 0); + cfs_atomic_read(&exp->exp_replay_count) > 0); } static inline int exp_vbr_healthy(struct obd_export *exp) @@ -1426,12 +1521,13 @@ static inline int exp_finished(struct obd_export *exp) /** Checking routines for recovery */ static int check_for_clients(struct obd_device *obd) { + unsigned int clnts = cfs_atomic_read(&obd->obd_connected_clients); + if (obd->obd_abort_recovery || obd->obd_recovery_expired) return 1; - LASSERT(obd->obd_connected_clients <= obd->obd_max_recoverable_clients); + LASSERT(clnts <= obd->obd_max_recoverable_clients); if (obd->obd_no_conn == 0 && - obd->obd_connected_clients + obd->obd_stale_clients == - obd->obd_max_recoverable_clients) + clnts + obd->obd_stale_clients == obd->obd_max_recoverable_clients) return 1; return 0; } @@ -1442,18 +1538,18 @@ static int check_for_next_transno(struct obd_device *obd) int wake_up = 0, connected, completed, queue_len; __u64 next_transno, req_transno; ENTRY; - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_req_replay_queue)) { - req = list_entry(obd->obd_req_replay_queue.next, - struct ptlrpc_request, rq_list); + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_req_replay_queue)) { + req = cfs_list_entry(obd->obd_req_replay_queue.next, + struct ptlrpc_request, rq_list); req_transno = lustre_msg_get_transno(req->rq_reqmsg); } else { req_transno = 0; } - connected = obd->obd_connected_clients; - completed = connected - atomic_read(&obd->obd_req_replay_clients); + connected = cfs_atomic_read(&obd->obd_connected_clients); + completed = connected - cfs_atomic_read(&obd->obd_req_replay_clients); queue_len = obd->obd_requests_queued_for_recovery; next_transno = obd->obd_next_recovery_transno; @@ -1468,13 +1564,13 @@ static int check_for_next_transno(struct obd_device *obd) } else if (obd->obd_recovery_expired) { CDEBUG(D_HA, "waking for expired recovery\n"); wake_up = 1; - } else if (atomic_read(&obd->obd_req_replay_clients) == 0) { + } else if (cfs_atomic_read(&obd->obd_req_replay_clients) == 0) { CDEBUG(D_HA, "waking for completed recovery\n"); wake_up = 1; } else if (req_transno == next_transno) { CDEBUG(D_HA, "waking for next ("LPD64")\n", next_transno); wake_up = 1; - } else if (queue_len == atomic_read(&obd->obd_req_replay_clients)) { + } else if (queue_len == cfs_atomic_read(&obd->obd_req_replay_clients)) { int d_lvl = D_HA; /** handle gaps occured due to lost reply or VBR */ LASSERTF(req_transno >= next_transno, @@ -1498,7 +1594,7 @@ static int check_for_next_transno(struct obd_device *obd) obd->obd_next_recovery_transno = req_transno; wake_up = 1; } - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); return wake_up; } @@ -1506,11 +1602,11 @@ static int check_for_next_lock(struct obd_device *obd) { int wake_up = 0; - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_lock_replay_queue)) { + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_lock_replay_queue)) { CDEBUG(D_HA, "waking for next lock\n"); wake_up = 1; - } else if (atomic_read(&obd->obd_lock_replay_clients) == 0) { + } else if (cfs_atomic_read(&obd->obd_lock_replay_clients) == 0) { CDEBUG(D_HA, "waking for completed lock replay\n"); wake_up = 1; } else if (obd->obd_abort_recovery) { @@ -1520,7 +1616,7 @@ static int check_for_next_lock(struct obd_device *obd) CDEBUG(D_HA, "waking for expired recovery\n"); wake_up = 1; } - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); return wake_up; } @@ -1534,38 +1630,33 @@ static int target_recovery_overseer(struct obd_device *obd, int (*check_routine)(struct obd_device *), int (*health_check)(struct obd_export *)) { - int abort = 0, expired = 1; - - do { - cfs_wait_event(obd->obd_next_transno_waitq, check_routine(obd)); - spin_lock_bh(&obd->obd_processing_task_lock); - abort = obd->obd_abort_recovery; - expired = obd->obd_recovery_expired; +repeat: + cfs_wait_event(obd->obd_next_transno_waitq, check_routine(obd)); + if (obd->obd_abort_recovery) { + CWARN("recovery is aborted, evict exports in recovery\n"); + /** evict exports which didn't finish recovery yet */ + class_disconnect_stale_exports(obd, exp_finished); + return 1; + } else if (obd->obd_recovery_expired) { obd->obd_recovery_expired = 0; - spin_unlock_bh(&obd->obd_processing_task_lock); - if (abort) { - CWARN("recovery is aborted, evict exports in recovery\n"); - /** evict exports which didn't finish recovery yet */ - class_disconnect_stale_exports(obd, exp_finished); - } else if (expired) { - /** If some clients died being recovered, evict them */ - CDEBUG(D_WARNING, "recovery is timed out, evict stale exports\n"); - /** evict cexports with no replay in queue, they are stalled */ - class_disconnect_stale_exports(obd, health_check); - /** continue with VBR */ - spin_lock_bh(&obd->obd_processing_task_lock); - obd->obd_version_recov = 1; - spin_unlock_bh(&obd->obd_processing_task_lock); - /** - * reset timer, recovery will proceed with versions now, - * timeout is set just to handle reconnection delays - */ - reset_recovery_timer(obd, RECONNECT_DELAY_MAX, 1); - /** Wait for recovery events again, after evicting bad clients */ - } - } while (!abort && expired); - - return abort; + /** If some clients died being recovered, evict them */ + CDEBUG(D_WARNING, + "recovery is timed out, evict stale exports\n"); + /** evict cexports with no replay in queue, they are stalled */ + class_disconnect_stale_exports(obd, health_check); + /** continue with VBR */ + cfs_spin_lock(&obd->obd_dev_lock); + obd->obd_version_recov = 1; + cfs_spin_unlock(&obd->obd_dev_lock); + /** + * reset timer, recovery will proceed with versions now, + * timeout is set just to handle reconnection delays + */ + extend_recovery_timer(obd, RECONNECT_DELAY_MAX); + /** Wait for recovery events again, after evicting bad clients */ + goto repeat; + } + return 0; } static struct ptlrpc_request *target_next_replay_req(struct obd_device *obd) @@ -1582,17 +1673,17 @@ static struct ptlrpc_request *target_next_replay_req(struct obd_device *obd) abort_lock_replay_queue(obd); } - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_req_replay_queue)) { - req = list_entry(obd->obd_req_replay_queue.next, - struct ptlrpc_request, rq_list); - list_del_init(&req->rq_list); + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_req_replay_queue)) { + req = cfs_list_entry(obd->obd_req_replay_queue.next, + struct ptlrpc_request, rq_list); + cfs_list_del_init(&req->rq_list); obd->obd_requests_queued_for_recovery--; - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); } else { - spin_unlock_bh(&obd->obd_processing_task_lock); - LASSERT(list_empty(&obd->obd_req_replay_queue)); - LASSERT(atomic_read(&obd->obd_req_replay_clients) == 0); + cfs_spin_unlock(&obd->obd_recovery_task_lock); + LASSERT(cfs_list_empty(&obd->obd_req_replay_queue)); + LASSERT(cfs_atomic_read(&obd->obd_req_replay_clients) == 0); /** evict exports failed VBR */ class_disconnect_stale_exports(obd, exp_vbr_healthy); } @@ -1608,16 +1699,16 @@ static struct ptlrpc_request *target_next_replay_lock(struct obd_device *obd) exp_lock_replay_healthy)) abort_lock_replay_queue(obd); - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_lock_replay_queue)) { - req = list_entry(obd->obd_lock_replay_queue.next, - struct ptlrpc_request, rq_list); - list_del_init(&req->rq_list); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_lock_replay_queue)) { + req = cfs_list_entry(obd->obd_lock_replay_queue.next, + struct ptlrpc_request, rq_list); + cfs_list_del_init(&req->rq_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); } else { - spin_unlock_bh(&obd->obd_processing_task_lock); - LASSERT(list_empty(&obd->obd_lock_replay_queue)); - LASSERT(atomic_read(&obd->obd_lock_replay_clients) == 0); + cfs_spin_unlock(&obd->obd_recovery_task_lock); + LASSERT(cfs_list_empty(&obd->obd_lock_replay_queue)); + LASSERT(cfs_atomic_read(&obd->obd_lock_replay_clients) == 0); /** evict exports failed VBR */ class_disconnect_stale_exports(obd, exp_vbr_healthy); } @@ -1628,18 +1719,20 @@ static struct ptlrpc_request *target_next_final_ping(struct obd_device *obd) { struct ptlrpc_request *req = NULL; - spin_lock_bh(&obd->obd_processing_task_lock); - if (!list_empty(&obd->obd_final_req_queue)) { - req = list_entry(obd->obd_final_req_queue.next, - struct ptlrpc_request, rq_list); - list_del_init(&req->rq_list); + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (!cfs_list_empty(&obd->obd_final_req_queue)) { + req = cfs_list_entry(obd->obd_final_req_queue.next, + struct ptlrpc_request, rq_list); + cfs_list_del_init(&req->rq_list); + cfs_spin_unlock(&obd->obd_recovery_task_lock); if (req->rq_export->exp_in_recovery) { - spin_lock(&req->rq_export->exp_lock); + cfs_spin_lock(&req->rq_export->exp_lock); req->rq_export->exp_in_recovery = 0; - spin_unlock(&req->rq_export->exp_lock); + cfs_spin_unlock(&req->rq_export->exp_lock); } + } else { + cfs_spin_unlock(&obd->obd_recovery_task_lock); } - spin_unlock_bh(&obd->obd_processing_task_lock); return req; } @@ -1650,17 +1743,18 @@ static int handle_recovery_req(struct ptlrpc_thread *thread, int rc; ENTRY; - rc = lu_context_init(&req->rq_recov_session, LCT_SESSION); - if (rc) { - CERROR("Failure to initialize session: %d\n", rc); - GOTO(reqcopy_put, rc); - } /** * export can be evicted during recovery, no need to handle replays for * it after that, discard such request silently */ if (req->rq_export->exp_disconnected) + GOTO(reqcopy_put, rc = 0); + + rc = lu_context_init(&req->rq_recov_session, LCT_SESSION); + if (rc) { + CERROR("Failure to initialize session: %d\n", rc); GOTO(reqcopy_put, rc); + } req->rq_recov_session.lc_thread = thread; lu_context_enter(&req->rq_recov_session); @@ -1676,28 +1770,18 @@ static int handle_recovery_req(struct ptlrpc_thread *thread, lu_context_fini(&req->rq_recov_session); /* don't reset timer for final stage */ if (!exp_finished(req->rq_export)) { + int to = obd_timeout; + /** * Add request timeout to the recovery time so next request from * this client may come in recovery time */ - reset_recovery_timer(class_exp2obd(req->rq_export), - AT_OFF ? obd_timeout : - lustre_msg_get_timeout(req->rq_reqmsg), 1); - } - /** - * bz18031: increase next_recovery_transno before target_request_copy_put() - * will drop exp_rpc reference - */ - if (req->rq_export->exp_req_replay_needed) { - spin_lock_bh(&req->rq_export->exp_obd->obd_processing_task_lock); - req->rq_export->exp_obd->obd_next_recovery_transno++; - spin_unlock_bh(&req->rq_export->exp_obd->obd_processing_task_lock); + if (!AT_OFF) + to = lustre_msg_get_timeout(req->rq_reqmsg); + extend_recovery_timer(class_exp2obd(req->rq_export), to); } reqcopy_put: - if (req->rq_export->exp_req_replay_needed) - target_exp_dequeue_req_replay(req); - target_request_copy_put(req); - RETURN(0); + RETURN(rc); } static int target_recovery_thread(void *arg) @@ -1713,7 +1797,7 @@ static int target_recovery_thread(void *arg) int rc = 0; ENTRY; - cfs_daemonize("tgt_recov"); + cfs_daemonize_ctxt("tgt_recov"); SIGNAL_MASK_LOCK(current, flags); sigfillset(¤t->blocked); @@ -1725,14 +1809,18 @@ static int target_recovery_thread(void *arg) RETURN(rc); thread->t_env = &env; + thread->t_id = -1; /* force filter_iobuf_get/put to use local buffers */ env.le_ctx.lc_thread = thread; + thread->t_data = NULL; - CERROR("%s: started recovery thread pid %d\n", obd->obd_name, + CDEBUG(D_HA, "%s: started recovery thread pid %d\n", obd->obd_name, cfs_curproc_pid()); trd->trd_processing_task = cfs_curproc_pid(); + cfs_spin_lock(&obd->obd_dev_lock); obd->obd_recovering = 1; - complete(&trd->trd_starting); + cfs_spin_unlock(&obd->obd_dev_lock); + cfs_complete(&trd->trd_starting); /* first of all, we have to know the first transno to replay */ if (target_recovery_overseer(obd, check_for_clients, @@ -1743,9 +1831,8 @@ static int target_recovery_thread(void *arg) /* next stage: replay requests */ delta = jiffies; - obd->obd_req_replaying = 1; CDEBUG(D_INFO, "1: request replay stage - %d clients from t"LPU64"\n", - atomic_read(&obd->obd_req_replay_clients), + cfs_atomic_read(&obd->obd_req_replay_clients), obd->obd_next_recovery_transno); while ((req = target_next_replay_req(obd))) { LASSERT(trd->trd_processing_task == cfs_curproc_pid()); @@ -1754,6 +1841,15 @@ static int target_recovery_thread(void *arg) libcfs_nid2str(req->rq_peer.nid)); handle_recovery_req(thread, req, trd->trd_recovery_handler); + /** + * bz18031: increase next_recovery_transno before + * target_request_copy_put() will drop exp_rpc reference + */ + cfs_spin_lock(&obd->obd_recovery_task_lock); + obd->obd_next_recovery_transno++; + cfs_spin_unlock(&obd->obd_recovery_task_lock); + target_exp_dequeue_req_replay(req); + target_request_copy_put(req); obd->obd_replayed_requests++; } @@ -1761,13 +1857,14 @@ static int target_recovery_thread(void *arg) * The second stage: replay locks */ CDEBUG(D_INFO, "2: lock replay stage - %d clients\n", - atomic_read(&obd->obd_lock_replay_clients)); + cfs_atomic_read(&obd->obd_lock_replay_clients)); while ((req = target_next_replay_lock(obd))) { LASSERT(trd->trd_processing_task == cfs_curproc_pid()); DEBUG_REQ(D_HA, req, "processing lock from %s: ", libcfs_nid2str(req->rq_peer.nid)); handle_recovery_req(thread, req, trd->trd_recovery_handler); + target_request_copy_put(req); obd->obd_replayed_locks++; } @@ -1780,22 +1877,25 @@ static int target_recovery_thread(void *arg) lut_boot_epoch_update(lut); /* We drop recoverying flag to forward all new requests * to regular mds_handle() since now */ - spin_lock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&obd->obd_dev_lock); obd->obd_recovering = obd->obd_abort_recovery = 0; + cfs_spin_unlock(&obd->obd_dev_lock); + cfs_spin_lock(&obd->obd_recovery_task_lock); target_cancel_recovery_timer(obd); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); while ((req = target_next_final_ping(obd))) { LASSERT(trd->trd_processing_task == cfs_curproc_pid()); DEBUG_REQ(D_HA, req, "processing final ping from %s: ", libcfs_nid2str(req->rq_peer.nid)); handle_recovery_req(thread, req, trd->trd_recovery_handler); + target_request_copy_put(req); } - delta = (jiffies - delta) / HZ; + delta = (jiffies - delta) / CFS_HZ; CDEBUG(D_INFO,"4: recovery completed in %lus - %d/%d reqs/locks\n", delta, obd->obd_replayed_requests, obd->obd_replayed_locks); - if (delta > obd_timeout * OBD_RECOVERY_FACTOR) { + if (delta > OBD_RECOVERY_TIME_SOFT) { CWARN("too long recovery - read logs\n"); libcfs_debug_dumplog(); } @@ -1804,7 +1904,7 @@ static int target_recovery_thread(void *arg) lu_context_fini(&env.le_ctx); trd->trd_processing_task = 0; - complete(&trd->trd_finishing); + cfs_complete(&trd->trd_finishing); RETURN(rc); } @@ -1816,12 +1916,12 @@ static int target_start_recovery_thread(struct lu_target *lut, struct target_recovery_data *trd = &obd->obd_recovery_data; memset(trd, 0, sizeof(*trd)); - init_completion(&trd->trd_starting); - init_completion(&trd->trd_finishing); + cfs_init_completion(&trd->trd_starting); + cfs_init_completion(&trd->trd_finishing); trd->trd_recovery_handler = handler; - if (kernel_thread(target_recovery_thread, lut, 0) > 0) { - wait_for_completion(&trd->trd_starting); + if (cfs_create_thread(target_recovery_thread, lut, 0) > 0) { + cfs_wait_for_completion(&trd->trd_starting); LASSERT(obd->obd_recovering != 0); } else rc = -ECHILD; @@ -1831,19 +1931,17 @@ static int target_start_recovery_thread(struct lu_target *lut, void target_stop_recovery_thread(struct obd_device *obd) { - spin_lock_bh(&obd->obd_processing_task_lock); if (obd->obd_recovery_data.trd_processing_task > 0) { struct target_recovery_data *trd = &obd->obd_recovery_data; /** recovery can be done but postrecovery is not yet */ + cfs_spin_lock(&obd->obd_dev_lock); if (obd->obd_recovering) { CERROR("%s: Aborting recovery\n", obd->obd_name); obd->obd_abort_recovery = 1; cfs_waitq_signal(&obd->obd_next_transno_waitq); } - spin_unlock_bh(&obd->obd_processing_task_lock); - wait_for_completion(&trd->trd_finishing); - } else { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_dev_lock); + cfs_wait_for_completion(&trd->trd_finishing); } } @@ -1860,14 +1958,12 @@ static void target_recovery_expired(unsigned long castmeharder) struct obd_device *obd = (struct obd_device *)castmeharder; CDEBUG(D_HA, "%s: recovery timed out; %d clients are still in recovery" " after %lds (%d clients connected)\n", - obd->obd_name, atomic_read(&obd->obd_lock_replay_clients), + obd->obd_name, cfs_atomic_read(&obd->obd_lock_replay_clients), cfs_time_current_sec()- obd->obd_recovery_start, - obd->obd_connected_clients); + cfs_atomic_read(&obd->obd_connected_clients)); - spin_lock_bh(&obd->obd_processing_task_lock); obd->obd_recovery_expired = 1; cfs_waitq_signal(&obd->obd_next_transno_waitq); - spin_unlock_bh(&obd->obd_processing_task_lock); } void target_recovery_init(struct lu_target *lut, svc_handler_t handler) @@ -1886,9 +1982,7 @@ void target_recovery_init(struct lu_target *lut, svc_handler_t handler) obd->obd_next_recovery_transno = obd->obd_last_committed + 1; obd->obd_recovery_start = 0; obd->obd_recovery_end = 0; - obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout; - /* bz13079: this should be set to desired value for ost but not for mds */ - obd->obd_recovery_max_time = OBD_RECOVERY_MAX_TIME; + cfs_timer_init(&obd->obd_recovery_timer, target_recovery_expired, obd); target_start_recovery_thread(lut, handler); } @@ -1903,37 +1997,38 @@ static int target_process_req_flags(struct obd_device *obd, LASSERT(exp != NULL); if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REQ_REPLAY_DONE) { /* client declares he's ready to replay locks */ - spin_lock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&exp->exp_lock); if (exp->exp_req_replay_needed) { - LASSERT(atomic_read(&obd->obd_req_replay_clients) > 0); - spin_lock(&exp->exp_lock); exp->exp_req_replay_needed = 0; - spin_unlock(&exp->exp_lock); - atomic_dec(&obd->obd_req_replay_clients); + cfs_spin_unlock(&exp->exp_lock); + + LASSERT_ATOMIC_POS(&obd->obd_req_replay_clients); + cfs_atomic_dec(&obd->obd_req_replay_clients); + } else { + cfs_spin_unlock(&exp->exp_lock); } - spin_unlock_bh(&obd->obd_processing_task_lock); } if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_LOCK_REPLAY_DONE) { /* client declares he's ready to complete recovery * so, we put the request on th final queue */ - spin_lock_bh(&obd->obd_processing_task_lock); + cfs_spin_lock(&exp->exp_lock); if (exp->exp_lock_replay_needed) { - LASSERT(atomic_read(&obd->obd_lock_replay_clients) > 0); - spin_lock(&exp->exp_lock); exp->exp_lock_replay_needed = 0; - spin_unlock(&exp->exp_lock); - atomic_dec(&obd->obd_lock_replay_clients); + cfs_spin_unlock(&exp->exp_lock); + + LASSERT_ATOMIC_POS(&obd->obd_lock_replay_clients); + cfs_atomic_dec(&obd->obd_lock_replay_clients); + } else { + cfs_spin_unlock(&exp->exp_lock); } - spin_unlock_bh(&obd->obd_processing_task_lock); } - return 0; } int target_queue_recovery_request(struct ptlrpc_request *req, struct obd_device *obd) { - struct list_head *tmp; + cfs_list_t *tmp; int inserted = 0; __u64 transno = lustre_msg_get_transno(req->rq_reqmsg); ENTRY; @@ -1950,34 +2045,35 @@ int target_queue_recovery_request(struct ptlrpc_request *req, * so, we put the request on th final queue */ target_request_copy_get(req); DEBUG_REQ(D_HA, req, "queue final req"); - spin_lock_bh(&obd->obd_processing_task_lock); cfs_waitq_signal(&obd->obd_next_transno_waitq); + cfs_spin_lock(&obd->obd_recovery_task_lock); if (obd->obd_recovering) { - list_add_tail(&req->rq_list, &obd->obd_final_req_queue); + cfs_list_add_tail(&req->rq_list, + &obd->obd_final_req_queue); } else { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); target_request_copy_put(req); RETURN(obd->obd_stopping ? -ENOTCONN : 1); } - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); RETURN(0); } if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REQ_REPLAY_DONE) { /* client declares he's ready to replay locks */ target_request_copy_get(req); DEBUG_REQ(D_HA, req, "queue lock replay req"); - spin_lock_bh(&obd->obd_processing_task_lock); cfs_waitq_signal(&obd->obd_next_transno_waitq); + cfs_spin_lock(&obd->obd_recovery_task_lock); LASSERT(obd->obd_recovering); /* usually due to recovery abort */ if (!req->rq_export->exp_in_recovery) { - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); target_request_copy_put(req); RETURN(-ENOTCONN); } LASSERT(req->rq_export->exp_lock_replay_needed); - list_add_tail(&req->rq_list, &obd->obd_lock_replay_queue); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_list_add_tail(&req->rq_list, &obd->obd_lock_replay_queue); + cfs_spin_unlock(&obd->obd_recovery_task_lock); RETURN(0); } @@ -1991,8 +2087,6 @@ int target_queue_recovery_request(struct ptlrpc_request *req, RETURN(1); } - spin_lock_bh(&obd->obd_processing_task_lock); - /* If we're processing the queue, we want don't want to queue this * message. * @@ -2003,43 +2097,42 @@ int target_queue_recovery_request(struct ptlrpc_request *req, * Also, a resent, replayed request that has already been * handled will pass through here and be processed immediately. */ - CWARN("Next recovery transno: "LPU64", current: "LPU64", replaying: %i\n", - obd->obd_next_recovery_transno, transno, obd->obd_req_replaying); - if (transno < obd->obd_next_recovery_transno && obd->obd_req_replaying) { + CWARN("Next recovery transno: "LPU64", current: "LPU64", replaying\n", + obd->obd_next_recovery_transno, transno); + cfs_spin_lock(&obd->obd_recovery_task_lock); + if (transno < obd->obd_next_recovery_transno) { /* Processing the queue right now, don't re-add. */ - LASSERT(list_empty(&req->rq_list)); - spin_unlock_bh(&obd->obd_processing_task_lock); + LASSERT(cfs_list_empty(&req->rq_list)); + cfs_spin_unlock(&obd->obd_recovery_task_lock); RETURN(1); } - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); if (OBD_FAIL_CHECK(OBD_FAIL_TGT_REPLAY_DROP)) RETURN(0); target_request_copy_get(req); - spin_lock_bh(&obd->obd_processing_task_lock); - LASSERT(obd->obd_recovering); if (!req->rq_export->exp_in_recovery) { - spin_unlock_bh(&obd->obd_processing_task_lock); target_request_copy_put(req); RETURN(-ENOTCONN); } LASSERT(req->rq_export->exp_req_replay_needed); if (target_exp_enqueue_req_replay(req)) { - spin_unlock_bh(&obd->obd_processing_task_lock); DEBUG_REQ(D_ERROR, req, "dropping resent queued req"); target_request_copy_put(req); RETURN(0); } /* XXX O(n^2) */ - list_for_each(tmp, &obd->obd_req_replay_queue) { + cfs_spin_lock(&obd->obd_recovery_task_lock); + LASSERT(obd->obd_recovering); + cfs_list_for_each(tmp, &obd->obd_req_replay_queue) { struct ptlrpc_request *reqiter = - list_entry(tmp, struct ptlrpc_request, rq_list); + cfs_list_entry(tmp, struct ptlrpc_request, rq_list); if (lustre_msg_get_transno(reqiter->rq_reqmsg) > transno) { - list_add_tail(&req->rq_list, &reqiter->rq_list); + cfs_list_add_tail(&req->rq_list, &reqiter->rq_list); inserted = 1; break; } @@ -2048,7 +2141,7 @@ int target_queue_recovery_request(struct ptlrpc_request *req, transno)) { DEBUG_REQ(D_ERROR, req, "dropping replay: transno " "has been claimed by another client"); - spin_unlock_bh(&obd->obd_processing_task_lock); + cfs_spin_unlock(&obd->obd_recovery_task_lock); target_exp_dequeue_req_replay(req); target_request_copy_put(req); RETURN(0); @@ -2056,11 +2149,11 @@ int target_queue_recovery_request(struct ptlrpc_request *req, } if (!inserted) - list_add_tail(&req->rq_list, &obd->obd_req_replay_queue); + cfs_list_add_tail(&req->rq_list, &obd->obd_req_replay_queue); obd->obd_requests_queued_for_recovery++; + cfs_spin_unlock(&obd->obd_recovery_task_lock); cfs_waitq_signal(&obd->obd_next_transno_waitq); - spin_unlock_bh(&obd->obd_processing_task_lock); RETURN(0); } @@ -2088,10 +2181,10 @@ int target_pack_pool_reply(struct ptlrpc_request *req) */ obd = req->rq_export->exp_obd; - read_lock(&obd->obd_pool_lock); + cfs_read_lock(&obd->obd_pool_lock); lustre_msg_set_slv(req->rq_repmsg, obd->obd_pool_slv); lustre_msg_set_limit(req->rq_repmsg, obd->obd_pool_limit); - read_unlock(&obd->obd_pool_lock); + cfs_read_unlock(&obd->obd_pool_lock); RETURN(0); } @@ -2148,8 +2241,8 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) LASSERT (!rs->rs_handled); LASSERT (!rs->rs_on_net); LASSERT (rs->rs_export == NULL); - LASSERT (list_empty(&rs->rs_obd_list)); - LASSERT (list_empty(&rs->rs_exp_list)); + LASSERT (cfs_list_empty(&rs->rs_obd_list)); + LASSERT (cfs_list_empty(&rs->rs_exp_list)); exp = class_export_get (req->rq_export); obd = exp->exp_obd; @@ -2162,25 +2255,25 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) rs->rs_export = exp; rs->rs_opc = lustre_msg_get_opc(rs->rs_msg); - spin_lock(&exp->exp_uncommitted_replies_lock); + cfs_spin_lock(&exp->exp_uncommitted_replies_lock); CDEBUG(D_NET, "rs transno = "LPU64", last committed = "LPU64"\n", rs->rs_transno, exp->exp_last_committed); if (rs->rs_transno > exp->exp_last_committed) { /* not committed already */ - list_add_tail(&rs->rs_obd_list, - &exp->exp_uncommitted_replies); + cfs_list_add_tail(&rs->rs_obd_list, + &exp->exp_uncommitted_replies); } - spin_unlock (&exp->exp_uncommitted_replies_lock); + cfs_spin_unlock (&exp->exp_uncommitted_replies_lock); - spin_lock(&exp->exp_lock); - list_add_tail(&rs->rs_exp_list, &exp->exp_outstanding_replies); - spin_unlock(&exp->exp_lock); + cfs_spin_lock(&exp->exp_lock); + cfs_list_add_tail(&rs->rs_exp_list, &exp->exp_outstanding_replies); + cfs_spin_unlock(&exp->exp_lock); netrc = target_send_reply_msg (req, rc, fail_id); - spin_lock(&svc->srv_lock); + cfs_spin_lock(&svc->srv_rs_lock); - atomic_inc(&svc->srv_n_difficult_replies); + cfs_atomic_inc(&svc->srv_n_difficult_replies); if (netrc != 0) { /* error sending: reply is off the net. Also we need +1 @@ -2190,22 +2283,21 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) * reply_out_callback leaves alone) */ rs->rs_on_net = 0; ptlrpc_rs_addref(rs); - atomic_inc (&svc->srv_outstanding_replies); } - spin_lock(&rs->rs_lock); + cfs_spin_lock(&rs->rs_lock); if (rs->rs_transno <= exp->exp_last_committed || (!rs->rs_on_net && !rs->rs_no_ack) || - list_empty(&rs->rs_exp_list) || /* completed already */ - list_empty(&rs->rs_obd_list)) { + cfs_list_empty(&rs->rs_exp_list) || /* completed already */ + cfs_list_empty(&rs->rs_obd_list)) { CDEBUG(D_HA, "Schedule reply immediately\n"); ptlrpc_dispatch_difficult_reply(rs); } else { - list_add (&rs->rs_list, &svc->srv_active_replies); + cfs_list_add (&rs->rs_list, &svc->srv_active_replies); rs->rs_scheduled = 0; /* allow notifier to schedule */ } - spin_unlock(&rs->rs_lock); - spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&rs->rs_lock); + cfs_spin_unlock(&svc->srv_rs_lock); EXIT; } @@ -2253,7 +2345,7 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req) { #ifdef __KERNEL__ struct obd_device *obd = req->rq_export->exp_obd; - struct obd_device *master_obd; + struct obd_device *master_obd = NULL, *lov_obd = NULL; struct obd_device_target *obt; struct lustre_quota_ctxt *qctxt; struct qunit_data *qdata = NULL; @@ -2280,13 +2372,13 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req) } /* we use the observer */ - if (!obd->obd_observer || !obd->obd_observer->obd_observer) { + if (obd_pin_observer(obd, &lov_obd) || + obd_pin_observer(lov_obd, &master_obd)) { CERROR("Can't find the observer, it is recovering\n"); req->rq_status = -EAGAIN; GOTO(out, rc); } - master_obd = obd->obd_observer->obd_observer; obt = &master_obd->u.obt; qctxt = &obt->obt_qctxt; @@ -2300,9 +2392,9 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req) GOTO(out, rc); } - down_read(&obt->obt_rwsem); + cfs_down_read(&obt->obt_rwsem); if (qctxt->lqc_lqs_hash == NULL) { - up_read(&obt->obt_rwsem); + cfs_up_read(&obt->obt_rwsem); /* quota_type has not been processed yet, return EAGAIN * until we know whether or not quotas are supposed to * be enabled */ @@ -2315,7 +2407,7 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req) LASSERT(qctxt->lqc_handler); rc = qctxt->lqc_handler(master_obd, qdata, lustre_msg_get_opc(req->rq_reqmsg)); - up_read(&obt->obt_rwsem); + cfs_up_read(&obt->obt_rwsem); if (rc && rc != -EDQUOT) CDEBUG(rc == -EBUSY ? D_QUOTA : D_ERROR, "dqacq/dqrel failed! (rc:%d)\n", rc); @@ -2332,6 +2424,11 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req) EXIT; out: + if (master_obd) + obd_unpin_observer(lov_obd); + if (lov_obd) + obd_unpin_observer(obd); + rc = ptlrpc_reply(req); return rc; #else @@ -2340,53 +2437,6 @@ out: } #endif /* HAVE_QUOTA_SUPPORT */ -/* Send a remote set_info_async. - * This may go from client to server or server to client - */ -int target_set_info_rpc(struct obd_import *imp, int opcode, - obd_count keylen, void *key, - obd_count vallen, void *val, - struct ptlrpc_request_set *set) -{ - struct ptlrpc_request *req; - char *tmp; - int rc; - ENTRY; - - 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); - rc = ptlrpc_request_pack(req, LUSTRE_OBD_VERSION, opcode); - 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); - - if (set) { - ptlrpc_set_add_req(set, req); - ptlrpc_check_set(NULL, set); - } else { - rc = ptlrpc_queue_wait(req); - ptlrpc_req_finished(req); - } - - RETURN(rc); -} -EXPORT_SYMBOL(target_set_info_rpc); - - ldlm_mode_t lck_compat_array[] = { [LCK_EX] LCK_COMPAT_EX, [LCK_PW] LCK_COMPAT_PW, @@ -2432,7 +2482,7 @@ int ldlm_error2errno(ldlm_error_t error) if (((int)error) < 0) /* cast to signed type */ result = error; /* as ldlm_error_t can be unsigned */ else { - CERROR("Invalid DLM result code: %i\n", error); + CERROR("Invalid DLM result code: %d\n", error); result = -EPROTO; } } @@ -2479,15 +2529,119 @@ EXPORT_SYMBOL(ldlm_errno2error); #if LUSTRE_TRACKS_LOCK_EXP_REFS void ldlm_dump_export_locks(struct obd_export *exp) { - spin_lock(&exp->exp_locks_list_guard); - if (!list_empty(&exp->exp_locks_list)) { + cfs_spin_lock(&exp->exp_locks_list_guard); + if (!cfs_list_empty(&exp->exp_locks_list)) { struct ldlm_lock *lock; CERROR("dumping locks for export %p," "ignore if the unmount doesn't hang\n", exp); - list_for_each_entry(lock, &exp->exp_locks_list, l_exp_refs_link) + cfs_list_for_each_entry(lock, &exp->exp_locks_list, l_exp_refs_link) ldlm_lock_dump(D_ERROR, lock, 0); } - spin_unlock(&exp->exp_locks_list_guard); + cfs_spin_unlock(&exp->exp_locks_list_guard); } #endif + +static int target_bulk_timeout(void *data) +{ + ENTRY; + /* We don't fail the connection here, because having the export + * killed makes the (vital) call to commitrw very sad. + */ + RETURN(1); +} + +static inline char *bulk2type(struct ptlrpc_bulk_desc *desc) +{ + return desc->bd_type == BULK_GET_SINK ? "GET" : "PUT"; +} + +int target_bulk_io(struct obd_export *exp, struct ptlrpc_bulk_desc *desc, + struct l_wait_info *lwi) +{ + struct ptlrpc_request *req = desc->bd_req; + int rc = 0; + ENTRY; + + /* Check if there is eviction in progress, and if so, wait for + * it to finish */ + if (unlikely(cfs_atomic_read(&exp->exp_obd->obd_evict_inprogress))) { + *lwi = LWI_INTR(NULL, NULL); + rc = l_wait_event(exp->exp_obd->obd_evict_inprogress_waitq, + !cfs_atomic_read(&exp->exp_obd-> + obd_evict_inprogress), + lwi); + } + + /* Check if client was evicted or tried to reconnect already */ + if (exp->exp_failed || exp->exp_abort_active_req) { + rc = -ENOTCONN; + } else { + if (desc->bd_type == BULK_PUT_SINK) + rc = sptlrpc_svc_wrap_bulk(req, desc); + if (rc == 0) + rc = ptlrpc_start_bulk_transfer(desc); + } + + if (rc == 0 && OBD_FAIL_CHECK(OBD_FAIL_MDS_SENDPAGE)) { + ptlrpc_abort_bulk(desc); + } else if (rc == 0) { + time_t start = cfs_time_current_sec(); + do { + long timeoutl = req->rq_deadline - cfs_time_current_sec(); + cfs_duration_t timeout = timeoutl <= 0 ? + CFS_TICK : cfs_time_seconds(timeoutl); + *lwi = LWI_TIMEOUT_INTERVAL(timeout, + cfs_time_seconds(1), + target_bulk_timeout, + desc); + rc = l_wait_event(desc->bd_waitq, + !ptlrpc_server_bulk_active(desc) || + exp->exp_failed || + exp->exp_abort_active_req, + lwi); + LASSERT(rc == 0 || rc == -ETIMEDOUT); + /* Wait again if we changed deadline */ + } while ((rc == -ETIMEDOUT) && + (req->rq_deadline > cfs_time_current_sec())); + + if (rc == -ETIMEDOUT) { + DEBUG_REQ(D_ERROR, req, + "timeout on bulk %s after %ld%+lds", + bulk2type(desc), + req->rq_deadline - start, + cfs_time_current_sec() - + req->rq_deadline); + ptlrpc_abort_bulk(desc); + } else if (exp->exp_failed) { + DEBUG_REQ(D_ERROR, req, "Eviction on bulk %s", + bulk2type(desc)); + rc = -ENOTCONN; + ptlrpc_abort_bulk(desc); + } else if (exp->exp_abort_active_req) { + DEBUG_REQ(D_ERROR, req, "Reconnect on bulk %s", + bulk2type(desc)); + /* we don't reply anyway */ + rc = -ETIMEDOUT; + ptlrpc_abort_bulk(desc); + } else if (!desc->bd_success || + desc->bd_nob_transferred != desc->bd_nob) { + DEBUG_REQ(D_ERROR, req, "%s bulk %s %d(%d)", + desc->bd_success ? + "truncated" : "network error on", + bulk2type(desc), + desc->bd_nob_transferred, + desc->bd_nob); + /* XXX should this be a different errno? */ + rc = -ETIMEDOUT; + } else if (desc->bd_type == BULK_GET_SINK) { + rc = sptlrpc_svc_unwrap_bulk(req, desc); + } + } else { + DEBUG_REQ(D_ERROR, req, "bulk %s failed: rc %d", + bulk2type(desc), rc); + } + + RETURN(rc); +} +EXPORT_SYMBOL(target_bulk_io);