From: Oleg Nesterov <oleg@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] perf: Do not waste PAGE_SIZE bytes for ALIGN(8) in perf_event_mmap_event()
Date: Wed, 16 Oct 2013 22:10:04 +0200 [thread overview]
Message-ID: <20131016201004.GC23214@redhat.com> (raw)
In-Reply-To: <20131016200924.GA23214@redhat.com>
perf_event_mmap_event() does kzalloc(PATH_MAX + sizeof(u64)) to
ensure we can align the size later. However this means that we
actually allocate PAGE_SIZE * 2 buffer, seems too much.
Change this code to allocate PATH_MAX==PAGE_SIZE bytes, but tell
d_path() to not use the last sizeof(u64) bytes.
Note: it is not clear why do we need __GFP_ZERO, see the next patch.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/events/core.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index e27d8f8..4a1e7b8 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5107,17 +5107,18 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
if (file) {
struct inode *inode;
dev_t dev;
+
+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
+ if (!buf) {
+ name = strncpy(tmp, "//enomem", sizeof(tmp));
+ goto got_name;
+ }
/*
* d_path works from the end of the rb backwards, so we
* need to add enough zero bytes after the string to handle
* the 64bit alignment we do later.
*/
- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
- if (!buf) {
- name = strncpy(tmp, "//enomem", sizeof(tmp));
- goto got_name;
- }
- name = d_path(&file->f_path, buf, PATH_MAX);
+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
if (IS_ERR(name)) {
name = strncpy(tmp, "//toolong", sizeof(tmp));
goto got_name;
--
1.5.5.1
next prev parent reply other threads:[~2013-10-16 20:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 19:22 perf_event_mmap(vma) && !vma->vm_mm Oleg Nesterov
2013-10-14 10:24 ` Peter Zijlstra
2013-10-16 20:09 ` [PATCH 0/2] (Was: perf_event_mmap(vma) && !vma->vm_mm) Oleg Nesterov
2013-10-16 20:09 ` [PATCH 1/2] perf: Kill the dead !vma->vm_mm code in perf_event_mmap_event() Oleg Nesterov
2013-10-29 14:08 ` [tip:perf/core] perf: Kill the dead !vma-> vm_mm " tip-bot for Oleg Nesterov
2013-10-16 20:10 ` Oleg Nesterov [this message]
2013-10-29 14:08 ` [tip:perf/core] perf: Do not waste PAGE_SIZE bytes for ALIGN(8) " tip-bot for Oleg Nesterov
2013-10-16 20:28 ` [PATCH 0/2] (Was: perf_event_mmap(vma) && !vma->vm_mm) Peter Zijlstra
2013-10-16 20:43 ` Oleg Nesterov
2013-10-16 20:55 ` Peter Zijlstra
2013-10-16 20:55 ` Oleg Nesterov
2013-10-16 20:58 ` Peter Zijlstra
2013-10-16 20:58 ` Oleg Nesterov
2013-10-16 21:16 ` Peter Zijlstra
2013-10-17 15:20 ` Oleg Nesterov
2013-10-17 15:27 ` Oleg Nesterov
2013-10-17 16:47 ` Peter Zijlstra
2013-10-17 18:24 ` Oleg Nesterov
2013-10-17 21:32 ` Peter Zijlstra
2013-11-06 13:19 ` [tip:perf/core] perf: Factor out strncpy() in perf_event_mmap_event() tip-bot for Oleg Nesterov
2013-10-17 16:38 ` [PATCH 0/2] (Was: perf_event_mmap(vma) && !vma->vm_mm) Peter Zijlstra
2013-10-17 15:22 ` [PATCH 3/2] perf: Optimize the fill/align code in perf_event_mmap_event() Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131016201004.GC23214@redhat.com \
--to=oleg@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox