Commit d0ab25a8 authored by Andy Grover's avatar Andy Grover
Browse files

RDS: purge atomic resources too in rds_message_purge() 



Add atomic_free_op function, analogous to rdma_free_op,
and call it in rds_message_purge().

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

net/rds/message.c

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ static void rds_message_purge(struct rds_message *rm) 
		rds_rdma_free_op(&rm->rdma.m_rdma_op);

	if (rm->rdma.m_rdma_mr)

		rds_mr_put(rm->rdma.m_rdma_mr);



	if (rm->atomic.op_active)

		rds_atomic_free_op(&rm->atomic);

	if (rm->atomic.op_rdma_mr)

		rds_mr_put(rm->atomic.op_rdma_mr);

}



void rds_message_put(struct rds_message *rm)

net/rds/rdma.c

+16 −0
Original line number Diff line number Diff line
@@ -462,6 +462,22 @@ void rds_rdma_free_op(struct rds_rdma_op *ro) 
	ro->r_active = 0;

}



void rds_atomic_free_op(struct rm_atomic_op *ao)

{

	struct page *page = sg_page(ao->op_sg);



	/* Mark page dirty if it was possibly modified, which

	 * is the case for a RDMA_READ which copies from remote

	 * to local memory */

	set_page_dirty(page);

	put_page(page);



	kfree(ao->op_notifier);

	ao->op_notifier = NULL;

	ao->op_active = 0;

}





/*

 * Count the number of pages needed to describe an incoming iovec.

 */

net/rds/rds.h

+1 −0
Original line number Diff line number Diff line
@@ -745,6 +745,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, 
int rds_cmsg_rdma_map(struct rds_sock *rs, struct rds_message *rm,

			  struct cmsghdr *cmsg);

void rds_rdma_free_op(struct rds_rdma_op *ro);

void rds_atomic_free_op(struct rm_atomic_op *ao);

void rds_rdma_send_complete(struct rds_message *rm, int wc_status);

void rds_atomic_send_complete(struct rds_message *rm, int wc_status);

int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,