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

Commit 6c7cc6e4 authored by Andy Grover's avatar Andy Grover
Browse files

RDS: Rename data op members prefix from m_ to op_ 



For consistency.

Signed-off-by: default avatarAndy Grover <andy.grover@oracle.com>
parent f8b3aaf2

net/rds/ib_send.c

+13 −13
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void rds_ib_send_unmap_rm(struct rds_ib_connection *ic, 
	rdsdebug("ic %p send %p rm %p\n", ic, send, rm);



	ib_dma_unmap_sg(ic->i_cm_id->device,

			rm->data.m_sg, rm->data.m_nents,

			rm->data.op_sg, rm->data.op_nents,

			DMA_TO_DEVICE);



	if (rm->rdma.op_active) {
@@ -513,20 +513,20 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 


	/* map the message the first time we see it */

	if (!ic->i_rm) {

		if (rm->data.m_nents) {

			rm->data.m_count = ib_dma_map_sg(dev,

							    rm->data.m_sg,

							    rm->data.m_nents,

		if (rm->data.op_nents) {

			rm->data.op_count = ib_dma_map_sg(dev,

							  rm->data.op_sg,

							  rm->data.op_nents,

							  DMA_TO_DEVICE);

			rdsdebug("ic %p mapping rm %p: %d\n", ic, rm, rm->data.m_count);

			if (rm->data.m_count == 0) {

			rdsdebug("ic %p mapping rm %p: %d\n", ic, rm, rm->data.op_count);

			if (rm->data.op_count == 0) {

				rds_ib_stats_inc(s_ib_tx_sg_mapping_failure);

				rds_ib_ring_unalloc(&ic->i_send_ring, work_alloc);

				ret = -ENOMEM; /* XXX ? */

				goto out;

			}

		} else {

			rm->data.m_count = 0;

			rm->data.op_count = 0;

		}



		rds_message_addref(rm);
@@ -583,7 +583,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
	send = &ic->i_sends[pos];

	first = send;

	prev = NULL;

	scat = &rm->data.m_sg[sg];

	scat = &rm->data.op_sg[sg];

	i = 0;

	do {

		unsigned int len = 0;
@@ -604,7 +604,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 


		/* Set up the data, if present */

		if (i < work_alloc

		    && scat != &rm->data.m_sg[rm->data.m_count]) {

		    && scat != &rm->data.op_sg[rm->data.op_count]) {

			len = min(RDS_FRAG_SIZE, ib_sg_dma_len(dev, scat) - off);

			send->s_wr.num_sge = 2;
@@ -649,7 +649,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
		i++;



	} while (i < work_alloc

		 && scat != &rm->data.m_sg[rm->data.m_count]);

		 && scat != &rm->data.op_sg[rm->data.op_count]);



	/* Account the RDS header in the number of bytes we sent, but just once.

	 * The caller has no concept of fragmentation. */
@@ -657,7 +657,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
		bytes_sent += sizeof(struct rds_header);



	/* if we finished the message then send completion owns it */

	if (scat == &rm->data.m_sg[rm->data.m_count]) {

	if (scat == &rm->data.op_sg[rm->data.op_count]) {

		prev->s_rm = ic->i_rm;

		prev->s_wr.send_flags |= IB_SEND_SOLICITED;

		ic->i_rm = NULL;

net/rds/iw_send.c

+12 −12
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void rds_iw_send_unmap_rm(struct rds_iw_connection *ic, 
	rdsdebug("ic %p send %p rm %p\n", ic, send, rm);



	ib_dma_unmap_sg(ic->i_cm_id->device,

		     rm->data.m_sg, rm->data.m_nents,

		     rm->data.op_sg, rm->data.op_nents,

		     DMA_TO_DEVICE);



	if (rm->rdma.op_active) {
@@ -562,20 +562,20 @@ int rds_iw_xmit(struct rds_connection *conn, struct rds_message *rm, 
				rm->m_inc.i_hdr.h_flags,

				be32_to_cpu(rm->m_inc.i_hdr.h_len));

		   */

		if (rm->data.m_nents) {

			rm->data.m_count = ib_dma_map_sg(dev,

						    rm->data.m_sg,

						    rm->data.m_nents,

		if (rm->data.op_nents) {

			rm->data.op_count = ib_dma_map_sg(dev,

							  rm->data.op_sg,

							  rm->data.op_nents,

							  DMA_TO_DEVICE);

			rdsdebug("ic %p mapping rm %p: %d\n", ic, rm, rm->data.m_count);

			if (rm->data.m_count == 0) {

			rdsdebug("ic %p mapping rm %p: %d\n", ic, rm, rm->data.op_count);

			if (rm->data.op_count == 0) {

				rds_iw_stats_inc(s_iw_tx_sg_mapping_failure);

				rds_iw_ring_unalloc(&ic->i_send_ring, work_alloc);

				ret = -ENOMEM; /* XXX ? */

				goto out;

			}

		} else {

			rm->data.m_count = 0;

			rm->data.op_count = 0;

		}



		ic->i_unsignaled_wrs = rds_iw_sysctl_max_unsig_wrs;
@@ -622,7 +622,7 @@ int rds_iw_xmit(struct rds_connection *conn, struct rds_message *rm, 
	send = &ic->i_sends[pos];

	first = send;

	prev = NULL;

	scat = &rm->data.m_sg[sg];

	scat = &rm->data.op_sg[sg];

	sent = 0;

	i = 0;
@@ -651,7 +651,7 @@ int rds_iw_xmit(struct rds_connection *conn, struct rds_message *rm, 
	}



	/* if there's data reference it with a chain of work reqs */

	for (; i < work_alloc && scat != &rm->data.m_sg[rm->data.m_count]; i++) {

	for (; i < work_alloc && scat != &rm->data.op_sg[rm->data.op_count]; i++) {

		unsigned int len;



		send = &ic->i_sends[pos];
@@ -729,7 +729,7 @@ int rds_iw_xmit(struct rds_connection *conn, struct rds_message *rm, 
		sent += sizeof(struct rds_header);



	/* if we finished the message then send completion owns it */

	if (scat == &rm->data.m_sg[rm->data.m_count]) {

	if (scat == &rm->data.op_sg[rm->data.op_count]) {

		prev->s_rm = ic->i_rm;

		prev->s_wr.send_flags |= IB_SEND_SIGNALED | IB_SEND_SOLICITED;

		ic->i_rm = NULL;

net/rds/message.c

+11 −11
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ static void rds_message_purge(struct rds_message *rm) 
	if (unlikely(test_bit(RDS_MSG_PAGEVEC, &rm->m_flags)))

		return;



	for (i = 0; i < rm->data.m_nents; i++) {

		rdsdebug("putting data page %p\n", (void *)sg_page(&rm->data.m_sg[i]));

	for (i = 0; i < rm->data.op_nents; i++) {

		rdsdebug("putting data page %p\n", (void *)sg_page(&rm->data.op_sg[i]));

		/* XXX will have to put_page for page refs */

		__free_page(sg_page(&rm->data.m_sg[i]));

		__free_page(sg_page(&rm->data.op_sg[i]));

	}

	rm->data.m_nents = 0;

	rm->data.op_nents = 0;



	if (rm->rdma.op_active)

		rds_rdma_free_op(&rm->rdma);
@@ -261,11 +261,11 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in 


	set_bit(RDS_MSG_PAGEVEC, &rm->m_flags);

	rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);

	rm->data.m_nents = ceil(total_len, PAGE_SIZE);

	rm->data.m_sg = rds_message_alloc_sgs(rm, num_sgs);

	rm->data.op_nents = ceil(total_len, PAGE_SIZE);

	rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);



	for (i = 0; i < rm->data.m_nents; ++i) {

		sg_set_page(&rm->data.m_sg[i],

	for (i = 0; i < rm->data.op_nents; ++i) {

		sg_set_page(&rm->data.op_sg[i],

				virt_to_page(page_addrs[i]),

				PAGE_SIZE, 0);

	}
@@ -288,7 +288,7 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov, 
	/*

	 * now allocate and copy in the data payload.

	 */

	sg = rm->data.m_sg;

	sg = rm->data.op_sg;

	iov = first_iov;

	iov_off = 0;

	sg_off = 0; /* Dear gcc, sg->page will be null from kzalloc. */
@@ -299,7 +299,7 @@ int rds_message_copy_from_user(struct rds_message *rm, struct iovec *first_iov, 
						       GFP_HIGHUSER);

			if (ret)

				goto out;

			rm->data.m_nents++;

			rm->data.op_nents++;

			sg_off = 0;

		}
@@ -354,7 +354,7 @@ int rds_message_inc_copy_to_user(struct rds_incoming *inc, 


	iov = first_iov;

	iov_off = 0;

	sg = rm->data.m_sg;

	sg = rm->data.op_sg;

	vec_off = 0;

	copied = 0;

net/rds/rds.h

+3 −3
Original line number Diff line number Diff line
@@ -339,9 +339,9 @@ struct rds_message { 
		} rdma;

		struct rm_data_op {

			unsigned int		op_active:1;

			unsigned int		m_nents;

			unsigned int		m_count;

			struct scatterlist	*m_sg;

			unsigned int		op_nents;

			unsigned int		op_count;

			struct scatterlist	*op_sg;

		} data;

	};

	unsigned int		m_used_sgs;

net/rds/send.c

+5 −5
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int rds_send_xmit(struct rds_connection *conn) 
		rm = conn->c_xmit_rm;

		if (rm &&

		    conn->c_xmit_hdr_off == sizeof(struct rds_header) &&

		    conn->c_xmit_sg == rm->data.m_nents) {

		    conn->c_xmit_sg == rm->data.op_nents) {

			conn->c_xmit_rm = NULL;

			conn->c_xmit_sg = 0;

			conn->c_xmit_hdr_off = 0;
@@ -296,7 +296,7 @@ int rds_send_xmit(struct rds_connection *conn) 


		if (rm->data.op_active

		    && (conn->c_xmit_hdr_off < sizeof(struct rds_header) ||

			conn->c_xmit_sg < rm->data.m_nents)) {

			conn->c_xmit_sg < rm->data.op_nents)) {

			ret = conn->c_trans->xmit(conn, rm,

						  conn->c_xmit_hdr_off,

						  conn->c_xmit_sg,
@@ -312,7 +312,7 @@ int rds_send_xmit(struct rds_connection *conn) 
				ret -= tmp;

			}



			sg = &rm->data.m_sg[conn->c_xmit_sg];

			sg = &rm->data.op_sg[conn->c_xmit_sg];

			while (ret) {

				tmp = min_t(int, ret, sg->length -

						      conn->c_xmit_data_off);
@@ -323,7 +323,7 @@ int rds_send_xmit(struct rds_connection *conn) 
					sg++;

					conn->c_xmit_sg++;

					BUG_ON(ret != 0 &&

					       conn->c_xmit_sg == rm->data.m_nents);

					       conn->c_xmit_sg == rm->data.op_nents);

				}

			}

		}
@@ -959,7 +959,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 
		goto out;

	}



	rm->data.m_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE));

	rm->data.op_sg = rds_message_alloc_sgs(rm, ceil(payload_len, PAGE_SIZE));

	/* XXX fix this to not allocate memory */

	ret = rds_message_copy_from_user(rm, msg->msg_iov, payload_len);

	if (ret)