xfs: remove duplicated #include
[safe/jmp/linux-2.6] / fs / ceph / messenger.c
index c03b418..cd4fadb 100644 (file)
@@ -6,6 +6,7 @@
 #include <linux/inet.h>
 #include <linux/kthread.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <linux/socket.h>
 #include <linux/string.h>
 #include <net/tcp.h>
@@ -13,6 +14,7 @@
 #include "super.h"
 #include "messenger.h"
 #include "decode.h"
+#include "pagelist.h"
 
 /*
  * Ceph uses the messenger to exchange ceph_msg messages with other
@@ -28,6 +30,10 @@ static char tag_msg = CEPH_MSGR_TAG_MSG;
 static char tag_ack = CEPH_MSGR_TAG_ACK;
 static char tag_keepalive = CEPH_MSGR_TAG_KEEPALIVE;
 
+#ifdef CONFIG_LOCKDEP
+static struct lock_class_key socket_class;
+#endif
+
 
 static void queue_con(struct ceph_connection *con);
 static void con_work(struct work_struct *);
@@ -226,6 +232,10 @@ static struct socket *ceph_tcp_connect(struct ceph_connection *con)
        con->sock = sock;
        sock->sk->sk_allocation = GFP_NOFS;
 
+#ifdef CONFIG_LOCKDEP
+       lockdep_set_class(&sock->sk->sk_lock, &socket_class);
+#endif
+
        set_sock_callbacks(sock, con);
 
        dout("connect %s\n", pr_addr(&con->peer_addr.in_addr));
@@ -331,6 +341,7 @@ static void reset_connection(struct ceph_connection *con)
                con->out_msg = NULL;
        }
        con->in_seq = 0;
+       con->in_seq_acked = 0;
 }
 
 /*
@@ -341,8 +352,12 @@ void ceph_con_close(struct ceph_connection *con)
        dout("con_close %p peer %s\n", con, pr_addr(&con->peer_addr.in_addr));
        set_bit(CLOSED, &con->state);  /* in case there's queued work */
        clear_bit(STANDBY, &con->state);  /* avoid connect_seq bump */
+       clear_bit(LOSSYTX, &con->state);  /* so we retry next connect */
+       clear_bit(KEEPALIVE_PENDING, &con->state);
+       clear_bit(WRITE_PENDING, &con->state);
        mutex_lock(&con->mutex);
        reset_connection(con);
+       cancel_delayed_work(&con->work);
        mutex_unlock(&con->mutex);
        queue_con(con);
 }
@@ -361,6 +376,14 @@ void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr)
 }
 
 /*
+ * return true if this connection ever successfully opened
+ */
+bool ceph_con_opened(struct ceph_connection *con)
+{
+       return con->connect_seq > 0;
+}
+
+/*
  * generic get/put
  */
 struct ceph_connection *ceph_con_get(struct ceph_connection *con)
@@ -462,14 +485,21 @@ static void prepare_write_message(struct ceph_connection *con)
                       struct ceph_msg, list_head);
        con->out_msg = m;
        if (test_bit(LOSSYTX, &con->state)) {
+               list_del_init(&m->list_head);
+       } else {
                /* put message on sent list */
                ceph_msg_get(m);
                list_move_tail(&m->list_head, &con->out_sent);
-       } else {
-               list_del_init(&m->list_head);
        }
 
-       m->hdr.seq = cpu_to_le64(++con->out_seq);
+       /*
+        * only assign outgoing seq # if we haven't sent this message
+        * yet.  if it is requeued, resend with it's original seq.
+        */
+       if (m->needs_out_seq) {
+               m->hdr.seq = cpu_to_le64(++con->out_seq);
+               m->needs_out_seq = false;
+       }
 
        dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n",
             m, con->out_seq, le16_to_cpu(m->hdr.type),
