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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 094FDC10F0E for ; Thu, 18 Apr 2019 17:58:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDD3E217FA for ; Thu, 18 Apr 2019 17:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610334; bh=nnUSiTsQPVlFVLz18CraHSW0KjotpwKqwI13KE78hTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YkZvahS6Lntv/BFE0XrVcaM+CteMXLlk2AGHyHHUKDpIMq2Gn4iuivEw+pov2vllH NJ2YzLG1bWbBamVgqJMSF8joHhXrCldmm5qLTM36nc0k+LVuB89HnA8B/+dx6CWuJw mm/3pWRLqAaClDqhDgFG2gO0j9Z9AuQxituwEKoA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389990AbfDRR6x (ORCPT ); Thu, 18 Apr 2019 13:58:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:53180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389970AbfDRR6w (ORCPT ); Thu, 18 Apr 2019 13:58:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3F53218A1; Thu, 18 Apr 2019 17:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610331; bh=nnUSiTsQPVlFVLz18CraHSW0KjotpwKqwI13KE78hTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fi5yi6YBr7rdtky5YYatgiye0+IZsZPzaM6Rr9gaItPbJvwdJPSgPqnuxUULtGKh5 OLt2uQ2ht1fBMkJHtReGdNmobh8OyEfV0ZYqN1k0fOHYO52ap0Z5omwu8eeA7Qb+3b wq76jGboLXoA1F8j6TeTvTc2mkjcfNtNXsw8GWmQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Olsa , Adrian Hunter , Alexander Shishkin , Alexey Budankov , Andi Kleen , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 4.19 005/110] perf data: Dont store auxtrace index for directory data file Date: Thu, 18 Apr 2019 19:55:54 +0200 Message-Id: <20190418160437.973692718@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160437.484158340@linuxfoundation.org> References: <20190418160437.484158340@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit cd3dd8dd8ff62374d90cb3f2e54b8c94106c7810 ] We can't store the auxtrace index when we store into multiple files, because we keep only offset for it, not the file. The auxtrace data will be processed correctly in the 'pipe' mode. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Alexey Budankov Cc: Andi Kleen Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20190308134745.5057-3-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 22ebeb92ac51..f5b438486a64 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -178,7 +178,7 @@ static int record__process_auxtrace(struct perf_tool *tool, size_t padding; u8 pad[8] = {0}; - if (!perf_data__is_pipe(data)) { + if (!perf_data__is_pipe(data) && !perf_data__is_dir(data)) { off_t file_offset; int fd = perf_data__fd(data); int err; -- 2.19.1