lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 433/800] RDMA/rtrs-clt: Check if the queue_depth has changed during a reconnection
    Date
    From: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>

    [ Upstream commit 5b73b799c25c68a4703cd6c5ac4518006d9865b8 ]

    The queue_depth is a module parameter for rtrs_server. It is used on the
    client side to determing the queue_depth of the request queue for the RNBD
    virtual block device.

    During a reconnection event for an already mapped device, in case the
    rtrs_server module queue_depth has changed, fail the reconnect attempt.

    Also stop further auto reconnection attempts. A manual reconnect via
    sysfs has to be triggerred.

    Fixes: 6a98d71daea18 ("RDMA/rtrs: client: main functionality")
    Link: https://lore.kernel.org/r/20210528113018.52290-20-jinpu.wang@ionos.com
    Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
    Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
    Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/ulp/rtrs/rtrs-clt.c | 19 +++++++++++++++----
    1 file changed, 15 insertions(+), 4 deletions(-)

    diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
    index a563c9b9d52c..d4d54189c878 100644
    --- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
    +++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
    @@ -1791,7 +1791,19 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
    queue_depth);
    return -ECONNRESET;
    }
    - if (!sess->rbufs || sess->queue_depth < queue_depth) {
    + if (sess->queue_depth > 0 && queue_depth != sess->queue_depth) {
    + rtrs_err(clt, "Error: queue depth changed\n");
    +
    + /*
    + * Stop any more reconnection attempts
    + */
    + sess->reconnect_attempts = -1;
    + rtrs_err(clt,
    + "Disabling auto-reconnect. Trigger a manual reconnect after issue is resolved\n");
    + return -ECONNRESET;
    + }
    +
    + if (!sess->rbufs) {
    kfree(sess->rbufs);
    sess->rbufs = kcalloc(queue_depth, sizeof(*sess->rbufs),
    GFP_KERNEL);
    @@ -1805,7 +1817,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
    sess->chunk_size = sess->max_io_size + sess->max_hdr_size;

    /*
    - * Global queue depth and IO size is always a minimum.
    + * Global IO size is always a minimum.
    * If while a reconnection server sends us a value a bit
    * higher - client does not care and uses cached minimum.
    *
    @@ -1813,8 +1825,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
    * connections in parallel, use lock.
    */
    mutex_lock(&clt->paths_mutex);
    - clt->queue_depth = min_not_zero(sess->queue_depth,
    - clt->queue_depth);
    + clt->queue_depth = sess->queue_depth;
    clt->max_io_size = min_not_zero(sess->max_io_size,
    clt->max_io_size);
    mutex_unlock(&clt->paths_mutex);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:2.360 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site