Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 22 Oct 2019 10:01:15 +0200
From:   Jiri Olsa <jolsa@redhat.com>
To:     Andi Kleen <andi@firstfloor.org>
Cc:     acme@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org,
        eranian@google.com, kan.liang@linux.intel.com,
        peterz@infradead.org, Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH v2 2/9] perf evsel: Avoid close(-1)
Message-ID: <20191022080115.GB28177@krava>
References: <20191020175202.32456-1-andi@firstfloor.org>
 <20191020175202.32456-3-andi@firstfloor.org>
MIME-Version: 1.0
In-Reply-To: <20191020175202.32456-3-andi@firstfloor.org>
User-Agent: Mutt/1.12.1 (2019-06-15)
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Oct 20, 2019 at 10:51:55AM -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>=20
> In some weak fallback cases close can be called a lot with -1. Check
> for this case and avoid calling close then.
>=20
> This is mainly to shut up valgrind which complains about this case.
>=20
> Signed-off-by: Andi Kleen <ak@linux.intel.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

> ---
>  tools/perf/lib/evsel.c  | 3 ++-
>  tools/perf/util/evsel.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>=20
> diff --git a/tools/perf/lib/evsel.c b/tools/perf/lib/evsel.c
> index a8cb582e2721..5a89857b0381 100644
> --- a/tools/perf/lib/evsel.c
> +++ b/tools/perf/lib/evsel.c
> @@ -120,7 +120,8 @@ void perf_evsel__close_fd(struct perf_evsel *evsel)
> =20
>  =09for (cpu =3D 0; cpu < xyarray__max_x(evsel->fd); cpu++)
>  =09=09for (thread =3D 0; thread < xyarray__max_y(evsel->fd); ++thread) {
> -=09=09=09close(FD(evsel, cpu, thread));
> +=09=09=09if (FD(evsel, cpu, thread) >=3D 0)
> +=09=09=09=09close(FD(evsel, cpu, thread));
>  =09=09=09FD(evsel, cpu, thread) =3D -1;
>  =09=09}
>  }
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index d831038b55f2..d4451846af93 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -1815,7 +1815,8 @@ int evsel__open(struct evsel *evsel, struct perf_cp=
u_map *cpus,
>  =09old_errno =3D errno;
>  =09do {
>  =09=09while (--thread >=3D 0) {
> -=09=09=09close(FD(evsel, cpu, thread));
> +=09=09=09if (FD(evsel, cpu, thread) >=3D 0)
> +=09=09=09=09close(FD(evsel, cpu, thread));
>  =09=09=09FD(evsel, cpu, thread) =3D -1;
>  =09=09}
>  =09=09thread =3D nthreads;
> --=20
> 2.21.0
>=20