diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2016-02-17 22:04:08 +0300 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2016-03-08 15:15:31 +0300 |
commit | c8f36e20e8e770768991f9ce22e089f85fad0044 (patch) | |
tree | 0d3e03fc6bbf99b0e0706b0daf91ba8ea6e80828 /net | |
parent | 129ba7b75424ca42d1ae487b48a8e013b81ce2d8 (diff) | |
download | linux-c8f36e20e8e770768991f9ce22e089f85fad0044.tar.xz |
libceph: don't bail early from try_read() when skipping a message
commit e7a88e82fe380459b864e05b372638aeacb0f52d upstream.
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.
Reported-by: Varada Kari <Varada.Kari@sandisk.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Tested-by: Varada Kari <Varada.Kari@sandisk.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 6b15183a68c8..f2ea1a093800 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2285,7 +2285,7 @@ static int read_partial_message(struct ceph_connection *con) con->in_base_pos = -front_len - middle_len - data_len - sizeof(m->footer); con->in_tag = CEPH_MSGR_TAG_READY; - return 0; + return 1; } 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); @@ -2318,7 +2318,7 @@ static int read_partial_message(struct ceph_connection *con) sizeof(m->footer); con->in_tag = CEPH_MSGR_TAG_READY; con->in_seq++; - return 0; + return 1; } BUG_ON(!con->in_msg); |