From: <gregkh@linuxfoundation.org>
To: 20180911195538.23289-1-boris.ostrovsky@oracle.com,
andy@strugglers.netboris.ostrovsky@oracle.com,
gregkh@linuxfoundation.org, hpa@zytor.com, jgross@suse.com,
tglx@linutronix.de, xen-devel@lists.xenproject.org
Cc: stable-commits@vger.kernel.org
Subject: Patch "x86/EISA: Don't probe EISA bus for Xen PV guests" has been added to the 4.14-stable tree
Date: Sun, 23 Sep 2018 21:33:17 +0200 [thread overview]
Message-ID: <1537731197165231@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
x86/EISA: Don't probe EISA bus for Xen PV guests
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-eisa-don-t-probe-eisa-bus-for-xen-pv-guests.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From 6a92b11169a65b3f8cc512c75a252cbd0d096ba0 Mon Sep 17 00:00:00 2001
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Tue, 11 Sep 2018 15:55:38 -0400
Subject: x86/EISA: Don't probe EISA bus for Xen PV guests
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
commit 6a92b11169a65b3f8cc512c75a252cbd0d096ba0 upstream.
For unprivileged Xen PV guests this is normal memory and ioremap will
not be able to properly map it.
While at it, since ioremap may return NULL, add a test for pointer's
validity.
Reported-by: Andy Smith <andy@strugglers.net>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Cc: xen-devel@lists.xenproject.org
Cc: jgross@suse.com
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20180911195538.23289-1-boris.ostrovsky@oracle.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/kernel/eisa.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/eisa.c
+++ b/arch/x86/kernel/eisa.c
@@ -7,11 +7,17 @@
#include <linux/eisa.h>
#include <linux/io.h>
+#include <xen/xen.h>
+
static __init int eisa_bus_probe(void)
{
- void __iomem *p = ioremap(0x0FFFD9, 4);
+ void __iomem *p;
+
+ if (xen_pv_domain() && !xen_initial_domain())
+ return 0;
- if (readl(p) == 'E' + ('I'<<8) + ('S'<<16) + ('A'<<24))
+ p = ioremap(0x0FFFD9, 4);
+ if (p && readl(p) == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24))
EISA_bus = 1;
iounmap(p);
return 0;
Patches currently in stable-queue which might be from boris.ostrovsky@oracle.com are
queue-4.14/xen-netfront-fix-waiting-for-xenbus-state-change.patch
queue-4.14/x86-eisa-don-t-probe-eisa-bus-for-xen-pv-guests.patch
queue-4.14/x86-mm-pti-add-an-overflow-check-to-pti_clone_pmds.patch
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
reply other threads:[~2018-09-23 19:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1537731197165231@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=20180911195538.23289-1-boris.ostrovsky@oracle.com \
--cc=andy@strugglers.netboris.ostrovsky \
--cc=stable-commits@vger.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 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.