diff options
| author | Sage Weil <sage@redhat.com> | 2014-08-04 18:01:54 +0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 13:02:28 +0300 |
| commit | 36d5b7b83ab7931290de2ce533f75c540cb90702 (patch) | |
| tree | eb9961bdee1f8ee80a821aac4730b712f7fefd12 /net/ceph/mon_client.c | |
| parent | 386ba13164c2c136c0fbf585aa7b63831c96d7c8 (diff) | |
| download | linux-36d5b7b83ab7931290de2ce533f75c540cb90702.tar.xz | |
libceph: gracefully handle large reply messages from the mon
commit 73c3d4812b4c755efeca0140f606f83772a39ce4 upstream.
We preallocate a few of the message types we get back from the mon. If we
get a larger message than we are expecting, fall back to trying to allocate
a new one instead of blindly using the one we have.
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ilya Dryomov <ilya.dryomov@inktank.com>
[lizf: Backported to 3.4: s/front_alloc_len/front_max/g]
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'net/ceph/mon_client.c')
| -rw-r--r-- | net/ceph/mon_client.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 6765da36f78f..bc293c087de6 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -1042,7 +1042,15 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, if (!m) { pr_info("alloc_msg unknown type %d\n", type); *skip = 1; + } else if (front_len > m->front_max) { + pr_warning("mon_alloc_msg front %d > prealloc %d (%u#%llu)\n", + front_len, m->front_max, + (unsigned int)con->peer_name.type, + le64_to_cpu(con->peer_name.num)); + ceph_msg_put(m); + m = ceph_msg_new(type, front_len, GFP_NOFS, false); } + return m; } |