Commit 503438a4 authored by Jack Wang's avatar Jack Wang Committed by Jens Axboe
Browse files

block/rnbd-clt: Remove max_segment_size 



We always map with SZ_4K, so do not need max_segment_size.

Cc: Leon Romanovsky <leonro@nvidia.com>
Cc: linux-rdma@vger.kernel.org
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Reviewed-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: default avatarGioh Kim <gi-oh.kim@ionos.com>
Acked-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20210419073722.15351-18-gi-oh.kim@ionos.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3ba1c693

drivers/block/rnbd/rnbd-clt.c

+0 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,6 @@ find_and_get_or_create_sess(const char *sessname, 
				   paths, path_cnt, port_nr,

				   0, /* Do not use pdu of rtrs */

				   RECONNECT_DELAY, BMAX_SEGMENTS,

				   BLK_MAX_SEGMENT_SIZE,

				   MAX_RECONNECTS, nr_poll_queues);

	if (IS_ERR(sess->rtrs)) {

		err = PTR_ERR(sess->rtrs);

drivers/infiniband/ulp/rtrs/rtrs-clt.c

+5 −10
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ static void rtrs_clt_close_work(struct work_struct *work); 
static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt,

					 const struct rtrs_addr *path,

					 size_t con_num, u16 max_segments,

					 size_t max_segment_size, u32 nr_poll_queues)

					 u32 nr_poll_queues)

{

	struct rtrs_clt_sess *sess;

	int err = -ENOMEM;
@@ -1442,7 +1442,7 @@ static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt, 
		       rdma_addr_size((struct sockaddr *)path->src));

	strlcpy(sess->s.sessname, clt->sessname, sizeof(sess->s.sessname));

	sess->clt = clt;

	sess->max_pages_per_mr = max_segments * max_segment_size >> 12;

	sess->max_pages_per_mr = max_segments;

	init_waitqueue_head(&sess->state_wq);

	sess->state = RTRS_CLT_CONNECTING;

	atomic_set(&sess->connected_cnt, 0);
@@ -2538,7 +2538,6 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num, 
				  void	(*link_ev)(void *priv,

						   enum rtrs_clt_link_ev ev),

				  unsigned int max_segments,

				  size_t max_segment_size,

				  unsigned int reconnect_delay_sec,

				  unsigned int max_reconnect_attempts)

{
@@ -2568,7 +2567,6 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num, 
	clt->port = port;

	clt->pdu_sz = pdu_sz;

	clt->max_segments = max_segments;

	clt->max_segment_size = max_segment_size;

	clt->reconnect_delay_sec = reconnect_delay_sec;

	clt->max_reconnect_attempts = max_reconnect_attempts;

	clt->priv = priv;
@@ -2638,7 +2636,6 @@ static void free_clt(struct rtrs_clt *clt) 
 * @pdu_sz: Size of extra payload which can be accessed after permit allocation.

 * @reconnect_delay_sec: time between reconnect tries

 * @max_segments: Max. number of segments per IO request

 * @max_segment_size: Max. size of one segment

 * @max_reconnect_attempts: Number of times to reconnect on error before giving

 *			    up, 0 for * disabled, -1 for forever

 * @nr_poll_queues: number of polling mode connection using IB_POLL_DIRECT flag
@@ -2654,7 +2651,6 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, 
				 size_t paths_num, u16 port,

				 size_t pdu_sz, u8 reconnect_delay_sec,

				 u16 max_segments,

				 size_t max_segment_size,

				 s16 max_reconnect_attempts, u32 nr_poll_queues)

{

	struct rtrs_clt_sess *sess, *tmp;
@@ -2663,7 +2659,7 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, 


	clt = alloc_clt(sessname, paths_num, port, pdu_sz, ops->priv,

			ops->link_ev,

			max_segments, max_segment_size, reconnect_delay_sec,

			max_segments, reconnect_delay_sec,

			max_reconnect_attempts);

	if (IS_ERR(clt)) {

		err = PTR_ERR(clt);
@@ -2673,7 +2669,7 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, 
		struct rtrs_clt_sess *sess;



		sess = alloc_sess(clt, &paths[i], nr_cpu_ids,

				  max_segments, max_segment_size, nr_poll_queues);

				  max_segments, nr_poll_queues);

		if (IS_ERR(sess)) {

			err = PTR_ERR(sess);

			goto close_all_sess;
@@ -2951,8 +2947,7 @@ int rtrs_clt_create_path_from_sysfs(struct rtrs_clt *clt, 
	struct rtrs_clt_sess *sess;

	int err;



	sess = alloc_sess(clt, addr, nr_cpu_ids, clt->max_segments,

			  clt->max_segment_size, 0);

	sess = alloc_sess(clt, addr, nr_cpu_ids, clt->max_segments, 0);

	if (IS_ERR(sess))

		return PTR_ERR(sess);

drivers/infiniband/ulp/rtrs/rtrs-clt.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ struct rtrs_clt { 
	unsigned int		max_reconnect_attempts;

	unsigned int		reconnect_delay_sec;

	unsigned int		max_segments;

	size_t			max_segment_size;

	void			*permits;

	unsigned long		*permits_map;

	size_t			queue_depth;

drivers/infiniband/ulp/rtrs/rtrs.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, 
				 size_t path_cnt, u16 port,

				 size_t pdu_sz, u8 reconnect_delay_sec,

				 u16 max_segments,

				 size_t max_segment_size,

				 s16 max_reconnect_attempts, u32 nr_poll_queues);



void rtrs_clt_close(struct rtrs_clt *sess);