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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 66421C43381 for ; Thu, 21 Mar 2019 18:53:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 396DF21916 for ; Thu, 21 Mar 2019 18:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553194431; bh=tNvXgfI9DCQg+stxJd46bvicrPru5Yjz5bZPIiNzolo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BfyFqyen0DLC+jh+ddZ/QnNc5O+nKoHrNDB+ggAd+E823/jWU8xisU2HNyuERYwjz i42fxQ/TPX/RqqoOOQwKJK/c2DjCeuyD7GhTnQ8GSMq1b7SSxTvGShJgGV3U7ZyWBW zXHrsafsB2SlyOTutvi7FjDGZDrMHpeKxr+xahlI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729019AbfCUSxt (ORCPT ); Thu, 21 Mar 2019 14:53:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:45550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728657AbfCUSxs (ORCPT ); Thu, 21 Mar 2019 14:53:48 -0400 Received: from quaco.ghostprotocols.net (unknown [190.15.121.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61DC521925; Thu, 21 Mar 2019 18:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553194427; bh=tNvXgfI9DCQg+stxJd46bvicrPru5Yjz5bZPIiNzolo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5n7IYAXlzyaVNq8PmAXnsShXJLz5y2AwSZi6AmNhhLXnfz701gYpvrZjeXj61KB4 HE2M1gVlWzGNFCWLh0Pkcfks0yV6jE7s5sWydmIOl1o70vFouTOvqiiNa7whjfD0kY 7tGLJj0esTxO/TkKbhPnHnB5nu5lnhxiz21/DzuU= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Changbin Du , Alexei Starovoitov , Daniel Borkmann , Eric Saint-Etienne , Peter Zijlstra , Steven Rostedt , Arnaldo Carvalho de Melo Subject: [PATCH 19/44] perf map: Remove map from 'names' tree in __maps__remove() Date: Thu, 21 Mar 2019 15:51:17 -0300 Message-Id: <20190321185142.11441-20-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321185142.11441-1-acme@kernel.org> References: <20190321185142.11441-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Changbin Du There are two trees for each map inserted by maps__insert(), so remove it from the 'names' tree in __maps__remove(). Detected with gcc's ASan. Signed-off-by: Changbin Du Reviewed-by: Jiri Olsa Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Eric Saint-Etienne Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt (VMware) Fixes: 1e6285699b30 ("perf symbols: Fix slowness due to -ffunction-section") Link: http://lkml.kernel.org/r/20190316080556.3075-11-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index fbeb0c6efaa6..64bea5eb8bf6 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -917,6 +917,9 @@ static void __maps__remove(struct maps *maps, struct map *map) { rb_erase_init(&map->rb_node, &maps->entries); map__put(map); + + rb_erase_init(&map->rb_node_name, &maps->names); + map__put(map); } void maps__remove(struct maps *maps, struct map *map) -- 2.20.1