Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b61c2763 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: don't complain on msgpool alloc failures 



The pool allocation failures are masked by the pool; there is no need to
spam the console about them.  (That's the whole point of having the pool
in the first place.)

Mark msg allocations whose failure is safely handled as such.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent f6a2f5be

fs/ceph/caps.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static int send_cap_msg(struct ceph_mds_session *session, 
	     seq, issue_seq, mseq, follows, size, max_size,

	     xattr_version, xattrs_buf ? (int)xattrs_buf->vec.iov_len : 0);



	msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, sizeof(*fc), GFP_NOFS);

	msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, sizeof(*fc), GFP_NOFS, false);

	if (!msg)

		return -ENOMEM;

fs/ceph/mds_client.c

+6 −5
Original line number Diff line number Diff line
@@ -764,7 +764,8 @@ static struct ceph_msg *create_session_msg(u32 op, u64 seq) 
	struct ceph_msg *msg;

	struct ceph_mds_session_head *h;



	msg = ceph_msg_new(CEPH_MSG_CLIENT_SESSION, sizeof(*h), GFP_NOFS);

	msg = ceph_msg_new(CEPH_MSG_CLIENT_SESSION, sizeof(*h), GFP_NOFS,

			   false);

	if (!msg) {

		pr_err("create_session_msg ENOMEM creating msg\n");

		return NULL;
@@ -1240,7 +1241,7 @@ int ceph_add_cap_releases(struct ceph_mds_client *mdsc, 
	while (session->s_num_cap_releases < session->s_nr_caps + extra) {

		spin_unlock(&session->s_cap_lock);

		msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPRELEASE, PAGE_CACHE_SIZE,

				   GFP_NOFS);

				   GFP_NOFS, false);

		if (!msg)

			goto out_unlocked;

		dout("add_cap_releases %p msg %p now %d\n", session, msg,
@@ -1652,7 +1653,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, 
	if (req->r_old_dentry_drop)

		len += req->r_old_dentry->d_name.len;



	msg = ceph_msg_new(CEPH_MSG_CLIENT_REQUEST, len, GFP_NOFS);

	msg = ceph_msg_new(CEPH_MSG_CLIENT_REQUEST, len, GFP_NOFS, false);

	if (!msg) {

		msg = ERR_PTR(-ENOMEM);

		goto out_free2;
@@ -2518,7 +2519,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, 
		goto fail_nopagelist;

	ceph_pagelist_init(pagelist);



	reply = ceph_msg_new(CEPH_MSG_CLIENT_RECONNECT, 0, GFP_NOFS);

	reply = ceph_msg_new(CEPH_MSG_CLIENT_RECONNECT, 0, GFP_NOFS, false);

	if (!reply)

		goto fail_nomsg;
@@ -2831,7 +2832,7 @@ void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session, 
	dnamelen = dentry->d_name.len;

	len += dnamelen;



	msg = ceph_msg_new(CEPH_MSG_CLIENT_LEASE, len, GFP_NOFS);

	msg = ceph_msg_new(CEPH_MSG_CLIENT_LEASE, len, GFP_NOFS, false);

	if (!msg)

		return;

	lease = msg->front.iov_base;

include/linux/ceph/messenger.h

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ extern void ceph_con_keepalive(struct ceph_connection *con); 
extern struct ceph_connection *ceph_con_get(struct ceph_connection *con);

extern void ceph_con_put(struct ceph_connection *con);



extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags);

extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,

				     bool can_fail);

extern void ceph_msg_kfree(struct ceph_msg *m);

net/ceph/messenger.c

+11 −4
Original line number Diff line number Diff line
@@ -2281,7 +2281,8 @@ EXPORT_SYMBOL(ceph_con_keepalive); 
 * construct a new message with given type, size

 * the new msg has a ref count of 1.

 */

struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags)

struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,

			      bool can_fail)

{

	struct ceph_msg *m;
@@ -2333,7 +2334,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) 
			m->front.iov_base = kmalloc(front_len, flags);

		}

		if (m->front.iov_base == NULL) {

			pr_err("msg_new can't allocate %d bytes\n",

			dout("ceph_msg_new can't allocate %d bytes\n",

			     front_len);

			goto out2;

		}
@@ -2348,7 +2349,13 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) 
out2:

	ceph_msg_put(m);

