#define EXPORT_SYMTAB
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-
#define DEBUG_SUBSYSTEM S_RPC
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
#include <linux/lustre_net.h>
-extern ptl_handle_eq_t bulk_source_eq, sent_pkt_eq, rcvd_rep_eq, bulk_sink_eq;
+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};
int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk)
{
- if (bulk->b_flags == PTL_BULK_SENT) {
- EXIT;
- return 1;
- }
+ 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_INTR;
- EXIT;
- return 1;
+ bulk->b_flags |= PTL_RPC_FL_INTR;
+ RETURN(1);
}
CDEBUG(D_NET, "no event yet\n");
- return 0;
+ RETURN(0);
}
-int ptl_send_buf(struct ptlrpc_request *request, struct lustre_peer *peer,
- int portal)
+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;
+ request->rq_req_md.user_ptr = request;
+
switch (request->rq_type) {
- case PTL_RPC_BULK:
- request->rq_req_md.start = request->rq_bulkbuf;
- request->rq_req_md.length = request->rq_bulklen;
- request->rq_req_md.eventq = bulk_source_eq;
- request->rq_req_md.threshold = 2; /* SENT and ACK events */
- ack = PTL_ACK_REQ;
- break;
- case PTL_RPC_REQUEST:
- request->rq_req_md.start = request->rq_reqbuf;
+ case PTL_RPC_TYPE_REQUEST:
+ request->rq_req_md.start = request->rq_reqmsg;
request->rq_req_md.length = request->rq_reqlen;
- request->rq_req_md.eventq = sent_pkt_eq;
+ request->rq_req_md.eventq = request_out_eq;
request->rq_req_md.threshold = 1;
ack = PTL_NOACK_REQ;
break;
- case PTL_RPC_REPLY:
- request->rq_req_md.start = request->rq_repbuf;
+ case PTL_RPC_TYPE_REPLY:
+ request->rq_req_md.start = request->rq_repmsg;
request->rq_req_md.length = request->rq_replen;
- request->rq_req_md.eventq = sent_pkt_eq;
+ request->rq_req_md.eventq = reply_out_eq;
request->rq_req_md.threshold = 1;
ack = PTL_NOACK_REQ;
break;
request->rq_req_md.options = PTL_MD_OP_PUT;
request->rq_req_md.user_ptr = request;
- rc = PtlMDBind(peer->peer_ni, request->rq_req_md, &md_h);
+ 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);
return rc;
}
- remote_id.nid = peer->peer_nid;
+ remote_id.nid = conn->c_peer.peer_nid;
remote_id.pid = 0;
CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %d\n",
- request->rq_req_md.length, portal, request->rq_xid);
+ request->rq_req_md.length, portal, request->rq_reqmsg->xid);
- rc = PtlPut(md_h, ack, remote_id, portal, 0, request->rq_xid, 0, 0);
+ rc = PtlPut(md_h, ack, remote_id, portal, 0, request->rq_reqmsg->xid,
+ 0, 0);
if (rc != PTL_OK) {
CERROR("PtlPut(%d, %d, %d) failed: %d\n", remote_id.nid,
- portal, request->rq_xid, rc);
+ portal, request->rq_reqmsg->xid, rc);
PtlMDUnlink(md_h);
}
bulk->b_md.options = PTL_MD_OP_PUT;
bulk->b_md.user_ptr = bulk;
- rc = PtlMDBind(bulk->b_peer.peer_ni, bulk->b_md, &bulk->b_md_h);
+ rc = PtlMDBind(bulk->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;
}
- remote_id.nid = bulk->b_peer.peer_nid;
+ remote_id.nid = bulk->b_connection->c_peer.peer_nid;
remote_id.pid = 0;
CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %d\n",
int ptlrpc_register_bulk(struct ptlrpc_bulk_desc *bulk)
{
int rc;
-
ENTRY;
- rc = PtlMEAttach(bulk->b_peer.peer_ni, bulk->b_portal, local_id,
- bulk->b_xid, 0, PTL_UNLINK, PTL_INS_AFTER,
+ rc = PtlMEAttach(bulk->b_connection->c_peer.peer_ni, bulk->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);
return rc;
}
-int ptlrpc_reply(struct obd_device *obddev, struct ptlrpc_service *svc,
- struct ptlrpc_request *req)
+int ptlrpc_reply(struct ptlrpc_service *svc, struct ptlrpc_request *req)
{
- struct ptlrpc_request *clnt_req = req->rq_reply_handle;
- ENTRY;
-
- if (req->rq_reply_handle == NULL) {
- /* This is a request that came from the network via portals. */
-
- /* FIXME: we need to increment the count of handled events */
- req->rq_type = PTL_RPC_REPLY;
- req->rq_repmsg->xid = HTON__u32(req->rq_reqmsg->xid);
- req->rq_repmsg->status = HTON__u32(req->rq_status);
- req->rq_reqmsg->type = HTON__u32(req->rq_type);
- ptl_send_buf(req, &req->rq_peer, svc->srv_rep_portal);
- } else {
- /* This is a local request that came from another thread. */
-
- /* move the reply to the client */
- clnt_req->rq_replen = req->rq_replen;
- clnt_req->rq_repbuf = req->rq_repbuf;
- req->rq_repbuf = NULL;
- req->rq_replen = 0;
-
- /* free the request buffer */
- OBD_FREE(req->rq_reqbuf, req->rq_reqlen);
- req->rq_reqbuf = NULL;
-
- /* wake up the client */
- wake_up_interruptible(&clnt_req->rq_wait_for_rep);
- }
-
- RETURN(0);
+ /* 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);
+ 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);
}
-int ptlrpc_error(struct obd_device *obddev, struct ptlrpc_service *svc,
- struct ptlrpc_request *req)
+int ptlrpc_error(struct ptlrpc_service *svc, struct ptlrpc_request *req)
{
int rc;
ENTRY;
- if (req->rq_repbuf) {
- CERROR("req has repbuf\n");
+ if (req->rq_repmsg) {
+ CERROR("req already has repmsg\n");
LBUG();
}
- rc = lustre_pack_msg(0, NULL, NULL, &req->rq_replen, &req->rq_repbuf);
- req->rq_repmsg = (struct lustre_msg *)req->rq_repbuf;
+ rc = lustre_pack_msg(0, NULL, NULL, &req->rq_replen, &req->rq_repmsg);
if (rc)
RETURN(rc);
- req->rq_repmsg->type = HTON__u32(PTL_RPC_ERR);
+ req->rq_repmsg->type = HTON__u32(PTL_RPC_MSG_ERR);
- rc = ptlrpc_reply(obddev, svc, req);
+ rc = ptlrpc_reply(svc, req);
RETURN(rc);
}
-int ptl_send_rpc(struct ptlrpc_request *request, struct ptlrpc_client *cl)
+void ptlrpc_resend_req(struct ptlrpc_request *req)
+{
+ ENTRY;
+ req->rq_flags |= PTL_RPC_FL_RESEND;
+ req->rq_flags &= ~PTL_RPC_FL_TIMEOUT;
+ wake_up_interruptible(&req->rq_wait_for_rep);
+ EXIT;
+ return;
+}
+
+int ptl_send_rpc(struct ptlrpc_request *request)
{
ptl_process_id_t local_id;
int rc;
ENTRY;
- if (NTOH__u32(request->rq_reqmsg->type) != PTL_RPC_REQUEST) {
+ if (NTOH__u32(request->rq_reqmsg->type) != PTL_RPC_MSG_REQUEST) {
CERROR("wrong packet type sent %d\n",
NTOH__u32(request->rq_reqmsg->type));
LBUG();
RETURN(-EINVAL);
}
- /* request->rq_repbuf is set only when the reply comes in, in
+ /* request->rq_repmsg is set only when the reply comes in, in
* client_packet_callback() */
OBD_ALLOC(repbuf, request->rq_replen);
if (!repbuf)
local_id.nid = PTL_ID_ANY;
local_id.pid = PTL_ID_ANY;
- down(&cl->cli_rpc_sem);
+ down(&request->rq_client->cli_rpc_sem);
- rc = PtlMEAttach(cl->cli_server.peer_ni, request->rq_reply_portal,
- local_id, request->rq_xid, 0, PTL_UNLINK,
+ 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);
GOTO(cleanup, rc);
}
- request->rq_type = PTL_RPC_REQUEST;
+ 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 = rcvd_rep_eq;
+ 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);
}
CDEBUG(D_NET, "Setup reply buffer: %u bytes, xid %u, portal %u\n",
- request->rq_replen, request->rq_xid, request->rq_reply_portal);
+ request->rq_replen, request->rq_reqmsg->xid,
+ request->rq_client->cli_reply_portal);
+
+ spin_lock(&request->rq_client->cli_lock);
+ list_add(&request->rq_list, &request->rq_client->cli_sending_head);
+ spin_unlock(&request->rq_client->cli_lock);
- rc = ptl_send_buf(request, &cl->cli_server, request->rq_req_portal);
+ rc = ptl_send_buf(request, request->rq_connection,
+ request->rq_client->cli_request_portal);
RETURN(rc);
cleanup2:
PtlMEUnlink(request->rq_reply_me_h);
cleanup:
OBD_FREE(repbuf, request->rq_replen);
- up(&cl->cli_rpc_sem);
+ up(&request->rq_client->cli_rpc_sem);
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff