From: Danil Kipnis <danil.kipnis@cloud.ionos.com>
To: linux-block@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-next@vger.kernel.org, bvanassche@acm.org,
dledford@redhat.com, jgg@ziepe.ca
Cc: axboe@kernel.dk, danil.kipnis@cloud.ionos.com, lkp@intel.com,
jinpu.wang@cloud.ionos.com
Subject: [PATCH] RDMA/rtrs: get rid of the do_next_path while_next_path macros
Date: Fri, 22 May 2020 07:39:24 +0200 [thread overview]
Message-ID: <20200522053924.528980-1-danil.kipnis@cloud.ionos.com> (raw)
In-Reply-To: <20200520191105.GK31189@ziepe.ca>
The macros do_each_path/while_each_path lead to a smatch warning:
drivers/infiniband/ulp/rtrs/rtrs-clt.c:1196 rtrs_clt_failover_req() warn: inconsistent indenting
drivers/infiniband/ulp/rtrs/rtrs-clt.c:2890 rtrs_clt_request() warn: inconsistent indenting
Also checkpatch complains:
ERROR: Macros with multiple statements should be enclosed in a do - while loop
The macros are used only in two places: for a normal IO path and for the
failover path triggered after errors.
Get rid of the macros and just use a for loop iterating over the list
of paths in both places. It is easier to read and also less lines of code.
Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Danil Kipnis <danil.kipnis@cloud.ionos.com>
---
drivers/infiniband/ulp/rtrs/rtrs-clt.c | 29 ++++++++++++--------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index 468fdd0d8713..45ea5aa5f406 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -727,18 +727,6 @@ struct path_it {
struct rtrs_clt_sess *(*next_path)(struct path_it *it);
};
-#define do_each_path(path, clt, it) { \
- path_it_init(it, clt); \
- rcu_read_lock(); \
- for ((it)->i = 0; ((path) = ((it)->next_path)(it)) && \
- (it)->i < (it)->clt->paths_num; \
- (it)->i++)
-
-#define while_each_path(it) \
- path_it_deinit(it); \
- rcu_read_unlock(); \
- }
-
/**
* list_next_or_null_rr_rcu - get next list element in round-robin fashion.
* @head: the head for the list.
@@ -1177,7 +1165,10 @@ static int rtrs_clt_failover_req(struct rtrs_clt *clt,
int err = -ECONNABORTED;
struct path_it it;
- do_each_path(alive_sess, clt, &it) {
+ rcu_read_lock();
+ for (path_it_init(&it, clt);
+ (alive_sess = it.next_path(&it)) && it.i < it.clt->paths_num;
+ it.i++) {
if (unlikely(READ_ONCE(alive_sess->state) !=
RTRS_CLT_CONNECTED))
continue;
@@ -1193,7 +1184,9 @@ static int rtrs_clt_failover_req(struct rtrs_clt *clt,
/* Success path */
rtrs_clt_inc_failover_cnt(alive_sess->stats);
break;
- } while_each_path(&it);
+ }
+ path_it_deinit(&it);
+ rcu_read_unlock();
return err;
}
@@ -2862,7 +2855,9 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops,
dma_dir = DMA_TO_DEVICE;
}
- do_each_path(sess, clt, &it) {
+ rcu_read_lock();
+ for (path_it_init(&it, clt);
+ (sess = it.next_path(&it)) && it.i < it.clt->paths_num; it.i++) {
if (unlikely(READ_ONCE(sess->state) != RTRS_CLT_CONNECTED))
continue;
@@ -2887,7 +2882,9 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops,
}
/* Success path */
break;
- } while_each_path(&it);
+ }
+ path_it_deinit(&it);
+ rcu_read_unlock();
return err;
}
--
2.25.1
next prev parent reply other threads:[~2020-05-22 5:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 11:29 [PATCH v2] rtrs-clt: silence kbuild test inconsistent intenting smatch warning Danil Kipnis
2020-05-19 14:29 ` Bart Van Assche
2020-05-19 23:38 ` Jason Gunthorpe
2020-05-20 10:04 ` Danil Kipnis
2020-05-20 19:11 ` Jason Gunthorpe
2020-05-22 5:39 ` Danil Kipnis [this message]
2020-05-23 0:24 ` [PATCH] RDMA/rtrs: get rid of the do_next_path while_next_path macros Jason Gunthorpe
2020-05-20 10:02 ` [PATCH v2] rtrs-clt: silence kbuild test inconsistent intenting smatch warning Danil Kipnis
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=20200522053924.528980-1-danil.kipnis@cloud.ionos.com \
--to=danil.kipnis@cloud.ionos.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=jinpu.wang@cloud.ionos.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=lkp@intel.com \
/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).