forked from luck/tmp_suning_uos_patched
RDS: Establish connection before parsing CMSGs
The first message to a remote node should prompt a new connection. Even an RDMA op via CMSG. Therefore move CMSG parsing to after connection establishment. Signed-off-by: Andy Grover <andy.grover@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7acd4a794c
commit
49f6969141
|
@ -854,11 +854,6 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|||
|
||||
rm->m_daddr = daddr;
|
||||
|
||||
/* Parse any control messages the user may have included. */
|
||||
ret = rds_cmsg_send(rs, rm, msg, &allocated_mr);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
/* rds_conn_create has a spinlock that runs with IRQ off.
|
||||
* Caching the conn in the socket helps a lot. */
|
||||
if (rs->rs_conn && rs->rs_conn->c_faddr == daddr)
|
||||
|
@ -874,6 +869,11 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|||
rs->rs_conn = conn;
|
||||
}
|
||||
|
||||
/* Parse any control messages the user may have included. */
|
||||
ret = rds_cmsg_send(rs, rm, msg, &allocated_mr);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
if ((rm->m_rdma_cookie || rm->m_rdma_op)
|
||||
&& conn->c_trans->xmit_rdma == NULL) {
|
||||
if (printk_ratelimit())
|
||||
|
|
Loading…
Reference in New Issue
Block a user