From patchwork Sat Jan 19 01:43:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 156116 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3903729jaa; Fri, 18 Jan 2019 17:44:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN5wet4EAy2h7kBWXxazMCIS9gMPJMw6mtct0bkXAG3ihiHiZd9k2bXUoik6C4yqRtb1XiaZ X-Received: by 2002:a17:902:128c:: with SMTP id g12mr20497095pla.146.1547862283145; Fri, 18 Jan 2019 17:44:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547862283; cv=none; d=google.com; s=arc-20160816; b=YARRSCYqgUgeg17k1OVTLINzAU7CL8Vui+tf1UaZLmF1nNyyOagKy0+a7XY9t/Wbwt NimC/4W28Q5icc/AoMOCA+cuAJes5anxsHQPxYLGokCLR8BAKqkd0bodf4DMpfnNF+1T oZu1AE6KlTDuproC1luT5FnSmRXB88AN5ZM4wovy41Am7HOZEEU3LlZSlYGJO3TPlCjw 8VqD9JkXTw2QoO7AC7GWmLf9S948LwIiG5QpaizcXo2VpnjF7XoWpAONcLIQ/ZJ2QtV0 mznpfJnRQcLJxrd7yQbOFMARt9tMja/JQNetYLtVve4JQ7nBlgQS/2bJyxu5TtPkxwcx YMsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=LZ4bZwBosJupXg7CIOURZH9virkdhXUo2HCt4H7yUU8=; b=ixuihdStCsODYdMBY7Kirk5lxX36zJus3ldupE136LK0/bLajuQNnbck8sQE/e4+1k Bs4oeCGS1b8DKY73D9Zxq0tL0vr2bd1AYz/uocaWCdtVbzK7b7sh42T/PqPeC5nKNStl k05PNyzVrm9LEPXkxe4PHa0mc3Ef1GTTliX8tv0JlZ1iBuLm/ILq2pl2rx6qlVNKdVnA zW3SX7n6np+jvhyo/qjFf6zGA6k607FJKjJ+cliZjK4wOZpnrgHJB+7EyNJ5/OrVZuUL nos6lzK2vfD/wSGde3Jpg63i33abtAytmemwRpHDk4eh36n9t8rS/pXVfm9I9b2njCOB Oojg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fe57EdFx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si5767520plr.92.2019.01.18.17.44.42; Fri, 18 Jan 2019 17:44:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fe57EdFx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730409AbfASBok (ORCPT + 24 others); Fri, 18 Jan 2019 20:44:40 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40647 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730353AbfASBog (ORCPT ); Fri, 18 Jan 2019 20:44:36 -0500 Received: by mail-pg1-f194.google.com with SMTP id z10so6868361pgp.7 for ; Fri, 18 Jan 2019 17:44:35 -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=LZ4bZwBosJupXg7CIOURZH9virkdhXUo2HCt4H7yUU8=; b=Fe57EdFxK6kI+lHGwpQH8xnNTbrW0/jksnNtirzNJTrXF8NB+Akxw9ig42x6GxIgan Oqpnn4Vm9OzKKdSFU4ZTGFM9yj9O+2/xO9KyLf2DrXvq1d1wcKLzzHNSPAwaev1q0PG/ Y87VHwpzpGjJjzFZi8R6PVtBv/Bwy+jbiiAe4= 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=LZ4bZwBosJupXg7CIOURZH9virkdhXUo2HCt4H7yUU8=; b=XfMjcypSBWuPGvZbOd7BioNU2Kh/b+S0LpYvEYQy1y2n1+ZX8FVmyDx62Sv7Q3raqm smqEhUaC0lFbXdiWzw7Rb4WT+Hp5Ve04yqRnHIOYEmYYvBr36uHbCVRiX8YVaKozUKvx r/xNM7Dk2gg9pzO2vjNzwvh7U5saQN+ygBCglXZTVpB8SYpD6sz5soVakLWq+6eUrGFo YxT2moLF3pb6GXE0yeJhzg7ZWPHXjO0+SEXZZNe1xaTyl5THV5a86h68xeglCKqIEol8 4dwCGEGTciNVtyab73Ko5ZCIWgRK69OQjBN4+4YBCXumeWjORbCE54Bq+jrhoTdkgEDJ eD7A== X-Gm-Message-State: AJcUukcBB3l92JxRjftKahbi3W98GuNn+mG6+yR7H1O1z5TfQAdUnJmw NcAa3VaF/wPFH2vgx+AM+lBVVA== X-Received: by 2002:a62:2082:: with SMTP id m2mr21222637pfj.163.1547862274868; Fri, 18 Jan 2019 17:44:34 -0800 (PST) Received: from localhost.localdomain (li421-24.members.linode.com. [50.116.3.24]) by smtp.gmail.com with ESMTPSA id d21sm8648436pfo.162.2019.01.18.17.44.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 17:44:34 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulose , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Mike Leach , Robert Walker , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Coresight ML Cc: Leo Yan Subject: [PATCH v6 8/8] perf cs-etm: Set sample flags for exception return packet Date: Sat, 19 Jan 2019 09:43:47 +0800 Message-Id: <20190119014347.27441-9-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119014347.27441-1-leo.yan@linaro.org> References: <20190119014347.27441-1-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When return from exception, we need to distinguish if it's system call return or for other type exceptions for setting sample flags. Due to the exception return packet doesn't contain exception number, so we cannot decide sample flags based on exception number. On the other hand, the exception return packet is followed by an instruction range packet; this range packet deliveries the start address after exception handling, we can check if it is a SVC instruction just before the start address. If there has one SVC instruction is found ahead the return address, this means it's an exception return for system call; otherwise it is an normal return for other exceptions. This patch is to set sample flags for exception return packet, firstly it simply set sample flags as PERF_IP_FLAG_INTERRUPT for all exception returns since at this point it doesn't know what's exactly the exception type. We will defer to decide if it's an exception return for system call when the next instruction range packet comes, it checks if there has one SVC instruction prior to the start address and if so we will change sample flags to PERF_IP_FLAG_SYSCALLRET for system call return. Signed-off-by: Leo Yan --- tools/perf/util/cs-etm.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) -- 2.17.1 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 052805de6513..7547a7178f46 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1372,6 +1372,20 @@ static int cs_etm__set_sample_flags(struct cs_etm_queue *etmq) if (prev_packet->sample_type == CS_ETM_DISCONTINUITY) prev_packet->flags |= PERF_IP_FLAG_BRANCH | PERF_IP_FLAG_TRACE_BEGIN; + + /* + * If the previous packet is an exception return packet + * and the return address just follows SVC instuction, + * it needs to calibrate the previous packet sample flags + * as PERF_IP_FLAG_SYSCALLRET. + */ + if (prev_packet->flags == (PERF_IP_FLAG_BRANCH | + PERF_IP_FLAG_RETURN | + PERF_IP_FLAG_INTERRUPT) && + cs_etm__is_svc_instr(etmq, packet, packet->start_addr)) + prev_packet->flags = PERF_IP_FLAG_BRANCH | + PERF_IP_FLAG_RETURN | + PERF_IP_FLAG_SYSCALLRET; break; case CS_ETM_DISCONTINUITY: /* @@ -1422,6 +1436,36 @@ static int cs_etm__set_sample_flags(struct cs_etm_queue *etmq) prev_packet->flags = packet->flags; break; case CS_ETM_EXCEPTION_RET: + /* + * When the exception return packet is inserted, since + * exception return packet is not used standalone for + * generating samples and it's affiliation to the previous + * instruction range packet; so set previous range packet + * flags to tell perf it is an exception return branch. + * + * The exception return can be for either system call or + * other exception types; unfortunately the packet doesn't + * contain exception type related info so we cannot decide + * the exception type purely based on exception return packet. + * If we record the exception number from exception packet and + * reuse it for excpetion return packet, this is not reliable + * due the trace can be discontinuity or the interrupt can + * be nested, thus the recorded exception number cannot be + * used for exception return packet for these two cases. + * + * For exception return packet, we only need to distinguish the + * packet is for system call or for other types. Thus the + * decision can be deferred when receive the next packet which + * contains the return address, based on the return address we + * can read out the previous instruction and check if it's a + * system call instruction and then calibrate the sample flag + * as needed. + */ + if (prev_packet->sample_type == CS_ETM_RANGE) + prev_packet->flags = PERF_IP_FLAG_BRANCH | + PERF_IP_FLAG_RETURN | + PERF_IP_FLAG_INTERRUPT; + break; case CS_ETM_EMPTY: default: break;