out:

	pr_err("msg_new can't create type %d front %d\n", type, front_len);

	if (!can_fail) {

		pr_err("msg_new can't create type %d front %d\n", type,

		       front_len);

	} else {

		dout("msg_new can't create type %d front %d\n", type,

		     front_len);

	}

	return NULL;

}

EXPORT_SYMBOL(ceph_msg_new);
@@ -2398,7 +2405,7 @@ static struct ceph_msg *ceph_alloc_msg(struct ceph_connection *con, 
	}

	if (!msg) {

		*skip = 0;

		msg = ceph_msg_new(type, front_len, GFP_NOFS);

		msg = ceph_msg_new(type, front_len, GFP_NOFS, false);

		if (!msg) {

			pr_err("unable to allocate msg type %d len %d\n",

			       type, front_len);

net/ceph/mon_client.c

+15 −9
Original line number Diff line number Diff line
@@ -517,10 +517,12 @@ int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf) 
	init_completion(&req->completion);



	err = -ENOMEM;

	req->request = ceph_msg_new(CEPH_MSG_STATFS, sizeof(*h), GFP_NOFS);

	req->request = ceph_msg_new(CEPH_MSG_STATFS, sizeof(*h), GFP_NOFS,

				    true);

	if (!req->request)

		goto out;

	req->reply = ceph_msg_new(CEPH_MSG_STATFS_REPLY, 1024, GFP_NOFS);

	req->reply = ceph_msg_new(CEPH_MSG_STATFS_REPLY, 1024, GFP_NOFS,

				  true);

	if (!req->reply)

		goto out;
@@ -615,10 +617,12 @@ int ceph_monc_do_poolop(struct ceph_mon_client *monc, u32 op, 
	init_completion(&req->completion);



	err = -ENOMEM;

	req->request = ceph_msg_new(CEPH_MSG_POOLOP, sizeof(*h), GFP_NOFS);

	req->request = ceph_msg_new(CEPH_MSG_POOLOP, sizeof(*h), GFP_NOFS,

				    true);

	if (!req->request)

		goto out;

	req->reply = ceph_msg_new(CEPH_MSG_POOLOP_REPLY, 1024, GFP_NOFS);

	req->reply = ceph_msg_new(CEPH_MSG_POOLOP_REPLY, 1024, GFP_NOFS,

				  true);

	if (!req->reply)

		goto out;
@@ -765,19 +769,21 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) 
	err = -ENOMEM;

	monc->m_subscribe_ack = ceph_msg_new(CEPH_MSG_MON_SUBSCRIBE_ACK,

				     sizeof(struct ceph_mon_subscribe_ack),

				     GFP_NOFS);

				     GFP_NOFS, true);

	if (!monc->m_subscribe_ack)

		goto out_con;



	monc->m_subscribe = ceph_msg_new(CEPH_MSG_MON_SUBSCRIBE, 96, GFP_NOFS);

	monc->m_subscribe = ceph_msg_new(CEPH_MSG_MON_SUBSCRIBE, 96, GFP_NOFS,

					 true);

	if (!monc->m_subscribe)

		goto out_subscribe_ack;



	monc->m_auth_reply = ceph_msg_new(CEPH_MSG_AUTH_REPLY, 4096, GFP_NOFS);

	monc->m_auth_reply = ceph_msg_new(CEPH_MSG_AUTH_REPLY, 4096, GFP_NOFS,

					  true);

	if (!monc->m_auth_reply)

		goto out_subscribe;



	monc->m_auth = ceph_msg_new(CEPH_MSG_AUTH, 4096, GFP_NOFS);

	monc->m_auth = ceph_msg_new(CEPH_MSG_AUTH, 4096, GFP_NOFS, true);

	monc->pending_auth = 0;

	if (!monc->m_auth)

		goto out_auth_reply;
@@ -970,7 +976,7 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, 
	case CEPH_MSG_MON_MAP:

	case CEPH_MSG_MDS_MAP:

	case CEPH_MSG_OSD_MAP:

		m = ceph_msg_new(type, front_len, GFP_NOFS);

		m = ceph_msg_new(type, front_len, GFP_NOFS, false);

		break;

	}