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

Commit 63f2d211 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: use fixed endian encoding for ceph_entity_addr 



We exchange struct ceph_entity_addr over the wire and store it on disk.
The sockaddr_storage.ss_family field, however, is host endianness.  So,
fix ss_family endianness to big endian when sending/receiving over the
wire.

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

fs/ceph/decode.h

+14 −2
Original line number Original line Diff line number Diff line
@@ -76,18 +76,30 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n) 
 * struct ceph_timespec <-> struct timespec

 * struct ceph_timespec <-> struct timespec

 */

 */

static inline void ceph_decode_timespec(struct timespec *ts,

static inline void ceph_decode_timespec(struct timespec *ts,

					struct ceph_timespec *tv)

					const struct ceph_timespec *tv)

{

{

	ts->tv_sec = le32_to_cpu(tv->tv_sec);

	ts->tv_sec = le32_to_cpu(tv->tv_sec);

	ts->tv_nsec = le32_to_cpu(tv->tv_nsec);

	ts->tv_nsec = le32_to_cpu(tv->tv_nsec);

}

}

static inline void ceph_encode_timespec(struct ceph_timespec *tv,

static inline void ceph_encode_timespec(struct ceph_timespec *tv,

					struct timespec *ts)

					const struct timespec *ts)

{

{

	tv->tv_sec = cpu_to_le32(ts->tv_sec);

	tv->tv_sec = cpu_to_le32(ts->tv_sec);

	tv->tv_nsec = cpu_to_le32(ts->tv_nsec);

	tv->tv_nsec = cpu_to_le32(ts->tv_nsec);

}

}





/*

 * sockaddr_storage <-> ceph_sockaddr

 */

static inline void ceph_encode_addr(struct ceph_entity_addr *a)

{

	a->in_addr.ss_family = htons(a->in_addr.ss_family);

}

static inline void ceph_decode_addr(struct ceph_entity_addr *a)

{

	a->in_addr.ss_family = ntohs(a->in_addr.ss_family);

}



/*

/*

 * encoders

 * encoders

 */

 */

fs/ceph/mdsmap.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 




		ceph_decode_need(p, end, sizeof(addr) + 1 + sizeof(u32), bad);

		ceph_decode_need(p, end, sizeof(addr) + 1 + sizeof(u32), bad);

		ceph_decode_copy(p, &addr, sizeof(addr));

		ceph_decode_copy(p, &addr, sizeof(addr));

		ceph_decode_addr(&addr);

		infoversion = ceph_decode_8(p);

		infoversion = ceph_decode_8(p);

		namelen = ceph_decode_32(p);  /* skip mds name */

		namelen = ceph_decode_32(p);  /* skip mds name */

		*p += namelen;

		*p += namelen;

fs/ceph/messenger.c

+18 −5
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include "super.h"

#include "super.h"

#include "messenger.h"

#include "messenger.h"

#include "decode.h"





/*

/*

 * Ceph uses the messenger to exchange ceph_msg messages with other

 * Ceph uses the messenger to exchange ceph_msg messages with other
@@ -97,6 +98,12 @@ const char *pr_addr(const struct sockaddr_storage *ss) 
	return s;

	return s;

}

}





static void encode_my_addr(struct ceph_messenger *msgr)

{

	memcpy(&msgr->my_enc_addr, &msgr->inst.addr, sizeof(msgr->my_enc_addr));

	ceph_encode_addr(&msgr->my_enc_addr);

}



/*

/*

 * work queue for all reading and writing to/from the socket.

 * work queue for all reading and writing to/from the socket.

 */

 */
@@ -590,12 +597,12 @@ static void prepare_write_connect(struct ceph_messenger *msgr, 




	con->out_kvec[0].iov_base = CEPH_BANNER;

	con->out_kvec[0].iov_base = CEPH_BANNER;

	con->out_kvec[0].iov_len = len;

	con->out_kvec[0].iov_len = len;

	con->out_kvec[1].iov_base = &msgr->inst.addr;

	con->out_kvec[1].iov_base = &msgr->my_enc_addr;

	con->out_kvec[1].iov_len = sizeof(msgr->inst.addr);

	con->out_kvec[1].iov_len = sizeof(msgr->my_enc_addr);

	con->out_kvec[2].iov_base = &con->out_connect;

	con->out_kvec[2].iov_base = &con->out_connect;

	con->out_kvec[2].iov_len = sizeof(con->out_connect);

	con->out_kvec[2].iov_len = sizeof(con->out_connect);

	con->out_kvec_left = 3;

	con->out_kvec_left = 3;

	con->out_kvec_bytes = len + sizeof(msgr->inst.addr) +

	con->out_kvec_bytes = len + sizeof(msgr->my_enc_addr) +

		sizeof(con->out_connect);

		sizeof(con->out_connect);

	con->out_kvec_cur = con->out_kvec;

	con->out_kvec_cur = con->out_kvec;

	con->out_more = 0;

	con->out_more = 0;
@@ -976,6 +983,9 @@ static int process_connect(struct ceph_connection *con) 
	if (verify_hello(con) < 0)

	if (verify_hello(con) < 0)

		return -1;

		return -1;





	ceph_decode_addr(&con->actual_peer_addr);

	ceph_decode_addr(&con->peer_addr_for_me);



	/*

	/*

	 * Make sure the other end is who we wanted.  note that the other

	 * Make sure the other end is who we wanted.  note that the other

	 * end may not yet know their ip address, so if it's 0.0.0.0, give

	 * end may not yet know their ip address, so if it's 0.0.0.0, give
@@ -1005,6 +1015,7 @@ static int process_connect(struct ceph_connection *con) 
		       &con->peer_addr_for_me.in_addr,

		       &con->peer_addr_for_me.in_addr,

		       sizeof(con->peer_addr_for_me.in_addr));

		       sizeof(con->peer_addr_for_me.in_addr));

		addr_set_port(&con->msgr->inst.addr.in_addr, port);

		addr_set_port(&con->msgr->inst.addr.in_addr, port);

		encode_my_addr(con->msgr);

		dout("process_connect learned my addr is %s\n",

		dout("process_connect learned my addr is %s\n",

		     pr_addr(&con->msgr->inst.addr.in_addr));

		     pr_addr(&con->msgr->inst.addr.in_addr));

	}

	}
@@ -1780,6 +1791,7 @@ struct ceph_messenger *ceph_messenger_create(struct ceph_entity_addr *myaddr) 
	/* select a random nonce */

	/* select a random nonce */

	get_random_bytes(&msgr->inst.addr.nonce,

	get_random_bytes(&msgr->inst.addr.nonce,

			 sizeof(msgr->inst.addr.nonce));

			 sizeof(msgr->inst.addr.nonce));

	encode_my_addr(msgr);





	dout("messenger_create %p\n", msgr);

	dout("messenger_create %p\n", msgr);

	return msgr;

	return msgr;
@@ -1806,8 +1818,9 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg) 
	}

	}





	/* set src+dst */

	/* set src+dst */

	msg->hdr.src = con->msgr->inst;

	msg->hdr.src.name = con->msgr->inst.name;

	msg->hdr.orig_src = con->msgr->inst;

	msg->hdr.src.addr = con->msgr->my_enc_addr;

	msg->hdr.orig_src = msg->hdr.src;

	msg->hdr.dst_erank = con->peer_addr.erank;

	msg->hdr.dst_erank = con->peer_addr.erank;





	/* queue */

	/* queue */

fs/ceph/messenger.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ extern const char *ceph_name_type_str(int t); 




struct ceph_messenger {

struct ceph_messenger {

	struct ceph_entity_inst inst;    /* my name+address */

	struct ceph_entity_inst inst;    /* my name+address */

	struct ceph_entity_addr my_enc_addr;

	struct page *zero_page;          /* used in certain error cases */

	struct page *zero_page;          /* used in certain error cases */





	bool nocrc;

	bool nocrc;

fs/ceph/mon_client.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,8 @@ struct ceph_monmap *ceph_monmap_decode(void *p, void *end) 
	m->epoch = epoch;

	m->epoch = epoch;

	m->num_mon = num_mon;

	m->num_mon = num_mon;

	ceph_decode_copy(&p, m->mon_inst, num_mon*sizeof(m->mon_inst[0]));

	ceph_decode_copy(&p, m->mon_inst, num_mon*sizeof(m->mon_inst[0]));

	for (i = 0; i < num_mon; i++)

		ceph_decode_addr(&m->mon_inst[i].addr);





	dout("monmap_decode epoch %d, num_mon %d\n", m->epoch,

	dout("monmap_decode epoch %d, num_mon %d\n", m->epoch,

	     m->num_mon);

	     m->num_mon);