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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CEC9C369C2 for ; Fri, 25 Apr 2025 10:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 882F86B0007; Fri, 25 Apr 2025 06:33:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8311D6B000C; Fri, 25 Apr 2025 06:33:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AB386B0024; Fri, 25 Apr 2025 06:33:15 -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 4FEB36B0007 for ; Fri, 25 Apr 2025 06:33:15 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3CC6D1CCA41 for ; Fri, 25 Apr 2025 10:33:16 +0000 (UTC) X-FDA: 83372203992.24.F370324 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 992494000D for ; Fri, 25 Apr 2025 10:33:13 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PT6RehN2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745577193; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=x9+Z/Q60OGeACQP02vwBrfbLqyRUw8hbYCUsk3fpsjQ=; b=ZAKoj1uZDnm50A2hYsrpHGJA3ON8aRQYhIvqXT9tMemnHrI7XpLnnlukap98iB83k1c9xy OrR5T6Z50eNk7gaoueptN6lDJ42DeWPnOLYZJJnJf5H5mvNJnvmJnCAmVq6dnCSaOiZxLR 51ri0F51oXmc28THSvv8oQwJNGrDFKI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PT6RehN2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745577193; a=rsa-sha256; cv=none; b=ApQkbitMyouL+mfX5iI1AobJR28Ii6/AW/571n0LPhyZe4QwHsANVeSxXirProPXGmFsFG 1TXBhuyfiMVUMSAXhu0xrJVsm/sr4c5+8yc4EL22IE9O/yt1oJzgnDjVJ2ItidAI9VezTl fqDvaKwSLHIHh25LgEoJOIS29Rpb0zQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745577193; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=x9+Z/Q60OGeACQP02vwBrfbLqyRUw8hbYCUsk3fpsjQ=; b=PT6RehN2M+WagjMH4m2G+X99juIVIyEnvgX2qJcdQryFiI256b0dh4f0Fg+NJlHbyT8Yz5 Vp8MbQcQgvnbq1qCo0tZFHhYlglUIUTUoPB8LjYwgqeHoSTj9ASmOXt6R0YWGbQQeUkSJ6 lnlvPi09eM0szSzpxEUcFORKUND9KyQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-231-4SzllEo6M3aStQ95fLNr2w-1; Fri, 25 Apr 2025 06:33:09 -0400 X-MC-Unique: 4SzllEo6M3aStQ95fLNr2w-1 X-Mimecast-MFC-AGG-ID: 4SzllEo6M3aStQ95fLNr2w_1745577189 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43d6c65dc52so14639115e9.1 for ; Fri, 25 Apr 2025 03:33:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745577188; x=1746181988; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=x9+Z/Q60OGeACQP02vwBrfbLqyRUw8hbYCUsk3fpsjQ=; b=t4cbMKudW6DFzanGztzS3LJhUioSoy/Dc3MU9xHl1Q9sa8FxbGc5D4pPAqt9u+GqCH rlTFa+/P/GWkFDKQ340fBEDZvCxKWVksiVrvtznySnPYdzxlmD6bibSXmEi69eiD1ZYE fYJMI3fTLCFlzZCRMOPZF61crxJOQlE0uQoBV9NOhqBkYp0c3rH/NenCJ5JvjD4Nfchk 4BlTwOJWLojya0Y3wZunb1GIHxGDDxQ08Xcs8Zr0QjL+E7022W+JUhBEgo1TKW4rIJFc WFqFGrznw8oHte8AEo/F9xoDO+78CURP6EZsWpt7EXx8nLGZ9c577Yy6aGUysZx6GYS0 Kq9g== X-Gm-Message-State: AOJu0YxYrUWrnIAEpGUrG+tAmoZLLlzZPSqq8jrlNIr7FJfG2H3iZRc5 InzMLHuy7QN0FTjVaJXJOaIl+Uy69UktDJG0i34atn7eaQ9SEKh8ue1rEaRPG3wBZS3zRVdeKO0 DDcLBCizv4J08vSHb639P2yVyx43YIve/2ug1blDa37l+6Lqp X-Gm-Gg: ASbGncti6m3OMXi7IL+CRopfCU8zWH6OYHp473Ov2akrXR5Pizx2mrZcyYEgEwT9Gl3 SXjxnA/A0UviSPDSx4ZJvGxDIQ98NtW5EbPrD70NvSfRbGcZhou+dGdSWs7ryjvQj3fuIdN7HSB XUf7it9jAtcLyXEqOmmZou4YPeaWcZNLmlQ9GnekSF9xo3omRwDXT4+FRfPs0Og9NKxTT9ooTfz 0jY1Bp0zzkHzUwgnPdNpVhPPgNmnN2J/HHRUw/u+HuKbTsOvXxfUwOJ6ZoF1ZI4W49D3CJND89M KNrNT1LjihEagF7dPAqn5uaW/4UMkFgpxobTQgiXTLG8iTRmrS6JG/blA05yBTFZUaeWF7OSUqY bvY/eyIobIVqrRgsUeiRB+jDPhxuJWduPRouY X-Received: by 2002:a05:600c:3d8b:b0:440:6852:5b31 with SMTP id 5b1f17b1804b1-440a65d8109mr18982735e9.10.1745577188640; Fri, 25 Apr 2025 03:33:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3wMQyPtF6qF4KclgkUGxHK/glXl+aKSrb38iTYeEUzaNaNavwM0huVVwKu0gaFUaOnYwd/w== X-Received: by 2002:a05:600c:3d8b:b0:440:6852:5b31 with SMTP id 5b1f17b1804b1-440a65d8109mr18982455e9.10.1745577188164; Fri, 25 Apr 2025 03:33:08 -0700 (PDT) Received: from ?IPV6:2003:cb:c70f:6900:6c56:80f8:c14:6d2a? (p200300cbc70f69006c5680f80c146d2a.dip0.t-ipconnect.de. [2003:cb:c70f:6900:6c56:80f8:c14:6d2a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e5d52bsm1976880f8f.90.2025.04.25.03.33.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Apr 2025 03:33:07 -0700 (PDT) Message-ID: <0a6fa00f-0e48-4101-b2ad-23c9a964b740@redhat.com> Date: Fri, 25 Apr 2025 12:33:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] mm/contig_alloc: fix alloc_contig_range when __GFP_COMP and order < MAX_ORDER To: Jinjiang Tu , ziy@nvidia.com, akpm@linux-foundation.org, yuzhao@google.com Cc: linux-mm@kvack.org, wangkefeng.wang@huawei.com References: <20250421013620.459740-1-tujinjiang@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250421013620.459740-1-tujinjiang@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oYaT4qauHJeIZZVTLzFL8IgFQx1meNNcDPB0j5B6WR8_1745577189 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: op7x8xty6eu47uairah1sjatgzo9yaqc X-Rspamd-Queue-Id: 992494000D X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745577193-650366 X-HE-Meta: U2FsdGVkX19NnMYXj5DqwT7SpkV+yrwF4thpBzT3l+ELtM6Mn7lIhiRlW94FwHYhEn/Vx+9mBvPj3SLANaI+E5ceeI93GSccNG4fab7lr+nK0j4v5p+JfjIGJMWbR3ih82zs9O0lNPwUWoPMiiW/9BPhJhk5PWZnbEpUvYOV9foc2bnTUf8fO9gTVkDGirLXsjiCV580ulgE6pkLc28HjhQhIPU9q3+ldS4UsTj8+Iw0uH9xPAhA+AXlydp2yg79xv0Jla27Uh0o9UZg8483nf29qHKAF9U2VsDiv/RcSsuQtwj4C9GbRbtZZRAVNby/4W6y8NEBsO7EQS1eWmTP/p3qdXE4WRDc0x6v8LHydN0JaIGGraLCJNK/B9nlWmSwF1ssj5aGBEL/tL1zS4i3xECXZrkD6+nj5ib3x6bHXy+OKPwnEAGeeGjV3PrAz6VhOYWnEgSVV4ENMLR59Dhd0+wahs41ZdKUVFHcdA7TDHALeaVSvnkOifvVQ006qhwUvgfFUHgpCSfDTUp7AV84ir7mIBHjxkhFZpW15WdS6s7/Gjx6jeoCHufUVgs+J3uRelSyLkCzevirO1A0LN3Y40rHCFT1piTajoBjw5FhGaNxJNxKbWBK1TVNh6WeY7PO2Ou/CU+M2BitcCzE2aDNtmV7LvQng4/1alabJbL7hsYjAxtGggjIJoUA1dbxvO5hhVIuqAu1CBYeHES8Vgz58gYsKRJ31QRB/lfHPzqe48MrxqAJw3+/aMqETB2ZkiDxrL+nMwMcmRkfxCM47nLytox3tzRf1unCeJJmS0kvmrBM2Zey31Ii4aJ4mqYzmoEyuh4By+75xutugLsUpR7DheEE6TXwHrMHr0dsw/r0snLCVdKCwDyiz0nXYZIBY03fq3h/iav9EkrXNVTFDBfWr/LmgKsHxZP2wZrzl8rP56Rx0cZ06TUQbK4+OJqLfv0DC597UDfAhVxzZavxZ0D NLmFdcYA 5iRfMB3cO+sKr1j8KXLITEDNaCqJUVkE+31hMm3vfPOiOKEIuH20N9wsVON+XUePviAHpWJ0jpTJgxjhHKzdxodVoEfv2cGXz08BE6SSZeSNBilzLWs+sN7jWiHBN9qiDfQ4WYJVIn+n4h/57BxQiXTTAYLdDV0zQZVCr3qO1yfFCwjvr0pjt4bcL1DDbwYiWs4dhx9NTY8fRvTW1PYs4M0qgszNFuflHjHj1UioYZAe1cPyRt5SR7rrLOHHv3bsKGvijXrXiorJZJbNlyIbv7YBN0sT11SfnH5Yu/FetOc0FlM6D7jDDElGdu1CqmJzdwalRu4kXGcyLrIAwHPGeBEEO977Zo48+znmOMrtuPD9AXJjWk1HZ7ttj3TPvSX1gaOJvTpLK7QbOOhP8nQxHg8idrP3Qda+t3KR+yiYWjryNvVrHcrig6w1HwwsyD4bplI0wm/w8OeTdIMpKrFmWsYYKZFlBK9YMfO/df6G+MKJfGHnaPj+WJBO4aw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 21.04.25 03:36, Jinjiang Tu wrote: > When calling alloc_contig_range() with __GFP_COMP and the order of > requested pfn range is pageblock_order, less than MAX_ORDER, I triggered > WARNING as follows: > > PFN range: requested [2150105088, 2150105600), allocated [2150105088, 2150106112) > WARNING: CPU: 3 PID: 580 at mm/page_alloc.c:6877 alloc_contig_range+0x280/0x340 > Just to verify: there is no such in-tree user, right? > alloc_contig_range() marks pageblocks of the requested pfn range to be > isolated, migrate these pages if they are in use and will be freed to > MIGRATE_ISOLATED freelist. > > Suppose two alloc_contig_range() calls at the same time and the requested > pfn range are [0x80280000, 0x80280200) and [0x80280200, 0x80280400) > respectively. Suppose the two memory range are in use, then > alloc_contig_range() will migrate and free these pages to MIGRATE_ISOLATED > freelist. __free_one_page() will merge MIGRATE_ISOLATE buddy to larger > buddy, resulting in a MAX_ORDER buddy. Finally, find_large_buddy() in > alloc_contig_range() returns a MAX_ORDER buddy and results in WARNING. > > To fix it, call free_contig_range() to free the excess pfn range. > > Fixes: e98337d11bbd ("mm/contig_alloc: support __GFP_COMP") > Signed-off-by: Jinjiang Tu > --- > Changelog since v1: > * Add comment and remove redundant code, suggested by Zi Yan > > mm/page_alloc.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 579789600a3c..f0162ab991ad 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -6440,6 +6440,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, > .alloc_contig = true, > }; > INIT_LIST_HEAD(&cc.migratepages); > + bool is_range_aligned; is "aligned" the right word? Aligned to what? I do wonder if we could do the following on top, checking that the range is suitable for __GFP_COMP earlier. From 6c414d786db74b1494f7cf66ebf911c01995d20a Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 25 Apr 2025 12:32:15 +0200 Subject: [PATCH] tmp Signed-off-by: David Hildenbrand --- mm/page_alloc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 57aa64dc74a05..85312903dcd8c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6682,6 +6682,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_mask, gfp_t *gfp_cc_mask) int alloc_contig_range_noprof(unsigned long start, unsigned long end, unsigned migratetype, gfp_t gfp_mask) { + const int range_order = ilog2(end - start); unsigned long outer_start, outer_end; int ret = 0; @@ -6695,12 +6696,19 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, .alloc_contig = true, }; INIT_LIST_HEAD(&cc.migratepages); - bool is_range_aligned; gfp_mask = current_gfp_context(gfp_mask); if (__alloc_contig_verify_gfp_mask(gfp_mask, (gfp_t *)&cc.gfp_mask)) return -EINVAL; + /* __GFP_COMP may only be used for certain aligned+sized ranges. */ + if ((gfp_mask & __GFP_COMP) && + (!is_power_of_2(end - start) || !IS_ALIGNED(start, 1 << range_order))) { + WARN_ONCE(true, "PFN range: requested [%lu, %lu) is not suitable for __GFP_COMP\n", + start, end); + return -EINVAL; + } + /* * What we do here is we mark all pageblocks in range as * MIGRATE_ISOLATE. Because pageblock and max order pages may @@ -6789,9 +6797,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, * isolated free pages can have higher order than the requested * one. Use split_free_pages() to free out of range pages. */ - is_range_aligned = is_power_of_2(end - start); - if (!(gfp_mask & __GFP_COMP) || - (is_range_aligned && ilog2(end - start) < MAX_PAGE_ORDER)) { + if (!(gfp_mask & __GFP_COMP) || range_order < MAX_PAGE_ORDER) { split_free_pages(cc.freepages, gfp_mask); /* Free head and tail (if any) */ @@ -6802,22 +6808,16 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, outer_start = start; outer_end = end; - - if (!(gfp_mask & __GFP_COMP)) - goto done; } - if (start == outer_start && end == outer_end && is_range_aligned) { + if (gfp_mask & __GFP_COMP) { struct page *head = pfn_to_page(start); int order = ilog2(end - start); + VM_WARN_ON_ONCE(outer_start != start || outer_end != end); check_new_pages(head, order); prep_new_page(head, order, gfp_mask, 0); set_page_refcounted(head); - } else { - ret = -EINVAL; - WARN(true, "PFN range: requested [%lu, %lu), allocated [%lu, %lu)\n", - start, end, outer_start, outer_end); } done: undo_isolate_page_range(start, end, migratetype); -- 2.49.0 -- Cheers, David / dhildenb