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=-17.4 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 70343C433EF for ; Mon, 6 Sep 2021 11:50:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 028A560F45 for ; Mon, 6 Sep 2021 11:50:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 028A560F45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 4EBE16B0071; Mon, 6 Sep 2021 07:50:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49B926B0072; Mon, 6 Sep 2021 07:50:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 362DB900002; Mon, 6 Sep 2021 07:50:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id 272DA6B0071 for ; Mon, 6 Sep 2021 07:50:15 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D2A89181E48E3 for ; Mon, 6 Sep 2021 11:50:14 +0000 (UTC) X-FDA: 78556980348.30.26B8F92 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 492CD700009B for ; Mon, 6 Sep 2021 11:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630929013; 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; bh=zXE8dWQl68fSLFYKCn3Z80ZMxW3TXAEFPhGPj75Fg9E=; b=DiZJwsYOzDsBY/pT0HZaQIqUBlgWwaLWzlFtgr/W/eUL1GVFT5F1d0iuS5Cl2DLPJgXvHO gXxew7myMZth3jbzi/JqkCmBtsf/iHCDFNr7ANfFFNWEtBZ9duR8qQ79itLdz0m38rjBdA xeXbEGiFgqk83qNlr5pEMU0NkmRsx08= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-Pzu-U8x7NoGAGzuu5U-vAw-1; Mon, 06 Sep 2021 07:50:12 -0400 X-MC-Unique: Pzu-U8x7NoGAGzuu5U-vAw-1 Received: by mail-wr1-f71.google.com with SMTP id r17-20020adfda510000b02901526f76d738so1144815wrl.0 for ; Mon, 06 Sep 2021 04:50:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:organization:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=zXE8dWQl68fSLFYKCn3Z80ZMxW3TXAEFPhGPj75Fg9E=; b=djxOnPRbwxL2lyjJTSz8hgW8373hoLm+fWKE8D/X2wrnoxi2GQkkkuZNHfsmJ7B5Sq oqoD25yR6On8Kkfhh7FduETs16xL0S3z7vYA7UDI74v0CKawwsc3RvlAMbLUwaQzWaqB qQinOtDWJ2Im7esFLU5KEuXsnGTlONvQuWcjNYNW0OKaaoGXrrW3kPibYwEfx54GvOSB R15p0pdEUgEnq9tvtmXMfJ70BAWyuIyCIdN+WQJFS9NbST5KIVWnhG2hVSb61UalXR20 8j2d0TWbgBqVkgRlVb44JG1rE+HyNU0zqhDbcyJ/qXMypyBBo9yaoJhI0u6m6UUXnWo6 3Y1w== X-Gm-Message-State: AOAM532IcZBTrCWaAU50a0VpdMZ/31WzmA47KDi5779On322x6PzTHVi dug6uZ68Sv9/p7kAXRe54uGK/kIbYFiHDZYMe7L9On5/HMH0uKbezSEkOvY0S8ysqI0OQ32ZpTa iyxOy5GQHZyQ= X-Received: by 2002:adf:c513:: with SMTP id q19mr13053598wrf.20.1630929011496; Mon, 06 Sep 2021 04:50:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgonJlqWQp4Qp86UDMlbso1fC+0d73CbwXDTwyOFY3/SDiXIxxZ4LZ+gKFdzV0MgpLyeS0SA== X-Received: by 2002:adf:c513:: with SMTP id q19mr13053567wrf.20.1630929011181; Mon, 06 Sep 2021 04:50:11 -0700 (PDT) Received: from [192.168.3.132] (p5b0c6323.dip0.t-ipconnect.de. [91.12.99.35]) by smtp.gmail.com with ESMTPSA id l11sm7891776wrb.15.2021.09.06.04.50.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Sep 2021 04:50:10 -0700 (PDT) To: Miaohe Lin , akpm@linux-foundation.org Cc: vbabka@suse.cz, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20210904091839.20270-1-linmiaohe@huawei.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH] mm/page_isolation: don't putback unisolated page Message-ID: <5f7c4ac9-d17a-5af3-0326-1152cca38465@redhat.com> Date: Mon, 6 Sep 2021 13:50:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DiZJwsYO; spf=none (imf27.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Stat-Signature: x5rdcrinhg5a7wrf6m8gsfrrihb8wfu9 X-Rspamd-Queue-Id: 492CD700009B X-Rspamd-Server: rspam04 X-HE-Tag: 1630929014-359567 Content-Transfer-Encoding: quoted-printable 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: On 06.09.21 13:32, Miaohe Lin wrote: > On 2021/9/6 17:40, David Hildenbrand wrote: >> On 04.09.21 11:18, Miaohe Lin wrote: >>> If __isolate_free_page() failed, due to zone watermark check, the pag= e is >>> still on the free list. But this page will be put back to free list a= gain >>> via __putback_isolated_page() now. This may trigger page->flags check= s in >>> __free_one_page() if PageReported is set. Or we will corrupt the free= list >>> because list_add() will be called for pages already on another list. >>> >>> Fixes: 3c605096d315 ("mm/page_alloc: restrict max order of merging on= isolated pageblock") >>> Signed-off-by: Miaohe Lin >>> --- >>> =C2=A0 mm/page_isolation.c | 6 ++---- >>> =C2=A0 1 file changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/mm/page_isolation.c b/mm/page_isolation.c >>> index 9bb562d5d194..7d70d772525c 100644 >>> --- a/mm/page_isolation.c >>> +++ b/mm/page_isolation.c >>> @@ -93,10 +93,8 @@ static void unset_migratetype_isolate(struct page = *page, unsigned migratetype) >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 buddy_pfn =3D __find_buddy_pfn(pfn, order); >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 buddy =3D page + (buddy_pfn - pfn); >>> =C2=A0 -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 if (!is_migrate_isolate_page(buddy)) { >>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 __isolate_free_page(page, order); >>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 isolated_page =3D true; >>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 i= f (!is_migrate_isolate_page(buddy)) >>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 isolated_page =3D !!__isolate_free_page(page, order= ); >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>> =20 >> >> Shouldn't we much rather force to ignore watermarks here and make sure= __isolate_free_page() never fails? >=20 > It seems it is not easy to force to ignore watermarks here. And it's no= t a problem > if __isolate_free_page() fails because we can do move_freepages_block()= anyway. > What do you think? Many thanks. I'm wondering if all this complexity in this function is even required. W= hat about something like this: (completely untested) diff --git a/mm/page_isolation.c b/mm/page_isolation.c index bddf788f45bf..29ff2fcb339c 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -66,12 +66,10 @@ static int set_migratetype_isolate(struct page *page,= int migratetype, int isol_ =20 static void unset_migratetype_isolate(struct page *page, unsigned migra= tetype) { + bool buddy_merge_possible =3D false; struct zone *zone; unsigned long flags, nr_pages; - bool isolated_page =3D false; unsigned int order; - unsigned long pfn, buddy_pfn; - struct page *buddy; =20 zone =3D page_zone(page); spin_lock_irqsave(&zone->lock, flags); @@ -79,26 +77,15 @@ static void unset_migratetype_isolate(struct page *pa= ge, unsigned migratetype) goto out; =20 /* - * Because freepage with more than pageblock_order on isolated - * pageblock is restricted to merge due to freepage counting prob= lem, - * it is possible that there is free buddy page. - * move_freepages_block() doesn't care of merge so we need other - * approach in order to merge them. Isolation and free will make - * these pages to be merged. + * If our free page spans at least this whole pageblock and could + * eventually get merged into an even bigger page, go via + * __putback_isolated_page(), because move_freepages_block() won'= t + * trigger merging of free pages. */ if (PageBuddy(page)) { order =3D buddy_order(page); - if (order >=3D pageblock_order && order < MAX_ORDER - 1) = { - pfn =3D page_to_pfn(page); - buddy_pfn =3D __find_buddy_pfn(pfn, order); - buddy =3D page + (buddy_pfn - pfn); - - if (pfn_valid_within(buddy_pfn) && - !is_migrate_isolate_page(buddy)) { - __isolate_free_page(page, order); - isolated_page =3D true; - } - } + if (order >=3D pageblock_order && order < MAX_ORDER - 1) + buddy_merge_possible =3D true; } =20 /* @@ -111,12 +98,12 @@ static void unset_migratetype_isolate(struct page *p= age, unsigned migratetype) * onlining - just onlined memory won't immediately be considere= d for * allocation. */ - if (!isolated_page) { + if (!buddy_merge_possible) { nr_pages =3D move_freepages_block(zone, page, migratetyp= e, NULL); __mod_zone_freepage_state(zone, nr_pages, migratetype); } set_pageblock_migratetype(page, migratetype); - if (isolated_page) + if (buddy_merge_possible) __putback_isolated_page(page, order, migratetype); zone->nr_isolate_pageblock--; out: --=20 Thanks, David / dhildenb