From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 783A437149 for ; Thu, 29 Feb 2024 06:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709187664; cv=none; b=MhbuR1M9Gs1XpdVzYPkslDi6t7ycZlEbRwkt3wHDClKOj2pZimTD864lziJPEvXIHTVCwXecKPWJ7v2wEV0BQ2UUwoKbrifvk0dY+ZL1lVLw6TVFIqYKeOD2fYV1YhOtzioNf8TDG9hF5ZTVu20OaNBJRKPPoTjb8TJmWGCcl7o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709187664; c=relaxed/simple; bh=rWfMlMwr/8u2RrDewjX8624dpgZQiC94SLvycpO6+Tk=; h=Date:Message-Id:Mime-Version:Subject:From:To:Content-Type; b=odCwG8ayQc5zqiKwm/zUsZWaFPzLbDchJNsEhtYqvA1wurq25VpEpWw/mDnbAgenT+GRIfFLmb0sSPdlHiwrf8i91HFI57f2/9ahGJGiwatO7Q7uqLgpDZzyuv8wRzWtIzCs3sZUaG8rxfv8lkH8xQL4ek7f7T7QK5MT4KilN+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Q93PgiMu; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q93PgiMu" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbf216080f5so1024552276.1 for ; Wed, 28 Feb 2024 22:21:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709187662; x=1709792462; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=HP7FHTSIsiaJThzWBkYLUGihLpdmeLYVXFRi2ap+AOo=; b=Q93PgiMuTNFHaFBMTT7q9IYkbqBn6uQBFPZFiRtHrLrnA3s4/gYDUZBLgjduFT37rP NPWumPy5yNM+/K56ZIBF9ll3YYvsmm9zsX5q3+Fj67Z78eyewYvmWlA4gjNebUhOdRbz BxwfYAxh/GocDQXt+oIsFPP5Eu1TbzBSFkKlIb7XAh0E2XZvPR+PgbAPXqn4uxpXVyAB tVcEORGj0cEEtexjZTsWJnMmhG4GL2PGlq+bSSUEZ9MgRJwR3tkMnFliXSAMMu5jRhBu b6rLBUQuZowiUqqik9g3H8nrYBSU6WBX/47YDnrFmrkEOQ3oin1abYzOJ9Ezp6UyTO9p LLJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709187662; x=1709792462; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HP7FHTSIsiaJThzWBkYLUGihLpdmeLYVXFRi2ap+AOo=; b=FyowyYhFFOxZ+8wAuUR4+30HAW0WHAeG8Bmlibkuqj1LqCYpWb7Hm7D99Rlqd0+xCC tCon1TyWsQsW7r3qMrDybuKkxs2H0PpcfZsikpmWIA6nDdNX5I6ZCTr/wqGXGL7466lg yGJ7jZlkycY0gtTUTumxm8IGwUbXr6eLt3bN/0VVXH45m/AILm8boOXKS4jgefCS7m66 ej8TG9p+ghCvKj8h8mlmUrMZmX9foif60wZVe7/wUkensbjMfikgCAe11nDL89npH82r dqjQ+bdbI2kpFSdQayv6NFtt1JCZ3z7cQRutb3leYIzqxfyD/WQqjgCrLe/iguFIx+xM Cl4w== X-Forwarded-Encrypted: i=1; AJvYcCWetm06WsNWkaHWWt3OYnDnGdAIuoMByfeuBqFg3cxXvD1phWrvkzITBoyAXNpz0LRDGJLUdJdFOJC8pX1HnPo76ndmyrAkGUmQDbi6C6faNQ== X-Gm-Message-State: AOJu0YxjthziM9tviqPpsQtv4QHEEAArQSlLLnlu6udfa8DBeyJWdQN4 Y2BA6Uga3tPw8m0BemjwTm6K7p72ZNXWnJzOjVup4bJwJI1gHCisupHc/sCBQ9sYW7yk/1Et4O0 Chlt9xg== X-Google-Smtp-Source: AGHT+IHL4gLgrbuz5ENk/kFB22N+h9+KtteAwYmZer1Y12jokb3z8fSjA99h4Up660cDOw/41Kg4Qa2NBBBX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:77dc:144c:334e:e2dd]) (user=irogers job=sendgmr) by 2002:a05:6902:188d:b0:dcc:54d0:85e0 with SMTP id cj13-20020a056902188d00b00dcc54d085e0mr369155ybb.11.1709187662515; Wed, 28 Feb 2024 22:21:02 -0800 (PST) Date: Wed, 28 Feb 2024 22:20:48 -0800 Message-Id: <20240229062048.558799-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1] perf map: Fix map reference count issues From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Masami Hiramatsu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The find will get the map, ensure puts are done on all paths. Signed-off-by: Ian Rogers --- tools/perf/util/maps.c | 14 +++++++------- tools/perf/util/probe-event.c | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 53aea6d2ef93..ce13145a9f8e 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -611,14 +611,14 @@ struct symbol *maps__find_symbol(struct maps *maps, u64 addr, struct map **mapp) struct symbol *result = NULL; /* Ensure map is loaded before using map->map_ip */ - if (map != NULL && map__load(map) >= 0) { - if (mapp) - *mapp = map; - + if (map != NULL && map__load(map) >= 0) result = map__find_symbol(map, map__map_ip(map, addr)); - if (!mapp) - map__put(map); - } + + if (mapp) + *mapp = map; + else + map__put(map); + return result; } diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index be71abe8b9b0..2a0ad9ecf0a2 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2274,9 +2274,7 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp, ret = pp->function ? 0 : -ENOMEM; out: - if (map && !is_kprobe) { - map__put(map); - } + map__put(map); return ret; } -- 2.44.0.278.ge034bb2e1d-goog