diff options
author | Andy Grover <andy.grover@oracle.com> | 2010-03-01 19:10:40 -0500 |
---|---|---|
committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 21:12:06 -0400 |
commit | 2c3a5f9abb1dc5efdab8ba9a568b1661c65fd1e3 (patch) | |
tree | 72b6a4c5298fecf46637987fd8ae42296dc90a97 /net/rds/rdma.c | |
parent | 7e3bd65ebfd5d6cd76b8b979920c632d6e6b4b2a (diff) |
RDS: Add flag for silent ops. Do atomic op before RDMA
Add a flag to the API so users can indicate they want
silent operations. This is needed because silent ops
cannot be used with USE_ONCE MRs, so we can't just
assume silent.
Also, change send_xmit to do atomic op before rdma op if
both are present, and centralize the hairy logic to determine if
we want to attempt silent, or not.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net/rds/rdma.c')
-rw-r--r-- | net/rds/rdma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 5ba514684431..48781fe4431c 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c | |||
@@ -559,6 +559,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, | |||
559 | op->op_write = !!(args->flags & RDS_RDMA_READWRITE); | 559 | op->op_write = !!(args->flags & RDS_RDMA_READWRITE); |
560 | op->op_fence = !!(args->flags & RDS_RDMA_FENCE); | 560 | op->op_fence = !!(args->flags & RDS_RDMA_FENCE); |
561 | op->op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); | 561 | op->op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); |
562 | op->op_silent = !!(args->flags & RDS_RDMA_SILENT); | ||
562 | op->op_active = 1; | 563 | op->op_active = 1; |
563 | op->op_recverr = rs->rs_recverr; | 564 | op->op_recverr = rs->rs_recverr; |
564 | WARN_ON(!nr_pages); | 565 | WARN_ON(!nr_pages); |
@@ -747,6 +748,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm, | |||
747 | } | 748 | } |
748 | 749 | ||
749 | rm->atomic.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); | 750 | rm->atomic.op_notify = !!(args->flags & RDS_RDMA_NOTIFY_ME); |
751 | rm->atomic.op_silent = !!(args->flags & RDS_RDMA_SILENT); | ||
750 | rm->atomic.op_active = 1; | 752 | rm->atomic.op_active = 1; |
751 | rm->atomic.op_recverr = rs->rs_recverr; | 753 | rm->atomic.op_recverr = rs->rs_recverr; |
752 | rm->atomic.op_sg = rds_message_alloc_sgs(rm, 1); | 754 | rm->atomic.op_sg = rds_message_alloc_sgs(rm, 1); |