From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4612C7618B for ; Wed, 15 Mar 2023 14:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232691AbjCOOvo (ORCPT ); Wed, 15 Mar 2023 10:51:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232283AbjCOOvj (ORCPT ); Wed, 15 Mar 2023 10:51:39 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F11592732 for ; Wed, 15 Mar 2023 07:51:36 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id c18so1711364ple.11 for ; Wed, 15 Mar 2023 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EfFwm9/whD1jR/5n6DKKR8V6Fa945UAISwsDPx5HLJU=; b=KZugxK1LyG7HAO7IqFjdN3jXvQsOjnRWzVpP1xL1Tkj+buVGEEfOWxmIeEWzSDvzmK ms1ChOuszpzDA+GTPp/cavDKlnHwnrbJg9aWEbONC8gCP4h9AIZXNdfdmIIU7PgS699C u+XvdrXbhxfDPsFJN08NVERlQD2BKD2nmG8abbH0x+v/k9xl6AqASAFL7+0vfO3Hjt7k bERWmLGJs6VPNa2I4JateIzEU26/E6faw4Ave7It1UOcVjHkD04K/7lOGh4LHpR15J6k AlWwjdIIPAaPJ0Q4V6r39X5q1fYtVug/G0lghp1RvBo1PdU2CPiviKq0RN8I5hNQQPKR ZuIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EfFwm9/whD1jR/5n6DKKR8V6Fa945UAISwsDPx5HLJU=; b=m/hA4DVpLr2s4UcB2ijwWKSjMaTsmY7RDYzFZ/ij7Gl9IwrRvWuSQptkYcb0r6VoP5 750qScoLqGWdsNtXTItH/sZP1E+Y0dACKWViUgPg22REyov/DU9yRDVZgFRwlbm4wJK0 /3h7vQ0jjxvKsE1rCfJvTnVyDg8lKM+jvGcj6zibcT1DxanlNcgnN/1bj0VxCgl7XP1j k41hzyBWLPnOkfiW7CGYuIkObAKdKy78dPZAKWcvpvT8PtHOC4wEzFXPS85nZtgcczJf dxdXMQlpBVIVGkulPqseGgkyhTf7UrAZ6CcxtJJ1xI8EU1ISxB5v6uKqahpMFpST1E8c feFg== X-Gm-Message-State: AO0yUKVLBEsAygzo0gQJmRDyPz/rUXUPJmMuKRFp7ylQASYLYa3ZZc+b Cum0CvFQe1zi+fHNNAsw80JjPEiMDx9cZ92PNYZT9+LB X-Google-Smtp-Source: AK7set8qMbJAPIuXCdVoB6UCNz7/oT7SO0QBq/H+qHjAhlwX1P6E2qUM6KgqjzOFIiqFu/nUM+XJAg== X-Received: by 2002:a17:903:283:b0:1a1:78e6:d600 with SMTP id j3-20020a170903028300b001a178e6d600mr2650897plr.10.1678891895802; Wed, 15 Mar 2023 07:51:35 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:51:35 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 01/16] perf kvm: Refactor overall statistics Date: Wed, 15 Mar 2023 22:50:57 +0800 Message-Id: <20230315145112.186603-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently the tool computes overall statistics when sort the results. This patch refactors overall statistics during events processing, therefore, the function update_total_coun() is not needed anymore, an extra benefit is we can de-couple code between the statistics and the sorting. This patch is not expected any functionality changes. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 641e739c717c..0172e5b0d26e 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -278,9 +278,14 @@ static double kvm_event_rel_stddev(int vcpu_id, struct= kvm_event *event) avg_stats(&kvm_stats->stats)); } =20 -static bool update_kvm_event(struct kvm_event *event, int vcpu_id, +static bool update_kvm_event(struct perf_kvm_stat *kvm, + struct kvm_event *event, int vcpu_id, u64 time_diff) { + /* Update overall statistics */ + kvm->total_count++; + kvm->total_time +=3D time_diff; + if (vcpu_id =3D=3D -1) { kvm_update_event_stats(&event->total, time_diff); return true; @@ -399,7 +404,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm, } } =20 - return update_kvm_event(event, vcpu, time_diff); + return update_kvm_event(kvm, event, vcpu, time_diff); } =20 static @@ -526,15 +531,6 @@ static void insert_to_result(struct rb_root *result, s= truct kvm_event *event, rb_insert_color(&event->rb, result); } =20 -static void -update_total_count(struct perf_kvm_stat *kvm, struct kvm_event *event) -{ - int vcpu =3D kvm->trace_vcpu; - - kvm->total_count +=3D get_event_count(event, vcpu); - kvm->total_time +=3D get_event_time(event, vcpu); -} - static bool event_is_valid(struct kvm_event *event, int vcpu) { return !!get_event_count(event, vcpu); @@ -549,7 +545,6 @@ static void sort_result(struct perf_kvm_stat *kvm) for (i =3D 0; i < EVENTS_CACHE_SIZE; i++) { list_for_each_entry(event, &kvm->kvm_events_cache[i], hash_entry) { if (event_is_valid(event, vcpu)) { - update_total_count(kvm, event); insert_to_result(&kvm->result, event, kvm->compare, vcpu); } --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F6CDC6FD1D for ; Wed, 15 Mar 2023 14:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232788AbjCOOvv (ORCPT ); Wed, 15 Mar 2023 10:51:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232283AbjCOOvo (ORCPT ); Wed, 15 Mar 2023 10:51:44 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CDAF74A6C for ; Wed, 15 Mar 2023 07:51:42 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id rj10so8515942pjb.4 for ; Wed, 15 Mar 2023 07:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uN7zwUTTarFdEEyI4xavpEstkRipyyWqLXdanEnFXps=; b=dz9O6X6Lyg1W6HzzKFOyVtSVCtOcOjX8KUPSQGJc8jHxSUKbFkz/hVeQ0IeO06vNJg mdjLv5xdlHfxTFYU/l2wMFk6fROQORw9f+TdY+DE/sAZ0crV5vSB73uh2yg2zN10YTvh xVasUftypDkWRNQIu3RitoOknFgaKUxPyubkvgnjtLbhz+rHg3v7VQRqfx+TNBYL5Odu HP32DoZ0l++hvqej4Nr9VAXfhQ5G1LsoSoDWqNN0XKHEPG0uxa6+NmguqPg5R8NBVqEt EvDpy5BRxuliKIwnNrlkfIjTfxGwpNNVfg40LxE94KDTI91OspTkLzwXiQGu7vtLGkM8 OGqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uN7zwUTTarFdEEyI4xavpEstkRipyyWqLXdanEnFXps=; b=8KORu0hYF+OhfcE1dZ53UryIJqKTmv+K8WbSdAOysW2pOEjPECaXBnDXVeosQesDyJ DFHGFbKWgAU5W3IS6fskSQ9HdmaOzyqOKOt2HZ4PQ1AADGc+oPdYQ5s2bxoccK7NsWYt mbRdwH9ajYHp/5NEqMJ/bztoJt1ZYAlTY2F5t+X6aboblE8zgoUSJiBiJvifEVbTIBka qwPUcIQ9nFTZ/1Me0YloBmrZehHR8PBkdRJVSF59Hvj6BbzQe9T7nq+0+ucs/GGvb5g/ ki/UOa64m52svBcItjE5716xTV4Ls3U5AIfOZ37npAGfwaVYIIOtRZ1IWF2gGAvh3FgF +pwA== X-Gm-Message-State: AO0yUKWXbzj7ke5PDWL9kDrn/eyzSzRbIQM+IAZ3ED1KIE4CJ7HvC9yn +p8Awka6eDVXASjIUurvNqavIw== X-Google-Smtp-Source: AK7set+18F9Edl6g6CLpmAfVo4MglOMwc0eTGR01kSD+KJBuN3gDndbDDHajhADj2FlU+Vq8nRzdUA== X-Received: by 2002:a17:903:cc:b0:1a0:75bb:2803 with SMTP id x12-20020a17090300cc00b001a075bb2803mr2319315plc.63.1678891901947; Wed, 15 Mar 2023 07:51:41 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:51:41 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 02/16] perf kvm: Add pointer to 'perf_kvm_stat' in kvm event Date: Wed, 15 Mar 2023 22:50:58 +0800 Message-Id: <20230315145112.186603-3-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Sometimes, handling kvm events needs to base on global variables, e.g. when read event counts we need to know the target vcpu ID; the global variables are stored in structure perf_kvm_stat. This patch adds add a 'perf_kvm_stat' pointer in kvm event structure, it is to be used by later refactoring. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 6 ++++-- tools/perf/util/kvm-stat.h | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 0172e5b0d26e..3d2560ec6b37 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -209,7 +209,8 @@ static bool kvm_event_expand(struct kvm_event *event, i= nt vcpu_id) return true; } =20 -static struct kvm_event *kvm_alloc_init_event(struct event_key *key) +static struct kvm_event *kvm_alloc_init_event(struct perf_kvm_stat *kvm, + struct event_key *key) { struct kvm_event *event; =20 @@ -219,6 +220,7 @@ static struct kvm_event *kvm_alloc_init_event(struct ev= ent_key *key) return NULL; } =20 + event->perf_kvm =3D kvm; event->key =3D *key; init_stats(&event->total.stats); return event; @@ -238,7 +240,7 @@ static struct kvm_event *find_create_kvm_event(struct p= erf_kvm_stat *kvm, return event; } =20 - event =3D kvm_alloc_init_event(key); + event =3D kvm_alloc_init_event(kvm, key); if (!event) return NULL; =20 diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 6f0fa05b62b6..40a4b66cfee6 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -24,10 +24,13 @@ struct kvm_event_stats { struct stats stats; }; =20 +struct perf_kvm_stat; + struct kvm_event { struct list_head hash_entry; struct rb_node rb; =20 + struct perf_kvm_stat *perf_kvm; struct event_key key; =20 struct kvm_event_stats total; @@ -44,8 +47,6 @@ struct kvm_event_key { key_cmp_fun key; }; =20 -struct perf_kvm_stat; - struct child_event_ops { void (*get_key)(struct evsel *evsel, struct perf_sample *sample, --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF0F9C61DA4 for ; Wed, 15 Mar 2023 14:52:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232818AbjCOOwF (ORCPT ); Wed, 15 Mar 2023 10:52:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232800AbjCOOv6 (ORCPT ); Wed, 15 Mar 2023 10:51:58 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B71492F14 for ; Wed, 15 Mar 2023 07:51:48 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso3600302pjc.1 for ; Wed, 15 Mar 2023 07:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F9P/WNNNsLKtkXIlBizDtRA5HEUxXu0PrB/8N0zALdo=; b=kERtE0PayCcJQ3g8DvP/DKEm+wnQqWdaSqaR2NerLnXK+yX4pdUdXXbun86NaJWPip NaNxyTI5DDE93i1z0boAD2DCj4A/Q+JH5zKZBF+AtgiDmsI6LhKtHZRo3UmfqxaZkv4S gt0TLHk4YAc1EW2Y6k2KGJeQ/NUCeaiHOVq+qZ1LAkCDYUmjGguiHLs9W+i9MFdfzYXq bcW5anC2HFx14u31bHEJqluO8X8Rd2yETVU6V587+UuzxZ7KlZvv021+tcLpAjqeDRXn X8OnO6jDOEg9ifMzxC9reG7xPjJdBeEUWaXxO1oRVEkrJdrHYfZWWf+9xqxAp1gXnU/x Zq0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F9P/WNNNsLKtkXIlBizDtRA5HEUxXu0PrB/8N0zALdo=; b=o0nQVN2XJl5b/9N1p1JIOhKOrLz/k1+okvX0ie4kPtfenu21A5wJ0mxn8UkVT8dZKy 1p8JKV475h+HIdk5QGX/q1ihx7XYmeGp13pA+Qji6a/GsPO+UKhhjGp1RdbyjUvFjHJK nZkarGDXdGZLdiAgBDXC/gXwXZ04GllRlg5I5stFxO49cJFEKAgSUwK+5aZTR2bA/YIn D6GxvfeOBZ3OP0M74NRb5Ig8dl+CDFMkB++z8J0Q+c4kL82nR1h7ZBr/8b7gD/04hn1H T3wZ/YpRi9VnMdONGp+msS0mPWfsde/2Fy7lZ7NH4mI13HiQrMYL3zFePvczujr1uYYQ ueug== X-Gm-Message-State: AO0yUKVDyLXbuZrfvO61Wmcb8IxesfFyxs3GZTk+CWv56iyc32OQjkH3 kycq0Xkt0FN0c/1yVX5qkUe+sA== X-Google-Smtp-Source: AK7set9dml+fP8oxdvMnQArrcIveUFrdND0WQlnru3pW0iTofhwwc7D4RzHBKBI+q2LgpbbPbzhF4Q== X-Received: by 2002:a17:902:d4d0:b0:19f:30be:ea06 with SMTP id o16-20020a170902d4d000b0019f30beea06mr3274410plg.50.1678891907507; Wed, 15 Mar 2023 07:51:47 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:51:47 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 03/16] perf kvm: Move up metrics helpers Date: Wed, 15 Mar 2023 22:50:59 +0800 Message-Id: <20230315145112.186603-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch moves up the helper functions of event's metrics for later adding code to call them. No any functionality changes, but has a function renaming from compare_kvm_event_{metric}() to cmp_event_{metric}(). Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 3d2560ec6b37..62c097a37da9 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -49,6 +49,42 @@ #include #include =20 +#define GET_EVENT_KEY(func, field) \ +static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ +{ \ + if (vcpu =3D=3D -1) \ + return event->total.field; \ + \ + if (vcpu >=3D event->max_vcpu) \ + return 0; \ + \ + return event->vcpu[vcpu].field; \ +} + +#define COMPARE_EVENT_KEY(func, field) \ +GET_EVENT_KEY(func, field) \ +static int cmp_event_ ## func(struct kvm_event *one, \ + struct kvm_event *two, int vcpu) \ +{ \ + return get_event_ ##func(one, vcpu) > \ + get_event_ ##func(two, vcpu); \ +} + +GET_EVENT_KEY(time, time); +GET_EVENT_KEY(max, stats.max); +GET_EVENT_KEY(min, stats.min); +COMPARE_EVENT_KEY(count, stats.n); +COMPARE_EVENT_KEY(mean, stats.mean); + +#define DEF_SORT_NAME_KEY(name, compare_key) \ + { #name, cmp_event_ ## compare_key } + +static struct kvm_event_key keys[] =3D { + DEF_SORT_NAME_KEY(sample, count), + DEF_SORT_NAME_KEY(time, mean), + { NULL, NULL } +}; + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -461,42 +497,6 @@ static bool handle_kvm_event(struct perf_kvm_stat *kvm, return true; } =20 -#define GET_EVENT_KEY(func, field) \ -static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ -{ \ - if (vcpu =3D=3D -1) \ - return event->total.field; \ - \ - if (vcpu >=3D event->max_vcpu) \ - return 0; \ - \ - return event->vcpu[vcpu].field; \ -} - -#define COMPARE_EVENT_KEY(func, field) \ -GET_EVENT_KEY(func, field) \ -static int compare_kvm_event_ ## func(struct kvm_event *one, \ - struct kvm_event *two, int vcpu)\ -{ \ - return get_event_ ##func(one, vcpu) > \ - get_event_ ##func(two, vcpu); \ -} - -GET_EVENT_KEY(time, time); -COMPARE_EVENT_KEY(count, stats.n); -COMPARE_EVENT_KEY(mean, stats.mean); -GET_EVENT_KEY(max, stats.max); -GET_EVENT_KEY(min, stats.min); - -#define DEF_SORT_NAME_KEY(name, compare_key) \ - { #name, compare_kvm_event_ ## compare_key } - -static struct kvm_event_key keys[] =3D { - DEF_SORT_NAME_KEY(sample, count), - DEF_SORT_NAME_KEY(time, mean), - { NULL, NULL } -}; - static bool select_key(struct perf_kvm_stat *kvm) { int i; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C554C7618B for ; Wed, 15 Mar 2023 14:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232785AbjCOOwZ (ORCPT ); Wed, 15 Mar 2023 10:52:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233135AbjCOOwJ (ORCPT ); Wed, 15 Mar 2023 10:52:09 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C34397B5E for ; Wed, 15 Mar 2023 07:51:54 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id a2so20302399plm.4 for ; Wed, 15 Mar 2023 07:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cd+dkas2glmconcA3nZgOv1IgDvFJOrEFeQZRwvRr9Q=; b=YfMLFLfFXMW5NCpCaRGVHpsK7tI9UBEjIKHVIzaHfGrbedKISm9IE63szUmP0A5hXc R89hHVJJt+esMau2kph4nwZrNEcq8uYxo6x2zXz/r+d7/1Okwxl+v3WF2xwrIDLWcdbs rKjbrgvUGpiPsxhu3jCpASTHDCYRUxlQkQZL/UpPYcesmaXrfepoteyH7ey556AoKLcV kgVebWHBYJbNVH6hI0+VGA6MgvbltWc4xx+/j9J3eeyRFLH5gEKiC5Atg7pquz8y8K4h oQyFyszZGeEd0EK8lsiKu8mQFMxAZsbFmp/dtszSePeLqEOnyuglHR6oSJuvjfqXPNPr M3Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cd+dkas2glmconcA3nZgOv1IgDvFJOrEFeQZRwvRr9Q=; b=FRvAgemyPeh79qXgp2dN9nikOZQGDVzVyCtS3iBYUt1rHx0wfBRtG4uGlUy5aoPpwD H+ZQRZmL2GowcoRGkrUdNFAsZDVLO4AjglzZrkuAkxk1j/QiRbGLKZDXBb2tfEam3DLD 3wHhrzS7WhhYRdFIdebr/1SjwmK/sudmkZhshr1IBs6PurqfT4ZViajv9+pnjW4D3q7B R0+3bQIJty2LLt58GOcSEVeYV0zUbgIzEyRlMNgRl+YF9BEUlkja2SKvv310ezy+SUFz Ksub6OyUjDOoHG4L6jmtGaJ94K/qI/h7JfyfWKgkaFbA0c4VcARRBru/c6S2Fzw0uLhq AA6w== X-Gm-Message-State: AO0yUKWVojefYx5TT3IGMeHkdC0o0U2XwxFE9FistgXrXLJL8NtQT8kO g8qRNeqm7aO89WQHZjKkpvyD9Q== X-Google-Smtp-Source: AK7set+OD/ekdbUPyKgmlJavsWyrlHgkyNT+r7p946TYxjT0XL2xAzkm0EgeNF4uEnXoKDJhxpAPAQ== X-Received: by 2002:a17:903:234a:b0:19f:3797:d8de with SMTP id c10-20020a170903234a00b0019f3797d8demr3589747plh.9.1678891913436; Wed, 15 Mar 2023 07:51:53 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:51:53 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 04/16] perf kvm: Use subtraction for comparison metrics Date: Wed, 15 Mar 2023 22:51:00 +0800 Message-Id: <20230315145112.186603-5-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently the metrics comparison uses greater operator (>), it returns the boolean value (0 or 1). This patch changes to use subtraction as comparison result, which can be used by histograms sorting. Since the subtraction result is u64 type, we change key_cmp_fun's return type to int64_t to avoid overflow. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 6 +++--- tools/perf/util/kvm-stat.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 62c097a37da9..4e9519390da6 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -63,10 +63,10 @@ static u64 get_event_ ##func(struct kvm_event *event, i= nt vcpu) \ =20 #define COMPARE_EVENT_KEY(func, field) \ GET_EVENT_KEY(func, field) \ -static int cmp_event_ ## func(struct kvm_event *one, \ +static int64_t cmp_event_ ## func(struct kvm_event *one, \ struct kvm_event *two, int vcpu) \ { \ - return get_event_ ##func(one, vcpu) > \ + return get_event_ ##func(one, vcpu) - \ get_event_ ##func(two, vcpu); \ } =20 @@ -523,7 +523,7 @@ static void insert_to_result(struct rb_root *result, st= ruct kvm_event *event, p =3D container_of(*rb, struct kvm_event, rb); parent =3D *rb; =20 - if (bigger(event, p, vcpu)) + if (bigger(event, p, vcpu) > 0) rb =3D &(*rb)->rb_left; else rb =3D &(*rb)->rb_right; diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 40a4b66cfee6..0c2400d9b227 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -40,7 +40,7 @@ struct kvm_event { struct kvm_event_stats *vcpu; }; =20 -typedef int (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int); +typedef int64_t (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int); =20 struct kvm_event_key { const char *name; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4C84C61DA4 for ; Wed, 15 Mar 2023 14:52:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232790AbjCOOwe (ORCPT ); Wed, 15 Mar 2023 10:52:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbjCOOwW (ORCPT ); Wed, 15 Mar 2023 10:52:22 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA1D48A3BA for ; Wed, 15 Mar 2023 07:51:59 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id e15-20020a17090ac20f00b0023d1b009f52so2087213pjt.2 for ; Wed, 15 Mar 2023 07:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/ZjK+hr7JcZKa/bO3cuF+Qb3HZ2OSLLueCbPuYXRIsQ=; b=IyU4UgiasNb7sQ+9KfUeWXj6x+B0edjXQNGe8p+rVaNpm3PkPUswmR2xSxu6v9CbGo ptmsIxMZdIs0kdw7wuZso4xmCS/3F8XVS6Fh4rfbBPYJxu6u/xrucec9brj/wt6f4unx NCJdJ65y3Wqe0hQJQ4mTSbxEeIHMZS+Y2HgMQsH52BwTO7bVP4vzQBkdXxdtHuXAxAb/ 6aAN+phPK7GVEESezJOzxgnZ/h2Boigz7qIcV6Jkx9CRdzYVQdTcFVzJP+XfY0caiSop 0O4wTIxTdlX8z+OVpkTapRmaGlZQJAxDSQFOE+s7MLSEfRBSFsNDG7elDlsvmXtLnoM4 0Vlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ZjK+hr7JcZKa/bO3cuF+Qb3HZ2OSLLueCbPuYXRIsQ=; b=u9NukOqGTCZpWLWRkE5iyMKnPwQf7zDGKIa8o72C5+4aJiqVDUfN+mJhgNOWIHX39Q 0Ci2tF2mA/PyhFwbfKzmQOxFf/IypPoRLJ5aJz9ya+nSYXLDXJ8PJ9o+qgnWW0IvAWLA WWa+QofDopHxyKTItSS4WnLk4aCPesagGV/mOIAx2m88dOpjR+Oy0GUAMUmVfOq5SZMs Qxj4IjMt4AFG+bn+QsdFIUmVVoWUEgcpuk0PckprnCdALRUQviv/ICQ0cIFbEiJesc/M dY1FnfPENQPxBYzHuFeMiTvQxXY6NN6c0URD6nQBhgW5PqhFtn4mRkKGv/fqjgnST7NU VHjg== X-Gm-Message-State: AO0yUKWTgY07bow84WxUie6Vdgn6Ylkme/TMCBYxwPPEtzk9e2YDVmMm a+YyO4qo5vJAA7XiMbmNr12Sxg== X-Google-Smtp-Source: AK7set8Yh2PYaPUVuTnwTRUWOSUJd8SHurhxbIimvPTgXecs/zyq/ORsGmnyEvsiBWGfEbATml+14g== X-Received: by 2002:a17:902:fb4c:b0:1a0:53f3:3762 with SMTP id lf12-20020a170902fb4c00b001a053f33762mr2708370plb.46.1678891919097; Wed, 15 Mar 2023 07:51:59 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:51:58 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 05/16] perf kvm: Use macro to replace variable 'decode_str_len' Date: Wed, 15 Mar 2023 22:51:01 +0800 Message-Id: <20230315145112.186603-6-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The variable 'decode_str_len' defines the string length for KVM event name and every arch defines its own values. This introduces complexity that the variable definition are spreading in multiple source files under arch folder. This patch refactors code to use a macro KVM_EVENT_NAME_LEN to define event name length and thus remove the definitions in arch files. Signed-off-by: Leo Yan --- tools/perf/arch/arm64/util/kvm-stat.c | 1 - tools/perf/arch/powerpc/util/kvm-stat.c | 3 +-- tools/perf/arch/s390/util/kvm-stat.c | 1 - tools/perf/arch/x86/util/kvm-stat.c | 7 +++---- tools/perf/builtin-kvm.c | 10 +++++----- tools/perf/util/kvm-stat.h | 3 ++- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/perf/arch/arm64/util/kvm-stat.c b/tools/perf/arch/arm64/= util/kvm-stat.c index 73d18e0ed6f6..72ca9bb45804 100644 --- a/tools/perf/arch/arm64/util/kvm-stat.c +++ b/tools/perf/arch/arm64/util/kvm-stat.c @@ -11,7 +11,6 @@ define_exit_reasons_table(arm64_trap_exit_reasons, kvm_ar= m_exception_class); =20 const char *kvm_trap_exit_reason =3D "esr_ec"; const char *vcpu_id_str =3D "id"; -const int decode_str_len =3D 20; const char *kvm_exit_reason =3D "ret"; const char *kvm_entry_trace =3D "kvm:kvm_entry"; const char *kvm_exit_trace =3D "kvm:kvm_exit"; diff --git a/tools/perf/arch/powerpc/util/kvm-stat.c b/tools/perf/arch/powe= rpc/util/kvm-stat.c index 1a9b40ea92a5..d04a08c9fd19 100644 --- a/tools/perf/arch/powerpc/util/kvm-stat.c +++ b/tools/perf/arch/powerpc/util/kvm-stat.c @@ -14,7 +14,6 @@ #define NR_TPS 4 =20 const char *vcpu_id_str =3D "vcpu_id"; -const int decode_str_len =3D 40; const char *kvm_entry_trace =3D "kvm_hv:kvm_guest_enter"; const char *kvm_exit_trace =3D "kvm_hv:kvm_guest_exit"; =20 @@ -80,7 +79,7 @@ static void hcall_event_decode_key(struct perf_kvm_stat *= kvm __maybe_unused, { const char *hcall_reason =3D get_hcall_exit_reason(key->key); =20 - scnprintf(decode, decode_str_len, "%s", hcall_reason); + scnprintf(decode, KVM_EVENT_NAME_LEN, "%s", hcall_reason); } =20 static struct kvm_events_ops hcall_events =3D { diff --git a/tools/perf/arch/s390/util/kvm-stat.c b/tools/perf/arch/s390/ut= il/kvm-stat.c index 34da89ced29a..0aed92df51ba 100644 --- a/tools/perf/arch/s390/util/kvm-stat.c +++ b/tools/perf/arch/s390/util/kvm-stat.c @@ -19,7 +19,6 @@ define_exit_reasons_table(sie_diagnose_codes, diagnose_co= des); define_exit_reasons_table(sie_icpt_prog_codes, icpt_prog_codes); =20 const char *vcpu_id_str =3D "id"; -const int decode_str_len =3D 40; const char *kvm_exit_reason =3D "icptcode"; const char *kvm_entry_trace =3D "kvm:kvm_s390_sie_enter"; const char *kvm_exit_trace =3D "kvm:kvm_s390_sie_exit"; diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util= /kvm-stat.c index c5dd54f6ef5e..ef513def03ba 100644 --- a/tools/perf/arch/x86/util/kvm-stat.c +++ b/tools/perf/arch/x86/util/kvm-stat.c @@ -18,7 +18,6 @@ static struct kvm_events_ops exit_events =3D { }; =20 const char *vcpu_id_str =3D "vcpu_id"; -const int decode_str_len =3D 20; const char *kvm_exit_reason =3D "exit_reason"; const char *kvm_entry_trace =3D "kvm:kvm_entry"; const char *kvm_exit_trace =3D "kvm:kvm_exit"; @@ -77,7 +76,7 @@ static void mmio_event_decode_key(struct perf_kvm_stat *k= vm __maybe_unused, struct event_key *key, char *decode) { - scnprintf(decode, decode_str_len, "%#lx:%s", + scnprintf(decode, KVM_EVENT_NAME_LEN, "%#lx:%s", (unsigned long)key->key, key->info =3D=3D KVM_TRACE_MMIO_WRITE ? "W" : "R"); } @@ -121,7 +120,7 @@ static void ioport_event_decode_key(struct perf_kvm_sta= t *kvm __maybe_unused, struct event_key *key, char *decode) { - scnprintf(decode, decode_str_len, "%#llx:%s", + scnprintf(decode, KVM_EVENT_NAME_LEN, "%#llx:%s", (unsigned long long)key->key, key->info ? "POUT" : "PIN"); } @@ -165,7 +164,7 @@ static void msr_event_decode_key(struct perf_kvm_stat *= kvm __maybe_unused, struct event_key *key, char *decode) { - scnprintf(decode, decode_str_len, "%#llx:%s", + scnprintf(decode, KVM_EVENT_NAME_LEN, "%#llx:%s", (unsigned long long)key->key, key->info ? "W" : "R"); } diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 4e9519390da6..d400434aa137 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -159,7 +159,7 @@ void exit_event_decode_key(struct perf_kvm_stat *kvm, const char *exit_reason =3D get_exit_reason(kvm, key->exit_reasons, key->key); =20 - scnprintf(decode, decode_str_len, "%s", exit_reason); + scnprintf(decode, KVM_EVENT_NAME_LEN, "%s", exit_reason); } =20 static bool register_kvm_events_ops(struct perf_kvm_stat *kvm) @@ -432,7 +432,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm, time_diff =3D sample->time - time_begin; =20 if (kvm->duration && time_diff > kvm->duration) { - char decode[decode_str_len]; + char decode[KVM_EVENT_NAME_LEN]; =20 kvm->events_ops->decode_key(kvm, &event->key, decode); if (!skip_event(decode)) { @@ -603,7 +603,7 @@ static void show_timeofday(void) =20 static void print_result(struct perf_kvm_stat *kvm) { - char decode[decode_str_len]; + char decode[KVM_EVENT_NAME_LEN]; struct kvm_event *event; int vcpu =3D kvm->trace_vcpu; =20 @@ -614,7 +614,7 @@ static void print_result(struct perf_kvm_stat *kvm) =20 pr_info("\n\n"); print_vcpu_info(kvm); - pr_info("%*s ", decode_str_len, kvm->events_ops->name); + pr_info("%*s ", KVM_EVENT_NAME_LEN, kvm->events_ops->name); pr_info("%10s ", "Samples"); pr_info("%9s ", "Samples%"); =20 @@ -633,7 +633,7 @@ static void print_result(struct perf_kvm_stat *kvm) min =3D get_event_min(event, vcpu); =20 kvm->events_ops->decode_key(kvm, &event->key, decode); - pr_info("%*s ", decode_str_len, decode); + pr_info("%*s ", KVM_EVENT_NAME_LEN, decode); pr_info("%10llu ", (unsigned long long)ecount); pr_info("%8.2f%% ", (double)ecount / kvm->total_count * 100); pr_info("%8.2f%% ", (double)etime / kvm->total_time * 100); diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 0c2400d9b227..841b3174c211 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -8,6 +8,8 @@ #include "stat.h" #include "record.h" =20 +#define KVM_EVENT_NAME_LEN 40 + struct evsel; struct evlist; struct perf_session; @@ -143,7 +145,6 @@ extern const char *kvm_events_tp[]; extern struct kvm_reg_events_ops kvm_reg_events_ops[]; extern const char * const kvm_skip_events[]; extern const char *vcpu_id_str; -extern const int decode_str_len; extern const char *kvm_exit_reason; extern const char *kvm_entry_trace; extern const char *kvm_exit_trace; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DFA4C7618B for ; Wed, 15 Mar 2023 14:52:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232896AbjCOOws (ORCPT ); Wed, 15 Mar 2023 10:52:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232657AbjCOOwf (ORCPT ); Wed, 15 Mar 2023 10:52:35 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4195294754 for ; Wed, 15 Mar 2023 07:52:05 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so2307323pjb.0 for ; Wed, 15 Mar 2023 07:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6dWIAjzu4GgQ80mkmjPpe056TgbhyOFnv3PTrWVTdCA=; b=fUzax12tR1jc4yHd7um52yUFMB4DBpD59HmSPy6v2+XXoKDz2q9k8Miwh7oLSR05Ub kQfqCFoaWtwiET3HLUD/Wwm8NHCtxZh0xOND0EfXTSfXPpB9pax5H2wFZYq33eiXrmv6 c6mEMagKB5KyibDwg2fnwH9zaUA5HURAgvayY2vZQxIfDVH72qUu0yQTVQHqlS5hGlUL cKYTKOYL64ufrUHf6+wk7p/Yc0egjNySxbPTxDIHVPr/ND3KoG1O28AREWQc2Y58wW0u QkIZ0p/3GfJVJUcv7u3S+AMTtkX46ac8IgOv7uniyAL2SYqSO53BEK3knnVNxFoSzZOq JX6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6dWIAjzu4GgQ80mkmjPpe056TgbhyOFnv3PTrWVTdCA=; b=AHj+mgsdxDxVYuDNHzUfgDXRv5xPlzFfn+V8FKAprK4QCbRl/McWbHcvmzrPepVSQu 8GxWdIXpnViwZSqFAqF3CgH9OWxfBrKJmDesi3XD3nJAaUSs/PqepUZCR34eTiZzEJH8 fhK233d/TuGYD/j/Auk1tYhAaEipXyklxwWU/qpZjn65OkxzgGz+Plox/c1ZNPwEN++3 ne62qj4Xe3OXzYHLKTAgLkNEyX+yTXwi35B2GLIATUDyZhfSrPA8/ZHIBuBVDbya9/cU UL7ASklhMcbs76u8bvalg9BqnlSXQErp+fW06SJhrtN4ZWfgTCwsS35wa0KFlNqirZss sJTA== X-Gm-Message-State: AO0yUKX6zHRa8AysJgFgtril8s9eMlt29IUWQXD6dkrvPnYCqJNF26C0 VYWP4vrgkO2d+YzFD0fP+UKGew== X-Google-Smtp-Source: AK7set+0vZiNilSAoQVttsUGF4dFlIy3XJFLbztvrLMK/BPFXynFDi8kiNCSEB7dOrxUJzH4eKLQ0w== X-Received: by 2002:a17:903:410a:b0:19f:2b42:5d01 with SMTP id r10-20020a170903410a00b0019f2b425d01mr2475678pld.9.1678891924631; Wed, 15 Mar 2023 07:52:04 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:04 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 06/16] perf kvm: Introduce histograms data structures Date: Wed, 15 Mar 2023 22:51:02 +0800 Message-Id: <20230315145112.186603-7-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is a preparation to support histograms in perf kvm tool. As first step, this patch defines histograms data structures and initialize them. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 18 ++++++++++++++++++ tools/perf/util/kvm-stat.h | 1 + 2 files changed, 19 insertions(+) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index d400434aa137..384992c8a01a 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -85,6 +85,20 @@ static struct kvm_event_key keys[] =3D { { NULL, NULL } }; =20 +struct kvm_hists { + struct hists hists; + struct perf_hpp_list list; +}; + +static struct kvm_hists kvm_hists; + +static int kvm_hists__init(void) +{ + __hists__init(&kvm_hists.hists, &kvm_hists.list); + perf_hpp_list__init(&kvm_hists.list); + return 0; +} + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -957,6 +971,8 @@ static int kvm_events_live_report(struct perf_kvm_stat = *kvm) set_term_quiet_input(&save); init_kvm_event_record(kvm); =20 + kvm_hists__init(); + signal(SIGINT, sig_handler); signal(SIGTERM, sig_handler); =20 @@ -1152,6 +1168,8 @@ static int kvm_events_report_vcpu(struct perf_kvm_sta= t *kvm) init_kvm_event_record(kvm); setup_pager(); =20 + kvm_hists__init(); + ret =3D read_events(kvm); if (ret) goto exit; diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 841b3174c211..e2c17662bac7 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -5,6 +5,7 @@ #ifdef HAVE_KVM_STAT_SUPPORT =20 #include "tool.h" +#include "sort.h" #include "stat.h" #include "record.h" =20 --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90FC0C7618B for ; Wed, 15 Mar 2023 14:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232724AbjCOOwz (ORCPT ); Wed, 15 Mar 2023 10:52:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233188AbjCOOwo (ORCPT ); Wed, 15 Mar 2023 10:52:44 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 215629B9B0 for ; Wed, 15 Mar 2023 07:52:12 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id ja10so10630753plb.5 for ; Wed, 15 Mar 2023 07:52:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5IYKqlpTPvf4B9W/g9ZH0t1bS6GpjcqsifmwRVPlTPE=; b=x26vR0cXHAFQU/OylVs2A3pi9LFcSWhxlTPtYlnieFE6JRYXKgGQjVDkwSz7QBu5Nx sdvHxXI6FCFLlxlORUkFmaDzo7e2JKoejjxpI77bGeCaGT0aJvgzeTyTIGuslcdclVi5 4TyBRDLbeYmM30AYhhN/tIRqhmY1rOQoI7Qh2igwUxOgE9q+zNEal4k+XrYiYA/wFEbX GpLqe98MM+jvGMhcu0NygeMstpsEtut5+Ln4qooWLr4XER7qNB8BAn5pYP21IUt7Cr0h JnvhBx0OLd+HHK3BremRi9jiXeD9D5mWzW4fGYvXak1SBax78tZKH4CZ8TItk5jLYUlB GL2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5IYKqlpTPvf4B9W/g9ZH0t1bS6GpjcqsifmwRVPlTPE=; b=AxnKpXb7tdNbaKvB8czLGXmDmsmSkzY3TEfZpCj1DCXDTn9wiG7bdOA3DTo4WPwjlx V8S3XDFp8me+MeS/QUqzOQQupgb39NxK2+rokuD/y577J4izrN1B7qlA3IGJrlLsQNuA zmfJ66fEgzqUsjGAokLDyvvCs+MbthfpuKvzibtX4O7lssfhr20T5sZ38jY/+L7TL51X CEq/qN1jMKSShX9r925403PqZbxf+X8369BXSpEYrCJ6ZwiPqF65ZHBMzXJmD6a1b1ON /7QFZFNcjgyY53iBTAKYqUmClkpvBF/MP5e+Knx90mp4ztacHFCwJIlRovi+TDcTDv9X 6G0A== X-Gm-Message-State: AO0yUKUgkEi4qh1Ue6+zDqdu4bCqIIJwuY3TR0vpf1nCKoH2us6hLCyD MrzobLxOVmNZ/l4mbzI2GI84DA== X-Google-Smtp-Source: AK7set9VmJ9JazfbYgtFRf8oYUnPBYBITGOROjQDD6rD7Vh7Iej4zmzLmmZrN85pIp3yfHORhfPzng== X-Received: by 2002:a17:903:283:b0:19c:e0fe:ed2b with SMTP id j3-20020a170903028300b0019ce0feed2bmr3360060plr.54.1678891930227; Wed, 15 Mar 2023 07:52:10 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:09 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 07/16] perf kvm: Pass argument 'sample' to kvm_alloc_init_event() Date: Wed, 15 Mar 2023 22:51:03 +0800 Message-Id: <20230315145112.186603-8-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch adds an argument 'sample' for kvm_alloc_init_event(), and its caller functions are updated as well for passing down the 'sample' pointer. This is a preparation change to allow later patch to create histograms entries for kvm event, no any functionality changes. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 384992c8a01a..5ea723fd45a4 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -260,7 +260,8 @@ static bool kvm_event_expand(struct kvm_event *event, i= nt vcpu_id) } =20 static struct kvm_event *kvm_alloc_init_event(struct perf_kvm_stat *kvm, - struct event_key *key) + struct event_key *key, + struct perf_sample *sample __maybe_unused) { struct kvm_event *event; =20 @@ -277,7 +278,8 @@ static struct kvm_event *kvm_alloc_init_event(struct pe= rf_kvm_stat *kvm, } =20 static struct kvm_event *find_create_kvm_event(struct perf_kvm_stat *kvm, - struct event_key *key) + struct event_key *key, + struct perf_sample *sample) { struct kvm_event *event; struct list_head *head; @@ -290,7 +292,7 @@ static struct kvm_event *find_create_kvm_event(struct p= erf_kvm_stat *kvm, return event; } =20 - event =3D kvm_alloc_init_event(kvm, key); + event =3D kvm_alloc_init_event(kvm, key, sample); if (!event) return NULL; =20 @@ -300,15 +302,16 @@ static struct kvm_event *find_create_kvm_event(struct= perf_kvm_stat *kvm, =20 static bool handle_begin_event(struct perf_kvm_stat *kvm, struct vcpu_event_record *vcpu_record, - struct event_key *key, u64 timestamp) + struct event_key *key, + struct perf_sample *sample) { struct kvm_event *event =3D NULL; =20 if (key->key !=3D INVALID_KEY) - event =3D find_create_kvm_event(kvm, key); + event =3D find_create_kvm_event(kvm, key, sample); =20 vcpu_record->last_event =3D event; - vcpu_record->start_time =3D timestamp; + vcpu_record->start_time =3D sample->time; return true; } =20 @@ -375,12 +378,12 @@ static bool is_child_event(struct perf_kvm_stat *kvm, static bool handle_child_event(struct perf_kvm_stat *kvm, struct vcpu_event_record *vcpu_record, struct event_key *key, - struct perf_sample *sample __maybe_unused) + struct perf_sample *sample) { struct kvm_event *event =3D NULL; =20 if (key->key !=3D INVALID_KEY) - event =3D find_create_kvm_event(kvm, key); + event =3D find_create_kvm_event(kvm, key, sample); =20 vcpu_record->last_event =3D event; =20 @@ -429,7 +432,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm, return true; =20 if (!event) - event =3D find_create_kvm_event(kvm, key); + event =3D find_create_kvm_event(kvm, key, sample); =20 if (!event) return false; @@ -500,7 +503,7 @@ static bool handle_kvm_event(struct perf_kvm_stat *kvm, return true; =20 if (kvm->events_ops->is_begin_event(evsel, sample, &key)) - return handle_begin_event(kvm, vcpu_record, &key, sample->time); + return handle_begin_event(kvm, vcpu_record, &key, sample); =20 if (is_child_event(kvm, evsel, sample, &key)) return handle_child_event(kvm, vcpu_record, &key, sample); --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47C9EC61DA4 for ; Wed, 15 Mar 2023 14:52:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233193AbjCOOw5 (ORCPT ); Wed, 15 Mar 2023 10:52:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233192AbjCOOwr (ORCPT ); Wed, 15 Mar 2023 10:52:47 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72FC895E22 for ; Wed, 15 Mar 2023 07:52:19 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id y15-20020a17090aa40f00b00237ad8ee3a0so2280128pjp.2 for ; Wed, 15 Mar 2023 07:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BxPULJO486xqHJLRx8ubmkrWzwK0iscBf1dUdchHcWA=; b=ZG/EslB6f9/yZgtygYyLalr/i45+cTyqD6wRGVjTxOdd7TWk/8vE9TdItJGBNewgvh 3KbsUsgRWQXrncEp3I3jNl3GYazW55VQF/E1YK7YcNix0tfCf+T4GCHgNBOTkIoeavo5 152APIwoh4PuPEuyfV2T+1L0ZlK9MmzttdZHQATRNTyFQ9JzwrIl7bBMLnV1DdGZvk7R n0MiLIGN+11YRriy+F6haDjrxnbBu2fXfDIp2XP/rlLlZL1dFunykx1yMhHmEU02sriM W9dPj2mht+HhvdEYnC+8cqXLqvyIDe/sfVGBaxlezH+Nh0T14MX4032pNzqW9nstfYDD MBBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BxPULJO486xqHJLRx8ubmkrWzwK0iscBf1dUdchHcWA=; b=yPZ11rceVMpe3slfcrI0+h+81kjLgMfowfCm1XNpcS99nHJe4l8eozIEDs9P+DZn75 vSl8Aeqt9s6A6V6ZdJJcIkeXLP4zreKeS3BoNGE3OPv7HAeZfII33MZNblK7hB/q3g/3 P1SaH0xdU8pVOFY/2MCR2eGNSykWQA6N8ocG6Jw5lB6MsP33LZsklTBo8Kg/YViOv2ZP yX7UVpHTmd/xpyMRmG0w3Abebig7gr56INF3At99iF0zF89wamrD+wRUWmN01W80zESn TQuVI2vTCI8agJxho01KvQE9dRbr0+SYhBK/hhBbGYL/pNszjP9OG/LlE1O/FvaydaCI nRXQ== X-Gm-Message-State: AO0yUKU79h0yzDtMEC9bUWRc8wYGXkmIgaUB9GO5vKhmdijuTRuPyT43 rEIplwiHAq8uG9UKxBjfkn0Jgw== X-Google-Smtp-Source: AK7set8ko9n4ei4Die1EmIH61gaaEgOSpmUg0Rela+nxsidAZyB6jjslXFnUZTGMDc+45BGJhugZOQ== X-Received: by 2002:a17:902:da8d:b0:1a0:6bd4:ea78 with SMTP id j13-20020a170902da8d00b001a06bd4ea78mr3242115plx.31.1678891935892; Wed, 15 Mar 2023 07:52:15 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:15 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 08/16] perf kvm: Parse address location for samples Date: Wed, 15 Mar 2023 22:51:04 +0800 Message-Id: <20230315145112.186603-9-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Parse address location for samples and save it into the structure 'perf_kvm_stat', it is to be used by histograms entry. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 5 +++++ tools/perf/util/kvm-stat.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 5ea723fd45a4..fa91c8deb628 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -704,6 +704,11 @@ static int process_sample_event(struct perf_tool *tool, if (skip_sample(kvm, sample)) return 0; =20 + if (machine__resolve(machine, &kvm->al, sample) < 0) { + pr_warning("Fail to resolve address location, skip sample.\n"); + return 0; + } + thread =3D machine__findnew_thread(machine, sample->pid, sample->tid); if (thread =3D=3D NULL) { pr_debug("problem processing %d event, skipping it.\n", diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index e2c17662bac7..3b2eab91a9be 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -7,6 +7,7 @@ #include "tool.h" #include "sort.h" #include "stat.h" +#include "symbol.h" #include "record.h" =20 #define KVM_EVENT_NAME_LEN 40 @@ -88,6 +89,9 @@ struct perf_kvm_stat { const char *sort_key; int trace_vcpu; =20 + /* Used when process events */ + struct addr_location al; + struct exit_reasons_table *exit_reasons; const char *exit_reasons_isa; =20 --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D388AC7618D for ; Wed, 15 Mar 2023 14:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233242AbjCOOxK (ORCPT ); Wed, 15 Mar 2023 10:53:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233180AbjCOOwv (ORCPT ); Wed, 15 Mar 2023 10:52:51 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A55F297FC9 for ; Wed, 15 Mar 2023 07:52:22 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id ix20so13784730plb.3 for ; Wed, 15 Mar 2023 07:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YOhDhOeWOQtkq+0QLxaT0/TQ7BTr5as+8gQwmfBvXqw=; b=TngLGB6L6ILQc34i1+/kEMvmtO3rUcdAmtiaYwUcBgsg4DkDGO48NRqelWeBrGvlhi 2i+0jaEhzK8Rsyu/KGM37oc1z6LN+5l8e4J/OZF6J1mkfG5EAyDGFgth1GkIQa0J/qP/ S7hz8FNFUSsDJfo5pXbeyjJAD7OpY3m9hvz3Dvy3wGiLk22C59B69D2Lmj6Cbs67QP7c HPrk/lfrpntgICDtHRZ3rmpAPLSw6JaAP+MRUnpY3mNdjr9EobJtVU2pCOHW2Jo+lXcO l9ko1DwQ+fjatv4sVNaws+qOHFABRLpJHyI0jwnLyCuy+8mh5KOGWRCHo2fAJ/jzlw8X wKXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YOhDhOeWOQtkq+0QLxaT0/TQ7BTr5as+8gQwmfBvXqw=; b=E+CD5PCP+/9tkWK1xpJ6KXPGc0nQRQIGBhrcGx2w1wD9ekY2Iucn1AwOlfUIrZxSfc Tcn20MfKRcOIxVd7WzYFKnWaxhcT4zxMUZgozx9SkYOeJ6l0/MQ+7y0gr9vCjYcofVwF aZ61EodO/zyGs/jHcwIrjpX3j3M0mM2j7AzoEZcjVbxxp80QIdwjHYDC/lq/4ybOmyMs wY+e2u6TYzNUbLOjWNWugvCbg4gDFJNY8tXXkKmw0JFIC1s0qZygl7+0mC/amJw+1aCA p3wxCAvIJhCXvo/sxGCxNf0Lww7ca5RQ41n3rdYGPqg5cJj4Wirluj6SHds56soTrR6P i5CQ== X-Gm-Message-State: AO0yUKXYK+5KmJqnTEtTdAM4IoUsWk2He7H48BBc8niL//frz3opOB/n pGIRDyEbSsT/DdEQYHODeKGEMA== X-Google-Smtp-Source: AK7set/l0vxrdJxH7nQnaR7my1pa6tnW6WzcM4kLAXzBh173dJl9bXMppIl+ho3Oa3BoN+kPmPv1Bw== X-Received: by 2002:a17:903:1108:b0:19e:8075:5545 with SMTP id n8-20020a170903110800b0019e80755545mr3402214plh.54.1678891941739; Wed, 15 Mar 2023 07:52:21 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:21 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 09/16] perf hist: Add 'kvm_info' field in histograms entry Date: Wed, 15 Mar 2023 22:51:05 +0800 Message-Id: <20230315145112.186603-10-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" __hists__add_entry() creates a temporary entry and compare it with existed histograms entries, if any existed entry equals to the temporary entry it skips to allocation to avoid duplication. The problem for support KVM event in histograms is it doesn't contain any info to identify KVM event and can be used for comparison entries. This patch adds 'kvm_info' field in the histograms entry which contains the KVM event's key, this identifier will be used for comparison histograms entries in later change. Signed-off-by: Leo Yan --- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-c2c.c | 4 ++-- tools/perf/builtin-diff.c | 4 ++-- tools/perf/tests/hists_link.c | 4 ++-- tools/perf/util/hist.c | 19 ++++++++++++------- tools/perf/util/hist.h | 3 +++ tools/perf/util/kvm-stat.h | 4 ++++ tools/perf/util/sort.h | 1 + 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 90458ca6933f..4750fac7bf93 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -252,7 +252,7 @@ static int evsel__add_sample(struct evsel *evsel, struc= t perf_sample *sample, if (ann->has_br_stack && has_annotation(ann)) return process_branch_callback(evsel, sample, al, ann, machine); =20 - he =3D hists__add_entry(hists, al, NULL, NULL, NULL, sample, true); + he =3D hists__add_entry(hists, al, NULL, NULL, NULL, NULL, sample, true); if (he =3D=3D NULL) return -ENOMEM; =20 diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 56974eae0638..d3181fee4d3d 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -315,7 +315,7 @@ static int process_sample_event(struct perf_tool *tool = __maybe_unused, c2c_decode_stats(&stats, mi); =20 he =3D hists__add_entry_ops(&c2c_hists->hists, &c2c_entry_ops, - &al, NULL, NULL, mi, + &al, NULL, NULL, mi, NULL, sample, true); if (he =3D=3D NULL) goto free_mi; @@ -349,7 +349,7 @@ static int process_sample_event(struct perf_tool *tool = __maybe_unused, goto free_mi; =20 he =3D hists__add_entry_ops(&c2c_hists->hists, &c2c_entry_ops, - &al, NULL, NULL, mi, + &al, NULL, NULL, mi, NULL, sample, true); if (he =3D=3D NULL) goto free_mi; diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index ed07cc6cca56..22b526766e14 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -423,7 +423,7 @@ static int diff__process_sample_event(struct perf_tool = *tool, switch (compute) { case COMPUTE_CYCLES: if (!hists__add_entry_ops(hists, &block_hist_ops, &al, NULL, - NULL, NULL, sample, true)) { + NULL, NULL, NULL, sample, true)) { pr_warning("problem incrementing symbol period, " "skipping event\n"); goto out_put; @@ -442,7 +442,7 @@ static int diff__process_sample_event(struct perf_tool = *tool, break; =20 default: - if (!hists__add_entry(hists, &al, NULL, NULL, NULL, sample, + if (!hists__add_entry(hists, &al, NULL, NULL, NULL, NULL, sample, true)) { pr_warning("problem incrementing symbol period, " "skipping event\n"); diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c index 14b2ff808b5e..e7e4ee57ce04 100644 --- a/tools/perf/tests/hists_link.c +++ b/tools/perf/tests/hists_link.c @@ -87,7 +87,7 @@ static int add_hist_entries(struct evlist *evlist, struct= machine *machine) goto out; =20 he =3D hists__add_entry(hists, &al, NULL, - NULL, NULL, &sample, true); + NULL, NULL, NULL, &sample, true); if (he =3D=3D NULL) { addr_location__put(&al); goto out; @@ -106,7 +106,7 @@ static int add_hist_entries(struct evlist *evlist, stru= ct machine *machine) goto out; =20 he =3D hists__add_entry(hists, &al, NULL, - NULL, NULL, &sample, true); + NULL, NULL, NULL, &sample, true); if (he =3D=3D NULL) { addr_location__put(&al); goto out; diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index b6e4b4edde43..3670136a0074 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -4,6 +4,7 @@ #include "dso.h" #include "build-id.h" #include "hist.h" +#include "kvm-stat.h" #include "map.h" #include "map_symbol.h" #include "branch.h" @@ -698,6 +699,7 @@ __hists__add_entry(struct hists *hists, struct symbol *sym_parent, struct branch_info *bi, struct mem_info *mi, + struct kvm_info *ki, struct block_info *block_info, struct perf_sample *sample, bool sample_self, @@ -733,6 +735,7 @@ __hists__add_entry(struct hists *hists, .hists =3D hists, .branch_info =3D bi, .mem_info =3D mi, + .kvm_info =3D ki, .block_info =3D block_info, .transaction =3D sample->transaction, .raw_data =3D sample->raw_data, @@ -756,10 +759,11 @@ struct hist_entry *hists__add_entry(struct hists *his= ts, struct symbol *sym_parent, struct branch_info *bi, struct mem_info *mi, + struct kvm_info *ki, struct perf_sample *sample, bool sample_self) { - return __hists__add_entry(hists, al, sym_parent, bi, mi, NULL, + return __hists__add_entry(hists, al, sym_parent, bi, mi, ki, NULL, sample, sample_self, NULL); } =20 @@ -769,10 +773,11 @@ struct hist_entry *hists__add_entry_ops(struct hists = *hists, struct symbol *sym_parent, struct branch_info *bi, struct mem_info *mi, + struct kvm_info *ki, struct perf_sample *sample, bool sample_self) { - return __hists__add_entry(hists, al, sym_parent, bi, mi, NULL, + return __hists__add_entry(hists, al, sym_parent, bi, mi, ki, NULL, sample, sample_self, ops); } =20 @@ -846,7 +851,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter,= struct addr_location *al */ sample->period =3D cost; =20 - he =3D hists__add_entry(hists, al, iter->parent, NULL, mi, + he =3D hists__add_entry(hists, al, iter->parent, NULL, mi, NULL, sample, true); if (!he) return -ENOMEM; @@ -949,7 +954,7 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter= , struct addr_location *a sample->period =3D 1; sample->weight =3D bi->flags.cycles ? bi->flags.cycles : 1; =20 - he =3D hists__add_entry(hists, al, iter->parent, &bi[i], NULL, + he =3D hists__add_entry(hists, al, iter->parent, &bi[i], NULL, NULL, sample, true); if (he =3D=3D NULL) return -ENOMEM; @@ -987,7 +992,7 @@ iter_add_single_normal_entry(struct hist_entry_iter *it= er, struct addr_location struct hist_entry *he; =20 he =3D hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL, - sample, true); + NULL, sample, true); if (he =3D=3D NULL) return -ENOMEM; =20 @@ -1047,7 +1052,7 @@ iter_add_single_cumulative_entry(struct hist_entry_it= er *iter, struct hist_entry *he; int err =3D 0; =20 - he =3D hists__add_entry(hists, al, iter->parent, NULL, NULL, + he =3D hists__add_entry(hists, al, iter->parent, NULL, NULL, NULL, sample, true); if (he =3D=3D NULL) return -ENOMEM; @@ -1148,7 +1153,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter= *iter, } =20 he =3D hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL, - sample, false); + NULL, sample, false); if (he =3D=3D NULL) return -ENOMEM; =20 diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index d93a4e510dc7..86a677954279 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -14,6 +14,7 @@ struct hist_entry_ops; struct addr_location; struct map_symbol; struct mem_info; +struct kvm_info; struct branch_info; struct branch_stack; struct block_info; @@ -150,6 +151,7 @@ struct hist_entry *hists__add_entry(struct hists *hists, struct symbol *parent, struct branch_info *bi, struct mem_info *mi, + struct kvm_info *ki, struct perf_sample *sample, bool sample_self); =20 @@ -159,6 +161,7 @@ struct hist_entry *hists__add_entry_ops(struct hists *h= ists, struct symbol *sym_parent, struct branch_info *bi, struct mem_info *mi, + struct kvm_info *ki, struct perf_sample *sample, bool sample_self); =20 diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 3b2eab91a9be..0cf704333c4c 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -23,6 +23,10 @@ struct event_key { struct exit_reasons_table *exit_reasons; }; =20 +struct kvm_info { + char name[KVM_EVENT_NAME_LEN]; +}; + struct kvm_event_stats { u64 time; struct stats stats; diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index d79a100e5999..22f437c3476f 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -144,6 +144,7 @@ struct hist_entry { struct hists *hists; struct mem_info *mem_info; struct block_info *block_info; + struct kvm_info *kvm_info; void *raw_data; u32 raw_size; int num_res; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 375B2C61DA4 for ; Wed, 15 Mar 2023 14:53:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233208AbjCOOxX (ORCPT ); Wed, 15 Mar 2023 10:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233195AbjCOOw6 (ORCPT ); Wed, 15 Mar 2023 10:52:58 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DF4987A01 for ; Wed, 15 Mar 2023 07:52:31 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so2282827pjz.1 for ; Wed, 15 Mar 2023 07:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WVnvf3zk72qzgXgdIPbzoctQ9SQ7bt/Ml2Z1pGndq/0=; b=h9lHKPyNbnYbq3F6NSGv0JQNKcWgzxoUGZioCn02L8zidZZGjbjzFE2KyTr2FWd4iO W3gUzXZlNcyraP+QiNBGGADuv/Ib/+MvWL77YVrvJgx8zXkTXIzSOt4AcjMsLBYHJua1 RKBQ7HZrX6eHG4zbh3neC2IMvVXzrMuOV/rIg/xJG26nQPeFQfW9OMhRQAXoJdtgRgVa dJ8uWYLp9PzoJ5K7FNBMekCKj5uff/77qY9pv3Nm9TbjD/X5gcwKULbJilcoiY85q/tT pNZX2Dp37+qdq0Rggr0+QoC4crqurSdnN1wARdFMCs8fD8eJLRmnJ7gbEQ7ceVIOcnbj y07A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WVnvf3zk72qzgXgdIPbzoctQ9SQ7bt/Ml2Z1pGndq/0=; b=dMKGK2/JQdfi8wEyARVIHpjurjuBf/PYz2av+EzKJ5OXLQrng1lBgw0m2XNkuL25AD amAu6aoS3LfETOxCquqqU7glRO8U8U3tOy3tAzN7W3hjJJ3TjSUe9IKhGdTJaWVEuKNk xhwruxt6upXM/mv5W8YGIAyQpbNuo4NQbqUUgONVgkm9baPjlEKH940kzTZMPAVCHeRf JHD1dPFGPllueSJ9dU2toELOitsBKXysg4D6XzNQZVKdWe/gJkzDIUtPWyL/MATya52z 0477y8RKufuSEum/W8gglWifRSnBm5SUoevbhUIYLKKmSgs+VSBtqAeP49ihUafqUqL+ Ueuw== X-Gm-Message-State: AO0yUKUlgywWVBCrr0o+oZloHu7BppLX8839tWkLBh/n5Xim1B6nnrne VjH1cq8JSeXxcrML8URWhlD+kA== X-Google-Smtp-Source: AK7set+r3FQC59prCXVymFb4gV98LN3zPEPCcwLVumwG0uMonMH8J/HeeF0K6uziPkWIrIXYO+fYrQ== X-Received: by 2002:a17:902:c70b:b0:19d:abd:bb7e with SMTP id p11-20020a170902c70b00b0019d0abdbb7emr2195040plp.34.1678891947352; Wed, 15 Mar 2023 07:52:27 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:27 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 10/16] perf kvm: Add dimensions for KVM event statistics Date: Wed, 15 Mar 2023 22:51:06 +0800 Message-Id: <20230315145112.186603-11-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To support KVM event statistics, this patch firstly registers histograms columns and sorting fields; every column or field has its own format structure, the format structure is dereferenced to access the dimension, finally the dimension provides the comparison callback for sorting result. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 232 ++++++++++++++++++++++++++++++++++++- tools/perf/util/kvm-stat.h | 2 + 2 files changed, 230 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index fa91c8deb628..3f601ccb7aab 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -70,9 +70,9 @@ static int64_t cmp_event_ ## func(struct kvm_event *one, = \ get_event_ ##func(two, vcpu); \ } =20 -GET_EVENT_KEY(time, time); -GET_EVENT_KEY(max, stats.max); -GET_EVENT_KEY(min, stats.min); +COMPARE_EVENT_KEY(time, time); +COMPARE_EVENT_KEY(max, stats.max); +COMPARE_EVENT_KEY(min, stats.min); COMPARE_EVENT_KEY(count, stats.n); COMPARE_EVENT_KEY(mean, stats.mean); =20 @@ -90,13 +90,237 @@ struct kvm_hists { struct perf_hpp_list list; }; =20 +struct kvm_dimension { + const char *name; + int64_t (*cmp)(struct perf_hpp_fmt *fmt, struct hist_entry *left, + struct hist_entry *right); +}; + +struct kvm_fmt { + struct perf_hpp_fmt fmt; + struct kvm_dimension *dim; +}; + static struct kvm_hists kvm_hists; =20 +static int64_t ev_name_cmp(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, + struct hist_entry *right) +{ + /* Return opposite number for sorting in alphabetical order */ + return -strcmp(left->kvm_info->name, right->kvm_info->name); +} + +static struct kvm_dimension dim_event =3D { + .name =3D "ev_name", + .cmp =3D ev_name_cmp, +}; + +#define EV_METRIC_CMP(metric) \ +static int64_t ev_cmp_##metric(struct perf_hpp_fmt *fmt __maybe_unused, \ + struct hist_entry *left, \ + struct hist_entry *right) \ +{ \ + struct kvm_event *event_left; \ + struct kvm_event *event_right; \ + struct perf_kvm_stat *perf_kvm; \ + \ + event_left =3D container_of(left, struct kvm_event, he); \ + event_right =3D container_of(right, struct kvm_event, he); \ + \ + perf_kvm =3D event_left->perf_kvm; \ + return cmp_event_##metric(event_left, event_right, \ + perf_kvm->trace_vcpu); \ +} + +EV_METRIC_CMP(time) +EV_METRIC_CMP(count) +EV_METRIC_CMP(max) +EV_METRIC_CMP(min) +EV_METRIC_CMP(mean) + +static struct kvm_dimension dim_time =3D { + .name =3D "time", + .cmp =3D ev_cmp_time, +}; + +static struct kvm_dimension dim_count =3D { + .name =3D "sample", + .cmp =3D ev_cmp_count, +}; + +static struct kvm_dimension dim_max_time =3D { + .name =3D "max_t", + .cmp =3D ev_cmp_max, +}; + +static struct kvm_dimension dim_min_time =3D { + .name =3D "min_t", + .cmp =3D ev_cmp_min, +}; + +static struct kvm_dimension dim_mean_time =3D { + .name =3D "mean_t", + .cmp =3D ev_cmp_mean, +}; + +static struct kvm_dimension *dimensions[] =3D { + &dim_event, + &dim_time, + &dim_count, + &dim_max_time, + &dim_min_time, + &dim_mean_time, + NULL, +}; + +static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b) +{ + struct kvm_fmt *kvm_fmt_a =3D container_of(a, struct kvm_fmt, fmt); + struct kvm_fmt *kvm_fmt_b =3D container_of(b, struct kvm_fmt, fmt); + + return kvm_fmt_a->dim =3D=3D kvm_fmt_b->dim; +} + +static void fmt_free(struct perf_hpp_fmt *fmt) +{ + struct kvm_fmt *kvm_fmt; + + kvm_fmt =3D container_of(fmt, struct kvm_fmt, fmt); + free(kvm_fmt); +} + +static struct kvm_dimension *get_dimension(const char *name) +{ + unsigned int i; + + for (i =3D 0; dimensions[i] !=3D NULL; i++) { + if (!strcmp(dimensions[i]->name, name)) + return dimensions[i]; + } + + return NULL; +} + +static struct kvm_fmt *get_format(const char *name) +{ + struct kvm_dimension *dim =3D get_dimension(name); + struct kvm_fmt *kvm_fmt; + struct perf_hpp_fmt *fmt; + + if (!dim) + return NULL; + + kvm_fmt =3D zalloc(sizeof(*kvm_fmt)); + if (!kvm_fmt) + return NULL; + + kvm_fmt->dim =3D dim; + + fmt =3D &kvm_fmt->fmt; + INIT_LIST_HEAD(&fmt->list); + INIT_LIST_HEAD(&fmt->sort_list); + fmt->cmp =3D dim->cmp; + fmt->sort =3D dim->cmp; + fmt->color =3D NULL; + fmt->entry =3D NULL; + fmt->header =3D NULL; + fmt->width =3D NULL; + fmt->collapse =3D dim->cmp; + fmt->equal =3D fmt_equal; + fmt->free =3D fmt_free; + + return kvm_fmt; +} + +static int kvm_hists__init_output(struct perf_hpp_list *hpp_list, char *na= me) +{ + struct kvm_fmt *kvm_fmt =3D get_format(name); + + if (!kvm_fmt) { + pr_warning("Fail to find format for output field %s.\n", name); + return -EINVAL; + } + + perf_hpp_list__column_register(hpp_list, &kvm_fmt->fmt); + return 0; +} + +static int kvm_hists__init_sort(struct perf_hpp_list *hpp_list, char *name) +{ + struct kvm_fmt *kvm_fmt =3D get_format(name); + + if (!kvm_fmt) { + pr_warning("Fail to find format for sorting %s.\n", name); + return -EINVAL; + } + + perf_hpp_list__register_sort_field(hpp_list, &kvm_fmt->fmt); + return 0; +} + +static int kvm_hpp_list__init(char *list, + struct perf_hpp_list *hpp_list, + int (*fn)(struct perf_hpp_list *hpp_list, + char *name)) +{ + char *tmp, *tok; + int ret; + + if (!list || !fn) + return 0; + + for (tok =3D strtok_r(list, ", ", &tmp); tok; + tok =3D strtok_r(NULL, ", ", &tmp)) { + ret =3D fn(hpp_list, tok); + if (!ret) + continue; + + /* Handle errors */ + if (ret =3D=3D -EINVAL) + pr_err("Invalid field key: '%s'", tok); + else if (ret =3D=3D -ESRCH) + pr_err("Unknown field key: '%s'", tok); + else + pr_err("Fail to initialize for field key: '%s'", tok); + + break; + } + + return ret; +} + +static int kvm_hpp_list__parse(struct perf_hpp_list *hpp_list, + const char *output_, const char *sort_) +{ + char *output =3D output_ ? strdup(output_) : NULL; + char *sort =3D sort_ ? strdup(sort_) : NULL; + int ret; + + ret =3D kvm_hpp_list__init(output, hpp_list, kvm_hists__init_output); + if (ret) + goto out; + + ret =3D kvm_hpp_list__init(sort, hpp_list, kvm_hists__init_sort); + if (ret) + goto out; + + /* Copy sort keys to output fields */ + perf_hpp__setup_output_field(hpp_list); + + /* and then copy output fields to sort keys */ + perf_hpp__append_sort_keys(hpp_list); +out: + free(output); + free(sort); + return ret; +} + static int kvm_hists__init(void) { __hists__init(&kvm_hists.hists, &kvm_hists.list); perf_hpp_list__init(&kvm_hists.list); - return 0; + return kvm_hpp_list__parse(&kvm_hists.list, NULL, "ev_name"); } =20 static const char *get_filename_for_perf_kvm(void) diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 0cf704333c4c..fc30a72dfac1 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -46,6 +46,8 @@ struct kvm_event { #define DEFAULT_VCPU_NUM 8 int max_vcpu; struct kvm_event_stats *vcpu; + + struct hist_entry he; }; =20 typedef int64_t (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int); --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9249C6FD1D for ; Wed, 15 Mar 2023 14:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233125AbjCOOx0 (ORCPT ); Wed, 15 Mar 2023 10:53:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233217AbjCOOxD (ORCPT ); Wed, 15 Mar 2023 10:53:03 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B35943B1 for ; Wed, 15 Mar 2023 07:52:36 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id k18-20020a17090a591200b0023d36e30cb5so2093963pji.1 for ; Wed, 15 Mar 2023 07:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VpX5eG5BICdwUiyxxIOGXbe9ltJnRnUa5/qhb/BObdw=; b=IhD7gDtNXKpVqae6GrAVGJREdsRwLhQsCsDulpzLIHFujBKus4mwz/k7gzrvWaBg6t 3RL6+nTh1GLVE6A2rK/wCg2omf4nbnbsD0ctSsaN4KQcxbI12FlDnPuKfhxi5D23MnWV girZAy8wsHPYv5HtGqa0660B/9C7tWbeJ5QU6dlBDcKdlKzo1IcZdoAYsDnSMB2Ah1Sc 4KKtdkHcNlEhKfJgS8BhRMwt8evU0PG5PfiYnBlcqxrbhhmS7oKvOuumOko6m6CPTQgv j4XRD94+3vTLrgb70Pa837uPY3ZY8uaMdJlGFNh7e4SLeS+beSOV+koYUx5fTinTfwDo TC3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VpX5eG5BICdwUiyxxIOGXbe9ltJnRnUa5/qhb/BObdw=; b=GzZIPCvsfK2S+BMB5hac1ZqjllsixAskEdHdwc+qSWHQM3QCkXG5qMI2TDFOwwTSRq s+BDW08UI4ccSu3LFbf6moBU5sjkJpFjxh4fOkim/jYlMlO8pPogLYFuIECaLrIEFUIZ Oku8MP5z1kz4yolOqefy0T998Ofa0UB5XVgvK2DpL7G2BYnVsdwjuxP/A3AnC0XgBZLj Epe4DKyR+ROajobHy1J31H2Ed9onAF5C3PmknrLoJTtk5+s8NXStGQOPZVRzeVdayqfO o374D2KtJTlTgHuybtfK2TsIc/hD1TVAZGZ+KovCSPbHDA8GAbNj4Z+9NJ3m13IxmcNR NkzQ== X-Gm-Message-State: AO0yUKUmGiYpJpJQqnCk9sdXwhvyB9SusVVz4mf3tukAKgTg80njieR+ 4XjBcuQi9XsFZviJPin1kIDfhQ== X-Google-Smtp-Source: AK7set988SHmFCSkIwmVtr0pBg1nX7tBBXroJ6DfZCJ0oeOUVVX0GAEi1459Qr46+KRJVUaE+ctlWg== X-Received: by 2002:a17:903:886:b0:1a0:4526:3535 with SMTP id kt6-20020a170903088600b001a045263535mr2789903plb.57.1678891953208; Wed, 15 Mar 2023 07:52:33 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:32 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 11/16] perf kvm: Use histograms list to replace cached list Date: Wed, 15 Mar 2023 22:51:07 +0800 Message-Id: <20230315145112.186603-12-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" perf kvm tool defines its own cached list which is managed with RB tree, histograms also provide RB tree to manage data entries. Since now we have introduced histograms in the tool, it's not necessary to use the self defined list and we can directly use histograms list to manage KVM events. This patch changes to use histograms list to track KVM events, and it invokes the common function hists__output_resort_cb() to sort result, this also give us flexibility to extend more sorting key words easily. After histograms list supported, the cached list is redundant so remove the relevant code for it. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 189 +++++++++++++++++++------------------ tools/perf/util/kvm-stat.h | 7 -- 2 files changed, 95 insertions(+), 101 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 3f601ccb7aab..ba3134613bcb 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -323,6 +323,12 @@ static int kvm_hists__init(void) return kvm_hpp_list__parse(&kvm_hists.list, NULL, "ev_name"); } =20 +static int kvm_hists__reinit(const char *output, const char *sort) +{ + perf_hpp__reset_output_field(&kvm_hists.list); + return kvm_hpp_list__parse(&kvm_hists.list, output, sort); +} + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -420,44 +426,37 @@ struct vcpu_event_record { struct kvm_event *last_event; }; =20 - -static void init_kvm_event_record(struct perf_kvm_stat *kvm) -{ - unsigned int i; - - for (i =3D 0; i < EVENTS_CACHE_SIZE; i++) - INIT_LIST_HEAD(&kvm->kvm_events_cache[i]); -} - #ifdef HAVE_TIMERFD_SUPPORT -static void clear_events_cache_stats(struct list_head *kvm_events_cache) +static void clear_events_cache_stats(void) { - struct list_head *head; + struct rb_root_cached *root; + struct rb_node *nd; struct kvm_event *event; - unsigned int i; - int j; - - for (i =3D 0; i < EVENTS_CACHE_SIZE; i++) { - head =3D &kvm_events_cache[i]; - list_for_each_entry(event, head, hash_entry) { - /* reset stats for event */ - event->total.time =3D 0; - init_stats(&event->total.stats); - - for (j =3D 0; j < event->max_vcpu; ++j) { - event->vcpu[j].time =3D 0; - init_stats(&event->vcpu[j].stats); - } + int i; + + if (hists__has(&kvm_hists.hists, need_collapse)) + root =3D &kvm_hists.hists.entries_collapsed; + else + root =3D kvm_hists.hists.entries_in; + + for (nd =3D rb_first_cached(root); nd; nd =3D rb_next(nd)) { + struct hist_entry *he; + + he =3D rb_entry(nd, struct hist_entry, rb_node_in); + event =3D container_of(he, struct kvm_event, he); + + /* reset stats for event */ + event->total.time =3D 0; + init_stats(&event->total.stats); + + for (i =3D 0; i < event->max_vcpu; ++i) { + event->vcpu[i].time =3D 0; + init_stats(&event->vcpu[i].stats); } } } #endif =20 -static int kvm_events_hash_fn(u64 key) -{ - return key & (EVENTS_CACHE_SIZE - 1); -} - static bool kvm_event_expand(struct kvm_event *event, int vcpu_id) { int old_max_vcpu =3D event->max_vcpu; @@ -483,44 +482,64 @@ static bool kvm_event_expand(struct kvm_event *event,= int vcpu_id) return true; } =20 -static struct kvm_event *kvm_alloc_init_event(struct perf_kvm_stat *kvm, - struct event_key *key, - struct perf_sample *sample __maybe_unused) +static void *kvm_he_zalloc(size_t size) { - struct kvm_event *event; + struct kvm_event *kvm_ev; =20 - event =3D zalloc(sizeof(*event)); - if (!event) { - pr_err("Not enough memory\n"); + kvm_ev =3D zalloc(size + sizeof(*kvm_ev)); + if (!kvm_ev) return NULL; - } =20 - event->perf_kvm =3D kvm; - event->key =3D *key; - init_stats(&event->total.stats); - return event; + init_stats(&kvm_ev->total.stats); + hists__inc_nr_samples(&kvm_hists.hists, 0); + return &kvm_ev->he; +} + +static void kvm_he_free(void *he) +{ + struct kvm_event *kvm_ev; + + free(((struct hist_entry *)he)->kvm_info); + kvm_ev =3D container_of(he, struct kvm_event, he); + free(kvm_ev); } =20 +static struct hist_entry_ops kvm_ev_entry_ops =3D { + .new =3D kvm_he_zalloc, + .free =3D kvm_he_free, +}; + static struct kvm_event *find_create_kvm_event(struct perf_kvm_stat *kvm, struct event_key *key, struct perf_sample *sample) { struct kvm_event *event; - struct list_head *head; + struct hist_entry *he; + struct kvm_info *ki; =20 BUG_ON(key->key =3D=3D INVALID_KEY); =20 - head =3D &kvm->kvm_events_cache[kvm_events_hash_fn(key->key)]; - list_for_each_entry(event, head, hash_entry) { - if (event->key.key =3D=3D key->key && event->key.info =3D=3D key->info) - return event; + ki =3D zalloc(sizeof(*ki)); + if (!ki) { + pr_err("Failed to allocate kvm info\n"); + return NULL; } =20 - event =3D kvm_alloc_init_event(kvm, key, sample); - if (!event) + kvm->events_ops->decode_key(kvm, key, ki->name); + he =3D hists__add_entry_ops(&kvm_hists.hists, &kvm_ev_entry_ops, + &kvm->al, NULL, NULL, NULL, ki, sample, true); + if (he =3D=3D NULL) { + pr_err("Failed to allocate hist entry\n"); + free(ki); return NULL; + } + + event =3D container_of(he, struct kvm_event, he); + if (!event->perf_kvm) { + event->perf_kvm =3D kvm; + event->key =3D *key; + } =20 - list_add(&event->hash_entry, head); return event; } =20 @@ -753,58 +772,32 @@ static bool select_key(struct perf_kvm_stat *kvm) return false; } =20 -static void insert_to_result(struct rb_root *result, struct kvm_event *eve= nt, - key_cmp_fun bigger, int vcpu) -{ - struct rb_node **rb =3D &result->rb_node; - struct rb_node *parent =3D NULL; - struct kvm_event *p; - - while (*rb) { - p =3D container_of(*rb, struct kvm_event, rb); - parent =3D *rb; - - if (bigger(event, p, vcpu) > 0) - rb =3D &(*rb)->rb_left; - else - rb =3D &(*rb)->rb_right; - } - - rb_link_node(&event->rb, parent, rb); - rb_insert_color(&event->rb, result); -} - static bool event_is_valid(struct kvm_event *event, int vcpu) { return !!get_event_count(event, vcpu); } =20 -static void sort_result(struct perf_kvm_stat *kvm) +static int filter_cb(struct hist_entry *he, void *arg __maybe_unused) { - unsigned int i; - int vcpu =3D kvm->trace_vcpu; struct kvm_event *event; + struct perf_kvm_stat *perf_kvm; =20 - for (i =3D 0; i < EVENTS_CACHE_SIZE; i++) { - list_for_each_entry(event, &kvm->kvm_events_cache[i], hash_entry) { - if (event_is_valid(event, vcpu)) { - insert_to_result(&kvm->result, event, - kvm->compare, vcpu); - } - } - } + event =3D container_of(he, struct kvm_event, he); + perf_kvm =3D event->perf_kvm; + if (!event_is_valid(event, perf_kvm->trace_vcpu)) + he->filtered =3D 1; + else + he->filtered =3D 0; + return 0; } =20 -/* returns left most element of result, and erase it */ -static struct kvm_event *pop_from_result(struct rb_root *result) +static void sort_result(struct perf_kvm_stat *kvm) { - struct rb_node *node =3D rb_first(result); - - if (!node) - return NULL; + const char *output_columns =3D "ev_name,sample,time,max_t,min_t,mean_t"; =20 - rb_erase(node, result); - return container_of(node, struct kvm_event, rb); + kvm_hists__reinit(output_columns, kvm->sort_key); + hists__collapse_resort(&kvm_hists.hists, NULL); + hists__output_resort_cb(&kvm_hists.hists, NULL, filter_cb); } =20 static void print_vcpu_info(struct perf_kvm_stat *kvm) @@ -847,6 +840,7 @@ static void print_result(struct perf_kvm_stat *kvm) char decode[KVM_EVENT_NAME_LEN]; struct kvm_event *event; int vcpu =3D kvm->trace_vcpu; + struct rb_node *nd; =20 if (kvm->live) { puts(CONSOLE_CLEAR); @@ -865,9 +859,15 @@ static void print_result(struct perf_kvm_stat *kvm) pr_info("%16s ", "Avg time"); pr_info("\n\n"); =20 - while ((event =3D pop_from_result(&kvm->result))) { + for (nd =3D rb_first_cached(&kvm_hists.hists.entries); nd; nd =3D rb_next= (nd)) { + struct hist_entry *he; u64 ecount, etime, max, min; =20 + he =3D rb_entry(nd, struct hist_entry, rb_node); + if (he->filtered) + continue; + + event =3D container_of(he, struct kvm_event, he); ecount =3D get_event_count(event, vcpu); etime =3D get_event_time(event, vcpu); max =3D get_event_max(event, vcpu); @@ -1144,8 +1144,11 @@ static int perf_kvm__handle_timerfd(struct perf_kvm_= stat *kvm) sort_result(kvm); print_result(kvm); =20 + /* Reset sort list to "ev_name" */ + kvm_hists__reinit(NULL, "ev_name"); + /* reset counts */ - clear_events_cache_stats(kvm->kvm_events_cache); + clear_events_cache_stats(); kvm->total_count =3D 0; kvm->total_time =3D 0; kvm->lost_events =3D 0; @@ -1201,7 +1204,6 @@ static int kvm_events_live_report(struct perf_kvm_sta= t *kvm) } =20 set_term_quiet_input(&save); - init_kvm_event_record(kvm); =20 kvm_hists__init(); =20 @@ -1397,7 +1399,6 @@ static int kvm_events_report_vcpu(struct perf_kvm_sta= t *kvm) if (!register_kvm_events_ops(kvm)) goto exit; =20 - init_kvm_event_record(kvm); setup_pager(); =20 kvm_hists__init(); diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index fc30a72dfac1..3f0cbecb862c 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -36,7 +36,6 @@ struct perf_kvm_stat; =20 struct kvm_event { struct list_head hash_entry; - struct rb_node rb; =20 struct perf_kvm_stat *perf_kvm; struct event_key key; @@ -81,9 +80,6 @@ struct exit_reasons_table { const char *reason; }; =20 -#define EVENTS_BITS 12 -#define EVENTS_CACHE_SIZE (1UL << EVENTS_BITS) - struct perf_kvm_stat { struct perf_tool tool; struct record_opts opts; @@ -103,7 +99,6 @@ struct perf_kvm_stat { =20 struct kvm_events_ops *events_ops; key_cmp_fun compare; - struct list_head kvm_events_cache[EVENTS_CACHE_SIZE]; =20 u64 total_time; u64 total_count; @@ -112,8 +107,6 @@ struct perf_kvm_stat { =20 struct intlist *pid_list; =20 - struct rb_root result; - int timerfd; unsigned int display_time; bool live; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C240C7618B for ; Wed, 15 Mar 2023 14:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233280AbjCOOxa (ORCPT ); Wed, 15 Mar 2023 10:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233221AbjCOOxE (ORCPT ); Wed, 15 Mar 2023 10:53:04 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55E22974BF for ; Wed, 15 Mar 2023 07:52:41 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id rj10so8519450pjb.4 for ; Wed, 15 Mar 2023 07:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GXjE1lNyQ6Ulq2wrJYSF6aHLvPPQtJdwrD75rVojf8A=; b=BCoP6UXH2x8VV6ZsOW13Ae9hQ4T2I9/6OiiOOf26BOC3ZUWn3FhlVxYrwF0uGT2820 Z89j0GTbYPZbd2m0FTGAmQ3aeVDmEJtZzF1e/zHOZHQEwvVoNGq/xuYbvVwuqdT9d1ZE SMzXSpKbDY/rFapSOecLZBq8+zwdrzi6TujVS4OhT+wrSE/zUcm1EjBldfw1Mq+JajgA BwHIdRwEWuAS/5nOs4hcd4JPjVlkula1o2YjLf8HFYGm+SX7NX03Ph2xIXtoPM/cMhIv H8Lrwb4ru/Wj3svRHVKnevbHu7BtAfzHGDj+o4Dms7Ia98uaFLE1ZLCxRbiXzLeDdOr0 sfeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GXjE1lNyQ6Ulq2wrJYSF6aHLvPPQtJdwrD75rVojf8A=; b=ASKfImd6hRszgqQUOIQfJ9aCR0X5z8Y09eSKEDM1G6l6RWjkZ/8xZS0OHOENYNNRXr 09Nwv5ksYcR4QeDTMKE/38OvUdM9eqyCJL9W5jqTIfAYq+VpKTLCVJ1gHRYQAfDvIAuT 2j7RT89l1lHL98sUi5PLFQZcQNdPGdaOWFpiEzFIssULUumzJe++wA2pANiJ6QQB98fs gLSB5VOHe5D9dDsIBONISwTKjHlyn7/Rpo2QIVXtOo1i7dUk1owI+o5JVEwAdQL4I+DM eGK8eMs5O7sgVuR2Y2vO9x5z/DrjRcVwYrLnIaUAASB42Nj+uhubL9Qjfr/EBYL97z+6 QwyA== X-Gm-Message-State: AO0yUKUqw9MUxCaAmZn5a2vzpU32fChwfVTSgOGMQL9tvjr3PwEQunjc UQQW1gzF53xynr4kqgoEQ+Zxo1grGN7Uwtd3Mt8vaXVx X-Google-Smtp-Source: AK7set/x2sbhiI0KJMwBONL5ZF5YA0yPzV1seKM6HmyYEhYd4ut50lJhZLlgYJcc5Kcg6TFT3KxMtg== X-Received: by 2002:a17:902:f54e:b0:1a0:76d1:545c with SMTP id h14-20020a170902f54e00b001a076d1545cmr2950647plf.10.1678891958787; Wed, 15 Mar 2023 07:52:38 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:38 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 12/16] perf kvm: Polish sorting key Date: Wed, 15 Mar 2023 22:51:08 +0800 Message-Id: <20230315145112.186603-13-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since histograms supports sorting, the tool doesn't need to maintain the mapping between the sorting keys and the corresponding comparison callbacks, therefore, this patch removes structure kvm_event_key. But we still need to validate the sorting key, this patch uses an array for sorting keys and renames function select_key() to is_valid_key() to validate the sorting key passed by user. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 29 ++++++++++------------------- tools/perf/util/kvm-stat.h | 8 -------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index ba3134613bcb..1e9338855239 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -76,15 +76,6 @@ COMPARE_EVENT_KEY(min, stats.min); COMPARE_EVENT_KEY(count, stats.n); COMPARE_EVENT_KEY(mean, stats.mean); =20 -#define DEF_SORT_NAME_KEY(name, compare_key) \ - { #name, cmp_event_ ## compare_key } - -static struct kvm_event_key keys[] =3D { - DEF_SORT_NAME_KEY(sample, count), - DEF_SORT_NAME_KEY(time, mean), - { NULL, NULL } -}; - struct kvm_hists { struct hists hists; struct perf_hpp_list list; @@ -757,18 +748,18 @@ static bool handle_kvm_event(struct perf_kvm_stat *kv= m, return true; } =20 -static bool select_key(struct perf_kvm_stat *kvm) +static bool is_valid_key(struct perf_kvm_stat *kvm) { - int i; + static const char *key_array[] =3D { + "ev_name", "sample", "time", "max_t", "min_t", "mean_t", + }; + unsigned int i; =20 - for (i =3D 0; keys[i].name; i++) { - if (!strcmp(keys[i].name, kvm->sort_key)) { - kvm->compare =3D keys[i].key; + for (i =3D 0; i < ARRAY_SIZE(key_array); i++) + if (!strcmp(key_array[i], kvm->sort_key)) return true; - } - } =20 - pr_err("Unknown compare key:%s\n", kvm->sort_key); + pr_err("Unsupported sort key: %s\n", kvm->sort_key); return false; } =20 @@ -1198,7 +1189,7 @@ static int kvm_events_live_report(struct perf_kvm_sta= t *kvm) return ret; =20 if (!verify_vcpu(kvm->trace_vcpu) || - !select_key(kvm) || + !is_valid_key(kvm) || !register_kvm_events_ops(kvm)) { goto out; } @@ -1393,7 +1384,7 @@ static int kvm_events_report_vcpu(struct perf_kvm_sta= t *kvm) if (!verify_vcpu(vcpu)) goto exit; =20 - if (!select_key(kvm)) + if (!is_valid_key(kvm)) goto exit; =20 if (!register_kvm_events_ops(kvm)) diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 3f0cbecb862c..35d03894fac3 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -49,13 +49,6 @@ struct kvm_event { struct hist_entry he; }; =20 -typedef int64_t (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int); - -struct kvm_event_key { - const char *name; - key_cmp_fun key; -}; - struct child_event_ops { void (*get_key)(struct evsel *evsel, struct perf_sample *sample, @@ -98,7 +91,6 @@ struct perf_kvm_stat { const char *exit_reasons_isa; =20 struct kvm_events_ops *events_ops; - key_cmp_fun compare; =20 u64 total_time; u64 total_count; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAEB5C7618B for ; Wed, 15 Mar 2023 14:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232758AbjCOOxp (ORCPT ); Wed, 15 Mar 2023 10:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233240AbjCOOxJ (ORCPT ); Wed, 15 Mar 2023 10:53:09 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1905661885 for ; Wed, 15 Mar 2023 07:52:45 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id rj10so8519773pjb.4 for ; Wed, 15 Mar 2023 07:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lYZdsrHdzQhNgPnVDhJiRxXzSTwxol5Us4hF+GT6h6U=; b=Z/6R9liCK/YrFp9eYW9AUu6LjcM4VNWD0T+ur1ctZrYkL/CCX04ldFgRVAvsmKANMa MsBCR2iX9Z9KTNnc6Y2u4ilNwAy2qDvMnXvp1nHxGR+xafim2knMSamta8dG6pc5Tm1x PU0Bm8kEjchwO1RrLqoRcLJ3yf94PdOKIJNgS70HHS0x3bbwMhDCfo/ZIMwRc/xDUa1+ sSnTN4Y1WRhhMXf+4BwbtzgcBtfCG8YnXP8KAVnY8FbyteeKVJbFjUox/ebgs61Y1/bm oJj9Rg8UBr6GO30Zr/Cf0vnBkp3n5OrZ/cFwHWbPkpJdQbSMxkTN5I24WSpjmq5DkTcR DW4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lYZdsrHdzQhNgPnVDhJiRxXzSTwxol5Us4hF+GT6h6U=; b=klmX4oltWRtAJbls84sqcvv6hYInRXpMmrjhTtWGwmScMeO0eG2pIrj0M5HRoRjL4P lkfmnDJSHACBtfc2I3V+2UoCtetZwd4Tr9oYKR9ToZQksHJvBC6VSuTdhfH9szm3MoHl RqpxOdWMVanSfL+2QMLEwrIWrL4Vlwbdro4iRGh89zwFwYkrDEl/TExPSuaDZSZeA7uC 5xVHqKDQ4uYMgQ/iZmpXiQnNnhLH9YDFHQPHhW8HVGpgUYPqG4QszPsn45IL02QefBOu RjeQyMznV0jPblmHmLswZ3CfyN+1r47WAUpcRNxktSzwJwp8eRLAbA+3tpPIunU4lG7B SmAQ== X-Gm-Message-State: AO0yUKX0Qe4VS2C25PdSAAWfdYX5lS8qhE4hI94QWIp3SnUcBUnv8BXT e+U2ubtKTF1PytHhl7OJSDSdaA== X-Google-Smtp-Source: AK7set9WYvSWjIWJgp0gOzWd6Dr90KziquqYDNhjoLU7G8Dq0TcdXxYH33jyfL2gx99UjaaeADGPiQ== X-Received: by 2002:a17:902:cecd:b0:19e:9f97:f427 with SMTP id d13-20020a170902cecd00b0019e9f97f427mr3556306plg.10.1678891964438; Wed, 15 Mar 2023 07:52:44 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:44 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 13/16] perf kvm: Support printing attributions for dimensions Date: Wed, 15 Mar 2023 22:51:09 +0800 Message-Id: <20230315145112.186603-14-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch adds header, entry callback and width for every dimension, thus in TUI mode the tool can print items with the defined attributions. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 97 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 1e9338855239..0d857df826cf 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -83,8 +83,12 @@ struct kvm_hists { =20 struct kvm_dimension { const char *name; + const char *header; + int width; int64_t (*cmp)(struct perf_hpp_fmt *fmt, struct hist_entry *left, struct hist_entry *right); + int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, + struct hist_entry *he); }; =20 struct kvm_fmt { @@ -102,9 +106,24 @@ static int64_t ev_name_cmp(struct perf_hpp_fmt *fmt __= maybe_unused, return -strcmp(left->kvm_info->name, right->kvm_info->name); } =20 +static int fmt_width(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp __maybe_unused, + struct hists *hists __maybe_unused); + +static int ev_name_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, + struct hist_entry *he) +{ + int width =3D fmt_width(fmt, hpp, he->hists); + + return scnprintf(hpp->buf, hpp->size, "%*s", width, he->kvm_info->name); +} + static struct kvm_dimension dim_event =3D { + .header =3D "Event name", .name =3D "ev_name", .cmp =3D ev_name_cmp, + .entry =3D ev_name_entry, + .width =3D 40, }; =20 #define EV_METRIC_CMP(metric) \ @@ -130,29 +149,77 @@ EV_METRIC_CMP(max) EV_METRIC_CMP(min) EV_METRIC_CMP(mean) =20 +#define EV_METRIC_ENTRY(metric) \ +static int ev_entry_##metric(struct perf_hpp_fmt *fmt, \ + struct perf_hpp *hpp, \ + struct hist_entry *he) \ +{ \ + struct kvm_event *event; \ + int width =3D fmt_width(fmt, hpp, he->hists); \ + struct perf_kvm_stat *perf_kvm; \ + \ + event =3D container_of(he, struct kvm_event, he); \ + perf_kvm =3D event->perf_kvm; \ + return scnprintf(hpp->buf, hpp->size, "%*lu", width, \ + get_event_##metric(event, perf_kvm->trace_vcpu)); \ +} + +EV_METRIC_ENTRY(time) +EV_METRIC_ENTRY(count) +EV_METRIC_ENTRY(max) +EV_METRIC_ENTRY(min) + static struct kvm_dimension dim_time =3D { + .header =3D "Time (ns)", .name =3D "time", .cmp =3D ev_cmp_time, + .entry =3D ev_entry_time, + .width =3D 12, }; =20 static struct kvm_dimension dim_count =3D { + .header =3D "Samples", .name =3D "sample", .cmp =3D ev_cmp_count, + .entry =3D ev_entry_count, + .width =3D 12, }; =20 static struct kvm_dimension dim_max_time =3D { + .header =3D "Max Time (ns)", .name =3D "max_t", .cmp =3D ev_cmp_max, + .entry =3D ev_entry_max, + .width =3D 14, }; =20 static struct kvm_dimension dim_min_time =3D { + .header =3D "Min Time (ns)", .name =3D "min_t", .cmp =3D ev_cmp_min, + .entry =3D ev_entry_min, + .width =3D 14, }; =20 +static int ev_entry_mean(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, + struct hist_entry *he) +{ + struct kvm_event *event; + int width =3D fmt_width(fmt, hpp, he->hists); + struct perf_kvm_stat *perf_kvm; + + event =3D container_of(he, struct kvm_event, he); + perf_kvm =3D event->perf_kvm; + return scnprintf(hpp->buf, hpp->size, "%*lu", width, + get_event_mean(event, perf_kvm->trace_vcpu)); +} + static struct kvm_dimension dim_mean_time =3D { + .header =3D "Mean Time (ns)", .name =3D "mean_t", .cmp =3D ev_cmp_mean, + .entry =3D ev_entry_mean, + .width =3D 14, }; =20 static struct kvm_dimension *dimensions[] =3D { @@ -165,6 +232,30 @@ static struct kvm_dimension *dimensions[] =3D { NULL, }; =20 +static int fmt_width(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp __maybe_unused, + struct hists *hists __maybe_unused) +{ + struct kvm_fmt *kvm_fmt; + + kvm_fmt =3D container_of(fmt, struct kvm_fmt, fmt); + return kvm_fmt->dim->width; +} + +static int fmt_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, + struct hists *hists, int line __maybe_unused, + int *span __maybe_unused) +{ + struct kvm_fmt *kvm_fmt; + struct kvm_dimension *dim; + int width =3D fmt_width(fmt, hpp, hists); + + kvm_fmt =3D container_of(fmt, struct kvm_fmt, fmt); + dim =3D kvm_fmt->dim; + + return scnprintf(hpp->buf, hpp->size, "%*s", width, dim->header); +} + static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b) { struct kvm_fmt *kvm_fmt_a =3D container_of(a, struct kvm_fmt, fmt); @@ -214,9 +305,9 @@ static struct kvm_fmt *get_format(const char *name) fmt->cmp =3D dim->cmp; fmt->sort =3D dim->cmp; fmt->color =3D NULL; - fmt->entry =3D NULL; - fmt->header =3D NULL; - fmt->width =3D NULL; + fmt->entry =3D dim->entry; + fmt->header =3D fmt_header; + fmt->width =3D fmt_width; fmt->collapse =3D dim->cmp; fmt->equal =3D fmt_equal; fmt->free =3D fmt_free; --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C659FC6FD1D for ; Wed, 15 Mar 2023 14:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233293AbjCOOx7 (ORCPT ); Wed, 15 Mar 2023 10:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233265AbjCOOxZ (ORCPT ); Wed, 15 Mar 2023 10:53:25 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98C7D75A73 for ; Wed, 15 Mar 2023 07:52:53 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id k18-20020a17090a591200b0023d36e30cb5so2094816pji.1 for ; Wed, 15 Mar 2023 07:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lmJnfY2lbCc2C3dy6sxzWUeYnl8mSWLRJqM4XO3hbV8=; b=KypbBeFiiw071Rag2kqAVfUN+QVZTcqiKgxUGUU95LCFu9MmUtsYI+52dxV0Gv89Vy pvCdUgfGXRI6tPoC+r7RLW1BiF/XK9AmJdznQYzoS/HYtLWDcmCSSeflr+kVEeKLe4At SWjpbBLrLMBEltp6BVgmrJMqMhOjBu4+KbFYaw4+W+kuEtJe9qqUWwufhhMUJjwKMkXW UBSeVJ2/7gqCKip0CHurXPOnl1XVpTx+LrtS6vTTZQPVq77Pla+qZWnZATzQj7nDNFwc Jv1vNx+VfVH0Yahp0jDLw3tKhw+sbCtt5eRr+u60J23SyyNF0e5sas97TCOCDhbpSsfW KqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lmJnfY2lbCc2C3dy6sxzWUeYnl8mSWLRJqM4XO3hbV8=; b=n+L0996/dNjghtooYmyNJwPJ6NdLXHG1pU66j1xLVxgRpzmGz6ZuMmY7mfVfGZ9tnp M7qjNJRtl3t2B45f3ANEFZmB+bMW5Fzy5r3yrCilaKqt3rnVDkSInXzIMDH5lpN7LLfF hAWIN57EuxhUTdhpMwPfxi9KJECTt0wfaPHNWJof+JCybF8wNWYTJCglHwFSs+AY2+hy kBvXdUIx8Vm4s/SZ5S6yfpEVDCt2dbnSMCEW59CrYtLPIZPFi8FKs86JJzyIPp60JsXk BtnXyCN8sS2szo4xrACwRiY0IeE1TQsTwTrOmorupqNSmT2HrPcT/rvJ4S8fTiUSMT6X ScHg== X-Gm-Message-State: AO0yUKXdCaaduQPzbRd2UxAuhPobcvN4I85JjJ9RCVealY0Sv6+eT/xj O1diezOIB4DVf8aPbIHOvIEMjw== X-Google-Smtp-Source: AK7set8CJNZe2JhTNOxg0QgEtz1dzP7EuN9M3xiZmEechhTZHY0AG3PLkB8JSV85l+21tYStSl89xg== X-Received: by 2002:a17:902:e886:b0:19a:7f4b:3ef6 with SMTP id w6-20020a170902e88600b0019a7f4b3ef6mr3551199plg.3.1678891969844; Wed, 15 Mar 2023 07:52:49 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:49 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 14/16] perf kvm: Add dimensions for percentages Date: Wed, 15 Mar 2023 22:51:10 +0800 Message-Id: <20230315145112.186603-15-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add dimensions for count and time percentages, it would be useful for user to review percentage statistics. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 98 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 0d857df826cf..ab1cd6b5e528 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -222,10 +222,105 @@ static struct kvm_dimension dim_mean_time =3D { .width =3D 14, }; =20 +#define PERC_STR(__s, __v) \ +({ \ + scnprintf(__s, sizeof(__s), "%.2F%%", __v); \ + __s; \ +}) + +static double percent(u64 st, u64 tot) +{ + return tot ? 100. * (double) st / (double) tot : 0; +} + +#define EV_METRIC_PERCENT(metric) \ +static int ev_percent_##metric(struct hist_entry *he) \ +{ \ + struct kvm_event *event; \ + struct perf_kvm_stat *perf_kvm; \ + \ + event =3D container_of(he, struct kvm_event, he); \ + perf_kvm =3D event->perf_kvm; \ + \ + return percent(get_event_##metric(event, perf_kvm->trace_vcpu), \ + perf_kvm->total_##metric); \ +} + +EV_METRIC_PERCENT(time) +EV_METRIC_PERCENT(count) + +static int ev_entry_time_precent(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp, + struct hist_entry *he) +{ + int width =3D fmt_width(fmt, hpp, he->hists); + double per; + char buf[10]; + + per =3D ev_percent_time(he); + return scnprintf(hpp->buf, hpp->size, "%*s", width, PERC_STR(buf, per)); +} + +static int64_t +ev_cmp_time_precent(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) +{ + double per_left; + double per_right; + + per_left =3D ev_percent_time(left); + per_right =3D ev_percent_time(right); + + return per_left - per_right; +} + +static struct kvm_dimension dim_time_percent =3D { + .header =3D "Time%", + .name =3D "percent_time", + .cmp =3D ev_cmp_time_precent, + .entry =3D ev_entry_time_precent, + .width =3D 12, +}; + +static int ev_entry_count_precent(struct perf_hpp_fmt *fmt, + struct perf_hpp *hpp, + struct hist_entry *he) +{ + int width =3D fmt_width(fmt, hpp, he->hists); + double per; + char buf[10]; + + per =3D ev_percent_count(he); + return scnprintf(hpp->buf, hpp->size, "%*s", width, PERC_STR(buf, per)); +} + +static int64_t +ev_cmp_count_precent(struct perf_hpp_fmt *fmt __maybe_unused, + struct hist_entry *left, struct hist_entry *right) +{ + double per_left; + double per_right; + + per_left =3D ev_percent_count(left); + per_right =3D ev_percent_count(right); + + return per_left - per_right; +} + +static struct kvm_dimension dim_count_percent =3D { + .header =3D "Sample%", + .name =3D "percent_sample", + .cmp =3D ev_cmp_count_precent, + .entry =3D ev_entry_count_precent, + .width =3D 12, +}; + static struct kvm_dimension *dimensions[] =3D { &dim_event, &dim_time, + &dim_time_percent, &dim_count, + &dim_count_percent, &dim_max_time, &dim_min_time, &dim_mean_time, @@ -875,7 +970,8 @@ static int filter_cb(struct hist_entry *he, void *arg _= _maybe_unused) =20 static void sort_result(struct perf_kvm_stat *kvm) { - const char *output_columns =3D "ev_name,sample,time,max_t,min_t,mean_t"; + const char *output_columns =3D "ev_name,sample,percent_sample," + "time,percent_time,max_t,min_t,mean_t"; =20 kvm_hists__reinit(output_columns, kvm->sort_key); hists__collapse_resort(&kvm_hists.hists, NULL); --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26FDEC7618B for ; Wed, 15 Mar 2023 14:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233300AbjCOOyD (ORCPT ); Wed, 15 Mar 2023 10:54:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233144AbjCOOxi (ORCPT ); Wed, 15 Mar 2023 10:53:38 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C4A18ABC5 for ; Wed, 15 Mar 2023 07:52:56 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id y15-20020a17090aa40f00b00237ad8ee3a0so2282296pjp.2 for ; Wed, 15 Mar 2023 07:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4fUVJ64SEnuw/uEL+nd4TijpPo7wgQdrNlutXsuxFPw=; b=x9vKO8zrluYXjIO9bjuhov9DZqAYa+F8jPYdBlS5kHR0dQKGSslQ3g1RIFT/DY3dOi VVw7kKtu24W/1xfax5GHrCuIF38Xnp01YXTRGWvIJsSs4CS6X1z6szgrhaZNh8Py3f8n AGYREmFwR+i8ztqj+WLQj8ejBEfCI13ArCEUGW5dDcx4hi/nuHtan9lOjsnVHFf3qk/M ELsF+6QNzSAgNYgtQWu41OUMvJh1xo62qR5QUAvQ5/dF8MvHfNslaEzh6me8hCAHAWr4 6XWNYL5m4aGKIGg5APbsyJN58aq4yEHfL1cIqB2JEgmf0Zw2yF7ajrpoC6X5DKrlKAXE zTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4fUVJ64SEnuw/uEL+nd4TijpPo7wgQdrNlutXsuxFPw=; b=07jWD+/a4P4MEdCzOu4gXwakAqvOC19nxvlo6cC6FPmAPv5LdlrlulHboA8Td7NlYh BZ1gN4mhaNEHsetneHAvSZ6f13aBf2dcDVrwHOshNVVqame8hWeeJq6rgyfr3wYhtYzR ypP9kO1IvOQTHR9msLm8tF71A/qrthWQ5nfFQ27cUWE7cnBsCxBTnmZ2ywS6Y9DT4wy7 acjZPBZyB/Em3YhUZuUDvzvWpJtWLA4hz9ZI9pZCrQ5JJDh9RMCbtJsdS1jUbFMw04uY Li8dsdTvIFwju7nkXkG/raOVQKjVHvfuTlpWExjQUEMvxqcNH13ju3Wm2yMLdTh9gynA eCeg== X-Gm-Message-State: AO0yUKVV/3h2/dGoFmJ/myWE3SaOaTcIkqMKDEW+MrGN9d/nFS1xlY2f phn0z09uALB++SnJCBZ6PfvqOg== X-Google-Smtp-Source: AK7set9B+UVpE782e+TBDyWEej89u0xSElFONYLClqrCI95oD1FjuDxJopuGRtjHwWabgeFPczT3Ow== X-Received: by 2002:a17:902:e2ca:b0:19a:f9b5:2f2f with SMTP id l10-20020a170902e2ca00b0019af9b52f2fmr2311988plc.55.1678891975618; Wed, 15 Mar 2023 07:52:55 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:52:55 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 15/16] perf kvm: Add TUI mode for stat report Date: Wed, 15 Mar 2023 22:51:11 +0800 Message-Id: <20230315145112.186603-16-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since we have supported histograms list and prepared the dimensions in the tool, this patch adds TUI mode for stat report. It also adds UI progress for sorting for better user experience. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 109 ++++++++++++++++++++++++++++++++++++- tools/perf/util/kvm-stat.h | 1 + 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index ab1cd6b5e528..3dd44763d1fc 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -23,6 +23,8 @@ #include "util/data.h" #include "util/ordered-events.h" #include "util/kvm-stat.h" +#include "ui/browsers/hists.h" +#include "ui/progress.h" #include "ui/ui.h" #include "util/string2.h" =20 @@ -495,6 +497,7 @@ static int kvm_hpp_list__parse(struct perf_hpp_list *hp= p_list, =20 static int kvm_hists__init(void) { + kvm_hists.list.nr_header_lines =3D 1; __hists__init(&kvm_hists.hists, &kvm_hists.list); perf_hpp_list__init(&kvm_hists.list); return kvm_hpp_list__parse(&kvm_hists.list, NULL, "ev_name"); @@ -506,6 +509,93 @@ static int kvm_hists__reinit(const char *output, const= char *sort) return kvm_hpp_list__parse(&kvm_hists.list, output, sort); } =20 +static void print_result(struct perf_kvm_stat *kvm); + +#ifdef HAVE_SLANG_SUPPORT +static void kvm_browser__update_nr_entries(struct hist_browser *hb) +{ + struct rb_node *nd =3D rb_first_cached(&hb->hists->entries); + u64 nr_entries =3D 0; + + for (; nd; nd =3D rb_next(nd)) { + struct hist_entry *he =3D rb_entry(nd, struct hist_entry, + rb_node); + + if (!he->filtered) + nr_entries++; + } + + hb->nr_non_filtered_entries =3D nr_entries; +} + +static int kvm_browser__title(struct hist_browser *browser, + char *buf, size_t size) +{ + scnprintf(buf, size, "KVM event statistics (%lu entries)", + browser->nr_non_filtered_entries); + return 0; +} + +static struct hist_browser* +perf_kvm_browser__new(struct hists *hists) +{ + struct hist_browser *browser =3D hist_browser__new(hists); + + if (browser) + browser->title =3D kvm_browser__title; + + return browser; +} + +static int kvm__hists_browse(struct hists *hists) +{ + struct hist_browser *browser; + int key =3D -1; + + browser =3D perf_kvm_browser__new(hists); + if (browser =3D=3D NULL) + return -1; + + /* reset abort key so that it can get Ctrl-C as a key */ + SLang_reset_tty(); + SLang_init_tty(0, 0, 0); + + kvm_browser__update_nr_entries(browser); + + while (1) { + key =3D hist_browser__run(browser, "? - help", true, 0); + + switch (key) { + case 'q': + goto out; + default: + break; + } + } + +out: + hist_browser__delete(browser); + return 0; +} + +static void kvm_display(struct perf_kvm_stat *kvm) +{ + if (!use_browser) + print_result(kvm); + else + kvm__hists_browse(&kvm_hists.hists); +} + +#else + +static void kvm_display(struct perf_kvm_stat *kvm) +{ + use_browser =3D 0; + print_result(kvm); +} + +#endif /* HAVE_SLANG_SUPPORT */ + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -970,12 +1060,15 @@ static int filter_cb(struct hist_entry *he, void *ar= g __maybe_unused) =20 static void sort_result(struct perf_kvm_stat *kvm) { + struct ui_progress prog; const char *output_columns =3D "ev_name,sample,percent_sample," "time,percent_time,max_t,min_t,mean_t"; =20 kvm_hists__reinit(output_columns, kvm->sort_key); + ui_progress__init(&prog, kvm_hists.hists.nr_entries, "Sorting..."); hists__collapse_resort(&kvm_hists.hists, NULL); hists__output_resort_cb(&kvm_hists.hists, NULL, filter_cb); + ui_progress__finish(); } =20 static void print_vcpu_info(struct perf_kvm_stat *kvm) @@ -1577,7 +1670,14 @@ static int kvm_events_report_vcpu(struct perf_kvm_st= at *kvm) if (!register_kvm_events_ops(kvm)) goto exit; =20 - setup_pager(); + if (kvm->use_stdio) { + use_browser =3D 0; + setup_pager(); + } else { + use_browser =3D 1; + } + + setup_browser(false); =20 kvm_hists__init(); =20 @@ -1586,7 +1686,7 @@ static int kvm_events_report_vcpu(struct perf_kvm_sta= t *kvm) goto exit; =20 sort_result(kvm); - print_result(kvm); + kvm_display(kvm); =20 exit: return ret; @@ -1693,6 +1793,7 @@ kvm_events_report(struct perf_kvm_stat *kvm, int argc= , const char **argv) OPT_STRING('p', "pid", &kvm->opts.target.pid, "pid", "analyze events only for given process id(s)"), OPT_BOOLEAN('f', "force", &kvm->force, "don't complain, do it"), + OPT_BOOLEAN(0, "stdio", &kvm->use_stdio, "use the stdio interface"), OPT_END() }; =20 @@ -1710,6 +1811,10 @@ kvm_events_report(struct perf_kvm_stat *kvm, int arg= c, const char **argv) kvm_events_report_options); } =20 +#ifndef HAVE_SLANG_SUPPORT + kvm->use_stdio =3D true; +#endif + if (!kvm->opts.target.pid) kvm->opts.target.system_wide =3D true; =20 diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 35d03894fac3..bc6c8e38ef50 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -103,6 +103,7 @@ struct perf_kvm_stat { unsigned int display_time; bool live; bool force; + bool use_stdio; }; =20 struct kvm_reg_events_ops { --=20 2.34.1 From nobody Mon Sep 8 19:04:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36C01C7618B for ; Wed, 15 Mar 2023 14:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232906AbjCOOyV (ORCPT ); Wed, 15 Mar 2023 10:54:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233243AbjCOOxo (ORCPT ); Wed, 15 Mar 2023 10:53:44 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B91B18EA3B for ; Wed, 15 Mar 2023 07:53:01 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id u3-20020a17090a450300b00239db6d7d47so2277383pjg.4 for ; Wed, 15 Mar 2023 07:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678891981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t1yEtOA/S7kgzfPudB0ZivwtY0/Ec+bbW+dtSNwunWQ=; b=fBRB+iqdB2lrxzxP/K6MLf4EVrdfE0pmldFOD/r94qjAPy1mKmIlnvNcBS3W/1QOdZ GB1Yr8uy1wE/+elFlEF+g8O3cQZMYKq46UlaeD4QOba7SeslEPUMYDWLAnQu5j1Is7Jp 3m9F0TNKHkF/Hcr0Cl6aGH6Xg29iw/A5KtZBAuA9e8D6Ds6tig1mOs/+KA0OYA7TMD0E Iiqn4iHdoz9bxm5gXl3XrAqZEHNiXBcPOFFu99NUAczAW7OQNB8Z0Zj+ysgGnRNbuWpW LO4an+DRY+3aj3Y69HgvpZRxVwLx0ikauopI6KAUHGYAEaezIggdyg6uJadwj4n6nBMs U6ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678891981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t1yEtOA/S7kgzfPudB0ZivwtY0/Ec+bbW+dtSNwunWQ=; b=hpQmOcgImqUwQXd/zSxxzKJ42tKjr8H5vg3kcckbE4v2X8HKOIXbdjD7J/lxvZhPNG 7fZtDmXc4X6A26+zA0GNb0vteZXQMjatikiHYdxrXJbM+jB3OtwSpVQobAhAIg3/T5tC EYNta/wIPEEbReP8UDazcHmG76oQ3kjX010SiPxuVDiozGkDuV1+MuFvMWV/KhvaBLpZ Sw/xsZG2te3vyVdSX4jJX/GucdyGSMeJv39V+PZ1eirudoU4zxLAWx8zHstvUpFGlZ9N 6urhLKN6wJVU1W0GhLYiLN3cOkurHs5jFbw1wszclqj3ybHWqUHpt3rRKxqbLsx/QAGv F/7w== X-Gm-Message-State: AO0yUKUiEgMYBieEP9WbOjG97fGz52iht8oHWWWHegF1QNB5ZHkf1JdG qZNH+g0hwoxuC5IA3+8sTQ4WsQ== X-Google-Smtp-Source: AK7set+JCK/kO1YmQbSWHbUctvXH13LzI3Uf5TBpJAr0ALjblrtiTJbKCOgXTLT8x7A3gG/mulzd7Q== X-Received: by 2002:a17:903:430b:b0:19c:171a:d346 with SMTP id jz11-20020a170903430b00b0019c171ad346mr2373750plb.44.1678891981306; Wed, 15 Mar 2023 07:53:01 -0700 (PDT) Received: from leoy-huanghe.lan ([107.151.177.133]) by smtp.gmail.com with ESMTPSA id kh3-20020a170903064300b0019926c77577sm3781587plb.90.2023.03.15.07.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 07:53:01 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v5 16/16] perf kvm: Update documentation to reflect new changes Date: Wed, 15 Mar 2023 22:51:12 +0800 Message-Id: <20230315145112.186603-17-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230315145112.186603-1-leo.yan@linaro.org> References: <20230315145112.186603-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update documentation for new sorting and option '--stdio'. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/Documentation/perf-kvm.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-kvm.txt b/tools/perf/Documentati= on/perf-kvm.txt index 2ad3f5d9f72b..b66be66fe836 100644 --- a/tools/perf/Documentation/perf-kvm.txt +++ b/tools/perf/Documentation/perf-kvm.txt @@ -58,7 +58,7 @@ There are a couple of variants of perf kvm: events. =20 'perf kvm stat report' reports statistical data which includes events - handled time, samples, and so on. + handled sample, percent_sample, time, percent_time, max_t, min_t, mean_t. =20 'perf kvm stat live' reports statistical data in a live mode (similar to record + report but with statistical data updated live at a given display @@ -82,6 +82,8 @@ OPTIONS :GMEXAMPLESUBCMD: top include::guest-files.txt[] =20 +--stdio:: Use the stdio interface. + -v:: --verbose:: Be more verbose (show counter open errors, etc). @@ -97,7 +99,10 @@ STAT REPORT OPTIONS -k:: --key=3D:: Sorting key. Possible values: sample (default, sort by samples - number), time (sort by average time). + number), percent_sample (sort by sample percentage), time + (sort by average time), precent_time (sort by time percentage), + max_t (sort by maximum time), min_t (sort by minimum time), mean_t + (sort by mean time). -p:: --pid=3D:: Analyze events only for given process ID(s) (comma separated list). --=20 2.34.1