From patchwork Wed Jan 3 05:06:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 18663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4836656dyb; Tue, 2 Jan 2024 21:07:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiTTFLf2F3DFbtXd1a8hCtXfnNNDE/q52To63Vzt8Rq4vyXNOy/ApklbSpRo72ikO2SSbG X-Received: by 2002:a19:6716:0:b0:50e:10e8:d544 with SMTP id b22-20020a196716000000b0050e10e8d544mr7676707lfc.68.1704258434411; Tue, 02 Jan 2024 21:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704258434; cv=none; d=google.com; s=arc-20160816; b=JfE5HS1aYd7LoRe8CNOO7okcKXjOXfqZM1vG1Xd2lzks+4UWY+MRLGHUwTEY1yja4Y TutfSPAPPL+y/MSzxJt6XOw2qcHx773kuUutY1ai7BBuBYWJFVjcxhF7qZYHVpSa6rld BbA5m7EmtGf9rp1cu2Xc9uv3tmcXKpqlzY0vkaUEdINyuSZ18Mv+X3BjvwltwOgn0d8C 4CrKJ5DphQjReBzArInF/vkQ6Lnd3/Kfz2fysxl8YEdq4TuDkKY/vqWqSsb5sYxTaQ2N eT96KKCJ2ZG2UgHmhT+z7T9gbnBL3BhkMHMF9mhR83Y8zFHu1xM5P9+pUHQbTvDJfY0B hMqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:date:dkim-signature; bh=WcEjoF8y6LN4BRG5Sl8d3hd2XTKeujQHTw6ersfXE68=; fh=Io7x3OacpefNRRNKoYAzVE0aWTDwD7FRzyCdD1e3AN4=; b=Vp4VOEm1BgqrKEEzrj3MhnWjiHdGlble06PkCi1uRF1XS7jtsmSIySXPPSrkSI62Gf XjLG4wcqBbZFUMtijmNrSDN3qFFi77m6jpSKTQurp7CYdUD3vhZc9LvWm4HH8FqozrvH g9Csyy3SbWNXp1nvI1dlaOCrODFBt0Pinp9y88KhB/Qx6ofDXriZ/c5ZgF+dy8ds4p8a RpEQQBcRFRVkOvBY/gOxFjiVtG7uhWJzybB+fGkkjdTXsa5qtHQ4nagTQCgJ4UP+XRhO IRH4e4/FLmdEXYIwMjVHXWoxYsSra7wBrXbKLBa0yDn6qXFWfw27PeoqWg06RcxyZGkU 9pmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=3Wm++nrk; spf=pass (google.com: domain of linux-kernel+bounces-15159-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15159-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id o6-20020a17090608c600b00a2338cdecb5si10954619eje.496.2024.01.02.21.07.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 21:07:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-15159-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=3Wm++nrk; spf=pass (google.com: domain of linux-kernel+bounces-15159-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15159-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BA1201F23A33 for ; Wed, 3 Jan 2024 05:07:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BCCC179A4; Wed, 3 Jan 2024 05:06:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3Wm++nrk" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 E97F7171B4 for ; Wed, 3 Jan 2024 05:06:47 +0000 (UTC) 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 Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5e8d2c6903dso159836637b3.0 for ; Tue, 02 Jan 2024 21:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1704258407; x=1704863207; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=WcEjoF8y6LN4BRG5Sl8d3hd2XTKeujQHTw6ersfXE68=; b=3Wm++nrk6gopPQX5GAbKKulBFs2k06nK0pJarOybKSPeUvBPXDqIgm74VVZhi7j/my LxMzrbU1n58zP7RSEHAVBbq6be0xkwfmww1Zuo3VQh5cgZ4BI6Wj035+tDLWAj6tnWmn P66oJ3yjvVhq24YlXMjBf5iQbuL4OQLgAfn35hki3zK/6kdJvtyQUVeSj6HcqPLjFIdL r2edBKkKUewZRx4QXuF6fiHCIS4lT5hs1FfajrTI9VGcG5ScJgiMImVjtMxNemcNnPPc hpljskBcMA2tHOJfdXSv5Dh6bdg9JDAEWj864mh8mG/sEzRNreW1q8Nd5KR+QTIqdyUb tL4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704258407; x=1704863207; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WcEjoF8y6LN4BRG5Sl8d3hd2XTKeujQHTw6ersfXE68=; b=OUp+CNXZ4ACDkSloZZnBgXONPxFegGNID+SHuk+SYozogbJkMw8vlWVuNG4rujf8Ms T0DT97xNdrDDhwULHM9IXlD1HD5S1w/wv+TAW1TmLg3Qd2+5yWZ73rNUcw6wHUaXvY/g b0zWz5Sc522fQBJHrgv9ERSH7MfPETc1c/EFtQf8fIXtweZW/NE/zHJgrRa9ez3kVjE7 yJ7YXuNhrMnUgj0MCWdShC4oyLg/xzoRNMAZhyo39Yqz6JUwstu68fOFGV/pzkZ5NYN7 wwOo/jpAuowIQV8XU+k9hetKfxSz9FBQSEH9ftaYguUOST1eDX22+qYq+Yu2LdanUCLY B+Ig== X-Gm-Message-State: AOJu0Yw2z50ET+0Q2JG/GLoSigKazLjUBV7hHMFDsm1iKiSzh3Zhac1z /mvSMz1iripf4E6nyQfwrdoNRCJWboos7KKblek= X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:e2bd:f1f6:8ea6:8d6c]) (user=irogers job=sendgmr) by 2002:a05:6902:1746:b0:dbd:99af:daba with SMTP id bz6-20020a056902174600b00dbd99afdabamr3690131ybb.5.1704258406926; Tue, 02 Jan 2024 21:06:46 -0800 (PST) Date: Tue, 2 Jan 2024 21:06:10 -0800 Message-Id: <20240103050635.391888-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Subject: [PATCH v7 00/25] maps/threads/dsos memory improvements and fixes From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787044492006993479 X-GMAIL-MSGID: 1787044492006993479 Modify the implementation of maps to not use an rbtree as the container for maps, instead use a sorted array. Improve locking and reference counting issues. Similar to maps separate out and reimplement threads to use a hashmap for lower memory consumption and faster look up. The fixes a regression in memory usage where reference count checking switched to using non-invasive tree nodes. Reduce its default size by 32 times and improve locking discipline. Also, fix regressions where tids had become unordered to make `perf report --tasks` and `perf trace --summary` output easier to read. Better encapsulate the dsos abstraction. Remove the linked list and rbtree used for faster iteration and log(n) lookup to a sorted array for similar performance but half the memory usage per dso. Improve reference counting and locking discipline, adding reference count checking to dso. v7: - rebase to latest perf-tools-next where 22 patches were applied by Arnaldo. - resolve merge conflicts, in particular with fc044c53b99f ("perf annotate-data: Add dso->data_types tree") that required more dso accessor functions. v6 series is here: https://lore.kernel.org/lkml/20231207011722.1220634-1-irogers@google.com/ Ian Rogers (25): perf maps: Switch from rbtree to lazily sorted array for addresses perf maps: Get map before returning in maps__find perf maps: Get map before returning in maps__find_by_name perf maps: Get map before returning in maps__find_next_entry perf maps: Hide maps internals perf maps: Locking tidy up of nr_maps perf dso: Reorder variables to save space in struct dso perf report: Sort child tasks by tid perf trace: Ignore thread hashing in summary perf machine: Move fprintf to for_each loop and a callback perf threads: Move threads to its own files perf threads: Switch from rbtree to hashmap perf threads: Reduce table size from 256 to 8 perf dsos: Attempt to better abstract dsos internals perf dsos: Tidy reference counting and locking perf dsos: Add dsos__for_each_dso perf dso: Move dso functions out of dsos perf dsos: Switch more loops to dsos__for_each_dso perf dsos: Switch backing storage to array from rbtree/list perf dsos: Remove __dsos__addnew perf dsos: Remove __dsos__findnew_link_by_longname_id perf dsos: Switch hand code to bsearch perf dso: Add reference count checking and accessor functions perf dso: Reference counting related fixes perf dso: Use container_of to avoid a pointer in dso_data tools/perf/arch/x86/tests/dwarf-unwind.c | 1 + tools/perf/builtin-annotate.c | 8 +- tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-buildid-list.c | 18 +- tools/perf/builtin-inject.c | 96 +- tools/perf/builtin-kallsyms.c | 2 +- tools/perf/builtin-mem.c | 4 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 209 +-- tools/perf/builtin-script.c | 8 +- tools/perf/builtin-top.c | 4 +- tools/perf/builtin-trace.c | 43 +- tools/perf/tests/code-reading.c | 8 +- tools/perf/tests/dso-data.c | 67 +- tools/perf/tests/hists_common.c | 6 +- tools/perf/tests/hists_cumulate.c | 4 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/maps.c | 7 +- tools/perf/tests/symbols.c | 2 +- tools/perf/tests/thread-maps-share.c | 8 +- tools/perf/tests/vmlinux-kallsyms.c | 16 +- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/browsers/hists.c | 8 +- tools/perf/ui/browsers/map.c | 4 +- tools/perf/util/Build | 1 + tools/perf/util/annotate-data.c | 6 +- tools/perf/util/annotate.c | 45 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/block-info.c | 2 +- tools/perf/util/bpf-event.c | 9 +- tools/perf/util/bpf_lock_contention.c | 8 +- tools/perf/util/build-id.c | 136 +- tools/perf/util/build-id.h | 2 - tools/perf/util/callchain.c | 4 +- tools/perf/util/data-convert-json.c | 2 +- tools/perf/util/db-export.c | 6 +- tools/perf/util/dlfilter.c | 12 +- tools/perf/util/dso.c | 469 +++--- tools/perf/util/dso.h | 549 +++++-- tools/perf/util/dsos.c | 529 ++++--- tools/perf/util/dsos.h | 40 +- tools/perf/util/event.c | 12 +- tools/perf/util/header.c | 8 +- tools/perf/util/hist.c | 4 +- tools/perf/util/intel-pt.c | 22 +- tools/perf/util/machine.c | 570 +++----- tools/perf/util/machine.h | 32 +- tools/perf/util/map.c | 73 +- tools/perf/util/maps.c | 1280 +++++++++++------ tools/perf/util/maps.h | 65 +- tools/perf/util/probe-event.c | 26 +- tools/perf/util/rb_resort.h | 5 - .../util/scripting-engines/trace-event-perl.c | 6 +- .../scripting-engines/trace-event-python.c | 21 +- tools/perf/util/session.c | 21 + tools/perf/util/session.h | 2 + tools/perf/util/sort.c | 19 +- tools/perf/util/srcline.c | 65 +- tools/perf/util/symbol-elf.c | 132 +- tools/perf/util/symbol.c | 217 +-- tools/perf/util/symbol_fprintf.c | 4 +- tools/perf/util/synthetic-events.c | 24 +- tools/perf/util/thread.c | 8 +- tools/perf/util/thread.h | 6 - tools/perf/util/threads.c | 186 +++ tools/perf/util/threads.h | 35 + tools/perf/util/unwind-libunwind-local.c | 20 +- tools/perf/util/unwind-libunwind.c | 9 +- tools/perf/util/vdso.c | 56 +- 69 files changed, 3127 insertions(+), 2158 deletions(-) create mode 100644 tools/perf/util/threads.c create mode 100644 tools/perf/util/threads.h