From: Joerg Roedel <joro@8bytes.org>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, "H . Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Andy Lutomirski <luto@kernel.org>,
Dave Hansen <dave.hansen@intel.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Juergen Gross <jgross@suse.com>,
Peter Zijlstra <peterz@infradead.org>,
Borislav Petkov <bp@alien8.de>, Jiri Kosina <jkosina@suse.cz>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Brian Gerst <brgerst@gmail.com>,
David Laight <David.Laight@aculab.com>,
Denys Vlasenko <dvlasenk@redhat.com>,
Eduardo Valentin <eduval@amazon.com>,
Greg KH <gregkh@linuxfoundation.org>,
Will Deacon <will.deacon@arm.com>,
aliguori@amazon.com, daniel.gruss@iaik.tugraz.at,
hughd@google.com, keescook@google.com,
Andrea Arcangeli <aarcange@redhat.com>,
Waiman Long <llong@redhat.com>, Pavel Machek <pavel@ucw.cz>,
"David H . Gutteridge" <dhgutteridge@sympatico.ca>,
jroedel@suse.de, Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
joro@8bytes.org
Subject: [PATCH 2/3] Revert "perf/core: Make sure the ring-buffer is mapped in all page-tables"
Date: Wed, 25 Jul 2018 17:48:02 +0200 [thread overview]
Message-ID: <1532533683-5988-3-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1532533683-5988-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
This reverts commit 77754cfa09a6c528c38cbca9ee4cc4f7cf6ad6f2.
The patch was necessary to silence a WARN_ON_ONCE(in_nmi())
that triggered in the vmalloc_fault() function when PTI was
enabled on x86-32.
Faulting in an NMI handler turned out to be safe and the
warning in vmalloc_fault() is gone now. So the above patch
can be reverted.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
kernel/events/ring_buffer.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index df2d8cf..5d3cf40 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -814,13 +814,6 @@ static void rb_free_work(struct work_struct *work)
vfree(base);
kfree(rb);
-
- /*
- * FIXME: PAE workaround for vmalloc_fault(): Make sure buffer is
- * unmapped in all page-tables.
- */
- if (IS_ENABLED(CONFIG_X86_PAE))
- vmalloc_sync_all();
}
void rb_free(struct ring_buffer *rb)
@@ -847,15 +840,6 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
if (!all_buf)
goto fail_all_buf;
- /*
- * FIXME: PAE workaround for vmalloc_fault(): 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.
- */
- if (IS_ENABLED(CONFIG_X86_PAE))
- vmalloc_sync_all();
-
rb->user_page = all_buf;
rb->data_pages[0] = all_buf + PAGE_SIZE;
if (nr_pages) {
--
2.7.4
next prev parent reply other threads:[~2018-07-25 15:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 15:48 [PATCH 0/3] PTI x86-32 Updates and Fixes Joerg Roedel
2018-07-25 15:48 ` [PATCH 1/3] x86/mm: Remove in_nmi() warning from vmalloc_fault() Joerg Roedel
2018-07-30 11:57 ` [tip:x86/pti] " tip-bot for Joerg Roedel
2018-07-25 15:48 ` Joerg Roedel [this message]
2018-07-30 11:58 ` [tip:x86/pti] Revert "perf/core: Make sure the ring-buffer is mapped in all page-tables" tip-bot for Joerg Roedel
2018-07-25 15:48 ` [PATCH 3/3] x86/kexec: Allocate 8k PGDs for PTI Joerg Roedel
2018-07-30 11:58 ` [tip:x86/pti] " tip-bot for Joerg Roedel
2018-07-30 7:08 ` [PATCH 0/3] PTI x86-32 Updates and Fixes David H. Gutteridge
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=1532533683-5988-3-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=David.Laight@aculab.com \
--cc=aarcange@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=aliguori@amazon.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=daniel.gruss@iaik.tugraz.at \
--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=hughd@google.com \
--cc=jgross@suse.com \
--cc=jkosina@suse.cz \
--cc=jolsa@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=jroedel@suse.de \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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 \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).