From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46C58C433E2 for ; Thu, 10 Sep 2020 06:06:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFDD120795 for ; Thu, 10 Sep 2020 06:06:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rtK9FUK6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="kwPAvige"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazonses.com header.i=@amazonses.com header.b="bzjI0H+B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFDD120795 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MnF/FCKOre2CxqFtxm2wV0sNqrQc60vo3PdnuXh842s=; b=rtK9FUK64sBYa3WKOLBcfSnfaS bujVbQloUSXdpeG18Bq2DKmNoIqfKmTUYNykivSMaOksVEBQQbnP1OC0luPbwGOKGtsL9z83nHDFD OBHhH5tlfRNU/+14FZUF5i/Cd2e18wpfROZl8pdAH3UHZ9b+Hf+h77WrWgexYm9MEIW3eD5GGhdBN oulVBFM9Y+/irvWbhVSbJiAaJ9xrKiXHZRphOVeg7HVZvYBl8OBPlfsBiLyzaKkXIBUM55Y3b7Mv8 T4hSbglkvtYb748g1104JH1QhhT/vnnbujPFuNAovm7ufFmeIlBw2NFA6wGmzob78fLHeawdg+W27 rejRd6TQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGFhu-0001Ar-UC; Thu, 10 Sep 2020 06:05:18 +0000 Received: from a27-185.smtp-out.us-west-2.amazonses.com ([54.240.27.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGFhr-00019G-Hd for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2020 06:05:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=zsmsymrwgfyinv5wlfyidntwsjeeldzt; d=codeaurora.org; t=1599717912; h=From:To:Cc:Subject:Date:Message-Id; bh=8aYBJyZG/tinKAweATWIriZSqX7vdJP9zCTtlHAcLSA=; b=kwPAvige988/xSzUraDViN+TDIOoaU7m18vhpA+sWe2ZnX8tFbqZbBQahmNCydu7 Q/Cn8R7tu6sfxrjXg8J9y2tm9UH38Ls2fo0w44xm7E8AWXWKn+zIMG246P6nWN3rx/g Rg+ozeQ1mhW5rsGMTBeQ33TbiLIIenTBt3mtusO4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1599717912; h=From:To:Cc:Subject:Date:Message-Id:Feedback-ID; bh=8aYBJyZG/tinKAweATWIriZSqX7vdJP9zCTtlHAcLSA=; b=bzjI0H+BN1OoFnTi+rFXUpA4F3vfWdstAveA9jx31yarXJ74bwwXVXnFATg6lIlo TChwx9SX0Gj0Iip1ktPICqp3huEpHxwTbby/D2fpbpUoA3JoRt3aaJQ9dIA2TYj+GoF 0lFvQD3DeR5Yb6YtdGDP7tXwjT/s+WF+tGetuBA4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 06DEAC433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=sudaraja@codeaurora.org From: Sudarshan Rajagopalan To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64/mm: add fallback option to allocate virtually contiguous memory Date: Thu, 10 Sep 2020 06:05:11 +0000 Message-ID: <01010174769e2ce5-7f4a1726-2169-4a67-a24a-ab2abf897caf-000000@us-west-2.amazonses.com> X-Mailer: git-send-email 2.7.4 X-SES-Outgoing: 2020.09.10-54.240.27.185 Feedback-ID: 1.us-west-2.CZuq2qbDmUIuT3qdvXlRHZZCpfZqZ4GtG9v3VKgRyF0=:AmazonSES X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_020516_043225_0BD4B2B0 X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Will Deacon , Anshuman Khandual , Catalin Marinas , Sudarshan Rajagopalan , David Hildenbrand , Steven Price , Andrew Morton , Logan Gunthorpe MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When section mappings are enabled, we allocate vmemmap pages from physically continuous memory of size PMD_SZIE using vmemmap_alloc_block_buf(). Section mappings are good to reduce TLB pressure. But when system is highly fragmented and memory blocks are being hot-added at runtime, its possible that such physically continuous memory allocations can fail. Rather than failing the memory hot-add procedure, add a fallback option to allocate vmemmap pages from discontinuous pages using vmemmap_populate_basepages(). Signed-off-by: Sudarshan Rajagopalan Cc: Catalin Marinas Cc: Will Deacon Cc: Anshuman Khandual Cc: Mark Rutland Cc: Logan Gunthorpe Cc: David Hildenbrand Cc: Andrew Morton Cc: Steven Price --- arch/arm64/mm/mmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 75df62f..a46c7d4 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1100,6 +1100,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, p4d_t *p4dp; pud_t *pudp; pmd_t *pmdp; + int ret = 0; do { next = pmd_addr_end(addr, end); @@ -1121,15 +1122,23 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, void *p = NULL; p = vmemmap_alloc_block_buf(PMD_SIZE, node, altmap); - if (!p) - return -ENOMEM; + if (!p) { +#ifdef CONFIG_MEMORY_HOTPLUG + vmemmap_free(start, end, altmap); +#endif + ret = -ENOMEM; + break; + } pmd_set_huge(pmdp, __pa(p), __pgprot(PROT_SECT_NORMAL)); } else vmemmap_verify((pte_t *)pmdp, node, addr, next); } while (addr = next, addr != end); - return 0; + if (ret) + return vmemmap_populate_basepages(start, end, node, altmap); + else + return ret; } #endif /* !ARM64_SWAPPER_USES_SECTION_MAPS */ void vmemmap_free(unsigned long start, unsigned long end, -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel