From patchwork Thu Feb 29 06:32:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 208217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp211328dyb; Wed, 28 Feb 2024 22:39:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXeqbh9DCwzimbbmygqsFPRPX9/zL1tEVrBs3WYMmpVbuaZ57y8GbK0VxFyU6WGyHO1eruvzsVRENeFu/IKTwP7VT6llQ== X-Google-Smtp-Source: AGHT+IEQitqRhDrO+fJuZDLLFL//Cc1CN6pRIMxbNJx6evq04hY32835BF5sDGlzJO/6ZrFgh+bZ X-Received: by 2002:a05:6e02:dcb:b0:363:ad01:f052 with SMTP id l11-20020a056e020dcb00b00363ad01f052mr1551321ilj.24.1709188788655; Wed, 28 Feb 2024 22:39:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709188788; cv=pass; d=google.com; s=arc-20160816; b=N7z4D0lFYRkHC88V2I7gwF5n1EhjlqcBvbECtmVzouScPOTGyIdNGc3QTDT6mOSNbs g1OmnPD3L2265ObwuPuANjRZx5UMV1SGiQdkocU1VaHxMQvmCpScSz3EJbqaKZb5IZlR XrEmePe5qz3enarlnMhpdiTH8/qVPlJUvhBWsFJxxCALg3BtPAiV33XQ2un5hvdGJUjd v9EY88ubX64doGovhEjHCuNUkN+vg8WOE4E8Hg5bV+KIX51ziO44NG73q9kqni8uMibt 49zO0LkBPL+rnx0am4nwDiDRoEJDMjo+9rd/92ymSjQXR/lsTt+VupPoz7xCnVEmn2rH I2uA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=Lzq935DVwsBD/3GlNv8R9DsWFU45sAreOLDrveyoktg=; fh=AFIq/e1sSkoN6PLatuWMX0rX4IbiSUZwN91e01gVWSM=; b=fF7jOQ8Gf3nnSAszUw/ZVvt1PI3+N1+Nq1450mimCesQAGkMUWd92HAMGruGjBTIaz HvUzQsY+6pxNh09UxSFv1l7rQ5EZKZJcvmPCAvWKel9ocMecI8F7ZVmhQZ//+3MmZR3g Z/BBJ+9jVLKs5R3XCYgRN6PDz3yljgyzKBQCZSio6tQ8BudtlPYXwewWTQX8JTv5d3bz lq3bl1lWnwcJNdCZX5LBvEDX/6uiHV3qgJO9IIyy4IbrYIMUTIbG7fWROXHm4VRIX6l+ fq4ipSOuuiw1Sa8rW9KRDMV61Ej7hu71dAeuQdTbDsHjBba+2+LoczILiL315P0d571V 5PJA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=jx3tqIMa; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-86178-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86178-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id v28-20020a63481c000000b005dca5caed4bsi751738pga.516.2024.02.28.22.39.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 22:39:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86178-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=jx3tqIMa; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-86178-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86178-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 0DCB1B260D1 for ; Thu, 29 Feb 2024 06:35:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 11A4E481BF; Thu, 29 Feb 2024 06:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jx3tqIMa" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 528B745957 for ; Thu, 29 Feb 2024 06:33:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709188397; cv=none; b=twl36fscdWSPu++vACt1dVOeazrGb2k4uP4ktZ/IUSwtBFhG2me6jZSvYjB2KsLKhT3SW+gYL5TW7mMo5L78Ym61WRiInEyUGZhxWIVAtYIxBl4o8HaPJmvieAPH7GSqGsUIlWgytHG0CGn6ukQHUmhI5diIXZ4TTAmcP6iQGlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709188397; c=relaxed/simple; bh=hShucPp/bdTejRddl6V+fFxtMi6g+GO8s+RiIxpwE8s=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=COeAiYEKP54vmuN5jLZEtkq4HBKL0/u+hqWIF/Zw77ekdTClqI5dNXRM1KdSZ1ub8WGhr0cDSh/aO5HxuwKz2saUh15qPTV+xMWtZr0JPW+LqxeR84u/pvSC2uXfLo4p2z9x1FHnAy5nxRTVvyimzIOTiTp/UMlJ069woONeDis= 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=jx3tqIMa; arc=none smtp.client-ip=209.85.128.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 Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60971264c48so3052807b3.0 for ; Wed, 28 Feb 2024 22:33:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709188394; x=1709793194; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Lzq935DVwsBD/3GlNv8R9DsWFU45sAreOLDrveyoktg=; b=jx3tqIMaHuylhTrc04K4UixFgMEH88z4Wa1ujnggLgkdhAmHhHkpO1lPeKBAiEMEhj CbU9QJGDPQdlcxRaNbQp0qPVHgQuIYATDTqqddkeVoEEH3ZP4vK+2/8ZdRp/qCWksiTO dWStPx/wYDa5E87TnGTT9yq3QOGFjl51sJ2wODbNk9BhnNaqJdSoVBY8PHjAv8MqCxpg 4wE7Jf+VUTHbkt4tvYe8OvyzpSTUhh4p8Z+9MN3Zj33JPGxJ6/qZXth+DiqedWRneHyV y26LhHaCOM5OPXzIVbmI6w/O3ttOgNmFT9xM9NtZHRBv57Zka6QLpNZM/H+xe8du3tJC oFUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709188394; x=1709793194; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Lzq935DVwsBD/3GlNv8R9DsWFU45sAreOLDrveyoktg=; b=d1SzOyHyYoWvvtOpVK+g5ev9fxxUSjcpZvj/Rm16u1u/ZaSVhLYdukvLzoz0IAKnav oUx5spY6MTcfROq3p2wquLh9iZPNJCYhXwhxwmuhLcq1h6dLtH4bOyy31T8SYFaj3a3q sgFHqUj2IY7USscCy3nJhnumO15fE4egRIdNcXHpJH5M4d0/3/ylpDJIDGPu/rus2HQ+ w/myA6viAsyoJTmhp8g1FW9s5I4CcYH+XamfHqCT+2E8fJRL2IFWwW3qzMmebr5pMdJk pg6gai/fPsLMnlHAJNjNWrArUPciev9SZIjjzeS6mzjZSf5cr6XZ6gzwDOwxZmZUu2IC k3YQ== X-Forwarded-Encrypted: i=1; AJvYcCUJ0y6L1Jk+SkbEUj9JlndjUxkWTHB2W6tZVq53bNpzcSWw0qQDwJv0I4eUn8+2qxifYCV2IF066GMbaFdjrPx2AwvYFFyA/4TK/Rd9 X-Gm-Message-State: AOJu0YwTS8CpdOya/TFOzBRAUmtTC+gx9vCy+u2q72ANRmzcnqY57lAC sb6OpbqXTh0LtstGASkK3AVTbFeV63N7c7GolwL6LvueVxC1dkTYo5XikyEv5VrCaDWMpl4f3Ez jc5MP+w== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:77dc:144c:334e:e2dd]) (user=irogers job=sendgmr) by 2002:a05:690c:3507:b0:608:e67f:4387 with SMTP id fq7-20020a05690c350700b00608e67f4387mr277019ywb.7.1709188394512; Wed, 28 Feb 2024 22:33:14 -0800 (PST) Date: Wed, 28 Feb 2024 22:32:52 -0800 In-Reply-To: <20240229063253.561838-1-irogers@google.com> Message-Id: <20240229063253.561838-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240229063253.561838-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v3 6/7] perf threads: Switch from rbtree to hashmap From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Oliver Upton , Yang Jihong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792214343310478124 X-GMAIL-MSGID: 1792214343310478124 The rbtree provides a sorting on entries but this is unused. Switch to using hashmap for O(1) rather than O(log n) find/insert/remove complexity. Signed-off-by: Ian Rogers --- tools/perf/util/threads.c | 146 ++++++++++++-------------------------- tools/perf/util/threads.h | 6 +- 2 files changed, 47 insertions(+), 105 deletions(-) diff --git a/tools/perf/util/threads.c b/tools/perf/util/threads.c index d984ec939c7b..55923be53180 100644 --- a/tools/perf/util/threads.c +++ b/tools/perf/util/threads.c @@ -3,25 +3,30 @@ #include "machine.h" #include "thread.h" -struct thread_rb_node { - struct rb_node rb_node; - struct thread *thread; -}; - static struct threads_table_entry *threads__table(struct threads *threads, pid_t tid) { /* Cast it to handle tid == -1 */ return &threads->table[(unsigned int)tid % THREADS__TABLE_SIZE]; } +static size_t key_hash(long key, void *ctx __maybe_unused) +{ + /* The table lookup removes low bit entropy, but this is just ignored here. */ + return key; +} + +static bool key_equal(long key1, long key2, void *ctx __maybe_unused) +{ + return key1 == key2; +} + void threads__init(struct threads *threads) { for (int i = 0; i < THREADS__TABLE_SIZE; i++) { struct threads_table_entry *table = &threads->table[i]; - table->entries = RB_ROOT_CACHED; + hashmap__init(&table->shard, key_hash, key_equal, NULL); init_rwsem(&table->lock); - table->nr = 0; table->last_match = NULL; } } @@ -32,6 +37,7 @@ void threads__exit(struct threads *threads) for (int i = 0; i < THREADS__TABLE_SIZE; i++) { struct threads_table_entry *table = &threads->table[i]; + hashmap__clear(&table->shard); exit_rwsem(&table->lock); } } @@ -44,7 +50,7 @@ size_t threads__nr(struct threads *threads) struct threads_table_entry *table = &threads->table[i]; down_read(&table->lock); - nr += table->nr; + nr += hashmap__size(&table->shard); up_read(&table->lock); } return nr; @@ -86,28 +92,13 @@ static void threads_table_entry__set_last_match(struct threads_table_entry *tabl struct thread *threads__find(struct threads *threads, pid_t tid) { struct threads_table_entry *table = threads__table(threads, tid); - struct rb_node **p; - struct thread *res = NULL; + struct thread *res; down_read(&table->lock); res = __threads_table_entry__get_last_match(table, tid); - if (res) - return res; - - p = &table->entries.rb_root.rb_node; - while (*p != NULL) { - struct rb_node *parent = *p; - struct thread *th = rb_entry(parent, struct thread_rb_node, rb_node)->thread; - - if (thread__tid(th) == tid) { - res = thread__get(th); - break; - } - - if (tid < thread__tid(th)) - p = &(*p)->rb_left; - else - p = &(*p)->rb_right; + if (!res) { + if (hashmap__find(&table->shard, tid, &res)) + res = thread__get(res); } up_read(&table->lock); if (res) @@ -118,49 +109,25 @@ struct thread *threads__find(struct threads *threads, pid_t tid) struct thread *threads__findnew(struct threads *threads, pid_t pid, pid_t tid, bool *created) { struct threads_table_entry *table = threads__table(threads, tid); - struct rb_node **p; - struct rb_node *parent = NULL; struct thread *res = NULL; - struct thread_rb_node *nd; - bool leftmost = true; *created = false; down_write(&table->lock); - p = &table->entries.rb_root.rb_node; - while (*p != NULL) { - struct thread *th; - - parent = *p; - th = rb_entry(parent, struct thread_rb_node, rb_node)->thread; - - if (thread__tid(th) == tid) { - __threads_table_entry__set_last_match(table, th); - res = thread__get(th); - goto out_unlock; - } - - if (tid < thread__tid(th)) - p = &(*p)->rb_left; - else { - leftmost = false; - p = &(*p)->rb_right; - } - } - nd = malloc(sizeof(*nd)); - if (nd == NULL) - goto out_unlock; res = thread__new(pid, tid); - if (!res) - free(nd); - else { - *created = true; - nd->thread = thread__get(res); - rb_link_node(&nd->rb_node, parent, p); - rb_insert_color_cached(&nd->rb_node, &table->entries, leftmost); - ++table->nr; - __threads_table_entry__set_last_match(table, res); + if (res) { + if (hashmap__add(&table->shard, tid, res)) { + /* Add failed. Assume a race so find other entry. */ + thread__put(res); + res = NULL; + if (hashmap__find(&table->shard, tid, &res)) + res = thread__get(res); + } else { + res = thread__get(res); + *created = true; + } + if (res) + __threads_table_entry__set_last_match(table, res); } -out_unlock: up_write(&table->lock); return res; } @@ -169,57 +136,32 @@ void threads__remove_all_threads(struct threads *threads) { for (int i = 0; i < THREADS__TABLE_SIZE; i++) { struct threads_table_entry *table = &threads->table[i]; - struct rb_node *nd; + struct hashmap_entry *cur, *tmp; + size_t bkt; down_write(&table->lock); __threads_table_entry__set_last_match(table, NULL); - nd = rb_first_cached(&table->entries); - while (nd) { - struct thread_rb_node *trb = rb_entry(nd, struct thread_rb_node, rb_node); - - nd = rb_next(nd); - thread__put(trb->thread); - rb_erase_cached(&trb->rb_node, &table->entries); - RB_CLEAR_NODE(&trb->rb_node); - --table->nr; + hashmap__for_each_entry_safe((&table->shard), cur, tmp, bkt) { + struct thread *old_value; - free(trb); + hashmap__delete(&table->shard, cur->key, /*old_key=*/NULL, &old_value); + thread__put(old_value); } - assert(table->nr == 0); up_write(&table->lock); } } void threads__remove(struct threads *threads, struct thread *thread) { - struct rb_node **p; struct threads_table_entry *table = threads__table(threads, thread__tid(thread)); - pid_t tid = thread__tid(thread); + struct thread *old_value; down_write(&table->lock); if (table->last_match && RC_CHK_EQUAL(table->last_match, thread)) __threads_table_entry__set_last_match(table, NULL); - p = &table->entries.rb_root.rb_node; - while (*p != NULL) { - struct rb_node *parent = *p; - struct thread_rb_node *nd = rb_entry(parent, struct thread_rb_node, rb_node); - struct thread *th = nd->thread; - - if (RC_CHK_EQUAL(th, thread)) { - thread__put(nd->thread); - rb_erase_cached(&nd->rb_node, &table->entries); - RB_CLEAR_NODE(&nd->rb_node); - --table->nr; - free(nd); - break; - } - - if (tid < thread__tid(th)) - p = &(*p)->rb_left; - else - p = &(*p)->rb_right; - } + hashmap__delete(&table->shard, thread__tid(thread), /*old_key=*/NULL, &old_value); + thread__put(old_value); up_write(&table->lock); } @@ -229,11 +171,11 @@ int threads__for_each_thread(struct threads *threads, { for (int i = 0; i < THREADS__TABLE_SIZE; i++) { struct threads_table_entry *table = &threads->table[i]; - struct rb_node *nd; + struct hashmap_entry *cur; + size_t bkt; - for (nd = rb_first_cached(&table->entries); nd; nd = rb_next(nd)) { - struct thread_rb_node *trb = rb_entry(nd, struct thread_rb_node, rb_node); - int rc = fn(trb->thread, data); + hashmap__for_each_entry((&table->shard), cur, bkt) { + int rc = fn((struct thread *)cur->pvalue, data); if (rc != 0) return rc; diff --git a/tools/perf/util/threads.h b/tools/perf/util/threads.h index ed67de627578..d03bd91a7769 100644 --- a/tools/perf/util/threads.h +++ b/tools/perf/util/threads.h @@ -2,7 +2,7 @@ #ifndef __PERF_THREADS_H #define __PERF_THREADS_H -#include +#include "hashmap.h" #include "rwsem.h" struct thread; @@ -11,9 +11,9 @@ struct thread; #define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS) struct threads_table_entry { - struct rb_root_cached entries; + /* Key is tid, value is struct thread. */ + struct hashmap shard; struct rw_semaphore lock; - unsigned int nr; struct thread *last_match; };