From: tip-bot for Joerg Roedel <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: will.deacon@arm.com, acme@kernel.org, namhyung@kernel.org,
jpoimboe@redhat.com, jgross@suse.com, bp@alien8.de,
dhgutteridge@sympatico.ca, pavel@ucw.cz, David.Laight@aculab.com,
boris.ostrovsky@oracle.com, gregkh@linuxfoundation.org,
jolsa@redhat.com, brgerst@gmail.com, jkosina@suse.cz,
eduval@amazon.com, aarcange@redhat.com,
torvalds@linux-foundation.org,
alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org,
hpa@zytor.com, luto@kernel.org, peterz@infradead.org,
mingo@kernel.org, tglx@linutronix.de, dvlasenk@redhat.com,
jroedel@suse.de, llong@redhat.com, dave.hansen@intel.com
Subject: [tip:x86/pti] perf/core: Make sure the ring-buffer is mapped in all page-tables
Date: Fri, 20 Jul 2018 12:37:07 -0700 [thread overview]
Message-ID: <tip-cdbaf0a372db2bc3c3127e8b63fd15bd6e6757ee@git.kernel.org> (raw)
In-Reply-To: <1532103744-31902-2-git-send-email-joro@8bytes.org>
Commit-ID: cdbaf0a372db2bc3c3127e8b63fd15bd6e6757ee
Gitweb: https://git.kernel.org/tip/cdbaf0a372db2bc3c3127e8b63fd15bd6e6757ee
Author: Joerg Roedel <jroedel@suse.de>
AuthorDate: Fri, 20 Jul 2018 18:22:22 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 20 Jul 2018 21:32:08 +0200
perf/core: Make sure the ring-buffer is mapped in all page-tables
The ring-buffer is accessed in the NMI handler, so it's better to avoid
faulting on it. Sync the vmalloc range with all page-tables in system to
make sure everyone has it mapped.
This fixes a WARN_ON_ONCE() that can be triggered with PTI enabled on
x86-32:
WARNING: CPU: 4 PID: 0 at arch/x86/mm/fault.c:320 vmalloc_fault+0x220/0x230
This triggers because with PTI enabled on an PAE kernel the PMDs are no
longer shared between the page-tables, so the vmalloc changes do not
propagate automatically.
Note: Andy said rightfully that we should try to fix the vmalloc code for
that case, but that's not a hot fix for the issue at hand.
Fixes: 7757d607c6b3 ("x86/pti: Allow CONFIG_PAGE_TABLE_ISOLATION for x86_32")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: linux-mm@kvack.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Laight <David.Laight@aculab.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Eduardo Valentin <eduval@amazon.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: aliguori@amazon.com
Cc: daniel.gruss@iaik.tugraz.at
Cc: hughd@google.com
Cc: keescook@google.com
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Waiman Long <llong@redhat.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "David H . Gutteridge" <dhgutteridge@sympatico.ca>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: joro@8bytes.org
Link: https://lkml.kernel.org/r/1532103744-31902-2-git-send-email-joro@8bytes.org
---
kernel/events/ring_buffer.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 5d3cf407e374..7b0e9aafafdf 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -814,6 +814,9 @@ static void rb_free_work(struct work_struct *work)
vfree(base);
kfree(rb);
+
+ /* Make sure buffer is unmapped in all page-tables */
+ vmalloc_sync_all();
}
void rb_free(struct ring_buffer *rb)
@@ -840,6 +843,13 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
if (!all_buf)
goto fail_all_buf;
+ /*
+ * The buffer is accessed in NMI handlers, make sure it is
+ * mapped in all page-tables in the system so that we don't
+ * fault on the range in an NMI handler.
+ */
+ vmalloc_sync_all();
+
rb->user_page = all_buf;
rb->data_pages[0] = all_buf + PAGE_SIZE;
if (nr_pages) {
next prev parent reply other threads:[~2018-07-20 19:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 16:22 [PATCH 0/3] PTI for x86-32 Fixes and Updates Joerg Roedel
2018-07-20 16:22 ` [PATCH 1/3] perf/core: Make sure the ring-buffer is mapped in all page-tables Joerg Roedel
2018-07-20 17:06 ` Andy Lutomirski
2018-07-20 17:48 ` Joerg Roedel
2018-07-20 19:32 ` Andy Lutomirski
2018-07-20 21:37 ` Joerg Roedel
2018-07-20 22:20 ` Andy Lutomirski
2018-07-21 21:06 ` Linus Torvalds
2018-07-20 19:27 ` Thomas Gleixner
2018-07-20 19:33 ` Andy Lutomirski
2018-07-20 19:43 ` Thomas Gleixner
2018-07-20 19:53 ` Thomas Gleixner
2018-07-20 19:37 ` tip-bot for Joerg Roedel [this message]
2018-07-20 20:36 ` [tip:x86/pti] " tip-bot for Joerg Roedel
2018-07-20 16:22 ` [PATCH 2/3] x86/entry/32: Check for VM86 mode in slow-path check Joerg Roedel
2018-07-20 19:37 ` [tip:x86/pti] " tip-bot for Joerg Roedel
2018-07-20 20:37 ` tip-bot for Joerg Roedel
2018-07-21 16:06 ` [PATCH 2/3] " Pavel Machek
2018-07-20 16:22 ` [PATCH 3/3] x86/entry/32: Copy only ptregs on paranoid entry/exit path Joerg Roedel
2018-07-20 17:09 ` Andy Lutomirski
2018-07-20 21:42 ` Joerg Roedel
2018-07-23 3:49 ` [PATCH 0/3] PTI for x86-32 Fixes and Updates David H. Gutteridge
2018-07-23 7:29 ` Joerg Roedel
2018-07-26 3:47 ` David H. Gutteridge
2018-07-23 14:09 ` Pavel Machek
2018-07-23 19:00 ` Linus Torvalds
2018-07-23 21:38 ` Pavel Machek
2018-07-23 21:50 ` Andy Lutomirski
2018-07-23 21:55 ` Pavel Machek
2018-07-24 21:18 ` Pavel Machek
2018-07-23 21:59 ` Josh Poimboeuf
2018-07-23 22:07 ` Dave Hansen
2018-07-24 13:39 ` Pavel Machek
2018-07-24 14:39 ` Andy Lutomirski
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=tip-cdbaf0a372db2bc3c3127e8b63fd15bd6e6757ee@git.kernel.org \
--to=tipbot@zytor.com \
--cc=David.Laight@aculab.com \
--cc=aarcange@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@intel.com \
--cc=dhgutteridge@sympatico.ca \
--cc=dvlasenk@redhat.com \
--cc=eduval@amazon.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jkosina@suse.cz \
--cc=jolsa@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=llong@redhat.com \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.