From patchwork Tue Dec 7 06:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1564491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7VK945qFz9s3q for ; Tue, 7 Dec 2021 17:10:36 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4J7VK821Jcz305d for ; Tue, 7 Dec 2021 17:10:36 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e19::620; helo=fra01-mr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::620]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4J7VJy4MFwz2xsk for ; Tue, 7 Dec 2021 17:10:25 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HwuaD8teop10cP1DuWyDvc33sPQls/rbukseV9TBplgo2oizqruDz2pimaRWbPokc68YwzdNXd39S6QH/ud9VG5DiEMw0FAsgsDsPiDszoyHyTnhpsQ0QYkHLhLsFifJRRnctqRYarYA36fPEwJgnScGXeYZ6V9jH9F5CSHkkhXqP/XxCB3ndQZXu2EW3yQGUzJLzUVFPVh22AicOicOpFGogev+gMgBzDQbas00Em62Mk16YkxvBb9IXt/5eel7HiHQ8USKNhxU4xDYqjQaGTi7zzgsXmj51ngaG7BxBhZxT/ZEOmY8cGk5A6ZOdN/BaEkC/Beyn/ZYUP4vYBtyCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kBhHST/mJah0ioKrpv3VvMdLXcfxbV+3+sQYSsfniI0=; b=KXK61T24aQEVEOgY6yIB6tzDPG7t+jl/OhvkLXqsgeOIkjTNh5gqeef/oH/Bp2jz+7/bZ0uR3uI7zx3hdvnJ/B4CQefoTaMkAcc/RcmCaIO1L/2UBfutWxInKxdGjhft69MQTWuE25IVrIrVLmCcE4tWOY+8haDSmgLQCDD5+WjwXkKNehWWsRdeUWRNJ83JiBjwarU0R/6zSv7OqQkep7EHcPlbzTqdiV6whwGFbzlNX7QK2QatKYBLC7quWR1XAz2KaegeY0gGLDXgWD28mDmMGRBr4CjrP7ejW0iLyPkNs4lk6ifm/1vg52Arhxv4MafAJp8DGIudyVj6w8RSwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=csgroup.eu; dmarc=pass action=none header.from=csgroup.eu; dkim=pass header.d=csgroup.eu; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MRXP264MB0808.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:18::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Tue, 7 Dec 2021 06:10:05 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::fc67:d895:7965:663f%2]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 06:10:05 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH] powerpc/603: Fix boot failure with DEBUG_PAGEALLOC and KFENCE Thread-Topic: [PATCH] powerpc/603: Fix boot failure with DEBUG_PAGEALLOC and KFENCE Thread-Index: AQHX6zEUm45+sm7WYEq1/qYEgOJsjA== Date: Tue, 7 Dec 2021 06:10:05 +0000 Message-ID: Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e29c33a8-a917-4a3f-8e06-08d9b94836a5 x-ms-traffictypediagnostic: MRXP264MB0808:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1247; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pXp0uNdQGoa4CqZAn0UAKbOQLjKxwIAvlAocVqGddBdkwuoN7C1jBKyKk9wG7V0mLG/MvZwgnCoXDO65DL1RW5VjETzXtvfNOJYswaJrMpHOXjYs+d9G+qJ7vZGbduhq1AkwgGq793bDt45fyBOFijo9/4jV8lbrp7jua/tkvXn8dE8ytztRF4akvLyLRG8EpuOz3UQpl1UR6ZGfFdSjig1vUxLjM/yN+pNX3+wYfu18gpJhAILhG04x+OuE2zFUkyWfIjzDUzDwBujAL7Pxo4jnRMaMqjgIICvi+NvES4bkiwVUCQHT7GnZJWrTTlR6FXwj3vVClGwYkz8gJpbScbROhvAfQcsEGNX/6oVilY2DUFjVPfqsc7B3pYNbg5+PQQrzsLYPSXW9EvuYLtp3ilqnugxLQJT6W1WdRpU1xFEJFjZ1yqJ83xgacy69Twt6L0DUInp0yxrMQvcKtxwDVjrAfMqKcvVyn/h47e6EaVIfbdTfhvPlSe3K15PVNQi0ONt2jwrpD6Rp0zZyGpcjMg3H2yGo3wqbfsoiK6HxQgIwC8fU8KDOCOg6ko5J3DSx9V3wbd6GD5XquLVfotEypnyvzkEWVAYEdA/vq9UFP9d39NbaeRhyN+PA5PzDpgvPiMgYGtXfjgRY0gtRTzNid0jUFMcCZ6vu5nc1X6zmfWVU4/2Xhi2Ty8P3FClAPu+nzfXFdpwzVVahmJeDM4yK5A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(4326008)(36756003)(6506007)(71200400001)(83380400001)(38070700005)(38100700002)(5660300002)(8936002)(86362001)(66556008)(2616005)(54906003)(66476007)(66946007)(8676002)(91956017)(110136005)(76116006)(64756008)(44832011)(66446008)(6486002)(122000001)(508600001)(26005)(6512007)(2906002)(316002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?swf+JEovetKMpevzwOxPNqQ?= =?iso-8859-1?q?nQNGqWDQ45AukTHhsJPWHkTrpMM2nzPve1rVu7kzIlUG9MMVIlUn2942aJ+W?= =?iso-8859-1?q?aaRht7MXpL/BYq9O7Mj3xNdWAJRqbPMTR06mqAPLWF4PsLHpB544KoR1rQdw?= =?iso-8859-1?q?Uo+Ir3R1Se+e07HHfxnNEkZ54kMw9CfxfkGUXUPLjK0OrApmg+uJaVH54s82?= =?iso-8859-1?q?6bR7xbF5O8pEFbkpZY4eX2gNItbAa/vvXwzmDq7mE25jk6q/q72zuz7mIpmL?= =?iso-8859-1?q?lKvfLAKmdGqQVBMda8xo7gPgdzzO2Yi7HGtlABQqjJPw9ALUKulXDPVcMvW/?= =?iso-8859-1?q?/sowKZJabxu/dXaBmtoHo7+CaQjV1Wrq8D3GfVCZ0Odlq8rcpwPCPWsIo5MJ?= =?iso-8859-1?q?OFworIxUsHHNYhfpYRzSkiR7j/FWT647YrcU3I8/pS8YsH+x05JC3Kq7Bc/c?= =?iso-8859-1?q?uyrm0nFHZ38JIj2JawYGS0G397jXRRTu6ZjC5Wz7T2OUgw4bp2a7cs1+LOak?= =?iso-8859-1?q?WXsnHs9pvPD2LWrqrS/Ov94o/ikm8Ya57+kT9gq5qdVwLDrbciAS5oZLj7Ju?= =?iso-8859-1?q?zYblI2GFVAKQ0EbJwnn5I3Ph+Q+/1aisSdjfkbNw4i3rvrTCaYnJaW/uArSq?= =?iso-8859-1?q?JntuKvHcHGT8EBbCDGABfWuY6Qhci9abMkn2rx0aOctBaL/iA5gjaGkwsg2M?= =?iso-8859-1?q?LuPNygf0a1lthUwIkAel56VnfuGB7UTKxSv07rARv9DQMZiCtZAxTASGZZ1x?= =?iso-8859-1?q?pXcLfrFjC7183X7TKA40xvUpn6Kqr6LT2Nfp94SpPVdhhykDkGi0VtckRVjD?= =?iso-8859-1?q?5QZEy4mp1p7xEF0kZYLnUQIbFd4g5DhlTBUOwyGzPFk4rbboS0foHKx+0vRR?= =?iso-8859-1?q?AMm3gXuTsBniKSgfJquzOiJmXIT/epraKW6Xe0DOPJaNn45u9YM6zBNgj4g9?= =?iso-8859-1?q?LIfjPgt0yQ1flwnLNnPSJlyXDdYkXwwO9YEg42MJyMnacPbRcnrxtRF53IbY?= =?iso-8859-1?q?uH7zI673XrScgOnDdfNYGiR9ilGmD5HkMh/+bs1VaIP2BSBxYpn1HVVZu69h?= =?iso-8859-1?q?2uP+wtfgTcYXIqbVtRU/N4plT03GgfLAV1io6nQdIW5ImAjUr4YJohSChzxB?= =?iso-8859-1?q?esF1e8nLc6+DnmVnK8qndirGr3f1Uav3R7B4I1+xsmkt29UOlxO7dW+5BwAT?= =?iso-8859-1?q?swg2pvDOTyKHpUrj8zFeZ8lmp3Rmy00TCJFN6w1MOWfEv9/ujeR1n0iGKwS7?= =?iso-8859-1?q?VLCAkeN9i0bnv9mB/NLQtkoHDiBwTnB75wEu2248A258qudgZYSducf5XTAm?= =?iso-8859-1?q?MPmiGCp0/MBUQ++n7PXcgcD/zwUijshzrYZ6d3UWlUV0itvM2aNeExfgGVhB?= =?iso-8859-1?q?AzL1xegXSmQQKoMmyLVteCwpHR/3nYs5xIjuVYNpyjUALt9yQZBD5X9VuiXY?= =?iso-8859-1?q?RUGPH7RscoRExX0hjMMJTGZ7mZwTi6hiHX3Ie79qzmggQIPJ2te0ngOZ5sBH?= =?iso-8859-1?q?/xhkjb1WqWQxTFJrGnN5cL4V0T3h/Nev3cynPiuFqgfYE/QCLOFl1eiwEUfY?= =?iso-8859-1?q?FWxlt4vdhxJYTzuUUUyLVrTPgV0ym+svay71sZZ0a+ycFGdfWBsreVikgKaE?= =?iso-8859-1?q?mEOQLt6VNfo1+LKpsIar4fVmdutQwpj9iIJoIYUaA5/3nwuCLNNmjMSd7656?= =?iso-8859-1?q?VPjgDvoSV8BcuFlRi2hSWWKf99h+Q/YbTESwNOfb3YYy/129jO+tR3xD1Pgw?= =?iso-8859-1?q?u5ps=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: e29c33a8-a917-4a3f-8e06-08d9b94836a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2021 06:10:05.4193 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Fp7ahaKA/V71njNBYxht/5H0y0yQZgxQQdsTD5ao946U7IDd2BRX/Jy7RYwaC6UrslRT6klCXBMflGxIDHph7+ApSGe31akZVHXFLfc0lOo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRXP264MB0808 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Bizon , "stable@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Allthough kernel text is always mapped with BATs, we still have inittext mapped with pages, so TLB miss handling is required when CONFIG_DEBUG_PAGEALLOC or CONFIG_KFENCE is set. The final solution should be to set a BAT that also maps inittext but that BAT then needs to be cleared at end of init, and it will require more changes to be able to do it properly. As DEBUG_PAGEALLOC or KFENCE are debugging, performance is not a big deal so let's fix it simply for now to enable easy stable application. Reported-by: Maxime Bizon Fixes: 035b19a15a98 ("powerpc/32s: Always map kernel text and rodata with BATs") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_book3s_32.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 68e5c0a7e99d..2e2a8211b17b 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -421,14 +421,14 @@ InstructionTLBMiss: */ /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_IMISS -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE) lis r1, TASK_SIZE@h /* check if kernel address */ cmplw 0,r1,r3 #endif mfspr r2, SPRN_SDR1 li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC | _PAGE_USER rlwinm r2, r2, 28, 0xfffff000 -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE) bgt- 112f lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC