From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60860C6FD1D for ; Wed, 15 Mar 2023 19:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=H/seFHQ+80RtWJ0CgxvZYdXdv30Xi+Ml4CzMFSQ80kU=; b=1bo/ojweChciuD HhOAuWYd+3rMeTC7XmCGBUuryL8d2n1Az7yVGaVzY/TRA5BXOCF0reV7yAqH972pMmqDJUoiXUQ+d gTHphMr7pvb0UBp34eNu3zU+CwxMz1xVUeDBvMFFgmkXmSl0XAhX3gMIMHFlCyRu2vLSCrkWkFwxC ivOZ/NAxsUfUL795727oBXBQO3oYi/TjKiipJCPM5KwKr3IJq7RuDc0QA8PknGhv1mCb7lEBfTpg1 b8VHgTTNML+I86HlZIx2flEFyExym9qlSlIW+dwd3Q/dZv84uXVnMjo0vu255njW90vClP6NBvh2R yYRaFC3lHQeaR1a57JBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcX3A-00EKr1-2z; Wed, 15 Mar 2023 19:44:40 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcX39-00EKqg-2v for linux-arm-kernel@bombadil.infradead.org; Wed, 15 Mar 2023 19:44:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=BaJ6Thq6tjKq56aCjdrod16PQ6fT1ETpvfcK3ibMiBs=; b=ktiLpj2xtIb+sGV1HXGxypQSPW YHKt7Rc3B0Prni+kF6F5PLE5vBDr6yvJY9fJGiMx0IsiwE2CHfP8p5A/7KxBhV+Bl4OjZNUAIbqb3 h6+cVPI5Q8zgrJ2pZ8dODJ4jTcEqRzSzQpFybT4oL0LDeM0BwXo1424SALGWkaR078bUpKqpHLGqG 1S1xS/5CYUev7OYyEtmJQlZb/1mAwmCfP+VjwCj2bETZsK0fK82VQRg+lm99ZmVWG+SPDV37FgKLy elVOgFjpE8TtqpdVbMmAwUEwQ8MY4e8ANd1Ckj3XJrg3uouI/L8RlFuSahjOmtDXQZkNN6EmpoRFO g/41Wlyw==; Received: from [179.97.37.151] (helo=quaco.ghostprotocols.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pcX37-002E8g-3B; Wed, 15 Mar 2023 19:44:38 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 24DA14049F; Wed, 15 Mar 2023 16:44:35 -0300 (-03) Date: Wed, 15 Mar 2023 16:44:35 -0300 From: Arnaldo Carvalho de Melo To: Leo Yan Cc: 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 Subject: Re: [PATCH v5 03/16] perf kvm: Move up metrics helpers Message-ID: References: <20230315145112.186603-1-leo.yan@linaro.org> <20230315145112.186603-4-leo.yan@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230315145112.186603-4-leo.yan@linaro.org> X-Url: http://acmel.wordpress.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Em Wed, Mar 15, 2023 at 10:50:59PM +0800, Leo Yan escreveu: > 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}(). Those helper functions are only used if this is true: if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) So keep them enclosed with that. Did it here diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 62c097a37da9b9fe..c11f5454f35c544a 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -49,6 +49,7 @@ #include #include +#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) #define GET_EVENT_KEY(func, field) \ static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ { \ @@ -84,6 +85,7 @@ static struct kvm_event_key keys[] = { DEF_SORT_NAME_KEY(time, mean), { NULL, NULL } }; +#endif // defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) static const char *get_filename_for_perf_kvm(void) { > 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 > > +#define GET_EVENT_KEY(func, field) \ > +static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ > +{ \ > + if (vcpu == -1) \ > + return event->total.field; \ > + \ > + if (vcpu >= 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[] = { > + 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; > } > > -#define GET_EVENT_KEY(func, field) \ > -static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ > -{ \ > - if (vcpu == -1) \ > - return event->total.field; \ > - \ > - if (vcpu >= 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[] = { > - 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; > -- > 2.34.1 > -- - Arnaldo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel