From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB9DFC07E85 for ; Sun, 9 Dec 2018 21:57:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A43820661 for ; Sun, 9 Dec 2018 21:57:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A43820661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=decadent.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727054AbeLIV5l (ORCPT ); Sun, 9 Dec 2018 16:57:41 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:36268 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726760AbeLIVzk (ORCPT ); Sun, 9 Dec 2018 16:55:40 -0500 Received: from pub.yeoldevic.com ([81.174.156.145] helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gW730-0002po-7a; Sun, 09 Dec 2018 21:55:35 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gW72h-0003Z2-Mf; Sun, 09 Dec 2018 21:55:15 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, xen-devel@lists.xenproject.org, "Thomas Gleixner" , jgross@suse.com, hpa@zytor.com, "Boris Ostrovsky" , "Andy Smith" Date: Sun, 09 Dec 2018 21:50:33 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 233/328] x86/EISA: Don't probe EISA bus for Xen PV guests In-Reply-To: X-SA-Exim-Connect-IP: 81.174.156.145 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.62-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Boris Ostrovsky 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 Signed-off-by: Boris Ostrovsky Signed-off-by: Thomas Gleixner Cc: hpa@zytor.com Cc: xen-devel@lists.xenproject.org Cc: jgross@suse.com Link: https://lkml.kernel.org/r/20180911195538.23289-1-boris.ostrovsky@oracle.com Signed-off-by: Ben Hutchings --- 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 @@ -6,11 +6,17 @@ #include #include +#include + 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; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Hutchings Subject: [PATCH 3.16 233/328] x86/EISA: Don't probe EISA bus for Xen PV guests Date: Sun, 09 Dec 2018 21:50:33 +0000 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gW737-0000Jy-Md for xen-devel@lists.xenproject.org; Sun, 09 Dec 2018 21:55:41 +0000 Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: jgross@suse.com, Boris Ostrovsky , hpa@zytor.com, Andy Smith , xen-devel@lists.xenproject.org, akpm@linux-foundation.org, Thomas Gleixner List-Id: xen-devel@lists.xenproject.org My4xNi42Mi1yYzEgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBCb3JpcyBPc3Ry b3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgoKY29tbWl0IDZhOTJiMTExNjlhNjVi M2Y4Y2M1MTJjNzVhMjUyY2JkMGQwOTZiYTAgdXBzdHJlYW0uCgpGb3IgdW5wcml2aWxlZ2VkIFhl biBQViBndWVzdHMgdGhpcyBpcyBub3JtYWwgbWVtb3J5IGFuZCBpb3JlbWFwIHdpbGwKbm90IGJl IGFibGUgdG8gcHJvcGVybHkgbWFwIGl0LgoKV2hpbGUgYXQgaXQsIHNpbmNlIGlvcmVtYXAgbWF5 IHJldHVybiBOVUxMLCBhZGQgYSB0ZXN0IGZvciBwb2ludGVyJ3MKdmFsaWRpdHkuCgpSZXBvcnRl ZC1ieTogQW5keSBTbWl0aCA8YW5keUBzdHJ1Z2dsZXJzLm5ldD4KU2lnbmVkLW9mZi1ieTogQm9y aXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNvbT4KU2lnbmVkLW9mZi1ieTog VGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiBocGFAenl0b3IuY29tCkNj OiB4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKQ2M6IGpncm9zc0BzdXNlLmNvbQpMaW5r OiBodHRwczovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgwOTExMTk1NTM4LjIzMjg5LTEtYm9yaXMu b3N0cm92c2t5QG9yYWNsZS5jb20KU2lnbmVkLW9mZi1ieTogQmVuIEh1dGNoaW5ncyA8YmVuQGRl Y2FkZW50Lm9yZy51az4KLS0tCiBhcmNoL3g4Ni9rZXJuZWwvZWlzYS5jIHwgMTAgKysrKysrKyst LQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCi0tLSBh L2FyY2gveDg2L2tlcm5lbC9laXNhLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2Vpc2EuYwpAQCAt NiwxMSArNiwxNyBAQAogI2luY2x1ZGUgPGxpbnV4L2lvcG9ydC5oPgogI2luY2x1ZGUgPGxpbnV4 L2Vpc2EuaD4KIAorI2luY2x1ZGUgPHhlbi94ZW4uaD4KKwogc3RhdGljIF9faW5pdCBpbnQgZWlz YV9idXNfcHJvYmUodm9pZCkKIHsKLQl2b2lkIF9faW9tZW0gKnAgPSBpb3JlbWFwKDB4MEZGRkQ5 LCA0KTsKKwl2b2lkIF9faW9tZW0gKnA7CisKKwlpZiAoeGVuX3B2X2RvbWFpbigpICYmICF4ZW5f aW5pdGlhbF9kb21haW4oKSkKKwkJcmV0dXJuIDA7CiAKLQlpZiAocmVhZGwocCkgPT0gJ0UnICsg KCdJJzw8OCkgKyAoJ1MnPDwxNikgKyAoJ0EnPDwyNCkpCisJcCA9IGlvcmVtYXAoMHgwRkZGRDks IDQpOworCWlmIChwICYmIHJlYWRsKHApID09ICdFJyArICgnSScgPDwgOCkgKyAoJ1MnIDw8IDE2 KSArICgnQScgPDwgMjQpKQogCQlFSVNBX2J1cyA9IDE7CiAJaW91bm1hcChwKTsKIAlyZXR1cm4g MDsKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs