Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 13 Feb 2018 04:04:47 -0800
From:   tip-bot for Kan Liang <tipbot@zytor.com>
Message-ID: <tip-ab463a252c4c790913c0ca0196e5dc7ea04b1f02@git.kernel.org>
Cc:     tglx@linutronix.de, wangnan0@huawei.com, peterz@infradead.org,
        namhyung@kernel.org, hpa@zytor.com, ak@linux.intel.com,
        mingo@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org,
        yao.jin@linux.intel.com, acme@redhat.com, kan.liang@intel.com
Reply-To: namhyung@kernel.org, tglx@linutronix.de, wangnan0@huawei.com,
          peterz@infradead.org, linux-kernel@vger.kernel.org,
          mingo@kernel.org, jolsa@kernel.org, yao.jin@linux.intel.com,
          kan.liang@intel.com, acme@redhat.com, hpa@zytor.com,
          ak@linux.intel.com
In-Reply-To: <1516310792-208685-3-git-send-email-kan.liang@intel.com>
References: <1516310792-208685-3-git-send-email-kan.liang@intel.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] perf mmap: Recalculate size for overwrite mode
Git-Commit-ID: ab463a252c4c790913c0ca0196e5dc7ea04b1f02
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> 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

Commit-ID:  ab463a252c4c790913c0ca0196e5dc7ea04b1f02
Gitweb:     https://git.kernel.org/tip/ab463a252c4c790913c0ca0196e5dc7ea04b1f02
Author:     Kan Liang <kan.liang@intel.com>
AuthorDate: Thu, 18 Jan 2018 13:26:17 -0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 6 Feb 2018 10:11:49 -0300

perf mmap: Recalculate size for overwrite mode

In perf_mmap__push(), the 'size' need to be recalculated, otherwise the
invalid data might be pushed to the record in overwrite mode.

The issue is introduced by commit 7fb4b407a124 ("perf mmap: Don't
discard prev in backward mode").

When the ring buffer is full in overwrite mode, backward_rb_find_range()
will be called to recalculate the 'start' and 'end'. The 'size' needs to
be recalculated accordingly.

Unconditionally recalculate the 'size', not just for full ring buffer in
overwrite mode. Because:

- There is no harmful to recalculate the 'size' for other cases.
- The code of calculating 'start' and 'end' will be factored out later.
  The new function does not need to return 'size'.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 7fb4b407a124 ("perf mmap: Don't discard prev in backward mode")
Link: http://lkml.kernel.org/r/1516310792-208685-3-git-send-email-kan.liang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/mmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index 05076e6..97cf4fa 100644
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -302,6 +302,8 @@ int perf_mmap__push(struct perf_mmap *md, bool overwrite,
 			return -1;
 	}
 
+	size = end - start;
+
 	if ((start & md->mask) + size != (end & md->mask)) {
 		buf = &data[start & md->mask];
 		size = md->mask + 1 - (start & md->mask);