X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fevents.c;h=4cc7a746dbc2d39e852a5be558057faba97057b9;hb=c0ab3403465d75c80c5486347741172dca9e0f2f;hp=819e4f1c0fa4846161fa284fcb95902819e755a2;hpb=3f4529794c5bced6a547e914470d509299bc5c6b;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c index 819e4f1..4cc7a74 100644 --- a/lustre/ptlrpc/events.c +++ b/lustre/ptlrpc/events.c @@ -20,10 +20,10 @@ * */ -#define EXPORT_SYMTAB #define DEBUG_SUBSYSTEM S_RPC #include +#include #include ptl_handle_eq_t request_out_eq, reply_in_eq, reply_out_eq, bulk_source_eq, @@ -33,19 +33,13 @@ static const ptl_handle_ni_t *socknal_nip = NULL, *qswnal_nip = NULL; /* * Free the packet when it has gone out */ -static int request_out_callback(ptl_event_t *ev, void *data) +static int request_out_callback(ptl_event_t *ev) { - struct ptlrpc_request *req = ev->mem_desc.user_ptr; - struct ptlrpc_client *cl = req->rq_client; - ENTRY; - if (ev->type == PTL_EVENT_SENT) { - spin_lock(&req->rq_client->cli_lock); - list_del(&req->rq_list); - list_add(&req->rq_list, &cl->cli_sent_head); - spin_unlock(&req->rq_client->cli_lock); - } else { + LASSERT ((ev->mem_desc.options & PTL_MD_IOV) == 0); /* requests always contiguous */ + + if (ev->type != PTL_EVENT_SENT) { // XXX make sure we understand all events, including ACK's CERROR("Unknown event %d\n", ev->type); LBUG(); @@ -58,10 +52,12 @@ static int request_out_callback(ptl_event_t *ev, void *data) /* * Free the packet when it has gone out */ -static int reply_out_callback(ptl_event_t *ev, void *data) +static int reply_out_callback(ptl_event_t *ev) { ENTRY; + LASSERT ((ev->mem_desc.options & PTL_MD_IOV) == 0); /* replies always contiguous */ + if (ev->type == PTL_EVENT_SENT) { OBD_FREE(ev->mem_desc.start, ev->mem_desc.length); } else { @@ -76,15 +72,28 @@ static int reply_out_callback(ptl_event_t *ev, void *data) /* * Wake up the thread waiting for the reply once it comes in. */ -static int reply_in_callback(ptl_event_t *ev, void *data) +static int reply_in_callback(ptl_event_t *ev) { - struct ptlrpc_request *rpc = ev->mem_desc.user_ptr; + struct ptlrpc_request *req = ev->mem_desc.user_ptr; ENTRY; + LASSERT ((ev->mem_desc.options & PTL_MD_IOV) == 0); /* replies always contiguous */ + + if (req->rq_xid == 0x5a5a5a5a5a5a5a5a) { + CERROR("Reply received for freed request! Probably a missing " + "ptlrpc_abort()\n"); + LBUG(); + } + + if (req->rq_xid != ev->match_bits) { + CERROR("Reply packet for wrong request\n"); + LBUG(); + } + if (ev->type == PTL_EVENT_PUT) { - rpc->rq_repmsg = ev->mem_desc.start + ev->offset; + req->rq_repmsg = ev->mem_desc.start + ev->offset; barrier(); - wake_up_interruptible(&rpc->rq_wait_for_rep); + wake_up(&req->rq_wait_for_rep); } else { // XXX make sure we understand all events, including ACK's CERROR("Unknown event %d\n", ev->type); @@ -94,43 +103,16 @@ static int reply_in_callback(ptl_event_t *ev, void *data) RETURN(1); } -int request_in_callback(ptl_event_t *ev, void *data) +int request_in_callback(ptl_event_t *ev) { - struct ptlrpc_service *service = data; - int index; + struct ptlrpc_service *service = ev->mem_desc.user_ptr; + LASSERT ((ev->mem_desc.options & PTL_MD_IOV) == 0); /* requests always contiguous */ + if (ev->rlength != ev->mlength) CERROR("Warning: Possibly truncated rpc (%d/%d)\n", ev->mlength, ev->rlength); - spin_lock(&service->srv_lock); - for (index = 0; index < service->srv_ring_length; index++) - if ( service->srv_buf[index] == ev->mem_desc.start) - break; - - if (index == service->srv_ring_length) - LBUG(); - - service->srv_ref_count[index]++; - - if (ptl_is_valid_handle(&ev->unlinked_me)) { - int idx; - - for (idx = 0; idx < service->srv_ring_length; idx++) - if (service->srv_me_h[idx].handle_idx == - ev->unlinked_me.handle_idx) - break; - if (idx == service->srv_ring_length) - LBUG(); - - CDEBUG(D_NET, "unlinked %d\n", idx); - ptl_set_inv_handle(&(service->srv_me_h[idx])); - - if (service->srv_ref_count[idx] == 0) - ptlrpc_link_svc_me(service, idx); - } - - spin_unlock(&service->srv_lock); if (ev->type == PTL_EVENT_PUT) wake_up(&service->srv_waitq); else @@ -139,17 +121,32 @@ int request_in_callback(ptl_event_t *ev, void *data) return 0; } -static int bulk_source_callback(ptl_event_t *ev, void *data) +static int bulk_source_callback(ptl_event_t *ev) { - struct ptlrpc_bulk_desc *bulk = ev->mem_desc.user_ptr; + struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr; + struct ptlrpc_bulk_page *bulk; + struct list_head *tmp; + struct list_head *next; ENTRY; + /* 1 fragment for each page always */ + LASSERT (ev->mem_desc.niov == desc->b_page_count); + if (ev->type == PTL_EVENT_SENT) { CDEBUG(D_NET, "got SENT event\n"); } else if (ev->type == PTL_EVENT_ACK) { CDEBUG(D_NET, "got ACK event\n"); - bulk->b_flags |= PTL_BULK_FL_SENT; - wake_up_interruptible(&bulk->b_waitq); + + list_for_each_safe(tmp, next, &desc->b_page_list) { + bulk = list_entry(tmp, struct ptlrpc_bulk_page, b_link); + + if (bulk->b_cb != NULL) + bulk->b_cb(bulk); + } + desc->b_flags |= PTL_BULK_FL_SENT; + wake_up(&desc->b_waitq); + if (desc->b_cb != NULL) + desc->b_cb(desc, desc->b_cb_data); } else { CERROR("Unexpected event type!\n"); LBUG(); @@ -158,27 +155,43 @@ static int bulk_source_callback(ptl_event_t *ev, void *data) RETURN(1); } -static int bulk_sink_callback(ptl_event_t *ev, void *data) +static int bulk_sink_callback(ptl_event_t *ev) { - struct ptlrpc_bulk_desc *bulk = ev->mem_desc.user_ptr; + struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr; + struct ptlrpc_bulk_page *bulk; + struct list_head *tmp; + struct list_head *next; + ptl_size_t total = 0; ENTRY; if (ev->type == PTL_EVENT_PUT) { - if (bulk->b_buf != ev->mem_desc.start + ev->offset) - CERROR("bulkbuf != mem_desc -- why?\n"); - bulk->b_flags |= PTL_BULK_FL_RCVD; - if (bulk->b_cb != NULL) - bulk->b_cb(bulk, data); - wake_up_interruptible(&bulk->b_waitq); + /* put with zero offset */ + LASSERT (ev->offset == 0); + /* used iovs */ + LASSERT ((ev->mem_desc.options & PTL_MD_IOV) != 0); + /* 1 fragment for each page always */ + LASSERT (ev->mem_desc.niov == desc->b_page_count); + + list_for_each_safe (tmp, next, &desc->b_page_list) { + bulk = list_entry(tmp, struct ptlrpc_bulk_page, b_link); + + total += bulk->b_buflen; + + if (bulk->b_cb != NULL) + bulk->b_cb(bulk); + } + + LASSERT (ev->mem_desc.length == total); + + desc->b_flags |= PTL_BULK_FL_RCVD; + wake_up(&desc->b_waitq); + if (desc->b_cb != NULL) + desc->b_cb(desc, desc->b_cb_data); } else { CERROR("Unexpected event type!\n"); LBUG(); } - /* FIXME: This should happen unconditionally */ - if (bulk->b_cb != NULL) - ptlrpc_free_bulk(bulk); - RETURN(1); } @@ -200,23 +213,23 @@ int ptlrpc_init_portals(void) else ni = *socknal_nip; - rc = PtlEQAlloc(ni, 128, request_out_callback, NULL, &request_out_eq); + rc = PtlEQAlloc(ni, 1024, request_out_callback, &request_out_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc); - rc = PtlEQAlloc(ni, 128, reply_out_callback, NULL, &reply_out_eq); + rc = PtlEQAlloc(ni, 1024, reply_out_callback, &reply_out_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc); - rc = PtlEQAlloc(ni, 128, reply_in_callback, NULL, &reply_in_eq); + rc = PtlEQAlloc(ni, 1024, reply_in_callback, &reply_in_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc); - rc = PtlEQAlloc(ni, 128, bulk_source_callback, NULL, &bulk_source_eq); + rc = PtlEQAlloc(ni, 1024, bulk_source_callback, &bulk_source_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc); - rc = PtlEQAlloc(ni, 128, bulk_sink_callback, NULL, &bulk_sink_eq); + rc = PtlEQAlloc(ni, 1024, bulk_sink_callback, &bulk_sink_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc);