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

Commit 4f73113c authored by santosh.shilimkar@oracle.com's avatar santosh.shilimkar@oracle.com Committed by David S. Miller
Browse files

RDS: Mark message mapped before transmit 



rds_send_xmit() marks the rds message map flag after
xmit_[rdma/atomic]() which is clearly wrong.  We need
to maintain the ownership between transport and rds.

Also take care of error path.

Reviewed-by: default avatarAjaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0df5f9a6

net/rds/send.c

+16 −8
Original line number Diff line number Diff line
@@ -282,26 +282,34 @@ int rds_send_xmit(struct rds_connection *conn) 
		/* The transport either sends the whole rdma or none of it */

		if (rm->rdma.op_active && !conn->c_xmit_rdma_sent) {

			rm->m_final_op = &rm->rdma;

			/* The transport owns the mapped memory for now.

			 * You can't unmap it while it's on the send queue

			 */

			set_bit(RDS_MSG_MAPPED, &rm->m_flags);

			ret = conn->c_trans->xmit_rdma(conn, &rm->rdma);

			if (ret)

			if (ret) {

				clear_bit(RDS_MSG_MAPPED, &rm->m_flags);

				wake_up_interruptible(&rm->m_flush_wait);

				break;

			}

			conn->c_xmit_rdma_sent = 1;



			/* The transport owns the mapped memory for now.

			 * You can't unmap it while it's on the send queue */

			set_bit(RDS_MSG_MAPPED, &rm->m_flags);

		}



		if (rm->atomic.op_active && !conn->c_xmit_atomic_sent) {

			rm->m_final_op = &rm->atomic;

			/* The transport owns the mapped memory for now.

			 * You can't unmap it while it's on the send queue

			 */

			set_bit(RDS_MSG_MAPPED, &rm->m_flags);

			ret = conn->c_trans->xmit_atomic(conn, &rm->atomic);

			if (ret)

			if (ret) {

				clear_bit(RDS_MSG_MAPPED, &rm->m_flags);

				wake_up_interruptible(&rm->m_flush_wait);

				break;

			}

			conn->c_xmit_atomic_sent = 1;



			/* The transport owns the mapped memory for now.

			 * You can't unmap it while it's on the send queue */

			set_bit(RDS_MSG_MAPPED, &rm->m_flags);

		}



		/*