X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fclient.c;h=39d704929b293062caff27cf36c8f86f2dc3b157;hp=0cbcff24c383875907772a8a2366f423a8c2a294;hb=0cb008aa46d283c03aeae79fd3ab36c828da2174;hpb=5ba5b49768995332e0c94ba70ae4d65aaa2f9972 diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index 0cbcff2..39d7049 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -1,23 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_RPC @@ -27,11 +41,12 @@ #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "ptlrpc_internal.h" @@ -46,16 +61,17 @@ void ptlrpc_init_client(int req_portal, int rep_portal, char *name, struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid) { struct ptlrpc_connection *c; - struct ptlrpc_peer peer; - int err; + lnet_nid_t self; + lnet_process_id_t peer; + int err; - err = ptlrpc_uuid_to_peer(uuid, &peer); + err = ptlrpc_uuid_to_peer(uuid, &peer, &self); if (err != 0) { CERROR("cannot find peer %s!\n", uuid->uuid); return NULL; } - c = ptlrpc_get_connection(&peer, uuid); + c = ptlrpc_connection_get(peer, self, uuid); if (c) { memcpy(c->c_remote_uuid.uuid, uuid->uuid, sizeof(c->c_remote_uuid.uuid)); @@ -66,22 +82,6 @@ struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid) return c; } -void ptlrpc_readdress_connection(struct ptlrpc_connection *conn, - struct obd_uuid *uuid) -{ - struct ptlrpc_peer peer; - int err; - - err = ptlrpc_uuid_to_peer(uuid, &peer); - if (err != 0) { - CERROR("cannot find peer %s!\n", uuid->uuid); - return; - } - - memcpy(&conn->c_peer, &peer, sizeof (peer)); - return; -} - static inline struct ptlrpc_bulk_desc *new_bulk(int npages, int type, int portal) { struct ptlrpc_bulk_desc *desc; @@ -91,13 +91,13 @@ static inline struct ptlrpc_bulk_desc *new_bulk(int npages, int type, int portal return NULL; spin_lock_init(&desc->bd_lock); - init_waitqueue_head(&desc->bd_waitq); + cfs_waitq_init(&desc->bd_waitq); desc->bd_max_iov = npages; desc->bd_iov_count = 0; - desc->bd_md_h = PTL_INVALID_HANDLE; + LNetInvalidateHandle(&desc->bd_md_h); desc->bd_portal = portal; desc->bd_type = type; - + return desc; } @@ -107,6 +107,7 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp (struct ptlrpc_request *req, struct obd_import *imp = req->rq_import; struct ptlrpc_bulk_desc *desc; + ENTRY; LASSERT(type == BULK_PUT_SINK || type == BULK_GET_SOURCE); desc = new_bulk(npages, type, portal); if (desc == NULL) @@ -125,12 +126,13 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp (struct ptlrpc_request *req, return desc; } -struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp (struct ptlrpc_request *req, - int npages, int type, int portal) +struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp(struct ptlrpc_request *req, + int npages, int type, int portal) { struct obd_export *exp = req->rq_export; struct ptlrpc_bulk_desc *desc; + ENTRY; LASSERT(type == BULK_PUT_SOURCE || type == BULK_GET_SINK); desc = new_bulk(npages, type, portal); @@ -150,13 +152,13 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_exp (struct ptlrpc_request *req, } void ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc, - struct page *page, int pageoffset, int len) + cfs_page_t *page, int pageoffset, int len) { LASSERT(desc->bd_iov_count < desc->bd_max_iov); LASSERT(page != NULL); LASSERT(pageoffset >= 0); LASSERT(len > 0); - LASSERT(pageoffset + len <= PAGE_SIZE); + LASSERT(pageoffset + len <= CFS_PAGE_SIZE); desc->bd_nob += len; @@ -168,87 +170,523 @@ void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc) ENTRY; LASSERT(desc != NULL); - LASSERT(desc->bd_iov_count != 0x5a5a5a5a); /* not freed already */ + LASSERT(desc->bd_iov_count != LI_POISON); /* not freed already */ LASSERT(!desc->bd_network_rw); /* network hands off or */ LASSERT((desc->bd_export != NULL) ^ (desc->bd_import != NULL)); + + sptlrpc_enc_pool_put_pages(desc); + if (desc->bd_export) class_export_put(desc->bd_export); else class_import_put(desc->bd_import); - OBD_FREE(desc, offsetof(struct ptlrpc_bulk_desc, + OBD_FREE(desc, offsetof(struct ptlrpc_bulk_desc, bd_iov[desc->bd_max_iov])); EXIT; } -struct ptlrpc_request *ptlrpc_prep_req(struct obd_import *imp, int opcode, - int count, int *lengths, char **bufs) +/* Set server timelimit for this req */ +void ptlrpc_at_set_req_timeout(struct ptlrpc_request *req) +{ + __u32 serv_est; + int idx; + struct imp_at *at; + + LASSERT(req->rq_import); + + if (AT_OFF) { + /* non-AT settings */ + req->rq_timeout = req->rq_import->imp_server_timeout ? + obd_timeout / 2 : obd_timeout; + lustre_msg_set_timeout(req->rq_reqmsg, req->rq_timeout); + return; + } + + at = &req->rq_import->imp_at; + idx = import_at_get_index(req->rq_import, + req->rq_request_portal); + serv_est = at_get(&at->iat_service_estimate[idx]); + /* add an arbitrary minimum: 125% +5 sec */ + req->rq_timeout = serv_est + (serv_est >> 2) + 5; + /* We could get even fancier here, using history to predict increased + loading... */ + + /* Let the server know what this RPC timeout is by putting it in the + reqmsg*/ + lustre_msg_set_timeout(req->rq_reqmsg, req->rq_timeout); +} + +/* Adjust max service estimate based on server value */ +static void ptlrpc_at_adj_service(struct ptlrpc_request *req, + unsigned int serv_est) +{ + int idx; + unsigned int oldse; + struct imp_at *at; + + LASSERT(req->rq_import); + at = &req->rq_import->imp_at; + + idx = import_at_get_index(req->rq_import, req->rq_request_portal); + /* max service estimates are tracked on the server side, + so just keep minimal history here */ + oldse = at_add(&at->iat_service_estimate[idx], serv_est); + if (oldse != 0) + CDEBUG(D_ADAPTTO, "The RPC service estimate for %s ptl %d " + "has changed from %d to %d\n", + req->rq_import->imp_obd->obd_name,req->rq_request_portal, + oldse, at_get(&at->iat_service_estimate[idx])); +} + +/* Expected network latency per remote node (secs) */ +int ptlrpc_at_get_net_latency(struct ptlrpc_request *req) +{ + return AT_OFF ? 0 : at_get(&req->rq_import->imp_at.iat_net_latency); +} + +/* Adjust expected network latency */ +static void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req, + unsigned int service_time) +{ + unsigned int nl, oldnl; + struct imp_at *at; + time_t now = cfs_time_current_sec(); + + LASSERT(req->rq_import); + at = &req->rq_import->imp_at; + + /* Network latency is total time less server processing time */ + nl = max_t(int, now - req->rq_sent - service_time, 0) +1/*st rounding*/; + if (service_time > now - req->rq_sent + 3 /* bz16408 */) + CWARN("Reported service time %u > total measured time " + CFS_DURATION_T"\n", service_time, + cfs_time_sub(now, req->rq_sent)); + + oldnl = at_add(&at->iat_net_latency, nl); + if (oldnl != 0) + CDEBUG(D_ADAPTTO, "The network latency for %s (nid %s) " + "has changed from %d to %d\n", + req->rq_import->imp_obd->obd_name, + obd_uuid2str( + &req->rq_import->imp_connection->c_remote_uuid), + oldnl, at_get(&at->iat_net_latency)); +} + +static int unpack_reply(struct ptlrpc_request *req) { - struct ptlrpc_request *request; int rc; + + /* Clear reply swab mask; we may have already swabbed an early reply */ + req->rq_rep_swab_mask = 0; + + rc = lustre_unpack_msg(req->rq_repmsg, req->rq_replen); + if (rc) { + DEBUG_REQ(D_ERROR, req, "unpack_rep failed: %d", rc); + return(-EPROTO); + } + + rc = lustre_unpack_rep_ptlrpc_body(req, MSG_PTLRPC_BODY_OFF); + if (rc) { + DEBUG_REQ(D_ERROR, req, "unpack ptlrpc body failed: %d", rc); + return(-EPROTO); + } + return 0; +} + +/* + * Handle an early reply message, called with the rq_lock held. + * If anything goes wrong just ignore it - same as if it never happened + */ +static int ptlrpc_at_recv_early_reply(struct ptlrpc_request *req) +{ + struct ptlrpc_request *early_req; + time_t olddl; + int rc; ENTRY; - LASSERT((unsigned long)imp > 0x1000); + req->rq_early = 0; + spin_unlock(&req->rq_lock); - OBD_ALLOC(request, sizeof(*request)); - if (!request) { - CERROR("request allocation out of memory\n"); - RETURN(NULL); + rc = sptlrpc_cli_unwrap_early_reply(req, &early_req); + if (rc) { + spin_lock(&req->rq_lock); + RETURN(rc); + } + + rc = unpack_reply(early_req); + if (rc == 0) { + /* Expecting to increase the service time estimate here */ + ptlrpc_at_adj_service(req, + lustre_msg_get_timeout(early_req->rq_repmsg)); + ptlrpc_at_adj_net_latency(req, + lustre_msg_get_service_time(early_req->rq_repmsg)); } - rc = lustre_pack_request(request, count, lengths, bufs); + sptlrpc_cli_finish_early_reply(early_req); + + spin_lock(&req->rq_lock); + + if (rc == 0) { + /* Adjust the local timeout for this req */ + ptlrpc_at_set_req_timeout(req); + + olddl = req->rq_deadline; + /* server assumes it now has rq_timeout from when it sent the + early reply, so client should give it at least that long. */ + req->rq_deadline = cfs_time_current_sec() + req->rq_timeout + + ptlrpc_at_get_net_latency(req); + + DEBUG_REQ(D_ADAPTTO, req, + "Early reply #%d, new deadline in "CFS_DURATION_T"s " + "("CFS_DURATION_T"s)", req->rq_early_count, + cfs_time_sub(req->rq_deadline, + cfs_time_current_sec()), + cfs_time_sub(req->rq_deadline, olddl)); + } + + RETURN(rc); +} + +void ptlrpc_free_rq_pool(struct ptlrpc_request_pool *pool) +{ + struct list_head *l, *tmp; + struct ptlrpc_request *req; + + if (!pool) + return; + + list_for_each_safe(l, tmp, &pool->prp_req_list) { + req = list_entry(l, struct ptlrpc_request, rq_list); + list_del(&req->rq_list); + LASSERT(req->rq_reqbuf); + LASSERT(req->rq_reqbuf_len == pool->prp_rq_size); + OBD_FREE(req->rq_reqbuf, pool->prp_rq_size); + OBD_FREE(req, sizeof(*req)); + } + OBD_FREE(pool, sizeof(*pool)); +} + +void ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq) +{ + int i; + int size = 1; + + while (size < pool->prp_rq_size + SPTLRPC_MAX_PAYLOAD) + size <<= 1; + + LASSERTF(list_empty(&pool->prp_req_list) || size == pool->prp_rq_size, + "Trying to change pool size with nonempty pool " + "from %d to %d bytes\n", pool->prp_rq_size, size); + + spin_lock(&pool->prp_lock); + pool->prp_rq_size = size; + for (i = 0; i < num_rq; i++) { + struct ptlrpc_request *req; + struct lustre_msg *msg; + + spin_unlock(&pool->prp_lock); + OBD_ALLOC(req, sizeof(struct ptlrpc_request)); + if (!req) + return; + OBD_ALLOC_GFP(msg, size, CFS_ALLOC_STD); + if (!msg) { + OBD_FREE(req, sizeof(struct ptlrpc_request)); + return; + } + req->rq_reqbuf = msg; + req->rq_reqbuf_len = size; + req->rq_pool = pool; + spin_lock(&pool->prp_lock); + list_add_tail(&req->rq_list, &pool->prp_req_list); + } + spin_unlock(&pool->prp_lock); + return; +} + +struct ptlrpc_request_pool *ptlrpc_init_rq_pool(int num_rq, int msgsize, + void (*populate_pool)(struct ptlrpc_request_pool *, int)) +{ + struct ptlrpc_request_pool *pool; + + OBD_ALLOC(pool, sizeof (struct ptlrpc_request_pool)); + if (!pool) + return NULL; + + /* Request next power of two for the allocation, because internally + kernel would do exactly this */ + + spin_lock_init(&pool->prp_lock); + CFS_INIT_LIST_HEAD(&pool->prp_req_list); + pool->prp_rq_size = msgsize; + pool->prp_populate = populate_pool; + + populate_pool(pool, num_rq); + + if (list_empty(&pool->prp_req_list)) { + /* have not allocated a single request for the pool */ + OBD_FREE(pool, sizeof (struct ptlrpc_request_pool)); + pool = NULL; + } + return pool; +} + +static struct ptlrpc_request *ptlrpc_prep_req_from_pool(struct ptlrpc_request_pool *pool) +{ + struct ptlrpc_request *request; + struct lustre_msg *reqbuf; + + if (!pool) + return NULL; + + spin_lock(&pool->prp_lock); + + /* See if we have anything in a pool, and bail out if nothing, + * in writeout path, where this matters, this is safe to do, because + * nothing is lost in this case, and when some in-flight requests + * complete, this code will be called again. */ + if (unlikely(list_empty(&pool->prp_req_list))) { + spin_unlock(&pool->prp_lock); + return NULL; + } + + request = list_entry(pool->prp_req_list.next, struct ptlrpc_request, + rq_list); + list_del(&request->rq_list); + spin_unlock(&pool->prp_lock); + + LASSERT(request->rq_reqbuf); + LASSERT(request->rq_pool); + + reqbuf = request->rq_reqbuf; + memset(request, 0, sizeof(*request)); + request->rq_reqbuf = reqbuf; + request->rq_reqbuf_len = pool->prp_rq_size; + request->rq_pool = pool; + + return request; +} + +static void __ptlrpc_free_req_to_pool(struct ptlrpc_request *request) +{ + struct ptlrpc_request_pool *pool = request->rq_pool; + + spin_lock(&pool->prp_lock); + LASSERT(list_empty(&request->rq_list)); + list_add_tail(&request->rq_list, &pool->prp_req_list); + spin_unlock(&pool->prp_lock); +} + +static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request, + __u32 version, int opcode, + int count, __u32 *lengths, char **bufs, + struct ptlrpc_cli_ctx *ctx) +{ + struct obd_import *imp = request->rq_import; + int rc; + ENTRY; + + if (unlikely(ctx)) + request->rq_cli_ctx = sptlrpc_cli_ctx_get(ctx); + else { + rc = sptlrpc_req_get_ctx(request); + if (rc) + GOTO(out_free, rc); + } + + sptlrpc_req_set_flavor(request, opcode); + + rc = lustre_pack_request(request, imp->imp_msg_magic, count, + lengths, bufs); if (rc) { - CERROR("cannot pack request %d\n", rc); - OBD_FREE(request, sizeof(*request)); - RETURN(NULL); + LASSERT(!request->rq_pool); + GOTO(out_ctx, rc); } - if (imp->imp_server_timeout) - request->rq_timeout = obd_timeout / 2; - else - request->rq_timeout = obd_timeout; + lustre_msg_add_version(request->rq_reqmsg, version); request->rq_send_state = LUSTRE_IMP_FULL; request->rq_type = PTL_RPC_MSG_REQUEST; - request->rq_import = class_import_get(imp); + request->rq_export = NULL; request->rq_req_cbid.cbid_fn = request_out_callback; request->rq_req_cbid.cbid_arg = request; request->rq_reply_cbid.cbid_fn = reply_in_callback; request->rq_reply_cbid.cbid_arg = request; - + request->rq_phase = RQ_PHASE_NEW; - /* XXX FIXME bug 249 */ request->rq_request_portal = imp->imp_client->cli_request_portal; request->rq_reply_portal = imp->imp_client->cli_reply_portal; + ptlrpc_at_set_req_timeout(request); + spin_lock_init(&request->rq_lock); - INIT_LIST_HEAD(&request->rq_list); - INIT_LIST_HEAD(&request->rq_replay_list); - INIT_LIST_HEAD(&request->rq_set_chain); - init_waitqueue_head(&request->rq_reply_waitq); + CFS_INIT_LIST_HEAD(&request->rq_list); + CFS_INIT_LIST_HEAD(&request->rq_timed_list); + CFS_INIT_LIST_HEAD(&request->rq_replay_list); + CFS_INIT_LIST_HEAD(&request->rq_mod_list); + CFS_INIT_LIST_HEAD(&request->rq_ctx_chain); + CFS_INIT_LIST_HEAD(&request->rq_set_chain); + CFS_INIT_LIST_HEAD(&request->rq_history_list); + cfs_waitq_init(&request->rq_reply_waitq); request->rq_xid = ptlrpc_next_xid(); atomic_set(&request->rq_refcount, 1); - request->rq_reqmsg->opc = opcode; - request->rq_reqmsg->flags = 0; + lustre_msg_set_opc(request->rq_reqmsg, opcode); - RETURN(request); + RETURN(0); +out_ctx: + sptlrpc_cli_ctx_put(request->rq_cli_ctx, 1); +out_free: + class_import_put(imp); + return rc; +} + +int ptlrpc_request_bufs_pack(struct ptlrpc_request *request, + __u32 version, int opcode, char **bufs, + struct ptlrpc_cli_ctx *ctx) +{ + int count; + + count = req_capsule_filled_sizes(&request->rq_pill, RCL_CLIENT); + return __ptlrpc_request_bufs_pack(request, version, opcode, count, + request->rq_pill.rc_area[RCL_CLIENT], + bufs, ctx); +} +EXPORT_SYMBOL(ptlrpc_request_bufs_pack); + +int ptlrpc_request_pack(struct ptlrpc_request *request, + __u32 version, int opcode) +{ + return ptlrpc_request_bufs_pack(request, version, opcode, NULL, NULL); +} + +static inline +struct ptlrpc_request *__ptlrpc_request_alloc(struct obd_import *imp, + struct ptlrpc_request_pool *pool) +{ + struct ptlrpc_request *request = NULL; + + if (pool) + request = ptlrpc_prep_req_from_pool(pool); + + if (!request) + OBD_ALLOC_PTR(request); + + if (request) { + LASSERTF((unsigned long)imp > 0x1000, "%p", imp); + LASSERT(imp != LP_POISON); + LASSERTF((unsigned long)imp->imp_client > 0x1000, "%p", + imp->imp_client); + LASSERT(imp->imp_client != LP_POISON); + + request->rq_import = class_import_get(imp); + } else { + CERROR("request allocation out of memory\n"); + } + + return request; +} + +static struct ptlrpc_request * +ptlrpc_request_alloc_internal(struct obd_import *imp, + struct ptlrpc_request_pool * pool, + const struct req_format *format) +{ + struct ptlrpc_request *request; + + request = __ptlrpc_request_alloc(imp, pool); + if (request == NULL) + return NULL; + + req_capsule_init(&request->rq_pill, request, RCL_CLIENT); + req_capsule_set(&request->rq_pill, format); + return request; +} + +struct ptlrpc_request *ptlrpc_request_alloc(struct obd_import *imp, + const struct req_format *format) +{ + return ptlrpc_request_alloc_internal(imp, NULL, format); +} + +struct ptlrpc_request *ptlrpc_request_alloc_pool(struct obd_import *imp, + struct ptlrpc_request_pool * pool, + const struct req_format *format) +{ + return ptlrpc_request_alloc_internal(imp, pool, format); +} + +void ptlrpc_request_free(struct ptlrpc_request *request) +{ + if (request->rq_pool) + __ptlrpc_free_req_to_pool(request); + else + OBD_FREE_PTR(request); +} + +struct ptlrpc_request *ptlrpc_request_alloc_pack(struct obd_import *imp, + const struct req_format *format, + __u32 version, int opcode) +{ + struct ptlrpc_request *req = ptlrpc_request_alloc(imp, format); + int rc; + + if (req) { + rc = ptlrpc_request_pack(req, version, opcode); + if (rc) { + ptlrpc_request_free(req); + req = NULL; + } + } + return req; +} + +struct ptlrpc_request * +ptlrpc_prep_req_pool(struct obd_import *imp, + __u32 version, int opcode, + int count, __u32 *lengths, char **bufs, + struct ptlrpc_request_pool *pool) +{ + struct ptlrpc_request *request; + int rc; + + request = __ptlrpc_request_alloc(imp, pool); + if (!request) + return NULL; + + rc = __ptlrpc_request_bufs_pack(request, version, opcode, count, + lengths, bufs, NULL); + if (rc) { + ptlrpc_request_free(request); + request = NULL; + } + return request; +} + +struct ptlrpc_request * +ptlrpc_prep_req(struct obd_import *imp, __u32 version, int opcode, int count, + __u32 *lengths, char **bufs) +{ + return ptlrpc_prep_req_pool(imp, version, opcode, count, lengths, bufs, + NULL); } struct ptlrpc_request_set *ptlrpc_prep_set(void) { struct ptlrpc_request_set *set; + ENTRY; OBD_ALLOC(set, sizeof *set); if (!set) RETURN(NULL); - INIT_LIST_HEAD(&set->set_requests); - init_waitqueue_head(&set->set_waitq); + CFS_INIT_LIST_HEAD(&set->set_requests); + cfs_waitq_init(&set->set_waitq); set->set_remaining = 0; spin_lock_init(&set->set_new_req_lock); - INIT_LIST_HEAD(&set->set_new_requests); + CFS_INIT_LIST_HEAD(&set->set_new_requests); + CFS_INIT_LIST_HEAD(&set->set_cblist); RETURN(set); } @@ -285,14 +723,13 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *set) if (req->rq_phase == RQ_PHASE_NEW) { if (req->rq_interpret_reply != NULL) { - int (*interpreter)(struct ptlrpc_request *, - void *, int) = + ptlrpc_interpterer_t interpreter = req->rq_interpret_reply; /* higher level (i.e. LOV) failed; * let the sub reqs clean up */ req->rq_status = -EBADR; - interpreter(req, &req->rq_async_args, + interpreter(NULL, req, &req->rq_async_args, req->rq_status); } set->set_remaining--; @@ -308,6 +745,22 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *set) EXIT; } +int ptlrpc_set_add_cb(struct ptlrpc_request_set *set, + set_interpreter_func fn, void *data) +{ + struct ptlrpc_set_cbdata *cbdata; + + OBD_ALLOC_PTR(cbdata); + if (cbdata == NULL) + RETURN(-ENOMEM); + + cbdata->psc_interpret = fn; + cbdata->psc_data = data; + list_add_tail(&cbdata->psc_item, &set->set_cblist); + + RETURN(0); +} + void ptlrpc_set_add_req(struct ptlrpc_request_set *set, struct ptlrpc_request *req) { @@ -315,20 +768,40 @@ void ptlrpc_set_add_req(struct ptlrpc_request_set *set, list_add_tail(&req->rq_set_chain, &set->set_requests); req->rq_set = set; set->set_remaining++; + atomic_inc(&req->rq_import->imp_inflight); } -/* lock so many callers can add things, the context that owns the set - * is supposed to notice these and move them into the set proper. */ -void ptlrpc_set_add_new_req(struct ptlrpc_request_set *set, - struct ptlrpc_request *req) +/** + * Lock so many callers can add things, the context that owns the set + * is supposed to notice these and move them into the set proper. + */ +int ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc, + struct ptlrpc_request *req) { - unsigned long flags; - spin_lock_irqsave(&set->set_new_req_lock, flags); - /* The set takes over the caller's request reference */ + struct ptlrpc_request_set *set = pc->pc_set; + + /* + * Let caller know that we stopped and will not handle this request. + * It needs to take care itself of request. + */ + if (test_bit(LIOD_STOP, &pc->pc_flags)) + return -EALREADY; + + spin_lock(&set->set_new_req_lock); + /* + * The set takes over the caller's request reference. + */ list_add_tail(&req->rq_set_chain, &set->set_new_requests); req->rq_set = set; - spin_unlock_irqrestore(&set->set_new_req_lock, flags); + spin_unlock(&set->set_new_req_lock); + + /* + * Let thead know that we added something and better it to wake up + * and process. + */ + cfs_waitq_signal(&set->set_waitq); + return 0; } /* @@ -341,7 +814,7 @@ void ptlrpc_set_add_new_req(struct ptlrpc_request_set *set, * * The imp->imp_lock must be held. */ -static int ptlrpc_import_delay_req(struct obd_import *imp, +static int ptlrpc_import_delay_req(struct obd_import *imp, struct ptlrpc_request *req, int *status) { int delay = 0; @@ -350,38 +823,45 @@ static int ptlrpc_import_delay_req(struct obd_import *imp, LASSERT (status != NULL); *status = 0; - if (imp->imp_state == LUSTRE_IMP_NEW) { + if (req->rq_ctx_init || req->rq_ctx_fini) { + /* always allow ctx init/fini rpc go through */ + } else if (imp->imp_state == LUSTRE_IMP_NEW) { DEBUG_REQ(D_ERROR, req, "Uninitialized import."); *status = -EIO; LBUG(); - } - else if (imp->imp_state == LUSTRE_IMP_CLOSED) { + } else if (imp->imp_state == LUSTRE_IMP_CLOSED) { DEBUG_REQ(D_ERROR, req, "IMP_CLOSED "); *status = -EIO; - } - /* allow CONNECT even if import is invalid */ - else if (req->rq_send_state == LUSTRE_IMP_CONNECTING && - imp->imp_state == LUSTRE_IMP_CONNECTING) { - ; - } - /* - * If the import has been invalidated (such as by an OST failure), the - * request must fail with -EIO. - */ - else if (imp->imp_invalid) { - DEBUG_REQ(D_ERROR, req, "IMP_INVALID"); - *status = -EIO; - } - else if (req->rq_import_generation != imp->imp_generation) { + } else if (req->rq_send_state == LUSTRE_IMP_CONNECTING && + imp->imp_state == LUSTRE_IMP_CONNECTING) { + /* allow CONNECT even if import is invalid */ ; + if (atomic_read(&imp->imp_inval_count) != 0) { + DEBUG_REQ(D_ERROR, req, "invalidate in flight"); + *status = -EIO; + } + } else if ((imp->imp_invalid && (!imp->imp_recon_bk)) || + imp->imp_obd->obd_no_recov) { + /* If the import has been invalidated (such as by an OST + * failure), and if the import(MGC) tried all of its connection + * list (Bug 13464), the request must fail with -ESHUTDOWN. + * This indicates the requests should be discarded; an -EIO + * may result in a resend of the request. */ + if (!imp->imp_deactive) + DEBUG_REQ(D_ERROR, req, "IMP_INVALID"); + *status = -ESHUTDOWN; /* bz 12940 */ + } else if (req->rq_import_generation != imp->imp_generation) { DEBUG_REQ(D_ERROR, req, "req wrong generation:"); *status = -EIO; - } - else if (req->rq_send_state != imp->imp_state) { - if (imp->imp_obd->obd_no_recov || imp->imp_dlm_fake - || req->rq_no_delay) + } else if (req->rq_send_state != imp->imp_state) { + /* invalidate in progress - any requests should be drop */ + if (atomic_read(&imp->imp_inval_count) != 0) { + DEBUG_REQ(D_ERROR, req, "invalidate in flight"); + *status = -EIO; + } else if (imp->imp_dlm_fake || req->rq_no_delay) { *status = -EWOULDBLOCK; - else + } else { delay = 1; + } } RETURN(delay); @@ -389,35 +869,39 @@ static int ptlrpc_import_delay_req(struct obd_import *imp, static int ptlrpc_check_reply(struct ptlrpc_request *req) { - unsigned long flags; int rc = 0; ENTRY; /* serialise with network callback */ - spin_lock_irqsave (&req->rq_lock, flags); + spin_lock(&req->rq_lock); - if (req->rq_replied) { - DEBUG_REQ(D_NET, req, "REPLIED:"); + if (req->rq_replied) GOTO(out, rc = 1); + + if (req->rq_net_err && !req->rq_timedout) { + spin_unlock(&req->rq_lock); + rc = ptlrpc_expire_one_request(req); + spin_lock(&req->rq_lock); + GOTO(out, rc); } - if (req->rq_err) { - DEBUG_REQ(D_ERROR, req, "ABORTED:"); + if (req->rq_err) GOTO(out, rc = 1); - } - if (req->rq_resend) { - DEBUG_REQ(D_ERROR, req, "RESEND:"); + if (req->rq_resend) GOTO(out, rc = 1); - } - if (req->rq_restart) { - DEBUG_REQ(D_ERROR, req, "RESTART:"); + if (req->rq_restart) GOTO(out, rc = 1); + + if (req->rq_early) { + ptlrpc_at_recv_early_reply(req); + GOTO(out, rc = 0); /* keep waiting */ } + EXIT; out: - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); DEBUG_REQ(D_NET, req, "rc = %d for", rc); return rc; } @@ -427,10 +911,14 @@ static int ptlrpc_check_status(struct ptlrpc_request *req) int err; ENTRY; - err = req->rq_repmsg->status; - if (req->rq_repmsg->type == PTL_RPC_MSG_ERR) { - DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, err == %d", - err); + err = lustre_msg_get_status(req->rq_repmsg); + if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) { + struct obd_import *imp = req->rq_import; + __u32 opc = lustre_msg_get_opc(req->rq_reqmsg); + LCONSOLE_ERROR_MSG(0x011,"an error occurred while communicating" + " with %s. The %s operation failed with %d\n", + libcfs_nid2str(imp->imp_connection->c_peer.nid), + ll_opcode2str(opc), err); RETURN(err < 0 ? err : -EINVAL); } @@ -444,74 +932,118 @@ static int ptlrpc_check_status(struct ptlrpc_request *req) RETURN(err); } +/** + * Callback function called when client receives RPC reply for \a req. + */ static int after_reply(struct ptlrpc_request *req) { - unsigned long flags; struct obd_import *imp = req->rq_import; + struct obd_device *obd = req->rq_import->imp_obd; int rc; + struct timeval work_start; + long timediff; ENTRY; LASSERT(!req->rq_receiving_reply); + LASSERT(obd); + LASSERT(req->rq_nob_received <= req->rq_repbuf_len); - /* NB Until this point, the whole of the incoming message, - * including buflens, status etc is in the sender's byte order. */ + /* + * NB Until this point, the whole of the incoming message, + * including buflens, status etc is in the sender's byte order. + */ -#if SWAB_PARANOIA - /* Clear reply swab mask; this is a new reply in sender's byte order */ - req->rq_rep_swab_mask = 0; -#endif - LASSERT (req->rq_nob_received <= req->rq_replen); - rc = lustre_unpack_msg(req->rq_repmsg, req->rq_nob_received); + rc = sptlrpc_cli_unwrap_reply(req); if (rc) { - CERROR("unpack_rep failed: %d\n", rc); - RETURN(-EPROTO); + DEBUG_REQ(D_ERROR, req, "unwrap reply failed (%d):", rc); + RETURN(rc); } - if (req->rq_repmsg->type != PTL_RPC_MSG_REPLY && - req->rq_repmsg->type != PTL_RPC_MSG_ERR) { - CERROR("invalid packet type received (type=%u)\n", - req->rq_repmsg->type); + /* + * Security layer unwrap might ask resend this request. + */ + if (req->rq_resend) + RETURN(0); + + rc = unpack_reply(req); + if (rc) + RETURN(rc); + + do_gettimeofday(&work_start); + timediff = cfs_timeval_sub(&work_start, &req->rq_arrival_time, NULL); + if (obd->obd_svc_stats != NULL) + lprocfs_counter_add(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR, + timediff); + + if (lustre_msg_get_type(req->rq_repmsg) != PTL_RPC_MSG_REPLY && + lustre_msg_get_type(req->rq_repmsg) != PTL_RPC_MSG_ERR) { + DEBUG_REQ(D_ERROR, req, "invalid packet received (type=%u)", + lustre_msg_get_type(req->rq_repmsg)); RETURN(-EPROTO); } - /* Store transno in reqmsg for replay. */ - req->rq_reqmsg->transno = req->rq_transno = req->rq_repmsg->transno; + OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_PAUSE_REP, obd_fail_val); + ptlrpc_at_adj_service(req, lustre_msg_get_timeout(req->rq_repmsg)); + ptlrpc_at_adj_net_latency(req, + lustre_msg_get_service_time(req->rq_repmsg)); rc = ptlrpc_check_status(req); + imp->imp_connect_error = rc; - /* Either we've been evicted, or the server has failed for - * some reason. Try to reconnect, and if that fails, punt to the - * upcall. */ - if (rc == -ENOTCONN) { - if (req->rq_send_state != LUSTRE_IMP_FULL || - imp->imp_obd->obd_no_recov || imp->imp_dlm_fake) { - RETURN(-ENOTCONN); + if (rc) { + /* + * Either we've been evicted, or the server has failed for + * some reason. Try to reconnect, and if that fails, punt to + * the upcall. + */ + if (ll_rpc_recoverable_error(rc)) { + if (req->rq_send_state != LUSTRE_IMP_FULL || + imp->imp_obd->obd_no_recov || imp->imp_dlm_fake) { + RETURN(rc); + } + ptlrpc_request_handle_notconn(req); + RETURN(rc); } - - ptlrpc_request_handle_notconn(req); - - RETURN(rc); + } else { + /* + * Let's look if server sent slv. Do it only for RPC with + * rc == 0. + */ + ldlm_cli_update_pool(req); } + /* + * Store transno in reqmsg for replay. + */ + req->rq_transno = lustre_msg_get_transno(req->rq_repmsg); + lustre_msg_set_transno(req->rq_reqmsg, req->rq_transno); + if (req->rq_import->imp_replayable) { - spin_lock_irqsave(&imp->imp_lock, flags); - if (req->rq_replay || req->rq_transno != 0) + spin_lock(&imp->imp_lock); + /* + * No point in adding already-committed requests to the replay + * list, we will just remove them immediately. b=9829 + */ + if (req->rq_transno != 0 && + (req->rq_transno > + lustre_msg_get_last_committed(req->rq_repmsg) || + req->rq_replay)) ptlrpc_retain_replayable_request(req, imp); else if (req->rq_commit_cb != NULL) { - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); req->rq_commit_cb(req); - spin_lock_irqsave(&imp->imp_lock, flags); - } - - if (req->rq_transno > imp->imp_max_transno) - imp->imp_max_transno = req->rq_transno; + spin_lock(&imp->imp_lock); + } - /* Replay-enabled imports return commit-status information. */ - if (req->rq_repmsg->last_committed) + /* + * Replay-enabled imports return commit-status information. + */ + if (lustre_msg_get_last_committed(req->rq_repmsg)) { imp->imp_peer_committed_transno = - req->rq_repmsg->last_committed; + lustre_msg_get_last_committed(req->rq_repmsg); + } ptlrpc_free_committed(imp); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); } RETURN(rc); @@ -519,17 +1051,18 @@ static int after_reply(struct ptlrpc_request *req) static int ptlrpc_send_new_req(struct ptlrpc_request *req) { - char str[PTL_NALFMT_SIZE]; struct obd_import *imp; - unsigned long flags; int rc; ENTRY; LASSERT(req->rq_phase == RQ_PHASE_NEW); + if (req->rq_sent && (req->rq_sent > cfs_time_current_sec())) + RETURN (0); + req->rq_phase = RQ_PHASE_RPC; imp = req->rq_import; - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); req->rq_import_generation = imp->imp_generation; @@ -540,18 +1073,18 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req) DEBUG_REQ(D_HA, req, "req from PID %d waiting for recovery: " "(%s != %s)", - req->rq_reqmsg->status, + lustre_msg_get_status(req->rq_reqmsg) , ptlrpc_import_state_name(req->rq_send_state), ptlrpc_import_state_name(imp->imp_state)); LASSERT(list_empty (&req->rq_list)); list_add_tail(&req->rq_list, &imp->imp_delayed_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); RETURN(0); } if (rc != 0) { - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); req->rq_status = rc; req->rq_phase = RQ_PHASE_INTERPRET; RETURN(rc); @@ -560,30 +1093,40 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req) /* XXX this is the same as ptlrpc_queue_wait */ LASSERT(list_empty(&req->rq_list)); list_add_tail(&req->rq_list, &imp->imp_sending_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); - - req->rq_reqmsg->status = current->pid; - CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc" - " %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm, - imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status, - req->rq_xid, - imp->imp_connection->c_peer.peer_ni->pni_name, - ptlrpc_peernid2str(&imp->imp_connection->c_peer, str), - req->rq_reqmsg->opc); - - rc = ptl_send_rpc(req); + spin_unlock(&imp->imp_lock); + + lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid()); + + rc = sptlrpc_req_refresh_ctx(req, -1); + if (rc) { + if (req->rq_err) { + req->rq_status = rc; + RETURN(1); + } else { + req->rq_wait_ctx = 1; + RETURN(0); + } + } + + CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc" + " %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(), + imp->imp_obd->obd_uuid.uuid, + lustre_msg_get_status(req->rq_reqmsg), req->rq_xid, + libcfs_nid2str(imp->imp_connection->c_peer.nid), + lustre_msg_get_opc(req->rq_reqmsg)); + + rc = ptl_send_rpc(req, 0); if (rc) { DEBUG_REQ(D_HA, req, "send failed (%d); expect timeout", rc); - req->rq_timeout = 1; + req->rq_net_err = 1; RETURN(rc); } RETURN(0); } -int ptlrpc_check_set(struct ptlrpc_request_set *set) +/* this sends any unsent RPCs in @set and returns TRUE if all are sent */ +int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) { - char str[PTL_NALFMT_SIZE]; - unsigned long flags; struct list_head *tmp; int force_timer_recalc = 0; ENTRY; @@ -601,6 +1144,9 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) ptlrpc_send_new_req(req)) { force_timer_recalc = 1; } + /* delayed send - skip */ + if (req->rq_phase == RQ_PHASE_NEW && req->rq_sent) + continue; if (!(req->rq_phase == RQ_PHASE_RPC || req->rq_phase == RQ_PHASE_BULK || @@ -616,15 +1162,19 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) if (req->rq_phase == RQ_PHASE_INTERPRET) GOTO(interpret, req->rq_status); + if (req->rq_net_err && !req->rq_timedout) + ptlrpc_expire_one_request(req); + if (req->rq_err) { ptlrpc_unregister_reply(req); + req->rq_replied = 0; if (req->rq_status == 0) req->rq_status = -EIO; req->rq_phase = RQ_PHASE_INTERPRET; - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); list_del_init(&req->rq_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); GOTO(interpret, req->rq_status); } @@ -632,65 +1182,67 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) /* ptlrpc_queue_wait->l_wait_event guarantees that rq_intr * will only be set after rq_timedout, but the oig waiting * path sets rq_intr irrespective of whether ptlrpcd has - * seen a timeout. our policy is to only interpret + * seen a timeout. our policy is to only interpret * interrupted rpcs after they have timed out */ - if (req->rq_intr && (req->rq_timedout || req->rq_waiting)) { + if (req->rq_intr && (req->rq_timedout || req->rq_waiting || + req->rq_wait_ctx)) { /* NB could be on delayed list */ ptlrpc_unregister_reply(req); req->rq_status = -EINTR; req->rq_phase = RQ_PHASE_INTERPRET; - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); list_del_init(&req->rq_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); GOTO(interpret, req->rq_status); } if (req->rq_phase == RQ_PHASE_RPC) { - if (req->rq_waiting || req->rq_resend) { + if (req->rq_timedout || req->rq_resend || + req->rq_waiting || req->rq_wait_ctx) { int status; - LASSERT (!ptlrpc_client_receiving_reply(req)); - LASSERT (req->rq_bulk == NULL || - !ptlrpc_bulk_active(req->rq_bulk)); + ptlrpc_unregister_reply(req); - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); - if (ptlrpc_import_delay_req(imp, req, &status)) { - spin_unlock_irqrestore(&imp->imp_lock, - flags); + if (ptlrpc_import_delay_req(imp, req, &status)){ + spin_unlock(&imp->imp_lock); continue; - } + } list_del_init(&req->rq_list); if (status != 0) { req->rq_status = status; req->rq_phase = RQ_PHASE_INTERPRET; - spin_unlock_irqrestore(&imp->imp_lock, - flags); + spin_unlock(&imp->imp_lock); GOTO(interpret, req->rq_status); } - if (req->rq_no_resend) { + if (req->rq_no_resend && !req->rq_wait_ctx) { req->rq_status = -ENOTCONN; req->rq_phase = RQ_PHASE_INTERPRET; - spin_unlock_irqrestore(&imp->imp_lock, - flags); + spin_unlock(&imp->imp_lock); GOTO(interpret, req->rq_status); } list_add_tail(&req->rq_list, &imp->imp_sending_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); req->rq_waiting = 0; - if (req->rq_resend) { + + if (req->rq_timedout||req->rq_resend) { + /* This is re-sending anyways, + * let's mark req as resend. */ + req->rq_resend = 1; lustre_msg_add_flags(req->rq_reqmsg, MSG_RESENT); - ptlrpc_unregister_reply(req); if (req->rq_bulk) { __u64 old_xid = req->rq_xid; + ptlrpc_unregister_bulk (req); + /* ensure previous bulk fails */ req->rq_xid = ptlrpc_next_xid(); CDEBUG(D_HA, "resend bulk " @@ -699,39 +1251,70 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) old_xid, req->rq_xid); } } + /* + * rq_wait_ctx is only touched by ptlrpcd, + * so no lock is needed here. + */ + status = sptlrpc_req_refresh_ctx(req, -1); + if (status) { + if (req->rq_err) { + req->rq_status = status; + force_timer_recalc = 1; + } else { + req->rq_wait_ctx = 1; + } + + continue; + } else { + req->rq_wait_ctx = 0; + } - rc = ptl_send_rpc(req); + rc = ptl_send_rpc(req, 0); if (rc) { DEBUG_REQ(D_HA, req, "send failed (%d)", rc); force_timer_recalc = 1; - req->rq_timeout = 0; + req->rq_net_err = 1; } /* need to reset the timeout */ force_timer_recalc = 1; } + spin_lock(&req->rq_lock); + + if (req->rq_early) { + ptlrpc_at_recv_early_reply(req); + spin_unlock(&req->rq_lock); + continue; + } + /* Still waiting for a reply? */ - if (ptlrpc_client_receiving_reply(req)) + if (req->rq_receiving_reply) { + spin_unlock(&req->rq_lock); continue; + } /* Did we actually receive a reply? */ - if (!ptlrpc_client_replied(req)) + if (!req->rq_replied) { + spin_unlock(&req->rq_lock); continue; + } - spin_lock_irqsave(&imp->imp_lock, flags); + spin_unlock(&req->rq_lock); + + spin_lock(&imp->imp_lock); list_del_init(&req->rq_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); req->rq_status = after_reply(req); if (req->rq_resend) { /* Add this req to the delayed list so it can be errored if the import is evicted after recovery. */ - spin_lock_irqsave (&req->rq_lock, flags); - list_add_tail(&req->rq_list, + spin_lock(&imp->imp_lock); + list_add_tail(&req->rq_list, &imp->imp_delayed_list); - spin_unlock_irqrestore(&req->rq_lock, flags); + spin_unlock(&imp->imp_lock); continue; } @@ -771,47 +1354,66 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set) if (req->rq_bulk != NULL) ptlrpc_unregister_bulk (req); - req->rq_phase = RQ_PHASE_COMPLETE; - if (req->rq_interpret_reply != NULL) { - int (*interpreter)(struct ptlrpc_request *,void *,int) = + ptlrpc_interpterer_t interpreter = req->rq_interpret_reply; - req->rq_status = interpreter(req, &req->rq_async_args, + req->rq_status = interpreter(NULL, req, + &req->rq_async_args, req->rq_status); } + req->rq_phase = RQ_PHASE_COMPLETE; - CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:" - "opc %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm, - imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status, - req->rq_xid, - imp->imp_connection->c_peer.peer_ni->pni_name, - ptlrpc_peernid2str(&imp->imp_connection->c_peer, str), - req->rq_reqmsg->opc); - - set->set_remaining--; + CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:" + "opc %s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(), + imp->imp_obd->obd_uuid.uuid, + lustre_msg_get_status(req->rq_reqmsg), req->rq_xid, + libcfs_nid2str(imp->imp_connection->c_peer.nid), + lustre_msg_get_opc(req->rq_reqmsg)); atomic_dec(&imp->imp_inflight); - wake_up(&imp->imp_recovery_waitq); + set->set_remaining--; + cfs_waitq_signal(&imp->imp_recovery_waitq); } /* If we hit an error, we want to recover promptly. */ RETURN(set->set_remaining == 0 || force_timer_recalc); } +/* Return 1 if we should give up, else 0 */ int ptlrpc_expire_one_request(struct ptlrpc_request *req) { - unsigned long flags; struct obd_import *imp = req->rq_import; + int rc = 0; ENTRY; - DEBUG_REQ(D_ERROR, req, "timeout"); + DEBUG_REQ(D_ERROR|D_NETERROR, req, + "%s (sent at "CFS_TIME_T", "CFS_DURATION_T"s ago)", + req->rq_net_err ? "network error" : "timeout", + req->rq_sent, cfs_time_sub(cfs_time_current_sec(), + req->rq_sent)); + + if (imp) { + LCONSOLE_WARN("Request x"LPU64" sent from %s to NID %s " + CFS_DURATION_T"s ago has timed out " + "(limit "CFS_DURATION_T"s).\n", req->rq_xid, + req->rq_import->imp_obd->obd_name, + libcfs_nid2str(imp->imp_connection->c_peer.nid), + cfs_time_sub(cfs_time_current_sec(), req->rq_sent), + cfs_time_sub(req->rq_deadline, req->rq_sent)); + } + + if (imp != NULL && obd_debug_peer_on_timeout) + LNetCtl(IOC_LIBCFS_DEBUG_PEER, &imp->imp_connection->c_peer); - spin_lock_irqsave (&req->rq_lock, flags); + spin_lock(&req->rq_lock); req->rq_timedout = 1; - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); ptlrpc_unregister_reply (req); + if (obd_dump_on_timeout) + libcfs_debug_dumplog(); + if (req->rq_bulk != NULL) ptlrpc_unregister_bulk (req); @@ -826,25 +1428,36 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req) /* If this request is for recovery or other primordial tasks, * then error it out here. */ - if (req->rq_send_state != LUSTRE_IMP_FULL || + if (req->rq_ctx_init || req->rq_ctx_fini || + req->rq_send_state != LUSTRE_IMP_FULL || imp->imp_obd->obd_no_recov) { - spin_lock_irqsave (&req->rq_lock, flags); + DEBUG_REQ(D_RPCTRACE, req, "err -110, sent_state=%s (now=%s)", + ptlrpc_import_state_name(req->rq_send_state), + ptlrpc_import_state_name(imp->imp_state)); + spin_lock(&req->rq_lock); req->rq_status = -ETIMEDOUT; req->rq_err = 1; - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); RETURN(1); } - ptlrpc_fail_import(imp, req->rq_import_generation); + /* if a request can't be resent we can't wait for an answer after + the timeout */ + if (req->rq_no_resend) { + DEBUG_REQ(D_RPCTRACE, req, "TIMEOUT-NORESEND:"); + rc = 1; + } + + ptlrpc_fail_import(imp, lustre_msg_get_conn_cnt(req->rq_reqmsg)); - RETURN(0); + RETURN(rc); } int ptlrpc_expired_set(void *data) { struct ptlrpc_request_set *set = data; struct list_head *tmp; - time_t now = LTIME_S (CURRENT_TIME); + time_t now = cfs_time_current_sec(); ENTRY; LASSERT(set != NULL); @@ -855,13 +1468,13 @@ int ptlrpc_expired_set(void *data) list_entry(tmp, struct ptlrpc_request, rq_set_chain); /* request in-flight? */ - if (!((req->rq_phase == RQ_PHASE_RPC && !req->rq_waiting - && !req->rq_resend) || + if (!(((req->rq_phase == RQ_PHASE_RPC) && !req->rq_waiting && + !req->rq_resend) || (req->rq_phase == RQ_PHASE_BULK))) continue; if (req->rq_timedout || /* already dealt with */ - req->rq_sent + req->rq_timeout > now) /* not expired */ + req->rq_deadline > now) /* not expired */ continue; /* deal with this guy */ @@ -877,10 +1490,9 @@ int ptlrpc_expired_set(void *data) void ptlrpc_mark_interrupted(struct ptlrpc_request *req) { - unsigned long flags; - spin_lock_irqsave(&req->rq_lock, flags); + spin_lock(&req->rq_lock); req->rq_intr = 1; - spin_unlock_irqrestore(&req->rq_lock, flags); + spin_unlock(&req->rq_lock); } void ptlrpc_interrupted_set(void *data) @@ -902,13 +1514,14 @@ void ptlrpc_interrupted_set(void *data) } } +/* get the smallest timeout in the set; this does NOT set a timeout. */ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set) { struct list_head *tmp; - time_t now = LTIME_S(CURRENT_TIME); - time_t deadline; + time_t now = cfs_time_current_sec(); int timeout = 0; struct ptlrpc_request *req; + int deadline; ENTRY; SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */ @@ -918,13 +1531,21 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set) /* request in-flight? */ if (!((req->rq_phase == RQ_PHASE_RPC && !req->rq_waiting) || - (req->rq_phase == RQ_PHASE_BULK))) + (req->rq_phase == RQ_PHASE_BULK) || + (req->rq_phase == RQ_PHASE_NEW))) continue; if (req->rq_timedout) /* already timed out */ continue; - deadline = req->rq_sent + req->rq_timeout; + if (req->rq_wait_ctx) /* waiting for ctx */ + continue; + + if (req->rq_phase == RQ_PHASE_NEW) + deadline = req->rq_sent; + else + deadline = req->rq_sent + req->rq_timeout; + if (deadline <= now) /* actually expired already */ timeout = 1; /* ASAP */ else if (timeout == 0 || timeout > deadline - now) @@ -932,7 +1553,6 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set) } RETURN(timeout); } - int ptlrpc_set_wait(struct ptlrpc_request_set *set) { @@ -942,7 +1562,9 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) int rc, timeout; ENTRY; - LASSERT(!list_empty(&set->set_requests)); + if (list_empty(&set->set_requests)) + RETURN(0); + list_for_each(tmp, &set->set_requests) { req = list_entry(tmp, struct ptlrpc_request, rq_set_chain); if (req->rq_phase == RQ_PHASE_NEW) @@ -954,12 +1576,13 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) /* wait until all complete, interrupted, or an in-flight * req times out */ - CDEBUG(D_HA, "set %p going to sleep for %d seconds\n", + CDEBUG(D_RPCTRACE, "set %p going to sleep for %d seconds\n", set, timeout); - lwi = LWI_TIMEOUT_INTR((timeout ? timeout : 1) * HZ, - ptlrpc_expired_set, + lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(timeout ? timeout : 1), + ptlrpc_expired_set, ptlrpc_interrupted_set, set); - rc = l_wait_event(set->set_waitq, ptlrpc_check_set(set), &lwi); + rc = l_wait_event(set->set_waitq, + ptlrpc_check_set(NULL, set), &lwi); LASSERT(rc == 0 || rc == -EINTR || rc == -ETIMEDOUT); @@ -970,7 +1593,7 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) * EINTR. * I don't really care if we go once more round the loop in * the error cases -eeb. */ - } while (rc != 0); + } while (rc != 0 || set->set_remaining != 0); LASSERT(set->set_remaining == 0); @@ -986,7 +1609,19 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) if (set->set_interpret != NULL) { int (*interpreter)(struct ptlrpc_request_set *set,void *,int) = set->set_interpret; - rc = interpreter (set, &set->set_args, rc); + rc = interpreter (set, set->set_arg, rc); + } else { + struct ptlrpc_set_cbdata *cbdata, *n; + int err; + + list_for_each_entry_safe(cbdata, n, + &set->set_cblist, psc_item) { + list_del_init(&cbdata->psc_item); + err = cbdata->psc_interpret(set, cbdata->psc_data, rc); + if (err && !rc) + rc = err; + OBD_FREE_PTR(cbdata); + } } RETURN(rc); @@ -1004,17 +1639,20 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked) LASSERTF(request->rq_rqbd == NULL, "req %p\n",request);/* client-side */ LASSERTF(list_empty(&request->rq_list), "req %p\n", request); LASSERTF(list_empty(&request->rq_set_chain), "req %p\n", request); + LASSERTF(!request->rq_replay, "req %p\n", request); + LASSERT(request->rq_cli_ctx); + + req_capsule_fini(&request->rq_pill); /* We must take it off the imp_replay_list first. Otherwise, we'll set * request->rq_reqmsg to NULL while osc_close is dereferencing it. */ if (request->rq_import != NULL) { - unsigned long flags = 0; if (!locked) - spin_lock_irqsave(&request->rq_import->imp_lock, flags); + spin_lock(&request->rq_import->imp_lock); + list_del_init(&request->rq_mod_list); list_del_init(&request->rq_replay_list); if (!locked) - spin_unlock_irqrestore(&request->rq_import->imp_lock, - flags); + spin_unlock(&request->rq_import->imp_lock); } LASSERTF(list_empty(&request->rq_replay_list), "req %p\n", request); @@ -1024,14 +1662,8 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked) LBUG(); } - if (request->rq_repmsg != NULL) { - OBD_FREE(request->rq_repmsg, request->rq_replen); - request->rq_repmsg = NULL; - } - if (request->rq_reqmsg != NULL) { - OBD_FREE(request->rq_reqmsg, request->rq_reqlen); - request->rq_reqmsg = NULL; - } + if (request->rq_repbuf != NULL) + sptlrpc_cli_free_repbuf(request); if (request->rq_export != NULL) { class_export_put(request->rq_export); request->rq_export = NULL; @@ -1043,13 +1675,16 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked) if (request->rq_bulk != NULL) ptlrpc_free_bulk(request->rq_bulk); - OBD_FREE(request, sizeof(*request)); - EXIT; -} + if (request->rq_reqbuf != NULL || request->rq_clrbuf != NULL) + sptlrpc_cli_free_reqbuf(request); -void ptlrpc_free_req(struct ptlrpc_request *request) -{ - __ptlrpc_free_req(request, 0); + sptlrpc_req_put_ctx(request, !locked); + + if (request->rq_pool) + __ptlrpc_free_req_to_pool(request); + else + OBD_FREE(request, sizeof(*request)); + EXIT; } static int __ptlrpc_req_finished(struct ptlrpc_request *request, int locked); @@ -1088,6 +1723,12 @@ void ptlrpc_req_finished(struct ptlrpc_request *request) __ptlrpc_req_finished(request, 0); } +__u64 ptlrpc_req_xid(struct ptlrpc_request *request) +{ + return request->rq_xid; +} +EXPORT_SYMBOL(ptlrpc_req_xid); + /* Disengage the client's reply buffer from the network * NB does _NOT_ unregister any client-side bulk. * IDEMPOTENT, but _not_ safe against concurrent callers. @@ -1096,20 +1737,21 @@ void ptlrpc_req_finished(struct ptlrpc_request *request) void ptlrpc_unregister_reply (struct ptlrpc_request *request) { int rc; - wait_queue_head_t *wq; + cfs_waitq_t *wq; struct l_wait_info lwi; LASSERT(!in_interrupt ()); /* might sleep */ - - if (!ptlrpc_client_receiving_reply(request)) + if (!ptlrpc_client_recv_or_unlink(request)) + /* Nothing left to do */ return; - PtlMDUnlink (request->rq_reply_md_h); + LNetMDUnlink (request->rq_reply_md_h); /* We have to l_wait_event() whatever the result, to give liblustre - * a chance to run reply_in_callback() */ + * a chance to run reply_in_callback(), and to make sure we've + * unlinked before returning a req to the pool */ - if (request->rq_set == NULL) + if (request->rq_set != NULL) wq = &request->rq_set->set_waitq; else wq = &request->rq_reply_waitq; @@ -1117,13 +1759,16 @@ void ptlrpc_unregister_reply (struct ptlrpc_request *request) for (;;) { /* Network access will complete in finite time but the HUGE * timeout lets us CWARN for visibility of sluggish NALs */ - lwi = LWI_TIMEOUT(300 * HZ, NULL, NULL); - rc = l_wait_event (*wq, !ptlrpc_client_receiving_reply(request), &lwi); + lwi = LWI_TIMEOUT(cfs_time_seconds(LONG_UNLINK), NULL, NULL); + rc = l_wait_event (*wq, !ptlrpc_client_recv_or_unlink(request), + &lwi); if (rc == 0) return; LASSERT (rc == -ETIMEDOUT); - DEBUG_REQ(D_WARNING, request, "Unexpectedly long timeout"); + DEBUG_REQ(D_WARNING, request, "Unexpectedly long timeout " + "rvcng=%d unlnk=%d", request->rq_receiving_reply, + request->rq_must_unlink); } } @@ -1139,8 +1784,20 @@ void ptlrpc_free_committed(struct obd_import *imp) LASSERT_SPIN_LOCKED(&imp->imp_lock); - CDEBUG(D_HA, "%s: committing for last_committed "LPU64"\n", - imp->imp_obd->obd_name, imp->imp_peer_committed_transno); + + if (imp->imp_peer_committed_transno == imp->imp_last_transno_checked && + imp->imp_generation == imp->imp_last_generation_checked) { + CDEBUG(D_RPCTRACE, "%s: skip recheck: last_committed "LPU64"\n", + imp->imp_obd->obd_name, imp->imp_peer_committed_transno); + EXIT; + return; + } + + CDEBUG(D_RPCTRACE, "%s: committing for last_committed "LPU64" gen %d\n", + imp->imp_obd->obd_name, imp->imp_peer_committed_transno, + imp->imp_generation); + imp->imp_last_transno_checked = imp->imp_peer_committed_transno; + imp->imp_last_generation_checked = imp->imp_generation; list_for_each_safe(tmp, saved, &imp->imp_replay_list) { req = list_entry(tmp, struct ptlrpc_request, rq_replay_list); @@ -1150,24 +1807,27 @@ void ptlrpc_free_committed(struct obd_import *imp) last_req = req; if (req->rq_import_generation < imp->imp_generation) { - DEBUG_REQ(D_HA, req, "freeing request with old gen"); + DEBUG_REQ(D_RPCTRACE, req, "free request with old gen"); GOTO(free_req, 0); } if (req->rq_replay) { - DEBUG_REQ(D_HA, req, "keeping (FL_REPLAY)"); + DEBUG_REQ(D_RPCTRACE, req, "keeping (FL_REPLAY)"); continue; } /* not yet committed */ if (req->rq_transno > imp->imp_peer_committed_transno) { - DEBUG_REQ(D_HA, req, "stopping search"); + DEBUG_REQ(D_RPCTRACE, req, "stopping search"); break; } - DEBUG_REQ(D_HA, req, "committing (last_committed "LPU64")", + DEBUG_REQ(D_RPCTRACE, req, "commit (last_committed "LPU64")", imp->imp_peer_committed_transno); free_req: + spin_lock(&req->rq_lock); + req->rq_replay = 0; + spin_unlock(&req->rq_lock); if (req->rq_commit_cb != NULL) req->rq_commit_cb(req); list_del_init(&req->rq_replay_list); @@ -1187,40 +1847,37 @@ void ptlrpc_cleanup_client(struct obd_import *imp) void ptlrpc_resend_req(struct ptlrpc_request *req) { - unsigned long flags; - DEBUG_REQ(D_HA, req, "going to resend"); - req->rq_reqmsg->handle.cookie = 0; + lustre_msg_set_handle(req->rq_reqmsg, &(struct lustre_handle){ 0 }); req->rq_status = -EAGAIN; - spin_lock_irqsave (&req->rq_lock, flags); + spin_lock(&req->rq_lock); req->rq_resend = 1; + req->rq_net_err = 0; req->rq_timedout = 0; if (req->rq_bulk) { __u64 old_xid = req->rq_xid; - + /* ensure previous bulk fails */ req->rq_xid = ptlrpc_next_xid(); CDEBUG(D_HA, "resend bulk old x"LPU64" new x"LPU64"\n", old_xid, req->rq_xid); } ptlrpc_wake_client_req(req); - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); } /* XXX: this function and rq_status are currently unused */ void ptlrpc_restart_req(struct ptlrpc_request *req) { - unsigned long flags; - DEBUG_REQ(D_HA, req, "restarting (possibly-)completed request"); req->rq_status = -ERESTARTSYS; - spin_lock_irqsave (&req->rq_lock, flags); + spin_lock(&req->rq_lock); req->rq_restart = 1; req->rq_timedout = 0; ptlrpc_wake_client_req(req); - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); } static int expired_request(void *data) @@ -1228,18 +1885,24 @@ static int expired_request(void *data) struct ptlrpc_request *req = data; ENTRY; + /* some failure can suspend regular timeouts */ + if (ptlrpc_check_suspend()) + RETURN(1); + + /* deadline may have changed with an early reply */ + if (req->rq_deadline > cfs_time_current_sec()) + RETURN(1); + RETURN(ptlrpc_expire_one_request(req)); } static void interrupted_request(void *data) { - unsigned long flags; - struct ptlrpc_request *req = data; DEBUG_REQ(D_HA, req, "request interrupted"); - spin_lock_irqsave (&req->rq_lock, flags); + spin_lock(&req->rq_lock); req->rq_intr = 1; - spin_unlock_irqrestore (&req->rq_lock, flags); + spin_unlock(&req->rq_lock); } struct ptlrpc_request *ptlrpc_request_addref(struct ptlrpc_request *req) @@ -1256,12 +1919,15 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req, LASSERT_SPIN_LOCKED(&imp->imp_lock); + /* clear this for new requests that were resent as well + as resent replayed requests. */ + lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT); + /* don't re-add requests that have been replayed */ if (!list_empty(&req->rq_replay_list)) return; - lustre_msg_add_flags(req->rq_reqmsg, - MSG_REPLAY); + lustre_msg_add_flags(req->rq_reqmsg, MSG_REPLAY); LASSERT(imp->imp_replayable); /* Balanced in ptlrpc_free_committed, usually. */ @@ -1294,13 +1960,12 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req, int ptlrpc_queue_wait(struct ptlrpc_request *req) { - char str[PTL_NALFMT_SIZE]; int rc = 0; int brc; struct l_wait_info lwi; struct obd_import *imp = req->rq_import; - unsigned long flags; - int timeout = 0; + cfs_duration_t timeout = CFS_TICK; + long timeoutl; ENTRY; LASSERT(req->rq_set == NULL); @@ -1308,64 +1973,64 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req) atomic_inc(&imp->imp_inflight); /* for distributed debugging */ - req->rq_reqmsg->status = current->pid; + lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid()); LASSERT(imp->imp_obd != NULL); - CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc " - "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm, + CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc " + "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(), imp->imp_obd->obd_uuid.uuid, - req->rq_reqmsg->status, req->rq_xid, - imp->imp_connection->c_peer.peer_ni->pni_name, - ptlrpc_peernid2str(&imp->imp_connection->c_peer, str), - req->rq_reqmsg->opc); + lustre_msg_get_status(req->rq_reqmsg), req->rq_xid, + libcfs_nid2str(imp->imp_connection->c_peer.nid), + lustre_msg_get_opc(req->rq_reqmsg)); /* Mark phase here for a little debug help */ req->rq_phase = RQ_PHASE_RPC; - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); req->rq_import_generation = imp->imp_generation; restart: if (ptlrpc_import_delay_req(imp, req, &rc)) { list_del(&req->rq_list); list_add_tail(&req->rq_list, &imp->imp_delayed_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); DEBUG_REQ(D_HA, req, "\"%s\" waiting for recovery: (%s != %s)", - current->comm, - ptlrpc_import_state_name(req->rq_send_state), + cfs_curproc_comm(), + ptlrpc_import_state_name(req->rq_send_state), ptlrpc_import_state_name(imp->imp_state)); lwi = LWI_INTR(interrupted_request, req); rc = l_wait_event(req->rq_reply_waitq, (req->rq_send_state == imp->imp_state || - req->rq_err), + req->rq_err || req->rq_intr), &lwi); - DEBUG_REQ(D_HA, req, "\"%s\" awake: (%s == %s or %d == 1)", - current->comm, - ptlrpc_import_state_name(imp->imp_state), + DEBUG_REQ(D_HA, req, "\"%s\" awake: (%s == %s or %d/%d == 1)", + cfs_curproc_comm(), + ptlrpc_import_state_name(imp->imp_state), ptlrpc_import_state_name(req->rq_send_state), - req->rq_err); + req->rq_err, req->rq_intr); - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); list_del_init(&req->rq_list); if (req->rq_err) { + /* rq_status was set locally */ rc = -EIO; - } + } else if (req->rq_intr) { rc = -EINTR; } else if (req->rq_no_resend) { - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); GOTO(out, rc = -ETIMEDOUT); } else { GOTO(restart, rc); } - } + } if (rc != 0) { list_del_init(&req->rq_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); req->rq_status = rc; // XXX this ok? GOTO(out, rc); } @@ -1373,57 +2038,83 @@ restart: if (req->rq_resend) { lustre_msg_add_flags(req->rq_reqmsg, MSG_RESENT); - if (req->rq_bulk != NULL) + if (req->rq_bulk != NULL) { ptlrpc_unregister_bulk (req); + /* bulk requests are supposed to be + * idempotent, so we are free to bump the xid + * here, which we need to do before + * registering the bulk again (bug 6371). + * print the old xid first for sanity. + */ + DEBUG_REQ(D_HA, req, "bumping xid for bulk: "); + req->rq_xid = ptlrpc_next_xid(); + } + DEBUG_REQ(D_HA, req, "resending: "); } /* XXX this is the same as ptlrpc_set_wait */ LASSERT(list_empty(&req->rq_list)); list_add_tail(&req->rq_list, &imp->imp_sending_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); - rc = ptl_send_rpc(req); + rc = sptlrpc_req_refresh_ctx(req, 0); if (rc) { - DEBUG_REQ(D_HA, req, "send failed (%d); recovering", rc); - timeout = 1; - } else { - timeout = MAX(req->rq_timeout * HZ, 1); - DEBUG_REQ(D_NET, req, "-- sleeping"); + if (req->rq_err) { + /* we got fatal ctx refresh error, directly jump out + * thus we can pass back the actual error code. + */ + spin_lock(&imp->imp_lock); + list_del_init(&req->rq_list); + spin_unlock(&imp->imp_lock); + + CERROR("Failed to refresh ctx of req %p: %d\n", req, rc); + GOTO(out, rc); + } + /* simulating we got error during send rpc */ + goto after_send; } + + rc = ptl_send_rpc(req, 0); + if (rc) + DEBUG_REQ(D_HA, req, "send failed (%d); recovering", rc); + +repeat: + timeoutl = req->rq_deadline - cfs_time_current_sec(); + timeout = (timeoutl <= 0 || rc) ? CFS_TICK : + cfs_time_seconds(timeoutl); + DEBUG_REQ(D_NET, req, + "-- sleeping for "CFS_DURATION_T" ticks", timeout); lwi = LWI_TIMEOUT_INTR(timeout, expired_request, interrupted_request, req); - l_wait_event(req->rq_reply_waitq, ptlrpc_check_reply(req), &lwi); - DEBUG_REQ(D_NET, req, "-- done sleeping"); - - CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:opc " - "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm, + brc = l_wait_event(req->rq_reply_waitq, ptlrpc_check_reply(req), &lwi); + if (brc == -ETIMEDOUT && ((req->rq_deadline > cfs_time_current_sec()) || + ptlrpc_check_and_wait_suspend(req))) + goto repeat; + +after_send: + CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:opc " + "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(), imp->imp_obd->obd_uuid.uuid, - req->rq_reqmsg->status, req->rq_xid, - imp->imp_connection->c_peer.peer_ni->pni_name, - ptlrpc_peernid2str(&imp->imp_connection->c_peer, str), - req->rq_reqmsg->opc); + lustre_msg_get_status(req->rq_reqmsg), req->rq_xid, + libcfs_nid2str(imp->imp_connection->c_peer.nid), + lustre_msg_get_opc(req->rq_reqmsg)); - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); list_del_init(&req->rq_list); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); /* If the reply was received normally, this just grabs the spinlock * (ensuring the reply callback has returned), sees that * req->rq_receiving_reply is clear and returns. */ ptlrpc_unregister_reply (req); - if (req->rq_err) - GOTO(out, rc = -EIO); - /* Resend if we need to, unless we were interrupted. */ - if (req->rq_resend && !req->rq_intr) { - /* ...unless we were specifically told otherwise. */ - if (req->rq_no_resend) - GOTO(out, rc = -ETIMEDOUT); - spin_lock_irqsave(&imp->imp_lock, flags); - goto restart; + if (req->rq_err) { + DEBUG_REQ(D_RPCTRACE, req, "err rc=%d status=%d", + rc, req->rq_status); + GOTO(out, rc = rc ? rc : -EIO); } if (req->rq_intr) { @@ -1434,6 +2125,15 @@ restart: GOTO(out, rc = -EINTR); } + /* Resend if we need to */ + if (req->rq_resend) { + /* ...unless we were specifically told otherwise. */ + if (req->rq_no_resend) + GOTO(out, rc = -ETIMEDOUT); + spin_lock(&imp->imp_lock); + goto restart; + } + if (req->rq_timedout) { /* non-recoverable timeout */ GOTO(out, rc = -ETIMEDOUT); } @@ -1445,16 +2145,16 @@ restart: GOTO(out, rc = req->rq_status); } - rc = after_reply (req); + rc = after_reply(req); /* NB may return +ve success rc */ if (req->rq_resend) { - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); goto restart; } out: if (req->rq_bulk != NULL) { - if (rc >= 0) { + if (rc >= 0) { /* success so far. Note that anything going wrong * with bulk now, is EXTREMELY strange, since the * server must have believed that the bulk @@ -1482,7 +2182,7 @@ restart: req->rq_phase = RQ_PHASE_INTERPRET; atomic_dec(&imp->imp_inflight); - wake_up(&imp->imp_recovery_waitq); + cfs_waitq_signal(&imp->imp_recovery_waitq); RETURN(rc); } @@ -1491,37 +2191,29 @@ struct ptlrpc_replay_async_args { int praa_old_status; }; -static int ptlrpc_replay_interpret(struct ptlrpc_request *req, +static int ptlrpc_replay_interpret(const struct lu_env *env, + struct ptlrpc_request *req, void * data, int rc) { struct ptlrpc_replay_async_args *aa = data; struct obd_import *imp = req->rq_import; - unsigned long flags; + ENTRY; atomic_dec(&imp->imp_replay_inflight); - + if (!req->rq_replied) { CERROR("request replay timed out, restarting recovery\n"); GOTO(out, rc = -ETIMEDOUT); } -#if SWAB_PARANOIA - /* Clear reply swab mask; this is a new reply in sender's byte order */ - req->rq_rep_swab_mask = 0; -#endif - LASSERT (req->rq_nob_received <= req->rq_replen); - rc = lustre_unpack_msg(req->rq_repmsg, req->rq_nob_received); - if (rc) { - CERROR("unpack_rep failed: %d\n", rc); - GOTO(out, rc = -EPROTO); - } - - if (req->rq_repmsg->type == PTL_RPC_MSG_ERR && - req->rq_repmsg->status == -ENOTCONN) - GOTO(out, rc = req->rq_repmsg->status); + if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR && + (lustre_msg_get_status(req->rq_repmsg) == -ENOTCONN || + lustre_msg_get_status(req->rq_repmsg) == -ENODEV)) + GOTO(out, rc = lustre_msg_get_status(req->rq_repmsg)); /* The transno had better not change over replay. */ - LASSERT(req->rq_reqmsg->transno == req->rq_repmsg->transno); + LASSERT(lustre_msg_get_transno(req->rq_reqmsg) == + lustre_msg_get_transno(req->rq_repmsg)); DEBUG_REQ(D_HA, req, "got rep"); @@ -1529,23 +2221,32 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req, if (req->rq_replay_cb) req->rq_replay_cb(req); - if (req->rq_replied && req->rq_repmsg->status != aa->praa_old_status) { + if (req->rq_replied && + lustre_msg_get_status(req->rq_repmsg) != aa->praa_old_status) { DEBUG_REQ(D_ERROR, req, "status %d, old was %d", - req->rq_repmsg->status, aa->praa_old_status); + lustre_msg_get_status(req->rq_repmsg), + aa->praa_old_status); } else { /* Put it back for re-replay. */ - req->rq_repmsg->status = aa->praa_old_status; + lustre_msg_set_status(req->rq_repmsg, aa->praa_old_status); } - spin_lock_irqsave(&imp->imp_lock, flags); - imp->imp_last_replay_transno = req->rq_transno; - spin_unlock_irqrestore(&imp->imp_lock, flags); - + /* + * Errors while replay can set transno to 0, but + * imp_last_replay_transno shouldn't be set to 0 anyway + */ + if (req->rq_transno > 0) { + spin_lock(&imp->imp_lock); + LASSERT(req->rq_transno <= imp->imp_last_replay_transno); + imp->imp_last_replay_transno = req->rq_transno; + spin_unlock(&imp->imp_lock); + } else + CERROR("Transno is 0 during replay!\n"); /* continue with recovery */ rc = ptlrpc_import_recovery_state_machine(imp); out: req->rq_send_state = aa->praa_old_state; - + if (rc != 0) /* this replay failed, so restart recovery */ ptlrpc_connect_import(imp, NULL); @@ -1553,39 +2254,32 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req, RETURN(rc); } - int ptlrpc_replay_req(struct ptlrpc_request *req) { struct ptlrpc_replay_async_args *aa; ENTRY; LASSERT(req->rq_import->imp_state == LUSTRE_IMP_REPLAY); - /* Not handling automatic bulk replay yet (or ever?) */ LASSERT(req->rq_bulk == NULL); - DEBUG_REQ(D_HA, req, "REPLAY"); - LASSERT (sizeof (*aa) <= sizeof (req->rq_async_args)); - aa = (struct ptlrpc_replay_async_args *)&req->rq_async_args; + aa = ptlrpc_req_async_args(req); memset(aa, 0, sizeof *aa); /* Prepare request to be resent with ptlrpcd */ aa->praa_old_state = req->rq_send_state; req->rq_send_state = LUSTRE_IMP_REPLAY; req->rq_phase = RQ_PHASE_NEW; - /* - * Q: "How can a req get on the replay list if it wasn't replied?" - * A: "If we failed during the replay of this request, it will still - * be on the list, but rq_replied will have been reset to 0." - */ - if (req->rq_replied) { - aa->praa_old_status = req->rq_repmsg->status; - req->rq_status = 0; - req->rq_replied = 0; - } - + if (req->rq_repmsg) + aa->praa_old_status = lustre_msg_get_status(req->rq_repmsg); + req->rq_status = 0; req->rq_interpret_reply = ptlrpc_replay_interpret; + /* Readjust the timeout for current conditions */ + ptlrpc_at_set_req_timeout(req); + + DEBUG_REQ(D_HA, req, "REPLAY"); + atomic_inc(&req->rq_import->imp_replay_inflight); ptlrpc_request_addref(req); /* ptlrpcd needs a ref */ @@ -1595,7 +2289,6 @@ int ptlrpc_replay_req(struct ptlrpc_request *req) void ptlrpc_abort_inflight(struct obd_import *imp) { - unsigned long flags; struct list_head *tmp, *n; ENTRY; @@ -1603,7 +2296,7 @@ void ptlrpc_abort_inflight(struct obd_import *imp) * ptlrpc_{queue,set}_wait must (and does) hold imp_lock while testing * this flag and then putting requests on sending_list or delayed_list. */ - spin_lock_irqsave(&imp->imp_lock, flags); + spin_lock(&imp->imp_lock); /* XXX locking? Maybe we should remove each request with the list * locked? Also, how do we know if the requests on the list are @@ -1613,11 +2306,12 @@ void ptlrpc_abort_inflight(struct obd_import *imp) struct ptlrpc_request *req = list_entry(tmp, struct ptlrpc_request, rq_list); - DEBUG_REQ(D_HA, req, "inflight"); + DEBUG_REQ(D_RPCTRACE, req, "inflight"); spin_lock (&req->rq_lock); if (req->rq_import_generation < imp->imp_generation) { req->rq_err = 1; + req->rq_status = -EINTR; ptlrpc_wake_client_req(req); } spin_unlock (&req->rq_lock); @@ -1627,28 +2321,81 @@ void ptlrpc_abort_inflight(struct obd_import *imp) struct ptlrpc_request *req = list_entry(tmp, struct ptlrpc_request, rq_list); - DEBUG_REQ(D_HA, req, "aborting waiting req"); + DEBUG_REQ(D_RPCTRACE, req, "aborting waiting req"); spin_lock (&req->rq_lock); if (req->rq_import_generation < imp->imp_generation) { req->rq_err = 1; + req->rq_status = -EINTR; ptlrpc_wake_client_req(req); } spin_unlock (&req->rq_lock); } /* Last chance to free reqs left on the replay list, but we - * will still leak reqs that haven't comitted. */ + * will still leak reqs that haven't committed. */ if (imp->imp_replayable) ptlrpc_free_committed(imp); - spin_unlock_irqrestore(&imp->imp_lock, flags); + spin_unlock(&imp->imp_lock); EXIT; } -static __u64 ptlrpc_last_xid = 0; -static spinlock_t ptlrpc_last_xid_lock = SPIN_LOCK_UNLOCKED; +void ptlrpc_abort_set(struct ptlrpc_request_set *set) +{ + struct list_head *tmp, *n; + + LASSERT(set != NULL); + + list_for_each_safe(tmp, n, &set->set_requests) { + struct ptlrpc_request *req = + list_entry(tmp, struct ptlrpc_request, rq_set_chain); + + spin_lock (&req->rq_lock); + if (req->rq_phase != RQ_PHASE_RPC) { + spin_unlock (&req->rq_lock); + continue; + } + + req->rq_err = 1; + req->rq_status = -EINTR; + ptlrpc_wake_client_req(req); + spin_unlock (&req->rq_lock); + } +} + +static __u64 ptlrpc_last_xid; +static spinlock_t ptlrpc_last_xid_lock; + +/* Initialize the XID for the node. This is common among all requests on + * this node, and only requires the property that it is monotonically + * increasing. It does not need to be sequential. Since this is also used + * as the RDMA match bits, it is important that a single client NOT have + * the same match bits for two different in-flight requests, hence we do + * NOT want to have an XID per target or similar. + * + * To avoid an unlikely collision between match bits after a client reboot + * (which would cause old to be delivered into the wrong buffer) we initialize + * the XID based on the current time, assuming a maximum RPC rate of 1M RPC/s. + * If the time is clearly incorrect, we instead use a 62-bit random number. + * In the worst case the random number will overflow 1M RPCs per second in + * 9133 years, or permutations thereof. + */ +#define YEAR_2004 (1ULL << 30) +void ptlrpc_init_xid(void) +{ + time_t now = cfs_time_current_sec(); + + spin_lock_init(&ptlrpc_last_xid_lock); + if (now < YEAR_2004) { + ll_get_random_bytes(&ptlrpc_last_xid, sizeof(ptlrpc_last_xid)); + ptlrpc_last_xid >>= 2; + ptlrpc_last_xid |= (1ULL << 61); + } else { + ptlrpc_last_xid = (now << 20); + } +} __u64 ptlrpc_next_xid(void) { @@ -1659,4 +2406,18 @@ __u64 ptlrpc_next_xid(void) return tmp; } - +__u64 ptlrpc_sample_next_xid(void) +{ +#if BITS_PER_LONG == 32 + /* need to avoid possible word tearing on 32-bit systems */ + __u64 tmp; + spin_lock(&ptlrpc_last_xid_lock); + tmp = ptlrpc_last_xid + 1; + spin_unlock(&ptlrpc_last_xid_lock); + return tmp; +#else + /* No need to lock, since returned value is racy anyways */ + return ptlrpc_last_xid + 1; +#endif +} +EXPORT_SYMBOL(ptlrpc_sample_next_xid);