Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200913210313.1985612-1-jolsa@kernel.org> <20200913210313.1985612-8-jolsa@kernel.org>
In-Reply-To: <20200913210313.1985612-8-jolsa@kernel.org>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Mon, 14 Sep 2020 14:54:36 +0900
Message-ID: <CAM9d7ciXWxDQ0WoOYy-6KpV6scHjtpUiWJ5zSbGcecBbEoO1NA@mail.gmail.com>
Subject: Re: [PATCH 07/26] perf tools: Add check for existing link in buildid dir
To:     Jiri Olsa <jolsa@kernel.org>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Ingo Molnar <mingo@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Song Liu <songliubraving@fb.com>,
        "Frank Ch. Eigler" <fche@redhat.com>,
        Ian Rogers <irogers@google.com>,
        Stephane Eranian <eranian@google.com>,
        Alexey Budankov <alexey.budankov@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Adrian Hunter <adrian.hunter@intel.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Sep 14, 2020 at 6:05 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> When adding new build id link we fail if the link is already
> there. Adding check for existing link and warn/replace the
> link with new target.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  tools/perf/util/build-id.c | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index bdee4e08e60d..ecdc167aa1a0 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -751,8 +751,26 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
>         tmp = dir_name + strlen(buildid_dir) - 5;
>         memcpy(tmp, "../..", 5);
>
> -       if (symlink(tmp, linkname) == 0)
> +       if (symlink(tmp, linkname) == 0) {
>                 err = 0;
> +       } else if (errno == EEXIST) {
> +               char path[PATH_MAX];
> +
> +               if (readlink(linkname, path, sizeof(path)) == -1) {
> +                       pr_err("Cant read link: %s\n", linkname);

typo

> +                       goto out_free;
> +               }
> +               if (strcmp(tmp, path)) {
> +                       pr_err("Inconsistent .debug record, updating [%s]\n",
> +                               linkname);

But isn't it ok to copy a binary to another location?
There can be multiple binaries with the same build-id..

Thanks
Namhyung


> +
> +                       unlink(linkname);
> +
> +                       if (symlink(tmp, linkname))
> +                               goto out_free;
> +               }
> +               err = 0;
> +       }
>
>         /* Update SDT cache : error is just warned */
>         if (realname &&
> --
> 2.26.2
>