| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Jiri Olsa <jolsa@kernel.org> |
| Date: Tue, 9 Jan 2018 14:39:23 +0100 |
| Subject: perf tools: Fix copyfile_offset update of output offset |
| |
| From: Jiri Olsa <jolsa@kernel.org> |
| |
| |
| [ Upstream commit fa1195ccc0af2d121abe0fe266a1caee8c265eea ] |
| |
| 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 <jolsa@kernel.org> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Andi Kleen <ak@linux.intel.com> |
| Cc: David Ahern <dsahern@gmail.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| 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 <acme@redhat.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/util/util.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/tools/perf/util/util.c |
| +++ b/tools/perf/util/util.c |
| @@ -207,7 +207,7 @@ int copyfile_offset(int ifd, loff_t off_ |
| |
| size -= ret; |
| off_in += ret; |
| - off_out -= ret; |
| + off_out += ret; |
| } |
| munmap(ptr, off_in + size); |
| |
