From patchwork Tue Apr 30 16:14:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13649587 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 3DF39C4345F for ; Tue, 30 Apr 2024 16:14:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C63CE6B00B4; Tue, 30 Apr 2024 12:14:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C137E6B00B5; Tue, 30 Apr 2024 12:14:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B029A6B00B7; Tue, 30 Apr 2024 12:14:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8FABF6B00B4 for ; Tue, 30 Apr 2024 12:14:47 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5761A160883 for ; Tue, 30 Apr 2024 16:14:47 +0000 (UTC) X-FDA: 82066696614.05.045420E Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf12.hostedemail.com (Postfix) with ESMTP id 9FA4B4000A for ; Tue, 30 Apr 2024 16:14:45 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=vXcaLqHM; spf=pass (imf12.hostedemail.com: domain of 39BgxZgQKCCMEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=39BgxZgQKCCMEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714493685; 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-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=HIciEpuWNLnk1gns0ydqprcy+C4ILYsBvN54hbVxkpI=; b=DkEhrOJxI4nHOU9majRP5O0Pp4v09gagUbcSXm/syUHjfXa9LlUJYju9hBIDkyH4MOy3oc 4aFTU6boK+G2+WHWYyLY2l+qsakPB0JUZqEt5n5jZSkrjcc9nPA7/AgUkUmRm58f5PSJkN 4ZpaqXsyONaowS3DfvNqsdlpep1griw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=vXcaLqHM; spf=pass (imf12.hostedemail.com: domain of 39BgxZgQKCCMEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=39BgxZgQKCCMEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714493685; a=rsa-sha256; cv=none; b=cKW7TISxsZbYbsJHE/ZnJtE//FVcKySZ4PB4+yZB7mEUMkiqqKCRUO8KTd6UAkw9ju/CIA TXbcZICj0HtHQ1MjPjd+giFqpC742GnrMOxrPMq75QmevCxAEdEaeTpT9ScWtEJorPUy+L yDB0T29Jte33G31HO8HJCP9q0coycdw= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-1ec6de5fff5so4063745ad.2 for ; Tue, 30 Apr 2024 09:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714493684; x=1715098484; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=HIciEpuWNLnk1gns0ydqprcy+C4ILYsBvN54hbVxkpI=; b=vXcaLqHM9Q6Dclo3Gu4M65wOC2yvkoYu4qYEejgqTuABWrwzgBrkA329nHQ0o6oXJ6 5IJHHx2Dz6X1JLAtZPfp29JyN47RZ4i9RWupzCJtjaSCeuNBUyJ7O1y7n/BQQTsyX47B 9g/ReL/OSk+bduhr/jl5PbJqN+WLOWwr5Po+RDEAUJQqewJwZdFRWpKJ0zFDK97zzd7l STsGRmqEp4EY9HTlZvdq4JoB2g0kaWbIEOAV6FHLHfowRvRlIl9FhJNEdqApm6nd3n51 RlF53JRYlFeiNakGHNs2B9TYhodKWLIKjhiAo3rdwuDlcivWykkqd9F4SwddqnakNp4G 0Mpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714493684; x=1715098484; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HIciEpuWNLnk1gns0ydqprcy+C4ILYsBvN54hbVxkpI=; b=gLeHbh0Z0VA8NrFLexCJp6nxXchUot/YVIGFoF9AQg77IyRFmPK1QoJ4wSvysvOmnU VLq2pMk8oApjKL5BaF2pKG8SLhmPuzZNuK2zCPYFhNbc4HEa/VhiYF+sCjoyA7qgKtHg pXCQR5xkT07LQ1lo8zec87fPm5JQ5f9Vt3GSBkHNzaUkduneQ+XnhKHImeVPn8+8XGgL FfghY6ntYXZt4IuPABKq+//q6xKHk5wEHDll4Oj7yRTerqtq5q0UAblCA56lTqRLuRIx FFnPWl1kxieogkM3ue6GsqKNEcXfBn+L8/9heNUm1Q6bY63zOFNWbizIbJPJ5jU4QOXu 59Jw== X-Gm-Message-State: AOJu0Yw3kvcTKBCNVrW1/0G7S89xEEh0FYNqdNxhZFAiXDVGBfCs9y+1 bh8GRBr/VNKLXy1vIVU+AQCW5dfhjzTEl6QFUyPN55Gxg+670laWcaMufpF+1UbHoewNpePFS1O pWl/Eq+ZZZlhmhc+UmdVlNNNr2FPDRMLozRq3Yp3Pwb4wz91SRmV7vEklL2UdPUfe/lilvaNz0I xCJvdg1zHXjJaAkqsE X-Google-Smtp-Source: AGHT+IFiuqHf8Bdc9itzeJU5mtt9Kt5Vy97V7tjmiaiUTiwgh4BpQuWSkEcek6UijTJHvchO1p58+2tt X-Received: from fvdl-cloudtop.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:46ab]) (user=fvdl job=sendgmr) by 2002:a17:902:d4ce:b0:1e8:37ea:d17 with SMTP id o14-20020a170902d4ce00b001e837ea0d17mr1158848plg.1.1714493684169; Tue, 30 Apr 2024 09:14:44 -0700 (PDT) Date: Tue, 30 Apr 2024 16:14:37 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.45.0.rc0.197.gbae5840b3b-goog Message-ID: <20240430161437.2100295-1-fvdl@google.com> Subject: [PATCH] mm/hugetlb: align cma on allocation order, not demotion order From: Frank van der Linden To: linux-mm@kvack.org, muchun.song@linux.dev, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Frank van der Linden , Roman Gushchin X-Stat-Signature: rxpwuwx5i6khrrdac3gtf6istna8fr98 X-Rspamd-Queue-Id: 9FA4B4000A X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714493685-919482 X-HE-Meta: U2FsdGVkX19A0/oufw/LV8B2EqM25Jz0NKtyhoj21H4avliD+wXwolyqLUerU4aeeflecnGcKQcjOwzF7e4qfN5a5xOLumcbumIYwGuFxg0evsci6paz11MzYmJxx9V2GZkPNQt/3UQSFjrgxlrIrGghrpjdweTge5sHothlqDovprYjlz2MKkAs8p5BttB/Zff/v1lDuRnJF6Qtqp+aIXnmMoGRC5sLEvS2kmwChYavOh5WQmACY5yCXpCeIstkGbJPIL4knNYMmHxhSzNwQF/BNa6j+ZZG8PBdpNF0wuJe/tO4DYsqQrs2UQyqy0ji5hTxcYaqGkFZewI9fwcic8R2Q8IpDa0y+5b0BS3C8KQLQ2vQoYIb3B8bSkzcWCbK1CiFTgMgOyrWJPMaFXBYUfdAqDQyl6ClqywAYRRhiCObx5imyYcvT9cT61V5ydQ65bTnap0qfy1FymS85fpffqePlYPqp9rR3c0vJ3W0exIEUthwgnmHG+9ARvTUkhf6ICB3yzKv2W8ZfYUFwP4iVahPn89BezkbLDExPLm3iOHz2218f3VH5zDcYLt44/hcxkd/QNFJW+KwUTJ/sEBg/Vu3KRnhs04xxKPAr97/TG+t05Ep0FDAnUtf2jvQqyPv15YxpNq8kK7faGLwI2QaWdY7FLYqG8RsgaJz7jtWBUg7gGuPUXuCwlOhpaG264WQ/g3l/S+KPSgV3XfCLxrLCZMFmidtIyq8aU7Za/ReFq0Cry5Xj1lQnLkWJzp4Os63hixU4O/tvLEmf3EcuMqMzl0L+Gjr0Rg9bkgYJPIdiuMOMXvQF0GFmzhTWGvYI3nFpfpWdJ9H1RTfEeeqZMbEccus11G1NLai4MchgNGuCJuf1IpJsiKom04KK5DrZ/KUkbnrj6KO7pXu9nFyPYOSn5VrRBjbt3eIW+hv8RFPqFMZdKMXR3aZYWckQrEpj66Grw1qZDmi9CWFqXy1EWP xvUwqrOG 4Y6z/v0Ru5gjaZHQVFJczR2SrCZdHNEHvZpoXcKYpDSa8HPtGEBuTcAdaXt937xS4CwI5D7LsNRqF0ZD79pMxcvpjJb0cNOrt7xgmTzwGrKdI3ysTKgZUp6VEhLFQOG6SMIZgQ4K4MGH4Je4twoXhZcF6aKefoS1f8AlVfKqozrjLpDA6PBt47iBkjpdcbb6U5eJumM7SPuVxhqGJXBJMI8gW8gKLDfQwY8ZCknL/+1QCzYtYT+4ti/FdE/2TKLffEclKfVcF1Zpb3wBPxaAsplBDaCbS7mh/HjwEvsp1GrnsEmKyya8l7Z1pVUHiPN1AMk2x7VAEyu30ebh4Nn6ER8UBGWF4hT52mGZqrwctScektyLg3j4HjgaTO1VlheQXDGxGnemrHn/2Ayn39dMtwHIF3a0Ug2Iv7Rftjziy14t0Bz3z1u+3OEnA2KVTvBIBOOoNJXaH6zCqQlXHDJhFCRBXjM98SKiKmTv2qylu7Zgj+m2wQ26nj8SPluBBkPYTLSRrVpJMwHJ4AsyxIN34TVRzPvhaCovfpx4qnN8pC6cWsmdA63UAQx6XEBFcwOZZNHeUQ1PnAjaAC7smPKT+958sFg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000292, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Align the CMA area for hugetlb gigantic pages to their size, not the size that they can be demoted to. Otherwise there might be misaligned sections at the start and end of the CMA area that will never be used for hugetlb page allocations. Signed-off-by: Frank van der Linden Cc: Roman Gushchin Fixes: a01f43901cfb ("hugetlb: be sure to free demoted CMA pages to CMA") Reviewed-by: David Hildenbrand Reviewed-by: Roman Gushchin Reviewed-by: Oscar Salvador --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5dc3f5ea3a2e..cfe7b025c576 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -7794,7 +7794,7 @@ void __init hugetlb_cma_reserve(int order) * huge page demotion. */ res = cma_declare_contiguous_nid(0, size, 0, - PAGE_SIZE << HUGETLB_PAGE_ORDER, + PAGE_SIZE << order, HUGETLB_PAGE_ORDER, false, name, &hugetlb_cma[nid], nid); if (res) {