From patchwork Wed Feb 28 00:52:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 207575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3072911dyb; Tue, 27 Feb 2024 17:29:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUkcUQ7KbIOqtQSlptOpA0xEtZ2dC5zpz9D802RGvPznWiJOQZlKuTuVgcrMm82GSPUQAvjR8D6bu13vOlVErRbY48Y8Q== X-Google-Smtp-Source: AGHT+IElc4mA/pplgXUO2ojG2FX9ve/BuNkbpFocwrJJByjdCapqHxndCrpGsvszFA0bh+Vf2tkH X-Received: by 2002:a17:90a:a112:b0:299:4f5a:62d5 with SMTP id s18-20020a17090aa11200b002994f5a62d5mr9640661pjp.18.1709083752953; Tue, 27 Feb 2024 17:29:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709083752; cv=pass; d=google.com; s=arc-20160816; b=Ww1GsupzrlOlK8Fmp6x1zb8BqSXYo7yAw4U0TApju2yuV/W/FxQYLWzmcKuCsOKmaU fyfRNugpppwhHVtpOMPrz42CifrbaMiH2lXwi/3OI+DKNuT7Yv9ltZ5pWXupZ7itzGV7 DbStrZPJ4uX2FYmvs01YDlXH++EIXgvJFPpEjvrHBdzwCZUNXw3hwM4EEsvaPmixs6c2 hrbbeig56Ap812Exj27Kq+/MuNwQ1oKsMLrN6nD5fyoVZvvFSyBCDDXSaLgX/i9AGoeA OO2OUhfvcc+V0VJBkMTCKKutc3c+jRqOEH7k3nNHnGAPFQZEjZ+8l6BJPzNEFgR7I9L3 ta1g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=IfBuunwtiWBXDReIqjk2VwaHc87dvfCu3Oz8mgKS4mA=; fh=s1fZEdGGHFKlkrF3njJuxobE+Xf6SbIV8h7pc+69Jsg=; b=DTVRIy6ymuSvcltpuhH4qA/A2Ks1OR1MubrJWtDF6uyF/0RlQhSrsEs75ETbAnF/rI DXq/nA0dSSA+ZbsQiyQCptw8RQBXHtBZHpyaW0IQu3LvS3GMzozgPiWhiNLyVbY7p+/i DxZAsp2oBTDt9syfC6TmTW6pk2HMuffZtkEsbL2HvQ/QahyAi5dW/Gt1/WvD/Crfdom9 5HlcdeCh9ebn+I9LvzJhRyxHdmts3Jsa3HDjaj0yLxpdbPhqcfjr8/BJI2+7UDvuWUy7 rrv0s2j8wLkzM+uj6Jq/F1Fnq6y5xbIikRama/mE5pbMqCMUDxH0vjrolgBTn4Aruzf4 30uQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ukT/kDj3"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-84289-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84289-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id f8-20020a17090a4a8800b00297074eed36si328173pjh.181.2024.02.27.17.29.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 17:29:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84289-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ukT/kDj3"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-84289-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84289-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 F03E3B28173 for ; Wed, 28 Feb 2024 00:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9C9301D681; Wed, 28 Feb 2024 00:52:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ukT/kDj3" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB64923CB; Wed, 28 Feb 2024 00:52:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709081553; cv=none; b=hooZXwwD3KE88mI5nVw3tZ7qstP5lAkPIxZjY8jQN3rjaIbiiaxmIgcLGPySRVsYEYGXrkIysJ53bg2dRwtjPGllQAM0EKozDpmByClozSKr/byGShSME+2uR2m23hCRFMwXjOzWNFW8Pd6B/oUq87CKgPflHUnIxtTllwTGBZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709081553; c=relaxed/simple; bh=HFQajpgQRni2lxL7vlCRDNCH5GBRC8OcnQVmLr+IUUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aoQnhS3BC0zK8zDY8C5FgeP7Wa66sf+oymdPkQx+tTCIqSbXXM9xkgzNNtxTVpkNuy3l4jqi1dXNd/UcOgnelB06JS4pMZTYpAgOnKgW8XVAEh7UJxGHfT3qEcjfZ84a+UKtwQL9fUxGZ4lPKLpz4NzfQ0Q2dBjQnr1VA+Uq8hA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ukT/kDj3; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BF0FC433C7; Wed, 28 Feb 2024 00:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709081553; bh=HFQajpgQRni2lxL7vlCRDNCH5GBRC8OcnQVmLr+IUUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ukT/kDj30vjh++aZFNI2tAwiRi6F5hkfR2MwKojMKr0mysmiX8ZRfG5XTNn8Dw5c9 ZrRVidkkBaHoMWBA0U4QeQXQcooe+n4wRhuETOdn9i/RYxNNeMLkVTGBNfCGAVo6pd c9nLjJdUGGiC3euaZCKrSzmaQMP5BP71L5OeQDeKZE73ln44hw7kv3a05C8iX4eg/3 SSRGg685teCatBS/iNObaGjFKqb0PL1k49iENaId0S4psm5ZLca21h4h5arq3gdX3R EihCgSNU3q5wt5f2ylD4a6PpONC61aZexMCQXKBIe6z8UiOURWZ9b0luhAn2LY2im+ 4bEuekd4f20vQ== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Andi Kleen Subject: [PATCH 3/4] perf annotate: Remove sym_hist.addr[] array Date: Tue, 27 Feb 2024 16:52:29 -0800 Message-ID: <20240228005230.287113-4-namhyung@kernel.org> X-Mailer: git-send-email 2.44.0.rc1.240.g4c46232300-goog In-Reply-To: <20240228005230.287113-1-namhyung@kernel.org> References: <20240228005230.287113-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792104205233993439 X-GMAIL-MSGID: 1792104205233993439 It's not used anymore and the code is coverted to use a hash map. Now sym_hist has a static size, so no need to have sizeof_sym_hist in the struct annotated_source. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate.c | 36 +++++------------------------------- tools/perf/util/annotate.h | 4 +--- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index e7859f756252..43b204815020 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -896,33 +896,10 @@ static __maybe_unused void annotated_source__delete(struct annotated_source *src } static int annotated_source__alloc_histograms(struct annotated_source *src, - size_t size, int nr_hists) + int nr_hists) { - size_t sizeof_sym_hist; - - /* - * Add buffer of one element for zero length symbol. - * When sample is taken from first instruction of - * zero length symbol, perf still resolves it and - * shows symbol name in perf report and allows to - * annotate it. - */ - if (size == 0) - size = 1; - - /* Check for overflow when calculating sizeof_sym_hist */ - if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry)) - return -1; - - sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(struct sym_hist_entry)); - - /* Check for overflow in zalloc argument */ - if (sizeof_sym_hist > SIZE_MAX / nr_hists) - return -1; - - src->sizeof_sym_hist = sizeof_sym_hist; src->nr_histograms = nr_hists; - src->histograms = calloc(nr_hists, sizeof_sym_hist) ; + src->histograms = calloc(nr_hists, sizeof(*src->histograms)); if (src->histograms == NULL) return -1; @@ -941,7 +918,7 @@ void symbol__annotate_zero_histograms(struct symbol *sym) annotation__lock(notes); if (notes->src != NULL) { memset(notes->src->histograms, 0, - notes->src->nr_histograms * notes->src->sizeof_sym_hist); + notes->src->nr_histograms * sizeof(*notes->src->histograms)); hashmap__clear(notes->src->samples); } if (notes->branch && notes->branch->cycles_hist) { @@ -1039,9 +1016,7 @@ static int __symbol__inc_addr_samples(struct map_symbol *ms, } h->nr_samples++; - h->addr[offset].nr_samples++; h->period += sample->period; - h->addr[offset].period += sample->period; entry->nr_samples++; entry->period += sample->period; @@ -1094,8 +1069,7 @@ struct annotated_source *symbol__hists(struct symbol *sym, int nr_hists) if (notes->src->histograms == NULL) { alloc_histograms: - annotated_source__alloc_histograms(notes->src, symbol__size(sym), - nr_hists); + annotated_source__alloc_histograms(notes->src, nr_hists); } return notes->src; @@ -2854,7 +2828,7 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx) struct annotation *notes = symbol__annotation(sym); struct sym_hist *h = annotation__histogram(notes, evidx); - memset(h, 0, notes->src->sizeof_sym_hist); + memset(h, 0, sizeof(*notes->src->histograms) * notes->src->nr_histograms); } void symbol__annotate_decay_histogram(struct symbol *sym, int evidx) diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 3362980a5d3d..4bdc70a9d376 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -242,7 +242,6 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel); struct sym_hist { u64 nr_samples; u64 period; - struct sym_hist_entry addr[]; }; struct cyc_hist { @@ -278,7 +277,6 @@ struct cyc_hist { */ struct annotated_source { struct list_head source; - size_t sizeof_sym_hist; struct sym_hist *histograms; struct annotation_line **offsets; struct hashmap *samples; @@ -348,7 +346,7 @@ void annotation__toggle_full_addr(struct annotation *notes, struct map_symbol *m static inline struct sym_hist *annotated_source__histogram(struct annotated_source *src, int idx) { - return ((void *)src->histograms) + (src->sizeof_sym_hist * idx); + return &src->histograms[idx]; } static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)