lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RDS: purge atomic resources too in rds_message_purge()

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

Signed-off-by: Andy Grover <andy.grover@oracle.com>
This commit is contained in:
Andy Grover
2010-01-27 16:15:48 -08:00
parent 4324879df0
commit d0ab25a83c
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/rds/message.c
View File

@@ -73,6 +73,11 @@ static void rds_message_purge(struct rds_message *rm)
rds_rdma_free_op(&rm->rdma.m_rdma_op); rds_rdma_free_op(&rm->rdma.m_rdma_op);
if (rm->rdma.m_rdma_mr) if (rm->rdma.m_rdma_mr)
rds_mr_put(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) void rds_message_put(struct rds_message *rm)

16
net/rds/rdma.c
View File

@@ -462,6 +462,22 @@ void rds_rdma_free_op(struct rds_rdma_op *ro)
ro->r_active = 0; 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. * Count the number of pages needed to describe an incoming iovec.
*/ */

1
net/rds/rds.h
View File

@@ -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, int rds_cmsg_rdma_map(struct rds_sock *rs, struct rds_message *rm,
struct cmsghdr *cmsg); struct cmsghdr *cmsg);
void rds_rdma_free_op(struct rds_rdma_op *ro); 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_rdma_send_complete(struct rds_message *rm, int wc_status);
void rds_atomic_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, int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,