Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp5498873ybl; Tue, 14 Jan 2020 09:56:46 -0800 (PST) X-Google-Smtp-Source: APXvYqzZOOGlT9lAIIiIKlj2YYp1l7CHcYEt+JkJnezdjzeuLrOsOFlH7lIIhJ2iAQj2UKnDF2uA X-Received: by 2002:aca:5658:: with SMTP id k85mr16655170oib.153.1579024606774; Tue, 14 Jan 2020 09:56:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579024606; cv=none; d=google.com; s=arc-20160816; b=T6FfGY/UbKTSoS51HTx5yDy3eLmZom+472U+rl9/N8mjhp3D8uk0Ml/d1Y9OS8e/F3 NbIIKVckJdnUXnA19thUpm7MJiYZSSFL2w6Hepu9mZpzWLUuCJzBZ76n8iOxg8DizCPq O6LCfr4Cn1phocaRBb+v1GA7WlBYjGm3W5ovs/tJOkQsrJAvqydYU3o9KZJTnqHAvc1b fm4tVwpC2f0dScJUKj3SYriXbylwAEDPeqbLwSAe13UfRVVf2ImryTeOoTYbqC54pIcS G+BJTRNnudXJ/fJENokJupIJBdLgVEqyGPT0LT6mum4gf7wvrj+TmZ0B6YdMyw3Db9pr +MRg== 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:references :in-reply-to:message-id:dkim-signature; bh=1gi8tiy8dwBccsWJGA9/konOi1hFYyPrqA/8BJnI8Bs=; b=miUiJLbWwkD4AAoFIK6O8dv98qWOaQzEGbdh7ts/2Fproloug1RCx9ECKkPTbme52w GNQsLeTM5W6kaB4f0IeR58w1RaBn9MFgredpT8ml+Fpsh1QqhenYl14DKQdLQCJ2K9VE xMxxhLY86WJBqWnYneljodwAiLcJLg33tCPCfy0gJxAOYy3vj2P90PUc4frC8ZQLyypj 5m8v7O9FcE69zQnzdKs1qV3QLIpZKjLRkVanLz46dDFJq3Sp0h90Z0GYGZtzhPpC9jxk tnwDmvymQ983YRDwxAit1ACRsUrXsRR3bIXbAbmvG01dTdjTRT49D6D8aOY2lzE1m+Pc VbeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=trAj8ycD; 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 s6si8518938otp.126.2020.01.14.09.56.35; Tue, 14 Jan 2020 09:56:46 -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=trAj8ycD; 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 S1728894AbgANRyH (ORCPT + 99 others); Tue, 14 Jan 2020 12:54:07 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:46906 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728794AbgANRyG (ORCPT ); Tue, 14 Jan 2020 12:54:06 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 47xykg4CK5z9txh1; Tue, 14 Jan 2020 18:54:03 +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=trAj8ycD; 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 E1j5e-IhSXwz; Tue, 14 Jan 2020 18:54:03 +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 47xykg3Bhsz9txgv; Tue, 14 Jan 2020 18:54:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1579024443; bh=1gi8tiy8dwBccsWJGA9/konOi1hFYyPrqA/8BJnI8Bs=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=trAj8ycD8diCyKtiJlgO5Ksee62ZFOkwrA+hRQdP9J69dNXqYLdXFLF/S5kH/XJYD sM/Xp3fxcPY1UrSNa85p0CbGbpkO0ciXIWM7iC8jwuwPqhXABX6uqkqftL4oWioqiN z1z5Mn2ujoPm1x3Bb/4sXqjYMfQaL2VS5/zay9nE= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 29EE68B7EB; Tue, 14 Jan 2020 18:54:05 +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 R8LJQr3mEul9; Tue, 14 Jan 2020 18:54:05 +0100 (CET) Received: from po14934vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E258D8B7E8; Tue, 14 Jan 2020 18:54:04 +0100 (CET) Received: by po14934vm.idsi0.si.c-s.fr (Postfix, from userid 0) id B1B776381C; Tue, 14 Jan 2020 17:54:04 +0000 (UTC) Message-Id: In-Reply-To: <031dec5487bde9b2181c8b3c9800e1879cf98c1a.1579024426.git.christophe.leroy@c-s.fr> References: <031dec5487bde9b2181c8b3c9800e1879cf98c1a.1579024426.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH 5/5] powerpc/32: reuse orphaned memblocks in kasan_init_shadow_page_tables() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , erhard_f@mailbox.org, dja@axtens.net Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 14 Jan 2020 17:54:04 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If concurrent PMD population has happened, re-use orphaned memblocks. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/kasan/kasan_init_32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/kasan/kasan_init_32.c b/arch/powerpc/mm/kasan/kasan_init_32.c index c4bf9ed04f88..d3cacd462560 100644 --- a/arch/powerpc/mm/kasan/kasan_init_32.c +++ b/arch/powerpc/mm/kasan/kasan_init_32.c @@ -34,17 +34,17 @@ static int __init kasan_init_shadow_page_tables(unsigned long k_start, unsigned { pmd_t *pmd; unsigned long k_cur, k_next; + pte_t *new = NULL; pmd = pmd_offset(pud_offset(pgd_offset_k(k_start), k_start), k_start); for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd++) { - pte_t *new; - k_next = pgd_addr_end(k_cur, k_end); if ((void *)pmd_page_vaddr(*pmd) != kasan_early_shadow_pte) continue; - new = memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE); + if (!new) + new = memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE); if (!new) return -ENOMEM; -- 2.13.3