linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gioh Kim <gi-oh.kim@ionos.com>
To: linux-rdma@vger.kernel.org
Cc: bvanassche@acm.org, leon@kernel.org, dledford@redhat.com,
	jgg@ziepe.ca, haris.iqbal@ionos.com, jinpu.wang@ionos.com,
	Md Haris Iqbal <haris.iqbal@cloud.ionos.com>,
	Gioh Kim <gi-oh.kim@ionos.com>
Subject: [PATCH for-next 19/20] RDMA/rtrs-clt: Check if the queue_depth has changed during a reconnection
Date: Mon,  3 May 2021 13:48:17 +0200	[thread overview]
Message-ID: <20210503114818.288896-20-gi-oh.kim@ionos.com> (raw)
In-Reply-To: <20210503114818.288896-1-gi-oh.kim@ionos.com>

From: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>

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")
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index c8a7807793bf..ec7055b8136b 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -1764,7 +1764,20 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
 	}
 	if (con->c.cid == 0) {
 		queue_depth = le16_to_cpu(msg->queue_depth);
-		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);
@@ -1778,7 +1791,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.
 		 *
@@ -1786,8 +1799,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.25.1


  parent reply	other threads:[~2021-05-03 11:48 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 11:47 [PATCH for-next 00/20] Misc update for rtrs Gioh Kim
2021-05-03 11:47 ` [PATCH for-next 01/20] RDMA/rtrs-srv: Kill reject_w_econnreset label Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 02/20] RDMA/rtrs-clt: Remove MAX_SESS_QUEUE_DEPTH from rtrs_send_sess_info Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 03/20] RDMA/rtrs-clt: No need to check queue_depth when receiving Gioh Kim
2021-05-09 11:24   ` Leon Romanovsky
2021-05-10 11:00     ` Haris Iqbal
2021-05-10 11:53       ` Leon Romanovsky
2021-05-10 12:06         ` Haris Iqbal
2021-05-10 12:17           ` Leon Romanovsky
2021-05-10 12:26             ` Haris Iqbal
2021-05-03 11:48 ` [PATCH for-next 04/20] RDMA/rtrs-srv: Add error messages for cases when failing RDMA connection Gioh Kim
2021-05-09 11:27   ` Leon Romanovsky
2021-05-10 10:55     ` Haris Iqbal
2021-05-10 12:03       ` Leon Romanovsky
2021-05-10 12:16         ` Haris Iqbal
2021-05-10 12:19           ` Leon Romanovsky
2021-05-03 11:48 ` [PATCH for-next 05/20] RDMA/rtrs-srv: Clean up the code in __rtrs_srv_change_state Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 06/20] RDMA/rtrs: Change MAX_SESS_QUEUE_DEPTH Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 07/20] RDMA/rtrs: Define MIN_CHUNK_SIZE Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 08/20] RDMA/rtrs: Use strscpy instead of strlcpy Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 09/20] RDMA/rtrs-clt: Kill rtrs_clt_{start,stop}_hb Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 10/20] RDMA/rtrs-clt: Kill rtrs_clt_disconnect_from_sysfs Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 11/20] RDMA/rtrs-srv: Kill __rtrs_srv_change_state Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 12/20] RDMA/rtrs-clt: Remove redundant 'break' Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 13/20] RDMA/rtrs-clt: Check state of the rtrs_clt_sess before reading its stats Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 14/20] RDMA/rtrs-srv: Replace atomic_t with percpu_ref for ids_inflight Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 15/20] RDMA/rtrs: Do not reset hb_missed_max after re-connection Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 16/20] RDMA/rtrs-srv: Duplicated session name is not allowed Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 17/20] RDMA/rtrs-srv: Fix memory leak of unfreed rtrs_srv_stats object Gioh Kim
2021-05-03 11:48 ` [PATCH for-next 18/20] RDMA/rtrs-srv: Fix memory leak when having multiple sessions Gioh Kim
2021-05-03 11:48 ` Gioh Kim [this message]
2021-05-03 11:48 ` [PATCH for-next 20/20] RDMA/rtrs-clt: Fix memory leak of not-freed sess->stats and stats->pcpu_stats Gioh Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210503114818.288896-20-gi-oh.kim@ionos.com \
    --to=gi-oh.kim@ionos.com \
    --cc=bvanassche@acm.org \
    --cc=dledford@redhat.com \
    --cc=haris.iqbal@cloud.ionos.com \
    --cc=haris.iqbal@ionos.com \
    --cc=jgg@ziepe.ca \
    --cc=jinpu.wang@ionos.com \
    --cc=leon@kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).