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=-11.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 82863C31E5B for ; Mon, 17 Jun 2019 19:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 518EA20863 for ; Mon, 17 Jun 2019 19:16:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="eyKsgNoi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727473AbfFQTQT (ORCPT ); Mon, 17 Jun 2019 15:16:19 -0400 Received: from terminus.zytor.com ([198.137.202.136]:39203 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725829AbfFQTQS (ORCPT ); Mon, 17 Jun 2019 15:16:18 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x5HJG2d33559573 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 17 Jun 2019 12:16:03 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x5HJG2d33559573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019051801; t=1560798963; bh=gVx3hXuIFJYkKAmvrfR0/2oh0i2DkF7PbVn1wdKkfOg=; h=Date:From:Cc:Reply-To:To:Subject:From; b=eyKsgNoiqR1XJ+eek7Uzdh4gtpNzVL1XHWXc9GnhHRBpRqvtcbGDh4089l7/1sWtJ HHGvE+3EfRN+dAxOohciVHXD3skvvZxm2xTLLBRuGGokn2+9hYrnwwMBjZpDv7jnHd qR20qboXhnrXehoq68oI+3kTc52+Rjzp5WzkaOJ0hPDP/ZNeZSoCPm3tbhH6CXhZnG IhsJVeAEF7Ppd+OMW0GH5pJMFHrh7mWLWRIlm6wFgSes/vvUy4iquvRAKZO+1Ppm4Z QDPoIjpyy7OK3fCOAlQHKwilNUuiYAdaXowvo0OyXdVw3QP4KSxCXgVCtyRZcPQQ7o Llbi8APjnD4Hg== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x5HJG2TB3559570; Mon, 17 Jun 2019 12:16:02 -0700 Date: Mon, 17 Jun 2019 12:16:02 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, adrian.hunter@intel.com, brendan.d.gregg@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org, lclaudio@redhat.com, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, lclaudio@redhat.com, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, brendan.d.gregg@gmail.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Consume the augmented_raw_syscalls payload Git-Commit-ID: 8195168e877948bb9a943ce11ad3e6ee71014bd5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8195168e877948bb9a943ce11ad3e6ee71014bd5 Gitweb: https://git.kernel.org/tip/8195168e877948bb9a943ce11ad3e6ee71014bd5 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 5 Jun 2019 10:34:47 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Jun 2019 10:52:19 -0300 perf trace: Consume the augmented_raw_syscalls payload To support the SCA_FILENAME beautifier in more than one syscall arg, as needed for syscalls such as the rename* family, we need to, after processing one such arg, bump the augmented pointers so that the next augmented arg don't reuse data for the previous augmented arguments. Cc: Adrian Hunter Cc: Brendan Gregg Cc: Jiri Olsa Cc: Luis Cláudio Gonçalves Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-4e4cmzyjxb3wkonfo1x9a27y@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 19f22127f02e..905e57c336b0 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1233,8 +1233,17 @@ static void thread__set_filename_pos(struct thread *thread, const char *bf, static size_t syscall_arg__scnprintf_augmented_string(struct syscall_arg *arg, char *bf, size_t size) { struct augmented_arg *augmented_arg = arg->augmented.args; + size_t printed = scnprintf(bf, size, "\"%.*s\"", augmented_arg->size, augmented_arg->value); + /* + * So that the next arg with a payload can consume its augmented arg, i.e. for rename* syscalls + * we would have two strings, each prefixed by its size. + */ + int consumed = sizeof(*augmented_arg) + augmented_arg->size; - return scnprintf(bf, size, "\"%.*s\"", augmented_arg->size, augmented_arg->value); + arg->augmented.args += consumed; + arg->augmented.size -= consumed; + + return printed; } static size_t syscall_arg__scnprintf_filename(char *bf, size_t size,