From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754324AbeAQQaf (ORCPT ); Wed, 17 Jan 2018 11:30:35 -0500 Received: from terminus.zytor.com ([65.50.211.136]:49881 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754295AbeAQQad (ORCPT ); Wed, 17 Jan 2018 11:30:33 -0500 Date: Wed, 17 Jan 2018 08:26:52 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, ak@linux.intel.com, namhyung@kernel.org, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, mingo@kernel.org, dsahern@gmail.com Reply-To: dsahern@gmail.com, mingo@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, acme@redhat.com, ak@linux.intel.com, namhyung@kernel.org, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <20180109133923.25406-1-jolsa@kernel.org> References: <20180109133923.25406-1-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix copyfile_offset update of output offset Git-Commit-ID: fa1195ccc0af2d121abe0fe266a1caee8c265eea 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fa1195ccc0af2d121abe0fe266a1caee8c265eea Gitweb: https://git.kernel.org/tip/fa1195ccc0af2d121abe0fe266a1caee8c265eea Author: Jiri Olsa AuthorDate: Tue, 9 Jan 2018 14:39:23 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 12 Jan 2018 16:57:16 -0300 perf tools: Fix copyfile_offset update of output offset We need to increase output offset in each iteration, not decrease it as we currently do. I guess we were lucky to finish in most cases in first iteration, so the bug never showed. However it shows a lot when working with big (~4GB) size data. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Fixes: 9c9f5a2f1944 ("perf tools: Introduce copyfile_offset() function") Link: http://lkml.kernel.org/r/20180109133923.25406-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index a789f95..443892d 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -210,7 +210,7 @@ static int copyfile_offset(int ifd, loff_t off_in, int ofd, loff_t off_out, u64 size -= ret; off_in += ret; - off_out -= ret; + off_out += ret; } munmap(ptr, off_in + size);