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,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 BD21CC43381 for ; Sat, 30 Mar 2019 01:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9095E206DD for ; Sat, 30 Mar 2019 01:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553908322; bh=OePIq9VW3/NI9AJRMHjnTkHdaPws1v5l2BiN3JNDTQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A/l+nx4sn+IBwO5tGvVP1UbqPgU5Mju4IZG8H8lKsogDJUz02Zh+bXAL8vV1Ve+tf 2xiJ7qjhiZkjkiqgUvdmvuGXlUSsjrgsiDxImyysA0jBq2jN1Rh9pRq4GqOH1Qvw1J rXv+7Lpj4rLmKeuH+yMSnnxzkbr4mIK+4JtjikXw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730469AbfC3Auz (ORCPT ); Fri, 29 Mar 2019 20:50:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:57488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730424AbfC3Auz (ORCPT ); Fri, 29 Mar 2019 20:50:55 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0123C206DD; Sat, 30 Mar 2019 00:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907054; bh=OePIq9VW3/NI9AJRMHjnTkHdaPws1v5l2BiN3JNDTQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QIU5NVeZtfkRRxelGoJbou9Jc7H4uR46ZxsRx79uNb7z4BFAsKWYStIqM9LvThxEu mknlVnH701rTp+qvVRoqZrWJcyR9mJruvdSGD3EAU89LmGBXczWo696k5TO7TD+mAO 2/dc6cwV5QOCiWZbqG/pkHWhA9du2KTo6PWTVS1U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Olsa , Adrian Hunter , Alexander Shishkin , Alexey Budankov , Andi Kleen , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.0 05/67] perf data: Don't store auxtrace index for directory data file Date: Fri, 29 Mar 2019 20:49:45 -0400 Message-Id: <20190330005047.25998-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005047.25998-1-sashal@kernel.org> References: <20190330005047.25998-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jiri Olsa [ 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 882285fb9f64..3fd154f1701b 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -386,7 +386,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