@@ -631,6 +661,7 @@ static void prepare_write_connect(struct ceph_messenger *msgr,
        dout("prepare_write_connect %p cseq=%d gseq=%d proto=%d\n", con,
             con->connect_seq, global_seq, proto);
 
+       con->out_connect.features = CEPH_FEATURE_SUPPORTED;
        con->out_connect.host_type = cpu_to_le32(CEPH_ENTITY_TYPE_CLIENT);
        con->out_connect.connect_seq = cpu_to_le32(con->connect_seq);
        con->out_connect.global_seq = cpu_to_le32(global_seq);
@@ -727,6 +758,11 @@ static int write_partial_msg_pages(struct ceph_connection *con)
                        page = msg->pages[con->out_msg_pos.page];
                        if (crc)
                                kaddr = kmap(page);
+               } else if (msg->pagelist) {
+                       page = list_first_entry(&msg->pagelist->head,
+                                               struct page, lru);
+                       if (crc)
+                               kaddr = kmap(page);
                } else {
                        page = con->msgr->zero_page;
                        if (crc)
@@ -749,7 +785,7 @@ static int write_partial_msg_pages(struct ceph_connection *con)
                                      MSG_DONTWAIT | MSG_NOSIGNAL |
                                      MSG_MORE);
 
-               if (crc && msg->pages)
+               if (crc && (msg->pages || msg->pagelist))
                        kunmap(page);
 
                if (ret <= 0)
@@ -761,6 +797,9 @@ static int write_partial_msg_pages(struct ceph_connection *con)
                        con->out_msg_pos.page_pos = 0;
                        con->out_msg_pos.page++;
                        con->out_msg_pos.did_page_crc = 0;
+                       if (msg->pagelist)
+                               list_move_tail(&page->lru,
+                                              &msg->pagelist->head);
                }
        }
 
@@ -816,13 +855,6 @@ static void prepare_read_connect(struct ceph_connection *con)
        con->in_base_pos = 0;
 }
 
-static void prepare_read_connect_retry(struct ceph_connection *con)
-{
-       dout("prepare_read_connect_retry %p\n", con);
-       con->in_base_pos = strlen(CEPH_BANNER) + sizeof(con->actual_peer_addr)
-               + sizeof(con->peer_addr_for_me);
-}
-
 static void prepare_read_ack(struct ceph_connection *con)
 {
        dout("prepare_read_ack %p\n", con);
@@ -1046,17 +1078,16 @@ static int process_banner(struct ceph_connection *con)
         * end may not yet know their ip address, so if it's 0.0.0.0, give
         * them the benefit of the doubt.
         */
-       if (!ceph_entity_addr_is_local(&con->peer_addr,
-                                      &con->actual_peer_addr) &&
+       if (memcmp(&con->peer_addr, &con->actual_peer_addr,
+                  sizeof(con->peer_addr)) != 0 &&
            !(addr_is_blank(&con->actual_peer_addr.in_addr) &&
              con->actual_peer_addr.nonce == con->peer_addr.nonce)) {
-               pr_err("wrong peer, want %s/%d, "
-                      "got %s/%d, wtf\n",
-                      pr_addr(&con->peer_addr.in_addr),
-                      con->peer_addr.nonce,
-                      pr_addr(&con->actual_peer_addr.in_addr),
-                      con->actual_peer_addr.nonce);
-               con->error_msg = "protocol error, wrong peer";
+               pr_warning("wrong peer, want %s/%lld, got %s/%lld\n",
+                          pr_addr(&con->peer_addr.in_addr),
+                          le64_to_cpu(con->peer_addr.nonce),
+                          pr_addr(&con->actual_peer_addr.in_addr),
+                          le64_to_cpu(con->actual_peer_addr.nonce));
+               con->error_msg = "wrong peer at address";
                return -1;
        }
 
@@ -1080,15 +1111,37 @@ static int process_banner(struct ceph_connection *con)
        return 0;
 }
 
+static void fail_protocol(struct ceph_connection *con)
+{
+       reset_connection(con);
+       set_bit(CLOSED, &con->state);  /* in case there's queued work */
+
+       mutex_unlock(&con->mutex);
+       if (con->ops->bad_proto)
+               con->ops->bad_proto(con);
+       mutex_lock(&con->mutex);
+}
+
 static int process_connect(struct ceph_connection *con)
 {
+       u64 sup_feat = CEPH_FEATURE_SUPPORTED;
+       u64 req_feat = CEPH_FEATURE_REQUIRED;
+       u64 server_feat = le64_to_cpu(con->in_reply.features);
+
        dout("process_connect on %p tag %d\n", con, (int)con->in_tag);
 
        switch (con->in_reply.tag) {
+       case CEPH_MSGR_TAG_FEATURES:
+               pr_err("%s%lld %s feature set mismatch,"
+                      " my %llx < server's %llx, missing %llx\n",
+                      ENTITY_NAME(con->peer_name),
+                      pr_addr(&con->peer_addr.in_addr),
+                      sup_feat, server_feat, server_feat & ~sup_feat);
+               con->error_msg = "missing required protocol features";
+               fail_protocol(con);
+               return -1;
+
        case CEPH_MSGR_TAG_BADPROTOVER:
-               dout("process_connect got BADPROTOVER my %d != their %d\n",
-                    le32_to_cpu(con->out_connect.protocol_version),
-                    le32_to_cpu(con->in_reply.protocol_version));
                pr_err("%s%lld %s protocol version mismatch,"
                       " my %d != server's %d\n",
                       ENTITY_NAME(con->peer_name),
@@ -1096,13 +1149,7 @@ static int process_connect(struct ceph_connection *con)
                       le32_to_cpu(con->out_connect.protocol_version),
                       le32_to_cpu(con->in_reply.protocol_version));
                con->error_msg = "protocol version mismatch";
-               reset_connection(con);
-               set_bit(CLOSED, &con->state);  /* in case there's queued work */
-
-               mutex_unlock(&con->mutex);
-               if (con->ops->bad_proto)
-                       con->ops->bad_proto(con);
-               mutex_lock(&con->mutex);
+               fail_protocol(con);
                return -1;
 
        case CEPH_MSGR_TAG_BADAUTHORIZER:
@@ -1117,7 +1164,7 @@ static int process_connect(struct ceph_connection *con)
                }
                con->auth_retry = 1;
                prepare_write_connect(con->msgr, con, 0);
-               prepare_read_connect_retry(con);
+               prepare_read_connect(con);
                break;
 
        case CEPH_MSGR_TAG_RESETSESSION:
@@ -1173,6 +1220,16 @@ static int process_connect(struct ceph_connection *con)
                break;
 
        case CEPH_MSGR_TAG_READY:
+               if (req_feat & ~server_feat) {
+                       pr_err("%s%lld %s protocol feature mismatch,"
+                              " my required %llx > server's %llx, need %llx\n",
+                              ENTITY_NAME(con->peer_name),
+                              pr_addr(&con->peer_addr.in_addr),
+                              req_feat, server_feat, req_feat & ~server_feat);
+                       con->error_msg = "missing required protocol features";
+                       fail_protocol(con);
+                       return -1;
+               }
                clear_bit(CONNECTING, &con->state);
                con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
                con->connect_seq++;
@@ -1244,8 +1301,34 @@ static void process_ack(struct ceph_connection *con)
 
 
 
+static int read_partial_message_section(struct ceph_connection *con,
+                                       struct kvec *section, unsigned int sec_len,
+                                       u32 *crc)
+{
+       int left;
+       int ret;
+
+       BUG_ON(!section);
+
+       while (section->iov_len < sec_len) {
+               BUG_ON(section->iov_base == NULL);
+               left = sec_len - section->iov_len;
+               ret = ceph_tcp_recvmsg(con->sock, (char *)section->iov_base +
+                                      section->iov_len, left);
+               if (ret <= 0)
+                       return ret;
+               section->iov_len += ret;
+               if (section->iov_len == sec_len)
+                       *crc = crc32c(0, section->iov_base,
+                                     section->iov_len);
+       }
 
+       return 1;
+}
 
+static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con,
+                               struct ceph_msg_header *hdr,
+                               int *skip);
 /*
  * read (part of) a message.
  */
@@ -1254,9 +1337,11 @@ static int read_partial_message(struct ceph_connection *con)
        struct ceph_msg *m = con->in_msg;
        void *p;
        int ret;
-       int to, want, left;
+       int to, left;
        unsigned front_len, middle_len, data_len, data_off;
        int datacrc = con->msgr->nocrc;
+       int skip;
+       u64 seq;
 
        dout("read_partial_message con %p msg %p\n", con, m);
 
@@ -1280,7 +1365,6 @@ static int read_partial_message(struct ceph_connection *con)
                        }
                }
        }
