From patchwork Fri Feb 2 06:15:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 195593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp238570dyc; Thu, 1 Feb 2024 22:19:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwTy+zlbEq945jI4jifiiexYefqqA26m6T3dGgmqM7m65NVUYpFTBqa9LeOinf3aysm33k X-Received: by 2002:a05:6214:21c9:b0:682:59:2338 with SMTP id d9-20020a05621421c900b0068200592338mr1208404qvh.59.1706854751093; Thu, 01 Feb 2024 22:19:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706854751; cv=pass; d=google.com; s=arc-20160816; b=YawGYd53rsDGviLg0l1nw7zejeQ0MJUezKMcDC02hIlEaxC76LOhCBrH5B43spy369 wSPIVGQ9qfm1mTp6DqM6pqW6PcoK+W7qtBOSbsAy5idrY50P+9NQ38TKYAe21mamaNuH W7F0Brzn5s5a3jsZlkvCu5Z/+rBRcDBHWLe0DzXVk/+WPnHVCw8HTWR0PM25bRvWhZrB QVJmCgy1ZeFzV2CviTt1J+Sp7JoLIYUJnU/7nTrhdE7V/wFJAYeDWVPcda+doB7O1sXj kw5O1QOGg+UBf4aU6o87ZHSlVBkYIjJW0g01dWdJ1QJeQYHLiivElFYggOiOhZ+65xqV z7Vg== 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=r8cuyus4waavntWUzMcbs7+5xI+OsCPQ5CRbneZJkcA=; fh=33qFiZhzca3PRgUAF1AdrpnfKVg6sDsiQU4xfYabzPk=; b=ZHyzqsY4MtD3tRCpjKrKPcp18D1dDwvEwExNcc2oDucbEqJP6MS++4LcLy4W5A4NiT HMvDdrTxy3+VY3Vq7rS2RSQTYsqMTZV9rJQNvPMRC0po4lfjO3I0x2iW2hTtB6iiFoKE SaYtsk5yOlZz0HFtgg/bz86CwgBrFbvWonjCWMJUKUwqHYNymEXhwcUpdvSy1L3G6747 aFQ42LuO6qjNwmCnqzgvPQna+V8GWYZe9PsjqmQcs9KDr6ciJIw8KSxvZZzjXUnXT5W5 RindoWeQGMsv7pcHabVgF0CH8wro8qmjJKlMS3dEaWYwePW08D6zBl2lh6zxm0I97owi 0aKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=LqWkOEnn; 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-49251-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49251-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCVS3U622GKnaMPUBJ0tj0YC/jcEbBNiMpctsRe0yo/g1k2lh9jtEBHtDrYS0m43kLFl1rFdLT5ECPKAtssKi6xy8OXRmA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id cz3-20020a056214088300b006816c71f3fasi1298146qvb.104.2024.02.01.22.19.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 22:19:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49251-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=LqWkOEnn; 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-49251-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49251-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id CF9921C2469D for ; Fri, 2 Feb 2024 06:19:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1387229420; Fri, 2 Feb 2024 06:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LqWkOEnn" Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 100DC1AACA for ; Fri, 2 Feb 2024 06:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706854576; cv=none; b=YnCP13zeaV/+QryXIYieaa0sNXfHkAu7J97oHJWfKfNQfnroDVzH53IWHPJuNcCe5FnQPrqR/04pC0a0/LKvQ5ciwlpsnD0wTqJ66JZ7Ewh1hc+m0IN66O/1tgwOfEEdahPXf/bjW0FyKIeF5gTc6AAZN/dkAYj34VH2FA5BorA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706854576; c=relaxed/simple; bh=vS3HQqPNbnCSG6H0mLijqDfI30W+eyfGf7Du2zJBBGI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=nR8hg9EOztzWSXcj7piQdfsbHD8jzpsYys5psadj6S1KbqwpKdbAco+p3tC2op8d9yOWIEMR1BzVfmt+yZDCwR83569ybJt7GWfoC3Y1RKS4SEUrqiPqhE2qsM+4t4peRCFfih7ALaBB+nHhIOXazjVzZco/oNGDvAORq4YFpIk= 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=LqWkOEnn; arc=none smtp.client-ip=209.85.219.202 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-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc657e9bdc4so2429413276.0 for ; Thu, 01 Feb 2024 22:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706854574; x=1707459374; 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=r8cuyus4waavntWUzMcbs7+5xI+OsCPQ5CRbneZJkcA=; b=LqWkOEnnZ/TIfV4hGMcpYhLQBD888gwe4X3PrdMFKQlUgDPXmhvmTZ6dQcrUNP5UJN vrSF9+kl9dF0P3icPObwZ9C6qPgmTCbG+P4l9z5lbxsM9JMQ7tOyZ0R+WPkazYrQaITs 15rrg1flN2Lv8oKroAjyaL6GldCzCAaywPeVOiF1tqujFPo70GfuAn7nb/MqzN7HxmLV pLQ8C2y/pDZsF+ejWNOSc9hJIk5OyWc1grbkmgMD+TuEOZDl0IaMHuJ5GUqCYzVzEmHJ mv13VhHg1+dTEfUjvHnk71Ml6B1PwaTlPcT9YdNBf2SxT2LYrVIbzQzAQcsulzc35mP5 7ZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706854574; x=1707459374; 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=r8cuyus4waavntWUzMcbs7+5xI+OsCPQ5CRbneZJkcA=; b=Bl+T2c4wp7Jpwac6vdrgSjAgA7NaIDMHrMvfjV4qHbLcFVqfV8enJWWFeH9VFQlD+F q2p3eblryV/8VZ5IpKReALAQEy/6/zos5mDwO1vqTCObBMXcDRXPaJnQ762x3aydm0ES 5Nktg2u5XZiOt5NntpeExQzzL/wjSZ3Jyfj/JvCeSEaxh+i+o2Vb6wj7aeijxhSa4pWf XPfj9bJOn0ihEGyMrW9/QIGQ+wlwFrCStjqBd4e8N3ugPsnV2wJK6A5uzoIWaNuG+GtQ nVGVnk0wJ25YRotdSahA5LZKVWY+I2KDVM40fwaG5TcB6ztuZ+TdSWHezDVYJg368VZI Qljw== X-Gm-Message-State: AOJu0Ywqp2Z5YNS1qZKoZcLQLXoIo6LVOgS0aVHawtWDfUS77BQ+OZ8J mGvBTkOpGlW47d1xpWkc8pVgOb7ahoh8cxnv6pvzb0ixTMRIFa6u6C2nEe8QsYHhI7RLl13pS+j iN7EP7w== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:a85f:db1d:a66b:7f53]) (user=irogers job=sendgmr) by 2002:a05:6902:108d:b0:dc6:d9eb:6422 with SMTP id v13-20020a056902108d00b00dc6d9eb6422mr67423ybu.10.1706854574065; Thu, 01 Feb 2024 22:16:14 -0800 (PST) Date: Thu, 1 Feb 2024 22:15:19 -0800 In-Reply-To: <20240202061532.1939474-1-irogers@google.com> Message-Id: <20240202061532.1939474-13-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240202061532.1939474-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v8 12/25] perf threads: Switch from rbtree to hashmap 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 , "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 , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789766927203525219 X-GMAIL-MSGID: 1789766927203525219 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; };