Commit e7a88e82 authored by Ilya Dryomov's avatar Ilya Dryomov

libceph: don't bail early from try_read() when skipping a message

The contract between try_read() and try_write() is that when called
each processes as much data as possible.  When instructed by osd_client
to skip a message, try_read() is violating this contract by returning
after receiving and discarding a single message instead of checking for
more.  try_write() then gets a chance to write out more requests,
generating more replies/skips for try_read() to handle, forcing the
messenger into a starvation loop.

Cc: stable@vger.kernel.org # 3.10+
Reported-by: default avatarVarada Kari <Varada.Kari@sandisk.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Tested-by: default avatarVarada Kari <Varada.Kari@sandisk.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent 81f70ba2
...@@ -2337,7 +2337,7 @@ static int read_partial_message(struct ceph_connection *con) ...@@ -2337,7 +2337,7 @@ static int read_partial_message(struct ceph_connection *con)
con->in_base_pos = -front_len - middle_len - data_len - con->in_base_pos = -front_len - middle_len - data_len -
sizeof(m->footer); sizeof(m->footer);
con->in_tag = CEPH_MSGR_TAG_READY; con->in_tag = CEPH_MSGR_TAG_READY;
return 0; return 1;
} else if ((s64)seq - (s64)con->in_seq > 1) { } else if ((s64)seq - (s64)con->in_seq > 1) {
pr_err("read_partial_message bad seq %lld expected %lld\n", pr_err("read_partial_message bad seq %lld expected %lld\n",
seq, con->in_seq + 1); seq, con->in_seq + 1);
...@@ -2363,7 +2363,7 @@ static int read_partial_message(struct ceph_connection *con) ...@@ -2363,7 +2363,7 @@ static int read_partial_message(struct ceph_connection *con)
sizeof(m->footer); sizeof(m->footer);
con->in_tag = CEPH_MSGR_TAG_READY; con->in_tag = CEPH_MSGR_TAG_READY;
con->in_seq++; con->in_seq++;
return 0; return 1;
} }
BUG_ON(!con->in_msg); BUG_ON(!con->in_msg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment