*
*/
-#define EXPORT_SYMTAB
#define DEBUG_SUBSYSTEM S_RPC
+#include <linux/obd_support.h>
#include <linux/lustre_net.h>
+#include <linux/lustre_lib.h>
+#include <linux/obd.h>
extern ptl_handle_eq_t request_out_eq, reply_in_eq, reply_out_eq,
bulk_source_eq, bulk_sink_eq;
-static ptl_process_id_t local_id = {PTL_ID_ANY, PTL_ID_ANY};
-
-static int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk)
-{
- ENTRY;
-
- if (bulk->b_flags & PTL_BULK_FL_SENT)
- RETURN(1);
-
- if (sigismember(&(current->pending.signal), SIGKILL) ||
- sigismember(&(current->pending.signal), SIGINT)) {
- bulk->b_flags |= PTL_RPC_FL_INTR;
- RETURN(1);
- }
-
- CDEBUG(D_NET, "no event yet\n");
- RETURN(0);
-}
static int ptl_send_buf(struct ptlrpc_request *request,
struct ptlrpc_connection *conn, int portal)
int rc;
ptl_process_id_t remote_id;
ptl_handle_md_t md_h;
- ptl_ack_req_t ack;
+
+ LASSERT(conn);
request->rq_req_md.user_ptr = request;
switch (request->rq_type) {
- case PTL_RPC_TYPE_REQUEST:
+ case PTL_RPC_MSG_REQUEST:
+ request->rq_reqmsg->type = HTON__u32(request->rq_type);
request->rq_req_md.start = request->rq_reqmsg;
request->rq_req_md.length = request->rq_reqlen;
request->rq_req_md.eventq = request_out_eq;
- request->rq_req_md.threshold = 1;
- ack = PTL_NOACK_REQ;
break;
- case PTL_RPC_TYPE_REPLY:
+ case PTL_RPC_MSG_ERR:
+ case PTL_RPC_MSG_REPLY:
+ request->rq_repmsg->type = HTON__u32(request->rq_type);
request->rq_req_md.start = request->rq_repmsg;
request->rq_req_md.length = request->rq_replen;
request->rq_req_md.eventq = reply_out_eq;
- request->rq_req_md.threshold = 1;
- ack = PTL_NOACK_REQ;
break;
default:
LBUG();
return -1; /* notreached */
}
+ request->rq_req_md.threshold = 1;
request->rq_req_md.options = PTL_MD_OP_PUT;
request->rq_req_md.user_ptr = request;
rc = PtlMDBind(conn->c_peer.peer_ni, request->rq_req_md, &md_h);
- //CERROR("MDBind (outgoing req/rep/bulk): %Lu\n", (__u64)md_h);
if (rc != 0) {
CERROR("PtlMDBind failed: %d\n", rc);
LBUG();
remote_id.nid = conn->c_peer.peer_nid;
remote_id.pid = 0;
- CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %Ld\n",
+ CDEBUG(D_NET, "Sending %d bytes to portal %d, xid "LPD64"\n",
request->rq_req_md.length, portal, request->rq_xid);
- rc = PtlPut(md_h, ack, remote_id, portal, 0, request->rq_reqmsg->xid,
+ if (!portal)
+ LBUG();
+ rc = PtlPut(md_h, PTL_NOACK_REQ, remote_id, portal, 0, request->rq_xid,
0, 0);
if (rc != PTL_OK) {
- CERROR("PtlPut(%d, %d, %Ld) failed: %d\n", remote_id.nid,
- portal, request->rq_xid, rc);
+ CERROR("PtlPut("LPU64", %d, "LPD64") failed: %d\n",
+ remote_id.nid, portal, request->rq_xid, rc);
PtlMDUnlink(md_h);
}
return rc;
}
+static inline struct iovec *
+ptlrpc_get_bulk_iov (struct ptlrpc_bulk_desc *desc)
+{
+ struct iovec *iov;
+
+ if (desc->bd_page_count <= sizeof (desc->bd_iov)/sizeof (struct iovec))
+ return (desc->bd_iov);
+
+ OBD_ALLOC (iov, desc->bd_page_count * sizeof (struct iovec));
+ if (iov == NULL)
+ LBUG();
+
+ return (iov);
+}
+
+static inline void
+ptlrpc_put_bulk_iov (struct ptlrpc_bulk_desc *desc, struct iovec *iov)
+{
+ if (desc->bd_page_count <= sizeof (desc->bd_iov)/sizeof (struct iovec))
+ return;
+
+ OBD_FREE (iov, desc->bd_page_count * sizeof (struct iovec));
+}
+
int ptlrpc_send_bulk(struct ptlrpc_bulk_desc *desc)
{
int rc;
struct list_head *tmp, *next;
ptl_process_id_t remote_id;
+ __u32 xid = 0;
+ struct iovec *iov;
ENTRY;
- list_for_each_safe(tmp, next, &desc->b_page_list) {
- /* only request an ACK for the last page */
- int ack = (next == &desc->b_page_list);
+ iov = ptlrpc_get_bulk_iov (desc);
+ if (iov == NULL)
+ RETURN (-ENOMEM);
+
+ desc->bd_md.start = iov;
+ desc->bd_md.niov = 0;
+ desc->bd_md.length = 0;
+ desc->bd_md.eventq = bulk_source_eq;
+ desc->bd_md.threshold = 2; /* SENT and ACK */
+ desc->bd_md.options = PTL_MD_OP_PUT | PTL_MD_IOV;
+ desc->bd_md.user_ptr = desc;
+
+ atomic_set (&desc->bd_source_callback_count, 2);
+
+ list_for_each_safe(tmp, next, &desc->bd_page_list) {
struct ptlrpc_bulk_page *bulk;
- bulk = list_entry(tmp, struct ptlrpc_bulk_page, b_link);
-
- bulk->b_md.start = bulk->b_buf;
- bulk->b_md.length = bulk->b_buflen;
- bulk->b_md.eventq = bulk_source_eq;
- bulk->b_md.threshold = 1 + ack; /* SENT and (if last) ACK */
- bulk->b_md.options = PTL_MD_OP_PUT;
- bulk->b_md.user_ptr = bulk;
-
- rc = PtlMDBind(desc->b_connection->c_peer.peer_ni, bulk->b_md,
- &bulk->b_md_h);
- if (rc != 0) {
- CERROR("PtlMDBind failed: %d\n", rc);
- LBUG();
- RETURN(rc);
- }
+ bulk = list_entry(tmp, struct ptlrpc_bulk_page, bp_link);
- remote_id.nid = desc->b_connection->c_peer.peer_nid;
- remote_id.pid = 0;
+ LASSERT (desc->bd_md.niov < desc->bd_page_count);
- CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %d\n",
- bulk->b_md.length, desc->b_portal, bulk->b_xid);
+ if (desc->bd_md.niov == 0)
+ xid = bulk->bp_xid;
+ LASSERT (xid == bulk->bp_xid); /* should all be the same */
- rc = PtlPut(bulk->b_md_h, (ack ? PTL_ACK_REQ : PTL_NOACK_REQ),
- remote_id, desc->b_portal, 0, bulk->b_xid, 0, 0);
- if (rc != PTL_OK) {
- CERROR("PtlPut(%d, %d, %d) failed: %d\n", remote_id.nid,
- desc->b_portal, bulk->b_xid, rc);
- PtlMDUnlink(bulk->b_md_h);
- LBUG();
- RETURN(rc);
- }
+ iov[desc->bd_md.niov].iov_base = bulk->bp_buf;
+ iov[desc->bd_md.niov].iov_len = bulk->bp_buflen;
+ desc->bd_md.niov++;
+ desc->bd_md.length += bulk->bp_buflen;
}
- wait_event_interruptible(desc->b_waitq, ptlrpc_check_bulk_sent(desc));
+ LASSERT (desc->bd_md.niov == desc->bd_page_count);
+ LASSERT (desc->bd_md.niov != 0);
+
+ rc = PtlMDBind(desc->bd_connection->c_peer.peer_ni, desc->bd_md,
+ &desc->bd_md_h);
- if (desc->b_flags & PTL_RPC_FL_INTR)
- RETURN(-EINTR);
+ ptlrpc_put_bulk_iov (desc, iov); /*move down to reduce latency to send*/
+
+ if (rc != PTL_OK) {
+ CERROR("PtlMDBind failed: %d\n", rc);
+ LBUG();
+ RETURN(rc);
+ }
+
+ remote_id.nid = desc->bd_connection->c_peer.peer_nid;
+ remote_id.pid = 0;
+
+ CDEBUG(D_NET, "Sending %u pages %u bytes to portal %d nid "LPX64" pid "
+ "%d xid %d\n", desc->bd_md.niov, desc->bd_md.length,
+ desc->bd_portal, remote_id.nid, remote_id.pid, xid);
+
+ rc = PtlPut(desc->bd_md_h, PTL_ACK_REQ, remote_id,
+ desc->bd_portal, 0, xid, 0, 0);
+ if (rc != PTL_OK) {
+ CERROR("PtlPut("LPU64", %d, %d) failed: %d\n",
+ remote_id.nid, desc->bd_portal, xid, rc);
+ PtlMDUnlink(desc->bd_md_h);
+ LBUG();
+ RETURN(rc);
+ }
RETURN(0);
}
{
struct list_head *tmp, *next;
int rc;
+ __u32 xid = 0;
+ struct iovec *iov;
+ ptl_process_id_t source_id;
ENTRY;
- list_for_each_safe(tmp, next, &desc->b_page_list) {
+ if (desc->bd_page_count > PTL_MD_MAX_IOV) {
+ CERROR("iov longer than %d pages not supported (count=%d)\n",
+ PTL_MD_MAX_IOV, desc->bd_page_count);
+ RETURN(-EINVAL);
+ }
+
+ iov = ptlrpc_get_bulk_iov (desc);
+ if (iov == NULL)
+ return (-ENOMEM);
+
+ desc->bd_md.start = iov;
+ desc->bd_md.niov = 0;
+ desc->bd_md.length = 0;
+ desc->bd_md.threshold = 1;
+ desc->bd_md.options = PTL_MD_OP_PUT | PTL_MD_IOV;
+ desc->bd_md.user_ptr = desc;
+ desc->bd_md.eventq = bulk_sink_eq;
+
+ list_for_each_safe(tmp, next, &desc->bd_page_list) {
struct ptlrpc_bulk_page *bulk;
- bulk = list_entry(tmp, struct ptlrpc_bulk_page, b_link);
+ bulk = list_entry(tmp, struct ptlrpc_bulk_page, bp_link);
- rc = PtlMEAttach(desc->b_connection->c_peer.peer_ni,
- desc->b_portal, local_id, bulk->b_xid, 0,
- PTL_UNLINK, PTL_INS_AFTER, &bulk->b_me_h);
- if (rc != PTL_OK) {
- CERROR("PtlMEAttach failed: %d\n", rc);
- LBUG();
- GOTO(cleanup, rc);
- }
+ LASSERT (desc->bd_md.niov < desc->bd_page_count);
- bulk->b_md.start = bulk->b_buf;
- bulk->b_md.length = bulk->b_buflen;
- bulk->b_md.threshold = 1;
- bulk->b_md.options = PTL_MD_OP_PUT;
- bulk->b_md.user_ptr = bulk;
- bulk->b_md.eventq = bulk_sink_eq;
+ if (desc->bd_md.niov == 0)
+ xid = bulk->bp_xid;
+ LASSERT (xid == bulk->bp_xid); /* should all be the same */
- rc = PtlMDAttach(bulk->b_me_h, bulk->b_md, PTL_UNLINK,
- &bulk->b_md_h);
- if (rc != PTL_OK) {
- CERROR("PtlMDAttach failed: %d\n", rc);
- LBUG();
- GOTO(cleanup, rc);
- }
+ iov[desc->bd_md.niov].iov_base = bulk->bp_buf;
+ iov[desc->bd_md.niov].iov_len = bulk->bp_buflen;
+ desc->bd_md.niov++;
+ desc->bd_md.length += bulk->bp_buflen;
+ }
+
+ LASSERT (desc->bd_md.niov == desc->bd_page_count);
+ LASSERT (desc->bd_md.niov != 0);
- CDEBUG(D_NET, "Setup bulk sink buffer: %u bytes, xid %u, "
- "portal %u\n", bulk->b_buflen, bulk->b_xid,
- desc->b_portal);
+ source_id.nid = desc->bd_connection->c_peer.peer_nid;
+ source_id.pid = PTL_PID_ANY;
+
+ rc = PtlMEAttach(desc->bd_connection->c_peer.peer_ni,
+ desc->bd_portal, source_id, xid, 0,
+ PTL_UNLINK, PTL_INS_AFTER, &desc->bd_me_h);
+
+ if (rc != PTL_OK) {
+ CERROR("PtlMEAttach failed: %d\n", rc);
+ LBUG();
+ GOTO(cleanup, rc);
+ }
+
+ rc = PtlMDAttach(desc->bd_me_h, desc->bd_md, PTL_UNLINK,
+ &desc->bd_md_h);
+ if (rc != PTL_OK) {
+ CERROR("PtlMDAttach failed: %d\n", rc);
+ LBUG();
+ GOTO(cleanup, rc);
}
+ ptlrpc_put_bulk_iov (desc, iov);
+
+ CDEBUG(D_NET, "Setup bulk sink buffers: %u pages %u bytes, xid %u, "
+ "portal %u\n", desc->bd_md.niov, desc->bd_md.length,
+ xid, desc->bd_portal);
+
RETURN(0);
cleanup:
+ ptlrpc_put_bulk_iov (desc, iov);
ptlrpc_abort_bulk(desc);
return rc;
int ptlrpc_abort_bulk(struct ptlrpc_bulk_desc *desc)
{
- struct list_head *tmp, *next;
-
- list_for_each_safe(tmp, next, &desc->b_page_list) {
- struct ptlrpc_bulk_page *bulk;
- bulk = list_entry(tmp, struct ptlrpc_bulk_page, b_link);
-
- /* This should be safe: these handles are initialized to be
- * invalid in ptlrpc_prep_bulk_page() */
- PtlMDUnlink(bulk->b_md_h);
- PtlMEUnlink(bulk->b_me_h);
- }
+ /* This should be safe: these handles are initialized to be
+ * invalid in ptlrpc_prep_bulk() */
+ PtlMDUnlink(desc->bd_md_h);
+ PtlMEUnlink(desc->bd_me_h);
return 0;
}
int ptlrpc_reply(struct ptlrpc_service *svc, struct ptlrpc_request *req)
{
+ if (req->rq_repmsg == NULL) {
+ CERROR("bad: someone called ptlrpc_reply when they meant "
+ "ptlrpc_error\n");
+ return -EINVAL;
+ }
+
/* FIXME: we need to increment the count of handled events */
- req->rq_type = PTL_RPC_TYPE_REPLY;
- req->rq_repmsg->conn = req->rq_connection->c_remote_conn;
- req->rq_repmsg->token = req->rq_connection->c_remote_token;
- req->rq_repmsg->xid = HTON__u32(req->rq_reqmsg->xid);
+ if (req->rq_type != PTL_RPC_MSG_ERR)
+ req->rq_type = PTL_RPC_MSG_REPLY;
+ //req->rq_repmsg->conn = req->rq_connection->c_remote_conn;
+ //req->rq_repmsg->token = req->rq_connection->c_remote_token;
req->rq_repmsg->status = HTON__u32(req->rq_status);
- req->rq_reqmsg->type = HTON__u32(req->rq_type);
return ptl_send_buf(req, req->rq_connection, svc->srv_rep_portal);
}
if (rc)
RETURN(rc);
- req->rq_repmsg->type = HTON__u32(PTL_RPC_MSG_ERR);
+ req->rq_type = PTL_RPC_MSG_ERR;
rc = ptlrpc_reply(svc, req);
RETURN(rc);
}
-
int ptl_send_rpc(struct ptlrpc_request *request)
{
- ptl_process_id_t local_id;
int rc;
char *repbuf;
+ ptl_process_id_t source_id;
ENTRY;
- if (NTOH__u32(request->rq_reqmsg->type) != PTL_RPC_MSG_REQUEST) {
+ if (request->rq_type != PTL_RPC_MSG_REQUEST) {
CERROR("wrong packet type sent %d\n",
NTOH__u32(request->rq_reqmsg->type));
LBUG();
RETURN(EINVAL);
}
- if (request->rq_replen == 0) {
- CERROR("request->rq_replen is 0!\n");
- RETURN(EINVAL);
- }
- /* request->rq_repmsg is set only when the reply comes in, in
- * client_packet_callback() */
- if (request->rq_reply_md.start)
- OBD_FREE(request->rq_reply_md.start, request->rq_replen);
+ source_id.nid = request->rq_connection->c_peer.peer_nid;
+ source_id.pid = PTL_PID_ANY;
- OBD_ALLOC(repbuf, request->rq_replen);
- if (!repbuf)
- RETURN(ENOMEM);
+ if (request->rq_replen != 0) {
- local_id.nid = PTL_ID_ANY;
- local_id.pid = PTL_ID_ANY;
+ /* request->rq_repmsg is set only when the reply comes in, in
+ * client_packet_callback() */
+ if (request->rq_reply_md.start)
+ OBD_FREE(request->rq_reply_md.start,
+ request->rq_replen);
- down(&request->rq_client->cli_rpc_sem);
+ OBD_ALLOC(repbuf, request->rq_replen);
+ if (!repbuf) {
+ LBUG();
+ RETURN(ENOMEM);
+ }
- rc = PtlMEAttach(request->rq_connection->c_peer.peer_ni,
- request->rq_client->cli_reply_portal,
- local_id, request->rq_reqmsg->xid, 0, PTL_UNLINK,
- PTL_INS_AFTER, &request->rq_reply_me_h);
- if (rc != PTL_OK) {
- CERROR("PtlMEAttach failed: %d\n", rc);
- LBUG();
- GOTO(cleanup, rc);
- }
+ rc = PtlMEAttach(request->rq_connection->c_peer.peer_ni,
+ request->rq_import->imp_client->cli_reply_portal,
+ source_id, request->rq_xid, 0, PTL_UNLINK,
+ PTL_INS_AFTER, &request->rq_reply_me_h);
+ if (rc != PTL_OK) {
+ CERROR("PtlMEAttach failed: %d\n", rc);
+ LBUG();
+ GOTO(cleanup, rc);
+ }
- request->rq_type = PTL_RPC_TYPE_REQUEST;
- request->rq_reply_md.start = repbuf;
- request->rq_reply_md.length = request->rq_replen;
- request->rq_reply_md.threshold = 1;
- request->rq_reply_md.options = PTL_MD_OP_PUT;
- request->rq_reply_md.user_ptr = request;
- request->rq_reply_md.eventq = reply_in_eq;
+ request->rq_reply_md.start = repbuf;
+ request->rq_reply_md.length = request->rq_replen;
+ request->rq_reply_md.threshold = 1;
+ request->rq_reply_md.options = PTL_MD_OP_PUT;
+ request->rq_reply_md.user_ptr = request;
+ request->rq_reply_md.eventq = reply_in_eq;
- rc = PtlMDAttach(request->rq_reply_me_h, request->rq_reply_md,
- PTL_UNLINK, &request->rq_reply_md_h);
- if (rc != PTL_OK) {
- CERROR("PtlMDAttach failed: %d\n", rc);
- LBUG();
- GOTO(cleanup2, rc);
- }
+ rc = PtlMDAttach(request->rq_reply_me_h, request->rq_reply_md,
+ PTL_UNLINK, &request->rq_reply_md_h);
+ if (rc != PTL_OK) {
+ CERROR("PtlMDAttach failed: %d\n", rc);
+ LBUG();
+ GOTO(cleanup2, rc);
+ }
- CDEBUG(D_NET, "Setup reply buffer: %u bytes, xid %Lu, portal %u\n",
- request->rq_replen, request->rq_xid,
- request->rq_client->cli_reply_portal);
+ CDEBUG(D_NET, "Setup reply buffer: %u bytes, xid "LPU64
+ ", portal %u\n",
+ request->rq_replen, request->rq_xid,
+ request->rq_import->imp_client->cli_reply_portal);
+ }
rc = ptl_send_buf(request, request->rq_connection,
- request->rq_client->cli_request_portal);
+ request->rq_import->imp_client->cli_request_portal);
RETURN(rc);
cleanup2:
PtlMEUnlink(request->rq_reply_me_h);
cleanup:
OBD_FREE(repbuf, request->rq_replen);
- up(&request->rq_client->cli_rpc_sem);
+ // up(&request->rq_client->cli_rpc_sem);
return rc;
}
-void ptlrpc_link_svc_me(struct ptlrpc_service *service, int i)
+void ptlrpc_link_svc_me(struct ptlrpc_request_buffer_desc *rqbd)
{
+ struct ptlrpc_service *service = rqbd->rqbd_service;
+ static ptl_process_id_t match_id = {PTL_NID_ANY, PTL_PID_ANY};
int rc;
ptl_md_t dummy;
ptl_handle_md_t md_h;
+ LASSERT (atomic_read (&rqbd->rqbd_refcount) == 0);
+
/* Attach the leading ME on which we build the ring */
rc = PtlMEAttach(service->srv_self.peer_ni, service->srv_req_portal,
- local_id, 0, ~0, PTL_RETAIN, PTL_INS_BEFORE,
- &(service->srv_me_h[i]));
+ match_id, 0, ~0,
+ PTL_UNLINK, PTL_INS_AFTER, &rqbd->rqbd_me_h);
if (rc != PTL_OK) {
CERROR("PtlMEAttach failed: %d\n", rc);
LBUG();
}
-
- if (service->srv_ref_count[i])
- LBUG();
-
- dummy.start = service->srv_buf[i];
- dummy.length = service->srv_buf_size;
- dummy.max_offset = service->srv_buf_size;
- dummy.threshold = PTL_MD_THRESH_INF;
- dummy.options = PTL_MD_OP_PUT | PTL_MD_AUTO_UNLINK;
- dummy.user_ptr = service;
- dummy.eventq = service->srv_eq_h;
- dummy.max_offset = service->srv_buf_size;
-
- rc = PtlMDAttach(service->srv_me_h[i], dummy, PTL_UNLINK, &md_h);
- if (rc != PTL_OK) {
- /* cleanup */
- CERROR("PtlMDAttach failed: %d\n", rc);
- LBUG();
- }
-}
-
-/* ptl_handled_rpc() should be called by the sleeping process once
- * it finishes processing an event. This ensures the ref count is
- * decremented and that the rpc ring buffer cycles properly.
- */
-int ptl_handled_rpc(struct ptlrpc_service *service, void *start)
-{
- int index;
- spin_lock(&service->srv_lock);
+ dummy.start = rqbd->rqbd_buffer;
+ dummy.length = service->srv_buf_size;
+ dummy.max_size = service->srv_max_req_size;
+ dummy.threshold = PTL_MD_THRESH_INF;
+ dummy.options = PTL_MD_OP_PUT | PTL_MD_MAX_SIZE | PTL_MD_AUTO_UNLINK;
+ dummy.user_ptr = rqbd;
+ dummy.eventq = service->srv_eq_h;
- for (index = 0; index < service->srv_ring_length; index++)
- if (service->srv_buf[index] == start)
- break;
+ atomic_inc (&service->srv_nrqbds_receiving);
+ atomic_set (&rqbd->rqbd_refcount, 1); /* 1 ref for portals */
- if (index == service->srv_ring_length)
- LBUG();
-
- CDEBUG(D_INFO, "MD index=%d Ref Count=%d\n", index,
- service->srv_ref_count[index]);
- service->srv_ref_count[index]--;
-
- if (service->srv_ref_count[index] < 0)
+ rc = PtlMDAttach(rqbd->rqbd_me_h, dummy, PTL_UNLINK, &md_h);
+ if (rc != PTL_OK) {
+ CERROR("PtlMDAttach failed: %d\n", rc);
LBUG();
-
- if (service->srv_ref_count[index] == 0 &&
- !ptl_is_valid_handle(&(service->srv_me_h[index]))) {
- CDEBUG(D_NET, "relinking %d\n", index);
- ptlrpc_link_svc_me(service, index);
+#warning proper cleanup required
+ PtlMEUnlink (rqbd->rqbd_me_h);
+ atomic_set (&rqbd->rqbd_refcount, 0);
+ atomic_dec (&service->srv_nrqbds_receiving);
}
-
- spin_unlock(&service->srv_lock);
- return 0;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff