Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220428202912.1056444-1-irogers@google.com> <FDBE8FEC-CC4B-43C2-B2AA-3ECCFF95A98E@linux.vnet.ibm.com>
In-Reply-To: <FDBE8FEC-CC4B-43C2-B2AA-3ECCFF95A98E@linux.vnet.ibm.com>
From:   Ian Rogers <irogers@google.com>
Date:   Fri, 29 Apr 2022 18:58:22 -0700
Message-ID: <CAP-5=fVr2Egp=_vw1nHc1QN4T4uLaGygQGQuvTRpaA-hFR8uOg@mail.gmail.com>
Subject: Re: [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings
To:     Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Andi Kleen <ak@linux.intel.com>,
        Jin Yao <yao.jin@linux.intel.com>,
        Zhengjun Xing <zhengjun.xing@linux.intel.com>,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Apr 29, 2022 at 2:21 AM Athira Rajeev
<atrajeev@linux.vnet.ibm.com> wrote:
>
>
>
> > On 29-Apr-2022, at 1:59 AM, Ian Rogers <irogers@google.com> wrote:
> >
> > BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert.
> > Compiling with NDEBUG yields:
> >
> > bench/numa.c: In function =E2=80=98bind_to_cpu=E2=80=99:
> > bench/numa.c:314:1: error: control reaches end of non-void function [-W=
error=3Dreturn-type]
> >  314 | }
> >      | ^
> > bench/numa.c: In function =E2=80=98bind_to_node=E2=80=99:
> > bench/numa.c:367:1: error: control reaches end of non-void function [-W=
error=3Dreturn-type]
> >  367 | }
> >      | ^
> >
> > Add return statements to cover this case.
>
> Looks fine to me
>
> Reviewed-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
>
> Thanks
> Athira

Thanks Athira :-) Arnaldo, could we get this in the 5th batch for 5.18
to keep NDEBUG building? It looks like there is a missing build test
for NDEBUG too.

Thanks,
Ian

> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> > tools/perf/bench/numa.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
> > index 44e1f8a44087..d5289fa58a4f 100644
> > --- a/tools/perf/bench/numa.c
> > +++ b/tools/perf/bench/numa.c
> > @@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu)
> >
> >       /* BUG_ON due to failure in allocation of orig_mask/mask */
> >       BUG_ON(-1);
> > +     return NULL;
> > }
> >
> > static cpu_set_t *bind_to_node(int target_node)
> > @@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node)
> >
> >       /* BUG_ON due to failure in allocation of orig_mask/mask */
> >       BUG_ON(-1);
> > +     return NULL;
> > }
> >
> > static void bind_to_cpumask(cpu_set_t *mask)
> > --
> > 2.36.0.464.gb9c8b46e94-goog
> >
>