lkml.org 
[lkml]   [2017]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 02/28] RDS: RDMA: return appropriate error on rdma map failures
    Date
    From: Santosh Shilimkar <santosh.shilimkar@oracle.com>

    [ Upstream commit 584a8279a44a800dea5a5c1e9d53a002e03016b4 ]

    The first message to a remote node should prompt a new
    connection even if it is RDMA operation. For RDMA operation
    the MR mapping can fail because connections is not yet up.

    Since the connection establishment is asynchronous,
    we make sure the map failure because of unavailable
    connection reach to the user by appropriate error code.
    Before returning to the user, lets trigger the connection
    so that its ready for the next retry.

    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    net/rds/send.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/net/rds/send.c b/net/rds/send.c
    index 6815f03324d7..1a3c6acdd3f8 100644
    --- a/net/rds/send.c
    +++ b/net/rds/send.c
    @@ -959,6 +959,11 @@ static int rds_cmsg_send(struct rds_sock *rs, struct rds_message *rm,
    ret = rds_cmsg_rdma_map(rs, rm, cmsg);
    if (!ret)
    *allocated_mr = 1;
    + else if (ret == -ENODEV)
    + /* Accommodate the get_mr() case which can fail
    + * if connection isn't established yet.
    + */
    + ret = -EAGAIN;
    break;
    case RDS_CMSG_ATOMIC_CSWP:
    case RDS_CMSG_ATOMIC_FADD:
    @@ -1072,8 +1077,12 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)

    /* Parse any control messages the user may have included. */
    ret = rds_cmsg_send(rs, rm, msg, &allocated_mr);
    - if (ret)
    + if (ret) {
    + /* Trigger connection so that its ready for the next retry */
    + if (ret == -EAGAIN)
    + rds_conn_connect_if_down(conn);
    goto out;
    + }

    if (rm->rdma.op_active && !conn->c_trans->xmit_rdma) {
    printk_ratelimited(KERN_NOTICE "rdma_op %p conn xmit_rdma %p\n",
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-11-15 04:06    [W:4.210 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site