From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517178777-2-7692120684726955181 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517178776; b=EMWk35UljWGlTai58wS/5jn98bdcgF/DOWErPeeqSE7RIVd iifmE01x4KIaod5OBYfumh4KHz5Z8o8VbGnWENj9fElNBFr3QZoglre6CJFjUl1o mJUxW+rRjJZx/S9HshK6tfRh3BoOsuigJSAfXVZmbZB1gmrHpD4cHEE5Flt0iIsN mTOZPCfl9dnBca6o6o3N16kQSFeaQAgNWXTElNCb0tCiQzZ0Tjvx0dKiR9kIt1IU 0KaMLR7uK5+puZ9v3lF0ubdTEPDujq0/qZbosMmW/qtU6Tp9M8AXOCFQFJDG2Cf/ ozmYNsoYSFYLLvFNZwlwhWCLtofWltZ51c1fMRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517178776; bh=vQfoD2 Nw2c0Qvw2Fp/J1fSFu6XLEorW3G+sPOZhIToU=; b=jvj0lPEzE5nrn7MS4wL+S6 CSz6OG3pLGYODxxi2r9Rzjkyv0RnrX2qYrSUpJrTJFGgCrqsy8qjIb8UP3dcCuS+ x0cCDeCKEfM5Yc7qRJkB742SWAxtqCT/nlfhF5N6BbPjyBZHcBSOzCOsp6TCnOPS XDfirB+NycbXS9SFzgThgGSIbLjzE680d6n5NYoXDv+Iqmmih+rNOvMzixozbXFH IPWrUeWPOQxlpcARiYS7exkqTiM2ySdu3sRKaQuYmqbICjyGy8JQtqDOJwBTX6AU rvD9j8P0GAh5UzFvYeV4L8603DtjbkQRgcRUq4E7r2i5VLeIr6f2d7MMiryvtQnQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lPQXk7wB x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lPQXk7wB x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932399AbeA1WcG (ORCPT ); Sun, 28 Jan 2018 17:32:06 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:29515 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753294AbeA1Wam (ORCPT ); Sun, 28 Jan 2018 17:30:42 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Dave Young , Linus Torvalds , Peter Zijlstra , "bp@suse.de" , "linux-efi@vger.kernel.org" , "linux-mm@kvack.org" , "Ingo Molnar" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 22/25] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Thread-Topic: [PATCH AUTOSEL for 3.18 22/25] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Thread-Index: AQHTmIeIE6hnSrYSXkOXUh+Xq8zMkQ== Date: Sun, 28 Jan 2018 22:29:59 +0000 Message-ID: <20180128222931.7781-22-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1098;7:cEOxZXOsG4yjQmNZaRbrrief7K4QMCB4anOhtWkFrmU8G/AzMytTHFpe9d4AJ2W68mNEJ21WVVFzOYrwlYPYfaO4p3VYw7HPBegHiOg3xJJoxsEg8AyNWl5N3DAk+eHtq9bDJxbMTLSnsh6mDoMotvlHUHFBzL5KKS3N1rg7nE4NDrh9jRdwFzYgJ8/uBvkjWHUEVTbZ8VEjfs9SohpeYDj/nIVENl44KAzG4LP/cfS++AvQ7En2rVkGQaSVlr8b x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 6ab1e264-9aa2-4673-6ede-08d5669ec0fa x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(966005)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(59450400001)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6306002)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(76176011)(6512007)(6486002)(186003)(22906009)(142933001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 5do3cUZzwbBPACH2SsCbnGMiXGwxOX8xbRbOkRdS/KmLJxQDCpvsWoN90eRO1vYQw2awTuTphSSkEETbui55kw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ab1e264-9aa2-4673-6ede-08d5669ec0fa X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:59.9072 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Dave Young [ Upstream commit 7f6f60a1ba52538c16f26930bfbcfe193d9d746a ] earlyprintk=3Defi,keep does not work any more with a warning in mm/early_ioremap.c: WARN_ON(system_state !=3D SYSTEM_BOOTING): Boot just hangs because of the earlyprintk within the earlyprintk implementation code itself. This is caused by a new introduced middle state in: 69a78ff226fe ("init: Introduce SYSTEM_SCHEDULING state") early_ioremap() is fine in both SYSTEM_BOOTING and SYSTEM_SCHEDULING states, original condition should be updated accordingly. Signed-off-by: Dave Young Acked-by: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Cc: bp@suse.de Cc: linux-efi@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20171209041610.GA3249@dhcp-128-65.nay.redhat= .com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c index e10ccd299d66..5edcf1b37fa6 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -102,7 +102,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned lon= g size, pgprot_t prot) enum fixed_addresses idx; int i, slot; =20 - WARN_ON(system_state !=3D SYSTEM_BOOTING); + WARN_ON(system_state >=3D SYSTEM_RUNNING); =20 slot =3D -1; for (i =3D 0; i < FIX_BTMAPS_SLOTS; i++) { --=20 2.11.0