-
        front_len = le32_to_cpu(con->in_hdr.front_len);
        if (front_len > CEPH_MSG_MAX_FRONT_LEN)
                return -EIO;
@@ -1290,101 +1374,73 @@ static int read_partial_message(struct ceph_connection *con)
        data_len = le32_to_cpu(con->in_hdr.data_len);
        if (data_len > CEPH_MSG_MAX_DATA_LEN)
                return -EIO;
+       data_off = le16_to_cpu(con->in_hdr.data_off);
+
+       /* verify seq# */
+       seq = le64_to_cpu(con->in_hdr.seq);
+       if ((s64)seq - (s64)con->in_seq < 1) {
+               pr_info("skipping %s%lld %s seq %lld, expected %lld\n",
+                       ENTITY_NAME(con->peer_name),
+                       pr_addr(&con->peer_addr.in_addr),
+                       seq, con->in_seq + 1);
+               con->in_base_pos = -front_len - middle_len - data_len -
+                       sizeof(m->footer);
+               con->in_tag = CEPH_MSGR_TAG_READY;
+               con->in_seq++;
+               return 0;
+       } else if ((s64)seq - (s64)con->in_seq > 1) {
+               pr_err("read_partial_message bad seq %lld expected %lld\n",
+                      seq, con->in_seq + 1);
+               con->error_msg = "bad message sequence # for incoming message";
+               return -EBADMSG;
+       }
 
        /* allocate message? */
        if (!con->in_msg) {
                dout("got hdr type %d front %d data %d\n", con->in_hdr.type,
                     con->in_hdr.front_len, con->in_hdr.data_len);
-               con->in_msg = con->ops->alloc_msg(con, &con->in_hdr);
-               if (!con->in_msg) {
+               con->in_msg = ceph_alloc_msg(con, &con->in_hdr, &skip);
+               if (skip) {
                        /* skip this message */
-                       pr_err("alloc_msg returned NULL, skipping message\n");
+                       dout("alloc_msg returned NULL, skipping message\n");
                        con->in_base_pos = -front_len - middle_len - data_len -
                                sizeof(m->footer);
                        con->in_tag = CEPH_MSGR_TAG_READY;
+                       con->in_seq++;
                        return 0;
                }
                if (IS_ERR(con->in_msg)) {
                        ret = PTR_ERR(con->in_msg);
                        con->in_msg = NULL;
-                       con->error_msg = "out of memory for incoming message";
+                       con->error_msg =
+                               "error allocating memory for incoming message";
                        return ret;
                }
                m = con->in_msg;
                m->front.iov_len = 0;    /* haven't read it yet */
-               memcpy(&m->hdr, &con->in_hdr, sizeof(con->in_hdr));
+               if (m->middle)
+                       m->middle->vec.iov_len = 0;
+
+               con->in_msg_pos.page = 0;
+               con->in_msg_pos.page_pos = data_off & ~PAGE_MASK;
+               con->in_msg_pos.data_pos = 0;
        }
 
        /* front */
-       while (m->front.iov_len < front_len) {
-               BUG_ON(m->front.iov_base == NULL);
-               left = front_len - m->front.iov_len;
-               ret = ceph_tcp_recvmsg(con->sock, (char *)m->front.iov_base +
-                                      m->front.iov_len, left);
-               if (ret <= 0)
-                       return ret;
-               m->front.iov_len += ret;
-               if (m->front.iov_len == front_len)
-                       con->in_front_crc = crc32c(0, m->front.iov_base,
-                                                     m->front.iov_len);
-       }
+       ret = read_partial_message_section(con, &m->front, front_len,
+                                          &con->in_front_crc);
+       if (ret <= 0)
+               return ret;
 
        /* middle */
-       while (middle_len > 0 && (!m->middle ||
-                                 m->middle->vec.iov_len < middle_len)) {
-               if (m->middle == NULL) {
-                       ret = -EOPNOTSUPP;
-                       if (con->ops->alloc_middle)
-                               ret = con->ops->alloc_middle(con, m);
-                       if (ret < 0) {
-                               pr_err("alloc_middle fail skipping payload\n");
-                               con->in_base_pos = -middle_len - data_len
-                                       - sizeof(m->footer);
-                               ceph_msg_put(con->in_msg);
-                               con->in_msg = NULL;
-                               con->in_tag = CEPH_MSGR_TAG_READY;
-                               return 0;
-                       }
-                       m->middle->vec.iov_len = 0;
-               }
-               left = middle_len - m->middle->vec.iov_len;
-               ret = ceph_tcp_recvmsg(con->sock,
-                                      (char *)m->middle->vec.iov_base +
-                                      m->middle->vec.iov_len, left);
+       if (m->middle) {
+               ret = read_partial_message_section(con, &m->middle->vec, middle_len,
+                                                  &con->in_middle_crc);
                if (ret <= 0)
                        return ret;
-               m->middle->vec.iov_len += ret;
-               if (m->middle->vec.iov_len == middle_len)
-                       con->in_middle_crc = crc32c(0, m->middle->vec.iov_base,
-                                                     m->middle->vec.iov_len);
        }
 
        /* (page) data */
-       data_off = le16_to_cpu(m->hdr.data_off);
-       if (data_len == 0)
-               goto no_data;
-
-       if (m->nr_pages == 0) {
-               con->in_msg_pos.page = 0;
-               con->in_msg_pos.page_pos = data_off & ~PAGE_MASK;
-               con->in_msg_pos.data_pos = 0;
-               /* find pages for data payload */
-               want = calc_pages_for(data_off & ~PAGE_MASK, data_len);
-               ret = -1;
-               mutex_unlock(&con->mutex);
-               if (con->ops->prepare_pages)
-                       ret = con->ops->prepare_pages(con, m, want);
-               mutex_lock(&con->mutex);
-               if (ret < 0) {
-                       dout("%p prepare_pages failed, skipping payload\n", m);
-                       con->in_base_pos = -data_len - sizeof(m->footer);
-                       ceph_msg_put(con->in_msg);
-                       con->in_msg = NULL;
-                       con->in_tag = CEPH_MSGR_TAG_READY;
-                       return 0;
-               }
-               BUG_ON(m->nr_pages < want);
-       }
        while (con->in_msg_pos.data_pos < data_len) {
                left = min((int)(data_len - con->in_msg_pos.data_pos),
                           (int)(PAGE_SIZE - con->in_msg_pos.page_pos));
@@ -1407,7 +1463,6 @@ static int read_partial_message(struct ceph_connection *con)
                }
        }
 
-no_data:
        /* footer */
        to = sizeof(m->hdr) + sizeof(m->footer);
        while (con->in_base_pos < to) {
@@ -1797,7 +1852,7 @@ done:
        clear_bit(BUSY, &con->state);
        dout("con->state=%lu\n", con->state);
        if (test_bit(QUEUED, &con->state)) {
-               if (!backoff) {
+               if (!backoff || test_bit(OPENING, &con->state)) {
                        dout("con_work %p QUEUED reset, looping\n", con);
                        goto more;
                }
@@ -1827,9 +1882,9 @@ static void ceph_fault(struct ceph_connection *con)
                goto out;
        }
 
-       clear_bit(BUSY, &con->state);  /* to avoid an improbable race */
-
        mutex_lock(&con->mutex);
+       if (test_bit(CLOSED, &con->state))
+               goto out_unlock;
 
        con_close_socket(con);
 
@@ -1838,34 +1893,39 @@ static void ceph_fault(struct ceph_connection *con)
                con->in_msg = NULL;
        }
 
+       /* Requeue anything that hasn't been acked */
+       list_splice_init(&con->out_sent, &con->out_queue);
+
        /* If there are no messages in the queue, place the connection
         * in a STANDBY state (i.e., don't try to reconnect just yet). */
        if (list_empty(&con->out_queue) && !con->out_keepalive_pending) {
                dout("fault setting STANDBY\n");
                set_bit(STANDBY, &con->state);
-               mutex_unlock(&con->mutex);
-               goto out;
-       }
-
-       /* Requeue anything that hasn't been acked, and retry after a
-        * delay. */
-       list_splice_init(&con->out_sent, &con->out_queue);
-
-       if (con->delay == 0)
-               con->delay = BASE_DELAY_INTERVAL;
-       else if (con->delay < MAX_DELAY_INTERVAL)
-               con->delay *= 2;
-
+       } else {
+               /* retry after a delay. */
+               if (con->delay == 0)
+                       con->delay = BASE_DELAY_INTERVAL;
+               else if (con->delay < MAX_DELAY_INTERVAL)
+                       con->delay *= 2;
+               dout("fault queueing %p delay %lu\n", con, con->delay);
+               con->ops->get(con);
+               if (queue_delayed_work(ceph_msgr_wq, &con->work,
+                                      round_jiffies_relative(con->delay)) == 0)
+                       con->ops->put(con);
+       }
+
+out_unlock:
        mutex_unlock(&con->mutex);
-
-       /* explicitly schedule work to try to reconnect again later. */
-       dout("fault queueing %p delay %lu\n", con, con->delay);
-       con->ops->get(con);
-       if (queue_delayed_work(ceph_msgr_wq, &con->work,
-                              round_jiffies_relative(con->delay)) == 0)
-               con->ops->put(con);
-
 out:
+       /*
+        * in case we faulted due to authentication, invalidate our
+        * current tickets so that we can get new ones.
+         */
+       if (con->auth_retry && con->ops->invalidate_authorizer) {
+               dout("calling invalidate_authorizer()\n");
+               con->ops->invalidate_authorizer(con);
+       }
+
        if (con->ops->fault)
                con->ops->fault(con);
 }
@@ -1898,8 +1958,8 @@ struct ceph_messenger *ceph_messenger_create(struct ceph_entity_addr *myaddr)
                msgr->inst.addr = *myaddr;
 
        /* select a random nonce */
-       get_random_bytes(&msgr->inst.addr.nonce,
-                        sizeof(msgr->inst.addr.nonce));
+       msgr->inst.addr.type = 0;
+       get_random_bytes(&msgr->inst.addr.nonce, sizeof(msgr->inst.addr.nonce));
        encode_my_addr(msgr);
 
        dout("messenger_create %p\n", msgr);
@@ -1930,7 +1990,10 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg)
        msg->hdr.src.name = con->msgr->inst.name;
        msg->hdr.src.addr = con->msgr->my_enc_addr;
        msg->hdr.orig_src = msg->hdr.src;
-       msg->hdr.dst_erank = con->peer_addr.erank;
+
+       BUG_ON(msg->front.iov_len != le32_to_cpu(msg->hdr.front_len));
+
+       msg->needs_out_seq = true;
 
        /* queue */
        mutex_lock(&con->mutex);
@@ -1976,6 +2039,36 @@ void ceph_con_revoke(struct ceph_connection *con, struct ceph_msg *msg)
 }
 
 /*
+ * Revoke a message that we may be reading data into
+ */
+void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg)
+{
+       mutex_lock(&con->mutex);
+       if (con->in_msg && con->in_msg == msg) {
+               unsigned front_len = le32_to_cpu(con->in_hdr.front_len);
+               unsigned middle_len = le32_to_cpu(con->in_hdr.middle_len);
+               unsigned data_len = le32_to_cpu(con->in_hdr.data_len);
+
+               /* skip rest of message */
+               dout("con_revoke_pages %p msg %p revoked\n", con, msg);
+                       con->in_base_pos = con->in_base_pos -
+                               sizeof(struct ceph_msg_header) -
+                               front_len -
+                               middle_len -
+                               data_len -
+                               sizeof(struct ceph_msg_footer);
+               ceph_msg_put(con->in_msg);
+               con->in_msg = NULL;
+               con->in_tag = CEPH_MSGR_TAG_READY;
+               con->in_seq++;
+       } else {
+               dout("con_revoke_pages %p msg %p pages %p no-op\n",
+                    con, con->in_msg, msg);
+       }
+       mutex_unlock(&con->mutex);
+}
+
+/*
  * Queue a keepalive byte to ensure the tcp connection is alive.
  */
 void ceph_con_keepalive(struct ceph_connection *con)
@@ -2001,15 +2094,19 @@ struct ceph_msg *ceph_msg_new(int type, int front_len,
        kref_init(&m->kref);
        INIT_LIST_HEAD(&m->list_head);
 
+       m->hdr.tid = 0;
        m->hdr.type = cpu_to_le16(type);
+       m->hdr.priority = cpu_to_le16(CEPH_MSG_PRIO_DEFAULT);
+       m->hdr.version = 0;
        m->hdr.front_len = cpu_to_le32(front_len);
        m->hdr.middle_len = 0;
        m->hdr.data_len = cpu_to_le32(page_len);
        m->hdr.data_off = cpu_to_le16(page_off);
-       m->hdr.priority = cpu_to_le16(CEPH_MSG_PRIO_DEFAULT);
+       m->hdr.reserved = 0;
        m->footer.front_crc = 0;
        m->footer.middle_crc = 0;
        m->footer.data_crc = 0;
+       m->footer.flags = 0;
        m->front_max = front_len;
        m->front_is_vmalloc = false;
        m->more_to_follow = false;
@@ -2040,6 +2137,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len,
        /* data */
        m->nr_pages = calc_pages_for(page_off, page_len);
        m->pages = pages;
+       m->pagelist = NULL;
 
        dout("ceph_msg_new %p page %d~%d -> %d\n", m, page_off, page_len,
             m->nr_pages);
@@ -2053,31 +2151,13 @@ out:
 }
 
 /*
- * Generic message allocator, for incoming messages.
- */
-struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con,
-                               struct ceph_msg_header *hdr)
-{
-       int type = le16_to_cpu(hdr->type);
-       int front_len = le32_to_cpu(hdr->front_len);
-       struct ceph_msg *msg = ceph_msg_new(type, front_len, 0, 0, NULL);
-
-       if (!msg) {
-               pr_err("unable to allocate msg type %d len %d\n",
-                      type, front_len);
-               return ERR_PTR(-ENOMEM);
-       }
-       return msg;
-}
-
-/*
  * Allocate "middle" portion of a message, if it is needed and wasn't
  * allocated by alloc_msg.  This allows us to read a small fixed-size
  * per-type header in the front and then gracefully fail (i.e.,
  * propagate the error to the caller based on info in the front) when
  * the middle is too large.
  */
-int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)
+static int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)
 {
        int type = le16_to_cpu(msg->hdr.type);
        int middle_len = le32_to_cpu(msg->hdr.middle_len);
@@ -2093,6 +2173,52 @@ int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)
        return 0;
 }
 
+/*
+ * Generic message allocator, for incoming messages.
+ */
+static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con,
+                               struct ceph_msg_header *hdr,
+                               int *skip)
+{
+       int type = le16_to_cpu(hdr->type);
+       int front_len = le32_to_cpu(hdr->front_len);
+       int middle_len = le32_to_cpu(hdr->middle_len);
+       struct ceph_msg *msg = NULL;
+       int ret;
+
+       if (con->ops->alloc_msg) {
+               mutex_unlock(&con->mutex);
+               msg = con->ops->alloc_msg(con, hdr, skip);
+               mutex_lock(&con->mutex);
+               if (IS_ERR(msg))
+                       return msg;
+
+               if (*skip)
+                       return NULL;
+       }
+       if (!msg) {
+               *skip = 0;
+               msg = ceph_msg_new(type, front_len, 0, 0, NULL);
+               if (!msg) {
+                       pr_err("unable to allocate msg type %d len %d\n",
+                              type, front_len);
+                       return ERR_PTR(-ENOMEM);
+               }
+       }
+       memcpy(&msg->hdr, &con->in_hdr, sizeof(con->in_hdr));
+
+       if (middle_len) {
+               ret = ceph_alloc_middle(con, msg);
+
+               if (ret < 0) {
+                       ceph_msg_put(msg);
+                       return msg;
+               }
+       }
+
+       return msg;
+}
+
 
 /*
  * Free a generically kmalloc'd message.
@@ -2125,6 +2251,12 @@ void ceph_msg_last_put(struct kref *kref)
        m->nr_pages = 0;
        m->pages = NULL;
 
+       if (m->pagelist) {
+               ceph_pagelist_release(m->pagelist);
+               kfree(m->pagelist);
+               m->pagelist = NULL;
+       }
+
        if (m->pool)
                ceph_msgpool_put(m->pool, m);
        else