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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 52157C63697 for ; Thu, 19 Nov 2020 15:30:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2FDE24695 for ; Thu, 19 Nov 2020 15:30:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XQeeIMCw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jOtZW9Cy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2FDE24695 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pe90cJThf6q71TBkvU57eZ6dUJqOrV229l6wWah3DJc=; b=XQeeIMCwDr+Hr2L5ZoUHDyKuXq M91QGXB86FmpYg6UlqM/5cQcSRtKg1W2OIf0qu4BDDZWk5EXffeQowEyI5Q3rVbrNkY1k2CMOg0sE /ego5Mtff3C5qeudpa7fGwJoMFfbafMx5s6AVihZuknT2ukhZBSKRqFUyQ1J3IryN2Y3iwi19jsqt DAA5j0zacDATGxX9hBrutJ57wZqFHcgxa6JVKtSO54iG0+Fs/iOlQSwOZ5Mk1WKEF8u5K9igEd1gq uhZQXthBk1zw5tn/GYb+GRXc2hWQb8IJIa3u1xCxkJLrgCbU54T8UpFD7YjJUtTWnnwC3NvQOw/G+ qv7jknpA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kflrX-0005Pa-0a; Thu, 19 Nov 2020 15:28:43 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfloV-0004JE-7j for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2020 15:25:44 +0000 Received: by mail-pf1-x42e.google.com with SMTP id t8so4798682pfg.8 for ; Thu, 19 Nov 2020 07:25:32 -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=Ey8d1UlWJG1Zz2Q3K1zIf680YY3GF+PiDiDzSdWK8Ls=; b=jOtZW9CydrxYkVP/D6zAZs/SxnrT1zzgb0ZFNqxTt2nEWp4CwmZk6wBCYH+ThpFBJA 7V3izyv35rbsBjVOUiWk5Jgx2jVq/TPofeJ665dkM4nfvixIS5oHAuEl8smZW6PMhSFo u5MfGkXLOEeAeD5OKMk9sf/xHiYMq8rCRhd+e8eKjtjRAnzeIZrr6Pa1wsD2+QUx4pXr ngPGEZ3hAZ55VVFDrKhMNC0yXbmhW1X+Q3uNaCv54eVXAnQ6/49fM4M6QR/NbowywUk7 LZowTZzUmxuFz+xgrSC8sCPXBhFzvRcMDehIqCTWacZpJcWgENzfO8CD2i6PKCt6uxXo IxMQ== 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=Ey8d1UlWJG1Zz2Q3K1zIf680YY3GF+PiDiDzSdWK8Ls=; b=tLPOpO/T0eFvnFt5j+pXe6Ld9C4VBzGCKDX4yohOuu13LvZ9UW6358qpihqrtPlp3L c0l2tbfZYOyWgYKyu7DdD4yPkbVvaKf6JLcev2XVOVy1GxslFvUqxWXeXODO0l233Z/4 Kq57H5YAwArYLrFp1j65kwATcBj/aQ68SVKsyr90I9RPB4c3NwLqaNWgnL3bac9kqzlf RfFPVK5EbIQAtq8nzFefEL9UNItiOjodESHHxaSOh7zLLgdZA4FWqtP2+gfQXIOncUCa k22xVPurD+PCFQFhkKBso4MtApUrmO4mo2vPssoT8oWwaBhzwq40D37Vb78/iQMmkXGj uq7g== X-Gm-Message-State: AOAM5314XFSRuEqhrJ3gR/Lgs+MfjqY1eRfGvydu2bynLYUzMaHrqngw wPoKXxl+tJxk264hEB9xrXsVyA== X-Google-Smtp-Source: ABdhPJzqActfVd1qN/uFr68PlWsqyNGdCiOFpnL60hPtElLJVaz70jRInZe4qIqLXC8pf+hFg6CjFA== X-Received: by 2002:a63:1057:: with SMTP id 23mr10286955pgq.41.1605799530395; Thu, 19 Nov 2020 07:25:30 -0800 (PST) Received: from localhost ([45.137.216.7]) by smtp.gmail.com with ESMTPSA id 6sm136156pfb.22.2020.11.19.07.25.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Nov 2020 07:25:29 -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 , John Garry , Will Deacon , Mathieu Poirier , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 09/16] perf arm-spe: Add new function arm_spe_pkt_desc_event() Date: Thu, 19 Nov 2020 23:24:34 +0800 Message-Id: <20201119152441.6972-10-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201119152441.6972-1-leo.yan@linaro.org> References: <20201119152441.6972-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201119_102535_410464_B81E2316 X-CRM114-Status: GOOD ( 17.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 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 This patch moves out the event packet parsing from arm_spe_pkt_desc() to the new function arm_spe_pkt_desc_event(). Signed-off-by: Leo Yan Reviewed-by: Andre Przywara --- .../arm-spe-decoder/arm-spe-pkt-decoder.c | 63 +++++++++++-------- 1 file changed, 37 insertions(+), 26 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 52f4339b1f0c..da6b9f76739c 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 @@ -287,6 +287,42 @@ static int arm_spe_pkt_out_string(int *err, char **buf_p, size_t *blen, return ret; } +static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet, + char *buf, size_t buf_len) +{ + u64 payload = packet->payload; + int err = 0; + + arm_spe_pkt_out_string(&err, &buf, &buf_len, "EV"); + + if (payload & 0x1) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " EXCEPTION-GEN"); + if (payload & 0x2) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " RETIRED"); + if (payload & 0x4) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-ACCESS"); + if (payload & 0x8) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-REFILL"); + if (payload & 0x10) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-ACCESS"); + if (payload & 0x20) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-REFILL"); + if (payload & 0x40) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " NOT-TAKEN"); + if (payload & 0x80) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " MISPRED"); + if (packet->index > 1) { + if (payload & 0x100) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-ACCESS"); + if (payload & 0x200) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-REFILL"); + if (payload & 0x400) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " REMOTE-ACCESS"); + } + + return err; +} + static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet, char *buf, size_t buf_len) { @@ -367,32 +403,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf, arm_spe_pkt_out_string(&err, &buf, &blen, "%s", name); break; case ARM_SPE_EVENTS: - arm_spe_pkt_out_string(&err, &buf, &blen, "EV"); - - if (payload & 0x1) - arm_spe_pkt_out_string(&err, &buf, &blen, " EXCEPTION-GEN"); - if (payload & 0x2) - arm_spe_pkt_out_string(&err, &buf, &blen, " RETIRED"); - if (payload & 0x4) - arm_spe_pkt_out_string(&err, &buf, &blen, " L1D-ACCESS"); - if (payload & 0x8) - arm_spe_pkt_out_string(&err, &buf, &blen, " L1D-REFILL"); - if (payload & 0x10) - arm_spe_pkt_out_string(&err, &buf, &blen, " TLB-ACCESS"); - if (payload & 0x20) - arm_spe_pkt_out_string(&err, &buf, &blen, " TLB-REFILL"); - if (payload & 0x40) - arm_spe_pkt_out_string(&err, &buf, &blen, " NOT-TAKEN"); - if (payload & 0x80) - arm_spe_pkt_out_string(&err, &buf, &blen, " MISPRED"); - if (idx > 1) { - if (payload & 0x100) - arm_spe_pkt_out_string(&err, &buf, &blen, " LLC-ACCESS"); - if (payload & 0x200) - arm_spe_pkt_out_string(&err, &buf, &blen, " LLC-REFILL"); - if (payload & 0x400) - arm_spe_pkt_out_string(&err, &buf, &blen, " REMOTE-ACCESS"); - } + err = arm_spe_pkt_desc_event(packet, buf, buf_len); break; case ARM_SPE_OP_TYPE: switch (idx) { -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel