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=-11.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 37F5FC433E2 for ; Mon, 14 Sep 2020 05:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E707120639 for ; Mon, 14 Sep 2020 05:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600062890; bh=Q4vq0Y8IgBBRqu5szaZ6j6qck0H1lcztDlullBMHTLE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=VKW7FbpkMEECMXCfipXncx3kac8tXqUfNgDuSFw+Fi+AlTEij3AWo8T5htjoLnz/1 ojqLn98pM6XVyF0x34/X5eez2OGMe1gC/gw/KQ39jchsKiSa+ccYhG0URl+lxhaj1X SEkb/0WIkZl+3wWBJuap1UGyZ0F6LdfU5PR8s874= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726075AbgINFyd (ORCPT ); Mon, 14 Sep 2020 01:54:33 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35645 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726010AbgINFyc (ORCPT ); Mon, 14 Sep 2020 01:54:32 -0400 Received: by mail-wm1-f66.google.com with SMTP id y15so9932601wmi.0 for ; Sun, 13 Sep 2020 22:54:47 -0700 (PDT) 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=yACQAfr4ocDVYmzJdr6OfNTCpHMfbSr+9aGFx2BoBBo=; b=bwXma4bMnpKQD+wXhS8i2StV7Ag5fyrPhh87qTvOUTtFtEBog+AvIzmRINXb0A10Ck YUd2jPNgrWQ2qLR657x0VH0BLDNWNW3OUAGXpy6YkprAQI7wrEb7lxHjE9nRBiFQt0Zh z41iMs2i9TN/2Cekm7/5Ny+o0SpTKqA8xhEyeX0KeQtJAE0s8ZaJsOye82V3ic391jHY PRKQ+tC+6TOHF6PqsEnsl+wh2vDIFAwHNd3k4px3Ihe8U34Da3bdMRYTEQvZBZ8hDb2q vFsG1inzRIR9V9e3j2dehfGl8lMqPibDOk5yqLYUMPPMS6tNuqRtmgTDQVUL2FRyic9q J/7w== X-Gm-Message-State: AOAM532t+zzYGahCcLF8rdkZV+uNuNAIyAdIY1WSI8MV0YTL9bSkJtTf g/UhEqGtB9pEMeKT2iktzXmf88wCIHmC2cz06x0= X-Google-Smtp-Source: ABdhPJzTy4qqUMt5YRHL6Q51z/tGy1iuVc8Cip0cec8YCplI2nWkcvqBbz3VKBvpM7W0DSmGnXkLCMWbZBEeZs2AooM= X-Received: by 2002:a1c:6341:: with SMTP id x62mr13308942wmb.70.1600062886905; Sun, 13 Sep 2020 22:54:46 -0700 (PDT) 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 Date: Mon, 14 Sep 2020 14:54:36 +0900 Message-ID: Subject: Re: [PATCH 07/26] perf tools: Add check for existing link in buildid dir To: Jiri Olsa Cc: Arnaldo Carvalho de Melo , lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Michael Petlan , Song Liu , "Frank Ch. Eigler" , Ian Rogers , Stephane Eranian , Alexey Budankov , Andi Kleen , Adrian Hunter Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 14, 2020 at 6:05 AM Jiri Olsa 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 > --- > 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 >