* Data movement routines
*
* Copyright (c) 2001-2003 Cluster File Systems, Inc.
- * Copyright (c) 2001-2002 Sandia National Laboratories
*
- * This file is part of Lustre, http://www.sf.net/projects/lustre/
+ * This file is part of Lustre, http://www.lustre.org
*
* Lustre is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define DEBUG_SUBSYSTEM S_PORTALS
+
#ifndef __KERNEL__
# include <stdio.h>
#else
-# define DEBUG_SUBSYSTEM S_PORTALS
-# include <linux/kp30.h>
+# include <libcfs/kp30.h>
#endif
#include <portals/p30.h>
#include <portals/lib-p30.h>
static void lib_commit_md (lib_nal_t *nal, lib_md_t *md, lib_msg_t *msg);
static lib_md_t *
-lib_match_md(lib_nal_t *nal, int index, int op_mask,
- ptl_nid_t src_nid, ptl_pid_t src_pid,
+lib_match_md(lib_nal_t *nal, int index, int op_mask,
+ ptl_nid_t src_nid, ptl_pid_t src_pid,
ptl_size_t rlength, ptl_size_t roffset,
ptl_match_bits_t match_bits, lib_msg_t *msg,
ptl_size_t *mlength_out, ptl_size_t *offset_out)
if (me->match_id.nid != PTL_NID_ANY &&
me->match_id.nid != src_nid)
continue;
-
- CDEBUG(D_NET,"match_id.pid [%x], src_pid [%x]\n", me->match_id.pid, src_pid);
+
+ CDEBUG(D_NET, "match_id.pid [%x], src_pid [%x]\n",
+ me->match_id.pid, src_pid);
if (me->match_id.pid != PTL_PID_ANY &&
me->match_id.pid != src_pid)
/* Commit to this ME/MD */
CDEBUG(D_NET, "Incoming %s index %x from "LPU64"/%u of "
- "length %d/%d into md "LPX64" [%d] + %d\n",
+ "length %d/%d into md "LPX64" [%d] + %d\n",
(op_mask == PTL_MD_OP_PUT) ? "put" : "get",
- index, src_nid, src_pid, mlength, rlength,
+ index, src_nid, src_pid, mlength, rlength,
md->md_lh.lh_cookie, md->md_niov, offset);
lib_commit_md(nal, md, msg);
/* NB Caller sets ev.type and ev.hdr_data */
msg->ev.initiator.nid = src_nid;
msg->ev.initiator.pid = src_pid;
- msg->ev.portal = index;
+ msg->ev.pt_index = index;
msg->ev.match_bits = match_bits;
msg->ev.rlength = rlength;
msg->ev.mlength = mlength;
msg->ev.offset = offset;
- lib_md_deconstruct(nal, md, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, md, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, md);
*offset_out = offset;
*mlength_out = mlength;
struct list_head *el;
struct list_head *next;
struct list_head cull;
-
+
if (threshold != 0) {
/* Adding a new entry */
PORTAL_ALLOC(tp, sizeof(*tp));
if (tp == NULL)
return PTL_NO_SPACE;
-
+
tp->tp_nid = nid;
tp->tp_threshold = threshold;
-
+
LIB_LOCK(nal, flags);
list_add_tail (&tp->tp_list, &nal->libnal_ni.ni_test_peers);
LIB_UNLOCK(nal, flags);
return PTL_OK;
}
-
+
/* removing entries */
- INIT_LIST_HEAD (&cull);
-
+ CFS_INIT_LIST_HEAD (&cull);
+
LIB_LOCK(nal, flags);
list_for_each_safe (el, next, &nal->libnal_ni.ni_test_peers) {
tp = list_entry (el, lib_test_peer_t, tp_list);
-
+
if (tp->tp_threshold == 0 || /* needs culling anyway */
nid == PTL_NID_ANY || /* removing all entries */
tp->tp_nid == nid) /* matched this one */
list_add (&tp->tp_list, &cull);
}
}
-
+
LIB_UNLOCK(nal, flags);
-
+
while (!list_empty (&cull)) {
tp = list_entry (cull.next, lib_test_peer_t, tp_list);
}
static int
-fail_peer (lib_nal_t *nal, ptl_nid_t nid, int outgoing)
+fail_peer (lib_nal_t *nal, ptl_nid_t nid, int outgoing)
{
lib_test_peer_t *tp;
struct list_head *el;
struct list_head cull;
int fail = 0;
- INIT_LIST_HEAD (&cull);
-
+ CFS_INIT_LIST_HEAD (&cull);
+
LIB_LOCK (nal, flags);
list_for_each_safe (el, next, &nal->libnal_ni.ni_test_peers) {
}
continue;
}
-
+
if (tp->tp_nid == PTL_NID_ANY || /* fail every peer */
nid == tp->tp_nid) { /* fail this peer */
fail = 1;
-
+
if (tp->tp_threshold != PTL_MD_THRESH_INF) {
tp->tp_threshold--;
if (outgoing &&
break;
}
}
-
+
LIB_UNLOCK (nal, flags);
while (!list_empty (&cull)) {
tp = list_entry (cull.next, lib_test_peer_t, tp_list);
list_del (&tp->tp_list);
-
+
PORTAL_FREE(tp, sizeof (*tp));
}
lib_iov_nob (int niov, struct iovec *iov)
{
ptl_size_t nob = 0;
-
+
while (niov-- > 0)
nob += (iov++)->iov_len;
-
+
return (nob);
}
void
-lib_copy_iov2buf (char *dest, int niov, struct iovec *iov,
+lib_copy_iov2buf (char *dest, int niov, struct iovec *iov,
ptl_size_t offset, ptl_size_t len)
{
ptl_size_t nob;
if (len == 0)
return;
-
+
/* skip complete frags before 'offset' */
LASSERT (niov > 0);
while (offset >= iov->iov_len) {
niov--;
LASSERT (niov > 0);
}
-
+
do {
LASSERT (niov > 0);
nob = MIN (iov->iov_len - offset, len);
}
void
-lib_copy_buf2iov (int niov, struct iovec *iov, ptl_size_t offset,
+lib_copy_buf2iov (int niov, struct iovec *iov, ptl_size_t offset,
char *src, ptl_size_t len)
{
ptl_size_t nob;
niov--;
LASSERT (niov > 0);
}
-
+
do {
LASSERT (niov > 0);
nob = MIN (iov->iov_len - offset, len);
memcpy (iov->iov_base + offset, src, nob);
-
+
len -= nob;
src += nob;
niov--;
for (;;) {
LASSERT (src_niov > 0);
LASSERT (niov <= dst_niov);
-
+
frag_len = src->iov_len - offset;
dst->iov_base = ((char *)src->iov_base) + offset;
dst->iov_len = len;
return (niov);
}
-
+
dst->iov_len = frag_len;
len -= frag_len;
#ifndef __KERNEL__
ptl_size_t
-lib_kiov_nob (int niov, ptl_kiov_t *kiov)
+lib_kiov_nob (int niov, ptl_kiov_t *kiov)
{
LASSERT (0);
return (0);
}
void
-lib_copy_kiov2buf (char *dest, int niov, ptl_kiov_t *kiov,
+lib_copy_kiov2buf (char *dest, int niov, ptl_kiov_t *kiov,
ptl_size_t offset, ptl_size_t len)
{
LASSERT (0);
}
int
-lib_extract_kiov (int dst_niov, ptl_kiov_t *dst,
+lib_extract_kiov (int dst_niov, ptl_kiov_t *dst,
int src_niov, ptl_kiov_t *src,
ptl_size_t offset, ptl_size_t len)
{
#else
ptl_size_t
-lib_kiov_nob (int niov, ptl_kiov_t *kiov)
+lib_kiov_nob (int niov, ptl_kiov_t *kiov)
{
ptl_size_t nob = 0;
}
void
-lib_copy_kiov2buf (char *dest, int niov, ptl_kiov_t *kiov,
+lib_copy_kiov2buf (char *dest, int niov, ptl_kiov_t *kiov,
ptl_size_t offset, ptl_size_t len)
{
ptl_size_t nob;
if (len == 0)
return;
-
+
LASSERT (!in_interrupt ());
LASSERT (niov > 0);
niov--;
LASSERT (niov > 0);
}
-
+
do{
LASSERT (niov > 0);
nob = MIN (kiov->kiov_len - offset, len);
-
- addr = ((char *)kmap (kiov->kiov_page)) + kiov->kiov_offset + offset;
+
+ addr = ((char *)cfs_kmap (kiov->kiov_page)) + kiov->kiov_offset + offset;
memcpy (dest, addr, nob);
- kunmap (kiov->kiov_page);
-
+ cfs_kunmap (kiov->kiov_page);
+
len -= nob;
dest += nob;
niov--;
niov--;
LASSERT (niov > 0);
}
-
+
do {
LASSERT (niov > 0);
nob = MIN (kiov->kiov_len - offset, len);
-
- addr = ((char *)kmap (kiov->kiov_page)) + kiov->kiov_offset + offset;
+
+ addr = ((char *)cfs_kmap (kiov->kiov_page)) + kiov->kiov_offset + offset;
memcpy (addr, src, nob);
- kunmap (kiov->kiov_page);
-
+ cfs_kunmap (kiov->kiov_page);
+
len -= nob;
src += nob;
niov--;
}
int
-lib_extract_kiov (int dst_niov, ptl_kiov_t *dst,
+lib_extract_kiov (int dst_niov, ptl_kiov_t *dst,
int src_niov, ptl_kiov_t *src,
ptl_size_t offset, ptl_size_t len)
{
for (;;) {
LASSERT (src_niov > 0);
LASSERT (niov <= dst_niov);
-
+
frag_len = src->kiov_len - offset;
dst->kiov_page = src->kiov_page;
dst->kiov_offset = src->kiov_offset + offset;
if ((md->options & PTL_MD_KIOV) == 0)
return (nal->libnal_recv(nal, private, msg,
- md->md_niov, md->md_iov.iov,
+ md->md_niov, md->md_iov.iov,
offset, mlen, rlen));
- return (nal->libnal_recv_pages(nal, private, msg,
+ return (nal->libnal_recv_pages(nal, private, msg,
md->md_niov, md->md_iov.kiov,
offset, mlen, rlen));
}
ptl_err_t
lib_send (lib_nal_t *nal, void *private, lib_msg_t *msg,
ptl_hdr_t *hdr, int type, ptl_nid_t nid, ptl_pid_t pid,
- lib_md_t *md, ptl_size_t offset, ptl_size_t len)
+ lib_md_t *md, ptl_size_t offset, ptl_size_t len)
{
if (len == 0)
return (nal->libnal_send(nal, private, msg,
hdr, type, nid, pid,
0, NULL,
offset, len));
-
+
if ((md->options & PTL_MD_KIOV) == 0)
- return (nal->libnal_send(nal, private, msg,
+ return (nal->libnal_send(nal, private, msg,
hdr, type, nid, pid,
md->md_niov, md->md_iov.iov,
offset, len));
- return (nal->libnal_send_pages(nal, private, msg,
+ return (nal->libnal_send_pages(nal, private, msg,
hdr, type, nid, pid,
md->md_niov, md->md_iov.kiov,
offset, len));
* decrementing its threshold. Come what may, the network "owns"
* the MD until a call to lib_finalize() signals completion. */
msg->md = md;
-
+
md->pending++;
if (md->threshold != PTL_MD_THRESH_INF) {
LASSERT (md->threshold > 0);
/* CAVEAT EMPTOR: this only drops messages that we've not committed
* to receive (init_msg() not called) and therefore can't cause an
* event. */
-
+
LIB_LOCK(nal, flags);
nal->libnal_ni.ni_counters.drop_count++;
nal->libnal_ni.ni_counters.drop_length += hdr->payload_length;
ptl_err_t rc;
lib_md_t *md;
unsigned long flags;
-
+
/* Convert put fields to host byte order */
- hdr->msg.put.match_bits = NTOH__u64 (hdr->msg.put.match_bits);
- hdr->msg.put.ptl_index = NTOH__u32 (hdr->msg.put.ptl_index);
- hdr->msg.put.offset = NTOH__u32 (hdr->msg.put.offset);
+ hdr->msg.put.match_bits = le64_to_cpu(hdr->msg.put.match_bits);
+ hdr->msg.put.ptl_index = le32_to_cpu(hdr->msg.put.ptl_index);
+ hdr->msg.put.offset = le32_to_cpu(hdr->msg.put.offset);
LIB_LOCK(nal, flags);
int rc;
/* Convert get fields to host byte order */
- hdr->msg.get.match_bits = NTOH__u64 (hdr->msg.get.match_bits);
- hdr->msg.get.ptl_index = NTOH__u32 (hdr->msg.get.ptl_index);
- hdr->msg.get.sink_length = NTOH__u32 (hdr->msg.get.sink_length);
- hdr->msg.get.src_offset = NTOH__u32 (hdr->msg.get.src_offset);
+ hdr->msg.get.match_bits = le64_to_cpu(hdr->msg.get.match_bits);
+ hdr->msg.get.ptl_index = le32_to_cpu(hdr->msg.get.ptl_index);
+ hdr->msg.get.sink_length = le32_to_cpu(hdr->msg.get.sink_length);
+ hdr->msg.get.src_offset = le32_to_cpu(hdr->msg.get.src_offset);
LIB_LOCK(nal, flags);
LIB_UNLOCK(nal, flags);
memset (&reply, 0, sizeof (reply));
- reply.type = HTON__u32 (PTL_MSG_REPLY);
- reply.dest_nid = HTON__u64 (hdr->src_nid);
- reply.dest_pid = HTON__u32 (hdr->src_pid);
- reply.src_nid = HTON__u64 (ni->ni_pid.nid);
- reply.src_pid = HTON__u32 (ni->ni_pid.pid);
- reply.payload_length = HTON__u32 (mlength);
+ reply.type = cpu_to_le32(PTL_MSG_REPLY);
+ reply.dest_nid = cpu_to_le64(hdr->src_nid);
+ reply.dest_pid = cpu_to_le32(hdr->src_pid);
+ reply.src_nid = cpu_to_le64(ni->ni_pid.nid);
+ reply.src_pid = cpu_to_le32(ni->ni_pid.pid);
+ reply.payload_length = cpu_to_le32(mlength);
reply.msg.reply.dst_wmd = hdr->msg.get.return_wmd;
/* NB call lib_send() _BEFORE_ lib_recv() completes the incoming
* message. Some NALs _require_ this to implement optimized GET */
- rc = lib_send (nal, private, msg, &reply, PTL_MSG_REPLY,
+ rc = lib_send (nal, private, msg, &reply, PTL_MSG_REPLY,
hdr->src_nid, hdr->src_pid, md, offset, mlength);
if (rc != PTL_OK)
CERROR(LPU64": Unable to send REPLY for GET from "LPU64": %d\n",
}
CDEBUG(D_NET, "Reply from "LPU64" of length %d/%d into md "LPX64"\n",
- hdr->src_nid, length, rlength,
+ hdr->src_nid, length, rlength,
hdr->msg.reply.dst_wmd.wh_object_cookie);
lib_commit_md(nal, md, msg);
msg->ev.mlength = length;
msg->ev.offset = 0;
- lib_md_deconstruct(nal, md, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, md, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, md);
ni->ni_counters.recv_count++;
ni->ni_counters.recv_length += length;
unsigned long flags;
/* Convert ack fields to host byte order */
- hdr->msg.ack.match_bits = NTOH__u64 (hdr->msg.ack.match_bits);
- hdr->msg.ack.mlength = NTOH__u32 (hdr->msg.ack.mlength);
+ hdr->msg.ack.match_bits = le64_to_cpu(hdr->msg.ack.match_bits);
+ hdr->msg.ack.mlength = le32_to_cpu(hdr->msg.ack.mlength);
LIB_LOCK(nal, flags);
md = ptl_wire_handle2md(&hdr->msg.ack.dst_wmd, nal);
if (md == NULL || md->threshold == 0) {
CDEBUG(D_INFO, LPU64": Dropping ACK from "LPU64" to %s MD "
- LPX64"."LPX64"\n", ni->ni_pid.nid, hdr->src_nid,
+ LPX64"."LPX64"\n", ni->ni_pid.nid, hdr->src_nid,
(md == NULL) ? "invalid" : "inactive",
hdr->msg.ack.dst_wmd.wh_interface_cookie,
hdr->msg.ack.dst_wmd.wh_object_cookie);
}
CDEBUG(D_NET, LPU64": ACK from "LPU64" into md "LPX64"\n",
- ni->ni_pid.nid, hdr->src_nid,
+ ni->ni_pid.nid, hdr->src_nid,
hdr->msg.ack.dst_wmd.wh_object_cookie);
lib_commit_md(nal, md, msg);
msg->ev.mlength = hdr->msg.ack.mlength;
msg->ev.match_bits = hdr->msg.ack.match_bits;
- lib_md_deconstruct(nal, md, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, md, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, md);
ni->ni_counters.recv_count++;
LIB_UNLOCK(nal, flags);
-
+
/* We have received and matched up the ack OK, create the
* completion event now... */
lib_finalize(nal, private, msg, PTL_OK);
/* ...and now discard any junk after the hdr */
(void) lib_recv(nal, private, NULL, NULL, 0, 0, hdr->payload_length);
-
+
return (PTL_OK);
}
/* NB we return PTL_OK if we manage to parse the header and believe
* it looks OK. Anything that goes wrong with receiving the
* message after that point is the responsibility of the NAL */
-
+
/* convert common fields to host byte order */
- hdr->type = NTOH__u32 (hdr->type);
- hdr->src_nid = NTOH__u64 (hdr->src_nid);
- hdr->src_pid = NTOH__u32 (hdr->src_pid);
- hdr->dest_pid = NTOH__u32 (hdr->dest_pid);
- hdr->payload_length = NTOH__u32(hdr->payload_length);
+ hdr->type = le32_to_cpu(hdr->type);
+ hdr->src_nid = le64_to_cpu(hdr->src_nid);
+ hdr->src_pid = le32_to_cpu(hdr->src_pid);
+ hdr->dest_pid = le32_to_cpu(hdr->dest_pid);
+ hdr->payload_length = le32_to_cpu(hdr->payload_length);
switch (hdr->type) {
case PTL_MSG_HELLO: {
/* dest_nid is really ptl_magicversion_t */
ptl_magicversion_t *mv = (ptl_magicversion_t *)&hdr->dest_nid;
- mv->magic = NTOH__u32(mv->magic);
- mv->version_major = NTOH__u16(mv->version_major);
- mv->version_minor = NTOH__u16(mv->version_minor);
+ mv->magic = le32_to_cpu(mv->magic);
+ mv->version_major = le16_to_cpu(mv->version_major);
+ mv->version_minor = le16_to_cpu(mv->version_minor);
if (mv->magic == PORTALS_PROTO_MAGIC &&
mv->version_major == PORTALS_PROTO_VERSION_MAJOR &&
mv->version_minor == PORTALS_PROTO_VERSION_MINOR) {
CWARN (LPU64": Dropping unexpected HELLO message: "
"magic %d, version %d.%d from "LPD64"\n",
- nal->libnal_ni.ni_pid.nid, mv->magic,
+ nal->libnal_ni.ni_pid.nid, mv->magic,
mv->version_major, mv->version_minor,
hdr->src_nid);
/* we got garbage */
CERROR (LPU64": Bad HELLO message: "
"magic %d, version %d.%d from "LPD64"\n",
- nal->libnal_ni.ni_pid.nid, mv->magic,
+ nal->libnal_ni.ni_pid.nid, mv->magic,
mv->version_major, mv->version_minor,
hdr->src_nid);
return PTL_FAIL;
case PTL_MSG_PUT:
case PTL_MSG_GET:
case PTL_MSG_REPLY:
- hdr->dest_nid = NTOH__u64 (hdr->dest_nid);
+ hdr->dest_nid = le64_to_cpu(hdr->dest_nid);
if (hdr->dest_nid != nal->libnal_ni.ni_pid.nid) {
CERROR(LPU64": BAD dest NID in %s message from"
- LPU64" to "LPU64" (not me)\n",
+ LPU64" to "LPU64" (not me)\n",
nal->libnal_ni.ni_pid.nid, hdr_type_string (hdr),
hdr->src_nid, hdr->dest_nid);
return PTL_FAIL;
{
CERROR(LPU64": Dropping incoming %s from "LPU64
": simulated failure\n",
- nal->libnal_ni.ni_pid.nid, hdr_type_string (hdr),
+ nal->libnal_ni.ni_pid.nid, hdr_type_string (hdr),
hdr->src_nid);
lib_drop_message(nal, private, hdr);
return PTL_OK;
if (msg == NULL) {
CERROR(LPU64": Dropping incoming %s from "LPU64
": can't allocate a lib_msg_t\n",
- nal->libnal_ni.ni_pid.nid, hdr_type_string (hdr),
+ nal->libnal_ni.ni_pid.nid, hdr_type_string (hdr),
hdr->src_nid);
lib_drop_message(nal, private, hdr);
return PTL_OK;
rc = PTL_FAIL; /* no compiler warning please */
break;
}
-
+
if (rc != PTL_OK) {
if (msg->md != NULL) {
/* committed... */
/* That's "OK I can parse it", not "OK I like it" :) */
}
-int
-lib_api_put(nal_t *apinal, ptl_handle_md_t *mdh,
+int
+lib_api_put(nal_t *apinal, ptl_handle_md_t *mdh,
ptl_ack_req_t ack, ptl_process_id_t *id,
ptl_pt_index_t portal, ptl_ac_index_t ac,
- ptl_match_bits_t match_bits,
+ ptl_match_bits_t match_bits,
ptl_size_t offset, ptl_hdr_data_t hdr_data)
{
lib_nal_t *nal = apinal->nal_data;
lib_md_t *md;
unsigned long flags;
int rc;
-
+
if (!list_empty (&ni->ni_test_peers) && /* normally we don't */
fail_peer (nal, id->nid, 1)) /* shall we now? */
{
if (md == NULL || md->threshold == 0) {
lib_msg_free(nal, msg);
LIB_UNLOCK(nal, flags);
-
+
return PTL_MD_INVALID;
}
CDEBUG(D_NET, "PtlPut -> "LPX64"\n", id->nid);
memset (&hdr, 0, sizeof (hdr));
- hdr.type = HTON__u32 (PTL_MSG_PUT);
- hdr.dest_nid = HTON__u64 (id->nid);
- hdr.dest_pid = HTON__u32 (id->pid);
- hdr.src_nid = HTON__u64 (ni->ni_pid.nid);
- hdr.src_pid = HTON__u32 (ni->ni_pid.pid);
- hdr.payload_length = HTON__u32 (md->length);
+ hdr.type = cpu_to_le32(PTL_MSG_PUT);
+ hdr.dest_nid = cpu_to_le64(id->nid);
+ hdr.dest_pid = cpu_to_le32(id->pid);
+ hdr.src_nid = cpu_to_le64(ni->ni_pid.nid);
+ hdr.src_pid = cpu_to_le32(ni->ni_pid.pid);
+ hdr.payload_length = cpu_to_le32(md->length);
/* NB handles only looked up by creator (no flips) */
if (ack == PTL_ACK_REQ) {
hdr.msg.put.ack_wmd = PTL_WIRE_HANDLE_NONE;
}
- hdr.msg.put.match_bits = HTON__u64 (match_bits);
- hdr.msg.put.ptl_index = HTON__u32 (portal);
- hdr.msg.put.offset = HTON__u32 (offset);
+ hdr.msg.put.match_bits = cpu_to_le64(match_bits);
+ hdr.msg.put.ptl_index = cpu_to_le32(portal);
+ hdr.msg.put.offset = cpu_to_le32(offset);
hdr.msg.put.hdr_data = hdr_data;
lib_commit_md(nal, md, msg);
-
+
msg->ev.type = PTL_EVENT_SEND_END;
msg->ev.initiator.nid = ni->ni_pid.nid;
msg->ev.initiator.pid = ni->ni_pid.pid;
- msg->ev.portal = portal;
+ msg->ev.pt_index = portal;
msg->ev.match_bits = match_bits;
msg->ev.rlength = md->length;
msg->ev.mlength = md->length;
msg->ev.offset = offset;
msg->ev.hdr_data = hdr_data;
- lib_md_deconstruct(nal, md, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, md, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, md);
ni->ni_counters.send_count++;
ni->ni_counters.send_length += md->length;
LIB_UNLOCK(nal, flags);
-
+
rc = lib_send (nal, NULL, msg, &hdr, PTL_MSG_PUT,
id->nid, id->pid, md, 0, md->length);
if (rc != PTL_OK) {
id->nid, rc);
lib_finalize (nal, NULL, msg, rc);
}
-
+
/* completion will be signalled by an event */
return PTL_OK;
}
-lib_msg_t *
+lib_msg_t *
lib_create_reply_msg (lib_nal_t *nal, ptl_nid_t peer_nid, lib_msg_t *getmsg)
{
/* The NAL can DMA direct to the GET md (i.e. no REPLY msg). This
msg->ev.rlength = msg->ev.mlength = getmd->length;
msg->ev.offset = 0;
- lib_md_deconstruct(nal, getmd, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, getmd, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, getmd);
ni->ni_counters.recv_count++;
ni->ni_counters.recv_length += getmd->length;
return NULL;
}
-int
+int
lib_api_get(nal_t *apinal, ptl_handle_md_t *mdh, ptl_process_id_t *id,
ptl_pt_index_t portal, ptl_ac_index_t ac,
ptl_match_bits_t match_bits, ptl_size_t offset)
lib_md_t *md;
unsigned long flags;
int rc;
-
+
if (!list_empty (&ni->ni_test_peers) && /* normally we don't */
fail_peer (nal, id->nid, 1)) /* shall we now? */
{
(unsigned long)id->pid);
memset (&hdr, 0, sizeof (hdr));
- hdr.type = HTON__u32 (PTL_MSG_GET);
- hdr.dest_nid = HTON__u64 (id->nid);
- hdr.dest_pid = HTON__u32 (id->pid);
- hdr.src_nid = HTON__u64 (ni->ni_pid.nid);
- hdr.src_pid = HTON__u32 (ni->ni_pid.pid);
+ hdr.type = cpu_to_le32(PTL_MSG_GET);
+ hdr.dest_nid = cpu_to_le64(id->nid);
+ hdr.dest_pid = cpu_to_le32(id->pid);
+ hdr.src_nid = cpu_to_le64(ni->ni_pid.nid);
+ hdr.src_pid = cpu_to_le32(ni->ni_pid.pid);
hdr.payload_length = 0;
/* NB handles only looked up by creator (no flips) */
hdr.msg.get.return_wmd.wh_interface_cookie = ni->ni_interface_cookie;
hdr.msg.get.return_wmd.wh_object_cookie = md->md_lh.lh_cookie;
- hdr.msg.get.match_bits = HTON__u64 (match_bits);
- hdr.msg.get.ptl_index = HTON__u32 (portal);
- hdr.msg.get.src_offset = HTON__u32 (offset);
- hdr.msg.get.sink_length = HTON__u32 (md->length);
+ hdr.msg.get.match_bits = cpu_to_le64(match_bits);
+ hdr.msg.get.ptl_index = cpu_to_le32(portal);
+ hdr.msg.get.src_offset = cpu_to_le32(offset);
+ hdr.msg.get.sink_length = cpu_to_le32(md->length);
lib_commit_md(nal, md, msg);
msg->ev.type = PTL_EVENT_SEND_END;
msg->ev.initiator = ni->ni_pid;
- msg->ev.portal = portal;
+ msg->ev.pt_index = portal;
msg->ev.match_bits = match_bits;
msg->ev.rlength = md->length;
msg->ev.mlength = md->length;
msg->ev.offset = offset;
msg->ev.hdr_data = 0;
- lib_md_deconstruct(nal, md, &msg->ev.mem_desc);
+ lib_md_deconstruct(nal, md, &msg->ev.md);
+ ptl_md2handle(&msg->ev.md_handle, nal, md);
ni->ni_counters.send_count++;
ni->ni_pid.nid, id->nid, rc);
lib_finalize (nal, NULL, msg, rc);
}
-
+
/* completion will be signalled by an event */
return PTL_OK;
}
void lib_assert_wire_constants (void)
{
/* Wire protocol assertions generated by 'wirecheck'
- * running on Linux robert.bartonsoftware.com 2.4.20-18.9 #1 Thu May 29 06:54:41 EDT 2003 i68
- * with gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5) */
+ * running on Linux mdevi 2.4.21-p4smp-55chaos #1 SMP Tue Jun 8 14:38:44 PDT 2004 i686 i686 i
+ * with gcc version 3.2.3 20030502 (Red Hat Linux 3.2.3-34) */
/* Constants... */
LASSERT (PORTALS_PROTO_MAGIC == 0xeebc0ded);
- LASSERT (PORTALS_PROTO_VERSION_MAJOR == 0);
- LASSERT (PORTALS_PROTO_VERSION_MINOR == 3);
+ LASSERT (PORTALS_PROTO_VERSION_MAJOR == 1);
+ LASSERT (PORTALS_PROTO_VERSION_MINOR == 0);
LASSERT (PTL_MSG_ACK == 0);
LASSERT (PTL_MSG_PUT == 1);
LASSERT (PTL_MSG_GET == 2);
/* Checks for struct ptl_handle_wire_t */
LASSERT ((int)sizeof(ptl_handle_wire_t) == 16);
- LASSERT (offsetof(ptl_handle_wire_t, wh_interface_cookie) == 0);
+ LASSERT ((int)offsetof(ptl_handle_wire_t, wh_interface_cookie) == 0);
LASSERT ((int)sizeof(((ptl_handle_wire_t *)0)->wh_interface_cookie) == 8);
- LASSERT (offsetof(ptl_handle_wire_t, wh_object_cookie) == 8);
+ LASSERT ((int)offsetof(ptl_handle_wire_t, wh_object_cookie) == 8);
LASSERT ((int)sizeof(((ptl_handle_wire_t *)0)->wh_object_cookie) == 8);
/* Checks for struct ptl_magicversion_t */
LASSERT ((int)sizeof(ptl_magicversion_t) == 8);
- LASSERT (offsetof(ptl_magicversion_t, magic) == 0);
+ LASSERT ((int)offsetof(ptl_magicversion_t, magic) == 0);
LASSERT ((int)sizeof(((ptl_magicversion_t *)0)->magic) == 4);
- LASSERT (offsetof(ptl_magicversion_t, version_major) == 4);
+ LASSERT ((int)offsetof(ptl_magicversion_t, version_major) == 4);
LASSERT ((int)sizeof(((ptl_magicversion_t *)0)->version_major) == 2);
- LASSERT (offsetof(ptl_magicversion_t, version_minor) == 6);
+ LASSERT ((int)offsetof(ptl_magicversion_t, version_minor) == 6);
LASSERT ((int)sizeof(((ptl_magicversion_t *)0)->version_minor) == 2);
/* Checks for struct ptl_hdr_t */
LASSERT ((int)sizeof(ptl_hdr_t) == 72);
- LASSERT (offsetof(ptl_hdr_t, dest_nid) == 0);
+ LASSERT ((int)offsetof(ptl_hdr_t, dest_nid) == 0);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->dest_nid) == 8);
- LASSERT (offsetof(ptl_hdr_t, src_nid) == 8);
+ LASSERT ((int)offsetof(ptl_hdr_t, src_nid) == 8);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->src_nid) == 8);
- LASSERT (offsetof(ptl_hdr_t, dest_pid) == 16);
+ LASSERT ((int)offsetof(ptl_hdr_t, dest_pid) == 16);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->dest_pid) == 4);
- LASSERT (offsetof(ptl_hdr_t, src_pid) == 20);
+ LASSERT ((int)offsetof(ptl_hdr_t, src_pid) == 20);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->src_pid) == 4);
- LASSERT (offsetof(ptl_hdr_t, type) == 24);
+ LASSERT ((int)offsetof(ptl_hdr_t, type) == 24);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->type) == 4);
- LASSERT (offsetof(ptl_hdr_t, payload_length) == 28);
+ LASSERT ((int)offsetof(ptl_hdr_t, payload_length) == 28);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->payload_length) == 4);
- LASSERT (offsetof(ptl_hdr_t, msg) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg) == 40);
/* Ack */
- LASSERT (offsetof(ptl_hdr_t, msg.ack.dst_wmd) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.ack.dst_wmd) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.ack.dst_wmd) == 16);
- LASSERT (offsetof(ptl_hdr_t, msg.ack.match_bits) == 48);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.ack.match_bits) == 48);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.ack.match_bits) == 8);
- LASSERT (offsetof(ptl_hdr_t, msg.ack.mlength) == 56);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.ack.mlength) == 56);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.ack.mlength) == 4);
/* Put */
- LASSERT (offsetof(ptl_hdr_t, msg.put.ack_wmd) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.put.ack_wmd) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.put.ack_wmd) == 16);
- LASSERT (offsetof(ptl_hdr_t, msg.put.match_bits) == 48);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.put.match_bits) == 48);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.put.match_bits) == 8);
- LASSERT (offsetof(ptl_hdr_t, msg.put.hdr_data) == 56);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.put.hdr_data) == 56);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.put.hdr_data) == 8);
- LASSERT (offsetof(ptl_hdr_t, msg.put.ptl_index) == 64);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.put.ptl_index) == 64);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.put.ptl_index) == 4);
- LASSERT (offsetof(ptl_hdr_t, msg.put.offset) == 68);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.put.offset) == 68);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.put.offset) == 4);
/* Get */
- LASSERT (offsetof(ptl_hdr_t, msg.get.return_wmd) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.get.return_wmd) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.get.return_wmd) == 16);
- LASSERT (offsetof(ptl_hdr_t, msg.get.match_bits) == 48);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.get.match_bits) == 48);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.get.match_bits) == 8);
- LASSERT (offsetof(ptl_hdr_t, msg.get.ptl_index) == 56);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.get.ptl_index) == 56);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.get.ptl_index) == 4);
- LASSERT (offsetof(ptl_hdr_t, msg.get.src_offset) == 60);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.get.src_offset) == 60);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.get.src_offset) == 4);
- LASSERT (offsetof(ptl_hdr_t, msg.get.sink_length) == 64);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.get.sink_length) == 64);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.get.sink_length) == 4);
/* Reply */
- LASSERT (offsetof(ptl_hdr_t, msg.reply.dst_wmd) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.reply.dst_wmd) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.reply.dst_wmd) == 16);
/* Hello */
- LASSERT (offsetof(ptl_hdr_t, msg.hello.incarnation) == 32);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.hello.incarnation) == 32);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.hello.incarnation) == 8);
- LASSERT (offsetof(ptl_hdr_t, msg.hello.type) == 40);
+ LASSERT ((int)offsetof(ptl_hdr_t, msg.hello.type) == 40);
LASSERT ((int)sizeof(((ptl_hdr_t *)0)->msg.hello.type) == 4);
}