From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E560CC433DF for ; Wed, 20 May 2020 10:02:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5EC0207ED for ; Wed, 20 May 2020 10:02:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cloud.ionos.com header.i=@cloud.ionos.com header.b="hfXYeUnh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726570AbgETKC5 (ORCPT ); Wed, 20 May 2020 06:02:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726224AbgETKC4 (ORCPT ); Wed, 20 May 2020 06:02:56 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95A0EC061A0E for ; Wed, 20 May 2020 03:02:56 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id h17so2487845wrc.8 for ; Wed, 20 May 2020 03:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1qCv6LnZLkc+ZmnPCOEPg4bD3VkMCgmCeeQUPB4C/I0=; b=hfXYeUnhWNOwtlHWt2eKleoasP0dym5XUmGjSaHg/Z2K2jtArTTO3x4y7a8dMlhxrH DKf8goaYCAnj15G4odOw4+GL3Q3IK0aQiqBWCU7HVEzlxB3kmk5nub3JQ+dbai6EzHdJ nmJtlNgeKOuizOeGCNeFrABerhb8D++0aSmV+upWFflavoglLIZ7JilhwQu8VIhXio9+ 81VxZS6UdudVmCiRTY2uAcq4mGIJEQEKwTRiaZdCAbbrZzghAuMstaBBmjMFc/s6lhwl 14UBCjUVO45XOvxYnN3oV0pdXea4bw9ZMFF/fu9ATRkyGnmHe0s3YaGxDfFzgWSmangT v2tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1qCv6LnZLkc+ZmnPCOEPg4bD3VkMCgmCeeQUPB4C/I0=; b=GO3Xwu09glg7xWfwnbj3qDUPUYE1KIBfEKUvyn2Qyr2zDNeAyvhmkP28GuW/mR7omn DoQ4Gm7eK46zKfHXCYwe+GdWmX+QQF+zGFD5EJ9wfQair/2sLHnoWpTzSiN+fjGTnaZA Fd+VL5NLl9ozkQibsw7ospE44j6GUmw+44scXO80/ueEjyDhX9ITFN1ExfoiD1vHACP/ J/TQoXecUbRLM8XvbJmRDz9qXePiXS2YftH+iexaCZVintXjffJAaFPrrf1mdPqHpg31 u1gcKx/rSW9QqBZb9eXY5QTYPlpU3GcLC73Ae6VoHlhiQ4c8kEHEFypEc0pLydit0otf 0Ofw== X-Gm-Message-State: AOAM533vi1uHbIoF2d3DPp4iDIE7un/wj6r6sZeehuFPTfjIR6cEAnZu REu4fdBHuhdiTUmlwOMAuYGNl1tPhZfesFxUjhxT X-Google-Smtp-Source: ABdhPJyWKGgPEm8MEJcYvTt+gmwLU4TczJEEN4qYstbU9TkGgHS9VHqcYV+9vOtYxAfoKxCq2ii/INHntBZtNxUsmTY= X-Received: by 2002:a5d:6705:: with SMTP id o5mr3601013wru.426.1589968975165; Wed, 20 May 2020 03:02:55 -0700 (PDT) MIME-Version: 1.0 References: <20200519112936.928185-1-danil.kipnis@cloud.ionos.com> <76b6b987-4f63-2487-7fbe-a1d9c2f06b76@acm.org> In-Reply-To: <76b6b987-4f63-2487-7fbe-a1d9c2f06b76@acm.org> From: Danil Kipnis Date: Wed, 20 May 2020 12:02:44 +0200 Message-ID: Subject: Re: [PATCH v2] rtrs-clt: silence kbuild test inconsistent intenting smatch warning To: Bart Van Assche Cc: linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, Linux Next Mailing List , Jens Axboe , Doug Ledford , Jason Gunthorpe , Leon Romanovsky , Jinpu Wang , kbuild test robot Content-Type: text/plain; charset="UTF-8" Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Hi Bart, On Tue, May 19, 2020 at 4:29 PM Bart Van Assche wrote: > > On 2020-05-19 04:29, Danil Kipnis wrote: > > Kbuild test robot reports 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 > > > > To get rid of the warning, move the while_each_path() macro to a newline. > > Rename the macro to end_each_path() to avoid the "while should follow close > > brace '}'" checkpatch error. > > > > Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality") > > > > Signed-off-by: Danil Kipnis > > Reported-by: kbuild test robot > > --- > > v1->v2 Add fixes line > > drivers/infiniband/ulp/rtrs/rtrs-clt.c | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c > > index 468fdd0d8713..0fa3a229d90e 100644 > > --- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c > > +++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c > > @@ -734,7 +734,7 @@ struct path_it { > > (it)->i < (it)->clt->paths_num; \ > > (it)->i++) > > > > -#define while_each_path(it) \ > > +#define end_each_path(it) \ > > path_it_deinit(it); \ > > rcu_read_unlock(); \ > > } > > @@ -1193,7 +1193,8 @@ 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); > > + } > > + end_each_path(&it); > > > > return err; > > } > > @@ -2887,7 +2888,8 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops, > > } > > /* Success path */ > > break; > > - } while_each_path(&it); > > + } > > + end_each_path(&it); > > > > return err; > > } > > I don't like the do_each_path() and end_each_path() macros because these do not > follow the pattern that is used elsewhere in the kernel to use a single macro > to iterate over a custom container. Has it been considered to combine these two > macros into a single macro, e.g. something like the following (untested) patch? > > > Subject: [PATCH] Combine while_each_path() and do_each_path() into > for_each_path() > > --- > drivers/infiniband/ulp/rtrs/rtrs-clt.c | 23 +++++++++-------------- > 1 file changed, 9 insertions(+), 14 deletions(-) > > diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c > index 468fdd0d8713..8dfa56dc32bc 100644 > --- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c > +++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c > @@ -727,18 +727,13 @@ 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; \ > +#define for_each_path(path, clt, it) \ > + for (path_it_init((it), (clt)), rcu_read_lock(), (it)->i = 0; \ > + (((path) = ((it)->next_path)(it)) && \ > + (it)->i < (it)->clt->paths_num) || \ > + (path_it_deinit(it), rcu_read_unlock(), 0); \ > (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 +1172,7 @@ static int rtrs_clt_failover_req(struct rtrs_clt *clt, > int err = -ECONNABORTED; > struct path_it it; > > - do_each_path(alive_sess, clt, &it) { > + for_each_path(alive_sess, clt, &it) { > if (unlikely(READ_ONCE(alive_sess->state) != > RTRS_CLT_CONNECTED)) > continue; > @@ -1193,7 +1188,7 @@ 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); > + } > > return err; > } > @@ -2862,7 +2857,7 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops, > dma_dir = DMA_TO_DEVICE; > } > > - do_each_path(sess, clt, &it) { > + for_each_path(sess, clt, &it) { > if (unlikely(READ_ONCE(sess->state) != RTRS_CLT_CONNECTED)) > continue; > > @@ -2887,7 +2882,7 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops, > } > /* Success path */ > break; > - } while_each_path(&it); > + } > > return err; > } This does look better. Will run it through tests.