From patchwork Wed Dec 23 06:39:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 11987751 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 E115EC433DB for ; Wed, 23 Dec 2020 06:41:16 +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 732B220771 for ; Wed, 23 Dec 2020 06:41:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 732B220771 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=6SziU8hvDBCqDLmPuvI8ILKIoiCRU4g2naRDIhvVkcc=; b=X0Wf4//VjfF37PbBHbKFn5fk8y HSCfn0UobjxCXYpXGImeTL3zjBVXazcS2lzNhRfUVDW/jh6YnQefa4mchhZegUrWO3mw05JCYk5nw c4ctcHP/7I/ykrFWr6gbaOLMU8mMXAQq7LRE2U63qvD2HDGBd/aHCCsIEmM+/mFJqSn2z5c9tDG0M Y8r76UsnHJfKUIbtXgbHnUeMUmWYExlxWPSUFxg/HQWoRp9GzTwjVQZwz7M/txnhgh57cud+ug4mw pDNRzffiORJaDWdvNqxn/nIkF67ynk9FaCnVhKvo5TOV/yWiD/6/mH5pErxb1LdIiXeZmluCVSlHl jL0tSysQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krxoZ-0007wG-SF; Wed, 23 Dec 2020 06:40:03 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krxoS-0007rg-Jm for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 06:39:57 +0000 Received: by mail-pl1-x62a.google.com with SMTP id 4so8646385plk.5 for ; Tue, 22 Dec 2020 22:39:56 -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=J6uJ+kErWklNE/7gO57BMrhqrOWmHLQYq2mwzGxfa8Y=; b=PNLk4qHQtyvRwY/OmJ+vez7yBo96Xg4JAC2HxGo9NwlQ7I7yJ1JvpiPKQ4IERJQYTq FEKC9ejA3T56V0ynXpcGwnPjQoxBZMgP8OOFS709tcheaKJLa2bkXGmJetgp9wrrsXqA AbyoF8CEs2hP33xV7O4Ui0KkSIVPhp88FfOgHPm61IEonKSw5FmV5+WoPaebtXlHUoW5 3DUoV7keG4zFcuCwqy76gtOE13KzxP02eCX/Bf8KZ7uQQ00m3DGeqFNuXmHdWL1pmMmr NyMiQV9L2VtAc7kfQRBwHHUVZ6ATalnRBM+GwL2Fz6pbqOpd4I7e0EPvIKRyKZwYlMMl bTnQ== 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=J6uJ+kErWklNE/7gO57BMrhqrOWmHLQYq2mwzGxfa8Y=; b=DDIYLIp7zF4V8w5HE1J0nxwAm8a0pt+p4lyxM/vyBq16QuD7tOljW3+Mkm+cmyvY8r SRb3pU5wnvyVPuQB3976Z09CJuf2ZUWzw0cXjSyCHmFV6a3HoMxR/E3Wa6vKKWYs38Sa 2rB5VfkohqdHNxGRpmYu/L8wNrmfe4n2My23a66O8G5U43vUQVO+GL3hT1oB/gsHLpcU K9RK4Ox8SjlO2GCCweLLZTaUoicAWzZvr24P7z6nyfYf21XH1oGuMmac2ecvhVSmHIUM WI/mKr3DbsX6DoLH+XZZGRH507vrUzkKCXm6JSAs580E39E6uxnSVfuqUtg1Xq2ufJZt DJTQ== X-Gm-Message-State: AOAM530YFbPGveOSe8CvIomUyjmjfN1SNixbmt1tNL6eIP7shT2DaaaN 8fViWt9HbLyxEvmUKve8a3CCWg== X-Google-Smtp-Source: ABdhPJwLdksuy3q/3B3+z2o6Vs3HiUJbLNYvWdNYiZ8lQF+JtLu0b2vU22cVoQnvbRHfayRlCXV3AQ== X-Received: by 2002:a17:90b:1213:: with SMTP id gl19mr25581931pjb.232.1608705594570; Tue, 22 Dec 2020 22:39:54 -0800 (PST) Received: from localhost ([45.137.216.7]) by smtp.gmail.com with ESMTPSA id n4sm22242926pfu.150.2020.12.22.22.39.53 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Dec 2020 22:39:54 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Will Deacon , John Garry , Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Alexandre Truong , Masami Hiramatsu , He Zhe , Thomas Richter , Sumanth Korikkar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] perf probe: Fixup Arm64 SDT arguments Date: Wed, 23 Dec 2020 14:39:04 +0800 Message-Id: <20201223063905.25784-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201223063905.25784-1-leo.yan@linaro.org> References: <20201223063905.25784-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_013956_696413_5E12922C X-CRM114-Status: GOOD ( 20.59 ) 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Arm64 ELF section '.note.stapsdt' uses string format "-4@[sp, NUM]" if the probe is to access data in stack, e.g. below is an example for dumping Arm64 ELF file and shows the argument format: Arguments: -4@[sp, 12] -4@[sp, 8] -4@[sp, 4] Comparing against other archs' argument format, Arm64's argument introduces an extra space character in the middle of square brackets, due to argv_split() uses space as splitter, the argument is wrongly divided into two items. To support Arm64 SDT, this patch fixes up for this case, if any item contains sub string "[sp", concatenates the two continuous items. And adds the detailed explaination in comment. Signed-off-by: Leo Yan --- tools/perf/util/probe-file.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 064b63a6a3f3..60878c859e60 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -794,6 +794,8 @@ static char *synthesize_sdt_probe_command(struct sdt_note *note, char *ret = NULL, **args; int i, args_count, err; unsigned long long ref_ctr_offset; + char *arg; + int arg_idx = 0; if (strbuf_init(&buf, 32) < 0) return NULL; @@ -815,8 +817,34 @@ static char *synthesize_sdt_probe_command(struct sdt_note *note, if (note->args) { args = argv_split(note->args, &args_count); - for (i = 0; i < args_count; ++i) { - if (synthesize_sdt_probe_arg(&buf, i, args[i]) < 0) + for (i = 0; i < args_count; ) { + /* + * FIXUP: Arm64 ELF section '.note.stapsdt' uses string + * format "-4@[sp, NUM]" if a probe is to access data in + * the stack, e.g. below is an example for the SDT + * Arguments: + * + * Arguments: -4@[sp, 12] -4@[sp, 8] -4@[sp, 4] + * + * Since the string introduces an extra space character + * in the middle of square brackets, the argument is + * divided into two items. Fixup for this case, if an + * item contains sub string "[sp,", need to concatenate + * the two items. + */ + if (strstr(args[i], "[sp,") && (i+1) < args_count) { + arg = strcat(args[i], args[i+1]); + i += 2; + } else { + arg = strdup(args[i]); + i += 1; + } + + err = synthesize_sdt_probe_arg(&buf, arg_idx, arg); + free(arg); + arg_idx++; + + if (err < 0) goto error; } }