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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4327C55179 for ; Fri, 6 Nov 2020 01:42:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37F0520759 for ; Fri, 6 Nov 2020 01:42:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Essh9JIZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732982AbgKFBmY (ORCPT ); Thu, 5 Nov 2020 20:42:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732743AbgKFBmX (ORCPT ); Thu, 5 Nov 2020 20:42:23 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AB3CC0613CF for ; Thu, 5 Nov 2020 17:42:22 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id c20so2837606pfr.8 for ; Thu, 05 Nov 2020 17:42:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ggrCrrOmIGShBF925Jr9ht3p0sf/ZpOgGfgHeELSUDk=; b=Essh9JIZrqPvXOWsM7F8jE9vTtA+EVNTfRO5eiq0JBkNeNbxUbAhfWuMyJkXhtXFOi 5rseCgYA3IH+Q2/iyAxsjXnU/7gEbQbf8gtkny0yaYKNt4kCY8LCvC8y6jH2oV+ywoGO Oneg8to9GgOehDKSCwV7o8TG+HRULrDyZ8kjnjE/T6b6k0KS383W6715stHPzRxcLpRz Xj3WlgOLYYYvzG5+KoqfvQXXtXQU8SVD6p1m7Xn20KfArSmiXoJ69IA4zjRG731ghNgK N7WYI+wRFsX1hNmCNHGMeSMXZasoP76tv8LI0fLODyZFYct/IQOa5M6eTPohCK9m2bwI rofQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ggrCrrOmIGShBF925Jr9ht3p0sf/ZpOgGfgHeELSUDk=; b=WiDQ99DtaCDDsyZeVEkRkkGBgglzloC1k4/aa1t6/+ex1ZQLRns+7x2yWa2dbHtNmB 5v9QD5pg/p+h8fRtmL7E77IoVxwQX8qmvkrF2JOqIfBl4pdwHCNryr8S4j7HwuDucPzc 5c8PVOGRRQHLR0z5+0i3Wk51NDIkQdsWLv6yJi3bDZO719eMcHv6e3Hlib9ZtMLie24L auOO8xAxu3pCufSjW6qXjxbShJa9sfgsJvwMGSUP/apuvd8oL1zZxXFpsg/Vcf3AGfVl L8BU6LkisAC0eMhNRBPyzOsblLYUwDVNjf/X1lHO+1nllBpKraWr9fEK9JTPE3+20UK6 oxBA== X-Gm-Message-State: AOAM533WNaUxBzHhlDIY3cM5lc0rAR9moGkaTlavG+2LpSjyYWvhyPqj QITEc+qAblwcV12DIHqHdETbcw== X-Google-Smtp-Source: ABdhPJwmWnoGHdVeNeiSjMg/ZMW3Moquqwubxa5LVPi1A4ay4ZrPLez61QKw8c0XGxVa0XIcR5mJbA== X-Received: by 2002:a63:d24a:: with SMTP id t10mr5100740pgi.344.1604626941605; Thu, 05 Nov 2020 17:42:21 -0800 (PST) Received: from localhost ([2400:8904::f03c:91ff:fe8a:adf7]) by smtp.gmail.com with ESMTPSA id t64sm4182516pfd.36.2020.11.05.17.42.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Nov 2020 17:42:21 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Andre Przywara , Dave Martin , James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Al Grant , Wei Li , linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v7 04/22] perf arm-spe: Refactor arm_spe_get_events() Date: Fri, 6 Nov 2020 09:41:18 +0800 Message-Id: <20201106014136.14103-5-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201106014136.14103-1-leo.yan@linaro.org> References: <20201106014136.14103-1-leo.yan@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In function arm_spe_get_events(), the event packet's 'index' is assigned as payload length, but the flow is not directive: it firstly gets the packet length from the return value of arm_spe_get_payload(), the value includes header length (1) and payload length: int ret = arm_spe_get_payload(buf, len, packet); and then reduces header length from packet length, so finally get the payload length: packet->index = ret - 1; To simplify the code, this patch directly assigns payload length to event packet's index; and at the end it calls arm_spe_get_payload() to return the payload value. Signed-off-by: Leo Yan Reviewed-by: Andre Przywara --- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c index 06b3eec4494e..f1b4cb008837 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c @@ -136,8 +136,6 @@ static int arm_spe_get_timestamp(const unsigned char *buf, size_t len, static int arm_spe_get_events(const unsigned char *buf, size_t len, struct arm_spe_pkt *packet) { - int ret = arm_spe_get_payload(buf, len, packet); - packet->type = ARM_SPE_EVENTS; /* we use index to identify Events with a less number of @@ -145,9 +143,9 @@ static int arm_spe_get_events(const unsigned char *buf, size_t len, * LLC-REFILL, and REMOTE-ACCESS events are identified if * index > 1. */ - packet->index = ret - 1; + packet->index = arm_spe_payload_len(buf[0]); - return ret; + return arm_spe_get_payload(buf, len, packet); } static int arm_spe_get_data_source(const unsigned char *buf, size_t len, -- 2.17.1