xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/rtrs-clt: Check if the queue_depth has changed during a reconnection

Browse Source 
[ 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: 6a98d71dae ("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>
This commit is contained in:
Md Haris Iqbal
2021-05-28 13:30:17 +02:00
committed by Greg Kroah-Hartman
parent 8651ad0e29
commit 6569ae1deb
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/infiniband/ulp/rtrs/rtrs-clt.c
View File

@@ -1727,7 +1727,19 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
queue_depth); queue_depth);
return -ECONNRESET; 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); kfree(sess->rbufs);
sess->rbufs = kcalloc(queue_depth, sizeof(*sess->rbufs), sess->rbufs = kcalloc(queue_depth, sizeof(*sess->rbufs),
GFP_KERNEL); GFP_KERNEL);
@@ -1741,7 +1753,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
sess->chunk_size = sess->max_io_size + sess->max_hdr_size; 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 * If while a reconnection server sends us a value a bit
* higher - client does not care and uses cached minimum. * higher - client does not care and uses cached minimum.
* *
@@ -1749,8 +1761,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
* connections in parallel, use lock. * connections in parallel, use lock.
*/ */
mutex_lock(&clt->paths_mutex); mutex_lock(&clt->paths_mutex);
clt->queue_depth = min_not_zero(sess->queue_depth, clt->queue_depth = sess->queue_depth;
clt->queue_depth);
clt->max_io_size = min_not_zero(sess->max_io_size, clt->max_io_size = min_not_zero(sess->max_io_size,
clt->max_io_size); clt->max_io_size);
mutex_unlock(&clt->paths_mutex); mutex_unlock(&clt->paths_mutex);