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.8 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 7F3C2C433E2 for ; Sun, 13 Sep 2020 21:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FF472220A for ; Sun, 13 Sep 2020 21:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600031065; bh=6diAgYLi6wnHxJLPm6K8zRB9ao5JyUFrZBhNSczkOvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MyoARFwcXyeddUeVNUG86zHiMYa47f+59GOZ8nOruwZNRgcWNCWUWQAAxfuY7muKx NANWiJa/vG1ZxH0ZNj4H2a/uSR82B1sKQgPwn/iB/hIWfiXnNaxIf1pjGKWhhsRp0b ozEf78DbsrKB8/Bpu+8+21K08Rr+YDHtjqy+hz0s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726016AbgIMVEV convert rfc822-to-8bit (ORCPT ); Sun, 13 Sep 2020 17:04:21 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:42688 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbgIMVEF (ORCPT ); Sun, 13 Sep 2020 17:04:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-437-9OVmYjGAMyuIRCsYvSCWEQ-1; Sun, 13 Sep 2020 17:03:56 -0400 X-MC-Unique: 9OVmYjGAMyuIRCsYvSCWEQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72BA72FD14; Sun, 13 Sep 2020 21:03:54 +0000 (UTC) Received: from krava.redhat.com (ovpn-112-4.ams2.redhat.com [10.36.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id A78EF1002388; Sun, 13 Sep 2020 21:03:50 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Song Liu , "Frank Ch. Eigler" , Ian Rogers , Stephane Eranian , Alexey Budankov , Andi Kleen , Adrian Hunter Subject: [PATCH 07/26] perf tools: Add check for existing link in buildid dir Date: Sun, 13 Sep 2020 23:02:54 +0200 Message-Id: <20200913210313.1985612-8-jolsa@kernel.org> In-Reply-To: <20200913210313.1985612-1-jolsa@kernel.org> References: <20200913210313.1985612-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); + goto out_free; + } + if (strcmp(tmp, path)) { + pr_err("Inconsistent .debug record, updating [%s]\n", + linkname); + + unlink(linkname); + + if (symlink(tmp, linkname)) + goto out_free; + } + err = 0; + } /* Update SDT cache : error is just warned */ if (realname && -- 2.26.2