Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp5543139ybi; Tue, 30 Jul 2019 23:03:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7n0giiR0tmodjx3n9wO63TTQ8JBg9hpOkpVZQcAEV+xP+g7Uj4OaIyjeUymrXrjA2I9/6 X-Received: by 2002:a17:90a:4806:: with SMTP id a6mr1173765pjh.38.1564553034049; Tue, 30 Jul 2019 23:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564553034; cv=none; d=google.com; s=arc-20160816; b=rUIdSbPMi01g962N3mA0w6C9sOSkJChV9QyMpBSaYjqJ7/+8Rbg1jSkUwkD667zZ5p bj4pwz+mwOPqLuWrKTXHX39lwBzrcVWa1sHZyElT69B36hcrcjc5EvVtMCvemAOWb8+T e14JPsxYFqYy9XvaeyVbk4/rxxj75rTnS3XA9XLeDkMUrBc4+k+u8/zcHitPXpSuPZEG BYFIBWxIDao4sC1li+zG+xFOszoPpxHJ5KQA9gdfSgeZzGKcwoPxsS1vaTJRtyTGNWcE zFAgR625LcxriW8CN9Y9FnEwJsgtwuHabOXc3OFeqBidSmOquMl78ff64I8l6jlaem76 Px9A== 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=IG7IceHsqpR4ypCLfyEAq7ZqVq97qCsq5eFIVAcghZA=; b=ezIWogji4Y6Td75mDWYt03NPbikcJRw4xvJ6el4u2aYv4oQsGcWPMQ4lsB9utV7rs5 ZlT/yTJ9V218G2OtZT0dgT3zO76m8DsiwLbRSDQu/7VQOdJGB7LkDPA+DW9PMRnaMEYU A045d3F0E9Rwr9R697Uij3XVbZ3ZhzmCuMHqkw/okgQfDYanNE0DLLoSfiY9oda9jOkY OzX64iBwsayyylnyED3YHaZouSK7+HExby89/YBO2Ae00FYyxFCLugdelPlsS8JZrZIv Cv8v4qdObXs54uypOsG74er1QhyDaW2lzhpibKUDvphdLEjg4fVlq8cWGQ5wpR+yr3p2 ujRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="Yu0/cyLA"; 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 e1si22753748pge.227.2019.07.30.23.03.38; Tue, 30 Jul 2019 23:03:54 -0700 (PDT) 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="Yu0/cyLA"; 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 S1726417AbfGaGBq (ORCPT + 99 others); Wed, 31 Jul 2019 02:01:46 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:47502 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725209AbfGaGBp (ORCPT ); Wed, 31 Jul 2019 02:01:45 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 45z2qp3v34z9vBLm; Wed, 31 Jul 2019 08:01:42 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Yu0/cyLA; 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 NSKsWU6BdTI3; Wed, 31 Jul 2019 08:01:42 +0200 (CEST) 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 45z2qp2kbNz9vBLQ; Wed, 31 Jul 2019 08:01:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1564552902; bh=IG7IceHsqpR4ypCLfyEAq7ZqVq97qCsq5eFIVAcghZA=; h=From:Subject:To:Cc:Date:From; b=Yu0/cyLArZOyeVzBDEwsi8J7PHg42rs84VU6QdqraFH++PVrqrvGp6ncPLIJoVnp5 1H8C1uU2nFs0NvMxDu9BSx9u/DRsthsrqI30Bx3wJ+Xzigf5xrVwFsUDyvsVKiEAPm bKF+1sKWcK/wtseoqOCwUTm8MMVaTvBiaHzxNNRQ= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 39BED8B824; Wed, 31 Jul 2019 08:01:43 +0200 (CEST) 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 ovo0elEEJFsH; Wed, 31 Jul 2019 08:01:43 +0200 (CEST) Received: from pc17473vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 084B28B752; Wed, 31 Jul 2019 08:01:43 +0200 (CEST) Received: by pc17473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C64E968F53; Wed, 31 Jul 2019 06:01:42 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/kasan: fix early boot failure on PPC32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 31 Jul 2019 06:01:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Due to commit 4a6d8cf90017 ("powerpc/mm: don't use pte_alloc_kernel() until slab is available on PPC32"), pte_alloc_kernel() cannot be used during early KASAN init. Fix it by using memblock_alloc() instead. Reported-by: Erhard F. Fixes: 2edb16efc899 ("powerpc/32: Add KASAN support") Signed-off-by: Christophe Leroy --- arch/powerpc/mm/kasan/kasan_init_32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/mm/kasan/kasan_init_32.c b/arch/powerpc/mm/kasan/kasan_init_32.c index 0d62be3cba47..74f4555a62ba 100644 --- a/arch/powerpc/mm/kasan/kasan_init_32.c +++ b/arch/powerpc/mm/kasan/kasan_init_32.c @@ -21,7 +21,7 @@ static void kasan_populate_pte(pte_t *ptep, pgprot_t prot) __set_pte_at(&init_mm, va, ptep, pfn_pte(PHYS_PFN(pa), prot), 0); } -static int kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end) +static int __ref kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end) { pmd_t *pmd; unsigned long k_cur, k_next; @@ -35,7 +35,10 @@ static int kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_ if ((void *)pmd_page_vaddr(*pmd) != kasan_early_shadow_pte) continue; - new = pte_alloc_one_kernel(&init_mm); + if (slab_is_available()) + new = pte_alloc_one_kernel(&init_mm); + else + new = memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE); if (!new) return -ENOMEM; -- 2.13.3