X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fevents.c;h=b2ae37e842d7ace819a9d0af8f6bbf0ec82807da;hb=c2f0e8398d39660a0c0ac02c1fa12faa8b360c5b;hp=405ed4856b42076f906e6ba5ccc3d35041b62c08;hpb=3a6dc87ad41275e2307e413be59d5e556de66a16;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c index 405ed48..b2ae37e 100644 --- a/lustre/ptlrpc/events.c +++ b/lustre/ptlrpc/events.c @@ -20,7 +20,6 @@ * */ -#define EXPORT_SYMTAB #define DEBUG_SUBSYSTEM S_RPC #include @@ -33,7 +32,7 @@ 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) { ENTRY; @@ -50,7 +49,7 @@ 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; @@ -68,15 +67,26 @@ 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; + if (req->rq_xid == 0x5a5a5a5a) { + 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_interruptible(&req->rq_wait_for_rep); } else { // XXX make sure we understand all events, including ACK's CERROR("Unknown event %d\n", ev->type); @@ -86,43 +96,14 @@ 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; 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 @@ -131,7 +112,7 @@ 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_page *bulk = ev->mem_desc.user_ptr; struct ptlrpc_bulk_desc *desc = bulk->b_desc; @@ -141,8 +122,14 @@ static int bulk_source_callback(ptl_event_t *ev, void *data) CDEBUG(D_NET, "got SENT event\n"); } else if (ev->type == PTL_EVENT_ACK) { CDEBUG(D_NET, "got ACK event\n"); - desc->b_flags |= PTL_BULK_FL_SENT; - wake_up_interruptible(&desc->b_waitq); + if (bulk->b_cb != NULL) + bulk->b_cb(bulk); + if (atomic_dec_and_test(&desc->b_pages_remaining)) { + desc->b_flags |= PTL_BULK_FL_SENT; + wake_up_interruptible(&desc->b_waitq); + if (desc->b_cb != NULL) + desc->b_cb(desc, desc->b_cb_data); + } } else { CERROR("Unexpected event type!\n"); LBUG(); @@ -151,7 +138,7 @@ 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_page *bulk = ev->mem_desc.user_ptr; struct ptlrpc_bulk_desc *desc = bulk->b_desc; @@ -160,14 +147,13 @@ static int bulk_sink_callback(ptl_event_t *ev, void *data) if (ev->type == PTL_EVENT_PUT) { if (bulk->b_buf != ev->mem_desc.start + ev->offset) CERROR("bulkbuf != mem_desc -- why?\n"); - desc->b_finished_count++; if (bulk->b_cb != NULL) bulk->b_cb(bulk); - if (desc->b_finished_count == desc->b_page_count) { + if (atomic_dec_and_test(&desc->b_pages_remaining)) { desc->b_flags |= PTL_BULK_FL_RCVD; wake_up_interruptible(&desc->b_waitq); if (desc->b_cb != NULL) - desc->b_cb(desc); + desc->b_cb(desc, desc->b_cb_data); } } else { CERROR("Unexpected event type!\n"); @@ -195,23 +181,23 @@ int ptlrpc_init_portals(void) else ni = *socknal_nip; - rc = PtlEQAlloc(ni, 128, request_out_callback, NULL, &request_out_eq); + rc = PtlEQAlloc(ni, 128, 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, 128, 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, 128, 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, 128, 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, 128, bulk_sink_callback, &bulk_sink_eq); if (rc != PTL_OK) CERROR("PtlEQAlloc failed: %d\n", rc);