Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp8166218ybc; Fri, 29 Nov 2019 06:30:18 -0800 (PST) X-Google-Smtp-Source: APXvYqyNPtkXymgarlH+Jr39D/oX1y6Vw+o/vnxueyxFOKK9NM8+zFSMgpKFYnVGJYWklUNxgGVS X-Received: by 2002:a17:906:6403:: with SMTP id d3mr62488335ejm.258.1575037818184; Fri, 29 Nov 2019 06:30:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575037818; cv=none; d=google.com; s=arc-20160816; b=Cg8UhbpeQoh+mA4bWzXa7177DYMpKeYNQb0LtWWozzaF7ySZmQwwKpyDaiHMN4HjX2 zCFmP1iqIMt8515Cqz3MH3OTJsMR9p9B16YWTLS9bPJU8J/CfK2JO46vBLRXOLz+R9vw wrEzYoChSmSGkQays01g63pWC4otoejXWtu0IBeO7aVp5qVjZGFXI7rn077j4uuutBe+ SEdGOd69uI0vCMVPBSVPjgsoW5+N52MfWGfTLfJssrmzwaFNd/gnOr7XDkYuI5FBrmNP uVlYZOcMbBX77WslhIHHQDB6vqXGh1pFkXb7HczLuhFT70HowY5SKQ8QGesCKKyZ+q5X qGAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=fRzoFjkgDE6CKu0YY0lAoghACN69MKrk+j4pYatlQUs=; b=Y5gZAFd8gjqDIC3LSOtPACBXdZhpqQukKJqA20LCFrMPvj0Swe0qHeB3/iL/pn7dVp hjh6ICy26mOxuUKET9Qn28F3FqhEblitwaG8Z1Q0dldceU2nQfkE+8BAIJz0GvKfuR/g ndZRYJ++1leYaqpnEa0pCDjSp03KJ1NUnnGIZ6aV6gCA5DgPuXcswM5G99InIv99GeZa FydziVFS/ljsq3CwTRU02undpT8jgqKsPFjSUFw9DFZ9qlnR4N4LsGkIG6T33OgVFkNg WCf5VcJV0/RAT/ZApXwPHZZt7Cqn1Er0yCBP8UH7dtcrfxEGeIHwsCaVW/odk2Y0ZNNy jwvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="vwadSwR/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si3560349edy.209.2019.11.29.06.29.47; Fri, 29 Nov 2019 06:30:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="vwadSwR/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726908AbfK2O0o (ORCPT + 99 others); Fri, 29 Nov 2019 09:26:44 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:20288 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726824AbfK2O0n (ORCPT ); Fri, 29 Nov 2019 09:26:43 -0500 Received: from localhost (mailhub1-ext [192.168.12.233]) by localhost (Postfix) with ESMTP id 47PcJd22cjz9tyNL; Fri, 29 Nov 2019 15:26:41 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=vwadSwR/; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id xzgtBmZd6aO8; Fri, 29 Nov 2019 15:26:41 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 47PcJd10X5z9tyNH; Fri, 29 Nov 2019 15:26:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1575037601; bh=fRzoFjkgDE6CKu0YY0lAoghACN69MKrk+j4pYatlQUs=; h=From:Subject:To:Cc:Date:From; b=vwadSwR/lBeQgtwOB28/AUGLBS8ZI1bEXg/s87aTU3glmMEtByxgdIh4Ef0vqqiJw sCZwfzASF5lp890RA3KoRYKc4x7FdFIV1XiqZnS3gioEOLT13S6BnzloaKCNZqwxm9 E08V+/mfCFAau2Gdp9flJZ2OXU9F+S6vvRDVr+/0= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8927B8B8DA; Fri, 29 Nov 2019 15:26:42 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id uSsj_lN5kQFD; Fri, 29 Nov 2019 15:26:42 +0100 (CET) Received: from po16098vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.103]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6D2A38B8D2; Fri, 29 Nov 2019 15:26:42 +0100 (CET) Received: by po16098vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 2F4E8635D4; Fri, 29 Nov 2019 14:26:41 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/kasan: fix boot failure with RELOCATABLE && FSL_BOOKE To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , shaolexi@huawei.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 29 Nov 2019 14:26:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When enabling CONFIG_RELOCATABLE and CONFIG_KASAN on FSL_BOOKE, the kernel doesn't boot. relocate_init() requires KASAN early shadow area to be set up because it needs access to the device tree through generic functions. Call kasan_early_init() before calling relocate_init() Reported-by: Lexi Shao Fixes: 2edb16efc899 ("powerpc/32: Add KASAN support") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_fsl_booke.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 838d9d4650c7..6f7a3a7162c5 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -240,6 +240,9 @@ set_ivor: bl early_init +#ifdef CONFIG_KASAN + bl kasan_early_init +#endif #ifdef CONFIG_RELOCATABLE mr r3,r30 mr r4,r31 @@ -266,9 +269,6 @@ set_ivor: /* * Decide what sort of machine this is and initialize the MMU. */ -#ifdef CONFIG_KASAN - bl kasan_early_init -#endif mr r3,r30 mr r4,r31 bl machine_init -- 2.13.3