From patchwork Wed Jan 18 08:05:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yun Levi X-Patchwork-Id: 13105814 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17ADBC32793 for ; Wed, 18 Jan 2023 08:05:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FD0B6B0075; Wed, 18 Jan 2023 03:05:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD596B0078; Wed, 18 Jan 2023 03:05:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 576106B007B; Wed, 18 Jan 2023 03:05:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 49F216B0075 for ; Wed, 18 Jan 2023 03:05:40 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0B6AFAAF6D for ; Wed, 18 Jan 2023 08:05:40 +0000 (UTC) X-FDA: 80367185640.27.7B913B3 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf17.hostedemail.com (Postfix) with ESMTP id 74C4C40004 for ; Wed, 18 Jan 2023 08:05:37 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=E9VQ8Fox; spf=pass (imf17.hostedemail.com: domain of ppbuk5246@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=ppbuk5246@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674029137; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=SfvGmMtFJjRRSAyhf9LFXYJKD8Rnq768IEyE92RvJw0=; b=z0V4a2Um000pg2WzlKDIV5cd1V9VduDJZutk9Qcqyl0kv/uhI8CL/wEPbcIu/dcOsSaqKK 5VX6VAQN6qLFYUqRFL1HIcF3p3brVEndPFJXYb8RhkXt0DcaTT1M02oh8nuMo8zthZGhuc 42fp74eMxyBM4K06H8tAtgtIjUKS8IQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=E9VQ8Fox; spf=pass (imf17.hostedemail.com: domain of ppbuk5246@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=ppbuk5246@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674029137; a=rsa-sha256; cv=none; b=Y7y3DCTTwmJ8SIBLaqI499pj0GFxICexeKaIuPk7Hx7GiQ9onUh4GHxi82zcg/OYlvogyP 6xO6Coptoh4bq65L2/v38lkuWGbpYqdKt9g2ryNZtCzeZpVrIacT8y4D1yEtgj0RF0oBAF lWqRKagJYvukUd/pZTbeSR7+tJ1fc6I= Received: by mail-pj1-f42.google.com with SMTP id 7-20020a17090a098700b002298931e366so1372771pjo.2 for ; Wed, 18 Jan 2023 00:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SfvGmMtFJjRRSAyhf9LFXYJKD8Rnq768IEyE92RvJw0=; b=E9VQ8FoxNSUrQG0Ly8zk8LSOYx2YwXs5F9WrtNhP7H1MeG+L3NyPfbaDSVccJ0lWGz RcAd/w4VRWGyQFpV/QPZVU0TlLju/hnt90mC8UFcS01K0hDeOEN6LXWGge/8nm3yzp7B JCFWXpYqI95zBsSMn4rh80lqcZDIe0dFIBig+Qj3Q703Q3jGVFosiZY+c1fSL06SvJCN YNccXl6lbEewgH/XIEHJ6gsuqK9lzoziCY3koDuKZNMM0qMSV1CJvhQjD0ahh2NWFsPK JmZA3RkP9Wf8eRke+GhlXKnht2oU/FiEcA9Tfy3//kX43lRB8WrI1FDjB+9mj0oUz9nF 73+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SfvGmMtFJjRRSAyhf9LFXYJKD8Rnq768IEyE92RvJw0=; b=vzLtpePNAPwquLlTJ3ioJGEDTvVwa8z5OxTyHq3edp8gDJY0UUdUA/A7M4jPGztfqm huX5nLai0Mf/7KEZ4Fd9Ep81ahxQpV2zRHxKDGYN2VbwnfTdAxqhTOlUuJUQ9upE1MKw OPq0kOeeT+bZ8AHwVq22yqLwk0rej2C88l3v2jCVdGvjeo/r0l4LZY5lB9nQp5vKRXEz JyCbDlQ8ByontwSb73NEmMkz0een53n528TnRJw3eZFWmP1CxL8zRRY2MRD6Jpb3/nwu 0k5FEsRLfn0yttHn3Va3TnhigbzLpUdY+2bay2k8RJROWRC6u8TeJzbZ58u5D8XDDebi CV/g== X-Gm-Message-State: AFqh2kpuKYR8PhMopzexxIrNypTsHH8nVJLjuzkB2FFxqNu/+7Qx2XjL gz3uESmEckvymlcThlg3XlmjYSMh0S4= X-Google-Smtp-Source: AMrXdXtoQsC++CK/5+jP5d61aNMmdnw4zpHruqa60koml8i9+ow1z+GRbWamZBRzEITMCT6HSb6NWg== X-Received: by 2002:a17:902:ccc9:b0:194:749a:1e78 with SMTP id z9-20020a170902ccc900b00194749a1e78mr7136533ple.40.1674029136134; Wed, 18 Jan 2023 00:05:36 -0800 (PST) Received: from localhost.localdomain ([2001:e60:8009:708:f1fc:e9cc:7685:9c2c]) by smtp.gmail.com with ESMTPSA id d11-20020a170902654b00b001895d87225csm22359430pln.182.2023.01.18.00.05.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 18 Jan 2023 00:05:35 -0800 (PST) From: Levi Yun To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Levi Yun Subject: [PATCH] mm/cma: Fix potential memory loss on cma_declare_contiguous_nid Date: Wed, 18 Jan 2023 17:05:23 +0900 Message-Id: <20230118080523.44522-1-ppbuk5246@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 74C4C40004 X-Stat-Signature: p4c13gwxnjdhazhybeqxqn9epdygz8qk X-Rspam-User: X-HE-Tag: 1674029137-35584 X-HE-Meta: U2FsdGVkX1/zZfdmbdHOIAIGmX7UPzOe3Tm//ST03FV5HlhEmCqgpe1KPRtVCXpaxP46pYaqEbxsDme4nTzB5WDyBiaulehSLv/TG4p6FGRUpf51AgXNOzOws0+Ps6Ii7ZhiiCyAxfidTk6I21AvCOX1iiPfjdxSiYghNY6mlhGN7eoxojwYMJgMYO6lGfKpU50rqNtOBldH61HbHl8lOqpEYndYBLXhPHnPozBSWd3aNX2jGHre3XHYhuKj4DXqafzd4EZq/9ea0kla7NJifqiyELp2QwODEtGUBDB1eYZoA9YKmPWowxJBA+yL2S3qRg8EGyK3tkoVEDgbzAUAQn1b1a6W2Oe8/o4Hwl/9nRt1o7nhsv2CqErsPcA8srFPFr3/0MESZlzxVz2I0J28nG8tM9zpbMHzC8RlFFYPTuIR8i6gW02irHEI2XaHdxINv/CVXBHW8kQUbzEXP7pk7dAVoETi/ooPV3wPbCcKO7iDy6VJoSAH4a/5LQPeYFut0jlYmB4M6ceqHHo1cdAyT84f8oQFpRFsyDmKEKdYSXznirnbQdxSVSfzr9ZeB7Qk+i2slX4DWpl+oiFezdnv43Sa3TQOMjPvnH2yjnDlYKv2rWcPPklKEl/daOFeeNcju95ed6eZ21hcERyvoqUJ96hTN3VMQZFlVvz+y4qsosc0IrMvWOOGRnEd/pJYPch4v11KmcL89nYCeKhMy+V0P4g3Ifd/3vfv2yGUJqy2/FuLxH+qZ68foyUbEhUMrRMdo3MpaqnxAe1lvTr8xEeWdte6miInASh0n4QLsb44DhAqlDZCzzBlnfTnWesH3iRKihTS/bMQB6unYsONgKne3rt7R1kRp2DqLqvFGkv6IBhrvA8MWE+KXDnomAH1gEjiEfBpy6FGInphau59zZbgNYZPEwQU2BDgvnIuCjgcHLsKmDsUGd3LY+LGmSDbQ2+VRpJvzdf0x4BbtmKEhyD 2lJcKK9e bIMN1w6P2XG+LuVWv9EIcrs4ja5CkmdCjYpLYDQSckq9ZKmcHMwwRfmUzDuwmjYHMjAbOmkrqgBOD63FBeg9OlNSqr8PqU4htm+j6rcM9aDnA2E7jIUXow2Sk3zb/mIx+rgIelGJ6AAW4ScJycpIVQp/BDUVD28XzEIm/C4CWohThcZ8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000008, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Suppose, memblock_alloc_ranged_nid with highmem_start is success when cma_declare_contiguous_nid is called with !fixed in the system 32-bit system with PHYS_ADDR_T_64BIT enabled with memblock.bottom_up == false. But, Next trial to memblock_alloc_range_nid to allocate in [SIZE_4G, limits) nullifies former success allocated addr and it retries to memblock_alloc_ragne_nid again. In this situation, first success address area is lost. By changing order of allocation (SIZE_4G, high_memory and base) and checking whether allocated prevents potential memory lost. Signed-off-by: Levi Yun Signed-off-by: Levi Yun Signed-off-by: Andrew Morton --- mm/cma.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.35.1 diff --git a/mm/cma.c b/mm/cma.c index 4a978e09547a..49d9b08d9a47 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -321,18 +321,6 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, } else { phys_addr_t addr = 0; - /* - * All pages in the reserved area must come from the same zone. - * If the requested region crosses the low/high memory boundary, - * try allocating from high memory first and fall back to low - * memory in case of failure. - */ - if (base < highmem_start && limit > highmem_start) { - addr = memblock_alloc_range_nid(size, alignment, - highmem_start, limit, nid, true); - limit = highmem_start; - } - /* * If there is enough memory, try a bottom-up allocation first. * It will place the new cma area close to the start of the node @@ -350,6 +338,18 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, } #endif + /* + * All pages in the reserved area must come from the same zone. + * If the requested region crosses the low/high memory boundary, + * try allocating from high memory first and fall back to low + * memory in case of failure. + */ + if (!addr && base < highmem_start && limit > highmem_start) { + addr = memblock_alloc_range_nid(size, alignment, + highmem_start, limit, nid, true); + limit = highmem_start; + } + if (!addr) { addr = memblock_alloc_range_nid(size, alignment, base, limit, nid, true);