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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EB306C63798 for ; Fri, 27 Nov 2020 15:44:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3EA1220B80 for ; Fri, 27 Nov 2020 15:44:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="KAq9MFqG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EA1220B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8CF186B005C; Fri, 27 Nov 2020 10:44:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 87FBC6B006C; Fri, 27 Nov 2020 10:44:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76FCC6B006E; Fri, 27 Nov 2020 10:44:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0121.hostedemail.com [216.40.44.121]) by kanga.kvack.org (Postfix) with ESMTP id 5EC596B005C for ; Fri, 27 Nov 2020 10:44:16 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 25DF81EF1 for ; Fri, 27 Nov 2020 15:44:16 +0000 (UTC) X-FDA: 77530619712.14.chain72_2c17f1127389 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 07CC318229818 for ; Fri, 27 Nov 2020 15:44:15 +0000 (UTC) X-HE-Tag: chain72_2c17f1127389 X-Filterd-Recvd-Size: 6541 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Fri, 27 Nov 2020 15:44:15 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id bj5so2878065plb.4 for ; Fri, 27 Nov 2020 07:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uEjXV2CA4jRtXtFdtsbnBy8ifv8488Jbk6i8FFwe9TM=; b=KAq9MFqGpsvUcfrIAbh8pJo4fh76R7rtXZTU5jGvNoJ3htVxlfGR8JshjO6jxcHH/y fE4R+Yf01YcJfquB6LA1A4pMTU8QH2UuQH5vTBJFnxb8ONhQr2YPAa4lwWxziyMouLuA 4C2k1xDZSRLVIfTYAB8K0yoPNxrQ8okKz82vfjtRY1uw4tZ1XkGr0+sr8jzVH3Q0v/Mg UKVCT3V8GuLWl47TUWgeEWcQovWZ97PM+BJfM73+upveHcWX0gTfdHx0pXD9G4Wohx7a 7VK532Pu47q3y3jikRTKSO78nrVVCbrX5FVV53oOc8pc3Y1+j7lYx0kLRG/ok3ZvedaU SA1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uEjXV2CA4jRtXtFdtsbnBy8ifv8488Jbk6i8FFwe9TM=; b=ixnAsAXbdQEeAABKbnicWHIrkgWXiTzYGyxyp1fyRcSQBpFh9Bch93Sg4ol5omIwaP +76H1TyYCF9wLDDebSv3Cx2pnidYFmkO36qF2CicSsgEZRks2Cq1PCIVZnwrkA57N6IG tLjV/giI0nL+aLCvKGGpGICuJEqEsBa+IsW0TK76wnG2MvTUybGkPcaUKb3eHB1Frj1M uZwjCR45q9dUicPNrFGqU/AlXhlbcUNORoCsUyfwYICNr04spfyT5pVurypngwbkei69 97itiZrZz5tp9SpWXcsNV5IuqEgdOWKPXmTROF1WwvrK9SEtkvCK06hlAbtLU/LOLlkC RldA== X-Gm-Message-State: AOAM530fmUVyjHvFtWBgkx8ibnoVE7CCYIumQhMeesBk61E58Y05lnhn QmYEkB00UTdRBOYdVGq7whFzerAp85nlGZN3EwV7oQ== X-Google-Smtp-Source: ABdhPJycsUoHNLGjSenG6L1QQWNj1cvDhj8fSiRquSj89Yi97LcANL0xhyfkKVLnoZpwDR1fylAEKjk9acyEqCgq9+k= X-Received: by 2002:a17:902:ff06:b029:da:420e:24b9 with SMTP id f6-20020a170902ff06b02900da420e24b9mr6286221plj.20.1606491852729; Fri, 27 Nov 2020 07:44:12 -0800 (PST) MIME-Version: 1.0 References: <20201127141900.43348-1-songmuchun@bytedance.com> <9e32e476-3812-2616-b2f5-a9b6f3531b8b@suse.cz> In-Reply-To: <9e32e476-3812-2616-b2f5-a9b6f3531b8b@suse.cz> From: Muchun Song Date: Fri, 27 Nov 2020 23:43:33 +0800 Message-ID: Subject: Re: [External] Re: [PATCH] mm/page_alloc: Do not isolate redundant pageblock To: Vlastimil Babka Cc: Andrew Morton , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" 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 Fri, Nov 27, 2020 at 11:17 PM Vlastimil Babka wrote: > > On 11/27/20 3:19 PM, Muchun Song wrote: > > Current pageblock isolation logic could isolate each pageblock individually > > since commit d9dddbf55667 ("mm/page_alloc: prevent merging between isolated > > and other pageblocks"). So we not need to concern about page allocator > > merges buddies from different pageblocks and changes MIGRATE_ISOLATE to > > some other migration type. > > Yeah, that should be the case now. > > > Signed-off-by: Muchun Song > > --- > > mm/page_alloc.c | 26 ++++++++------------------ > > 1 file changed, 8 insertions(+), 18 deletions(-) > > > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > > index cefbef32bf4a..608a2c2b8ab7 100644 > > --- a/mm/page_alloc.c > > +++ b/mm/page_alloc.c > > @@ -8313,16 +8313,14 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, > > } > > > > #ifdef CONFIG_CONTIG_ALLOC > > -static unsigned long pfn_max_align_down(unsigned long pfn) > > +static unsigned long pfn_align_down(unsigned long pfn) > > { > > - return pfn & ~(max_t(unsigned long, MAX_ORDER_NR_PAGES, > > - pageblock_nr_pages) - 1); > > + return pfn & ~(pageblock_nr_pages - 1); > > } > > > > -static unsigned long pfn_max_align_up(unsigned long pfn) > > +static unsigned long pfn_align_up(unsigned long pfn) > > { > > - return ALIGN(pfn, max_t(unsigned long, MAX_ORDER_NR_PAGES, > > - pageblock_nr_pages)); > > + return ALIGN(pfn, pageblock_nr_pages); > > } > > How bout just removing these wrappers completely and using ALIGN and ALIGN_DOWN > directly, as there are just two uses for each? Sounds good to me. Will do. > > > /* [start, end) must belong to a single zone. */ > > @@ -8415,14 +8413,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, > > INIT_LIST_HEAD(&cc.migratepages); > > > > /* > > - * What we do here is we mark all pageblocks in range as > > - * MIGRATE_ISOLATE. Because pageblock and max order pages may > > - * have different sizes, and due to the way page allocator > > - * work, we align the range to biggest of the two pages so > > - * that page allocator won't try to merge buddies from > > - * different pageblocks and change MIGRATE_ISOLATE to some > > - * other migration type. > > - * > > * Once the pageblocks are marked as MIGRATE_ISOLATE, we > > * migrate the pages from an unaligned range (ie. pages that > > * we are interested in). This will put all the pages in > > @@ -8438,8 +8428,8 @@ int alloc_contig_range(unsigned long start, unsigned long end, > > * put back to page allocator so that buddy can use them. > > */ > > > > - ret = start_isolate_page_range(pfn_max_align_down(start), > > - pfn_max_align_up(end), migratetype, 0); > > + ret = start_isolate_page_range(pfn_align_down(start), pfn_align_up(end), > > + migratetype, 0); > > if (ret) > > return ret; > > > > @@ -8522,8 +8512,8 @@ int alloc_contig_range(unsigned long start, unsigned long end, > > free_contig_range(end, outer_end - end); > > > > done: > > - undo_isolate_page_range(pfn_max_align_down(start), > > - pfn_max_align_up(end), migratetype); > > + undo_isolate_page_range(pfn_align_down(start), pfn_align_up(end), > > + migratetype); > > return ret; > > } > > EXPORT_SYMBOL(alloc_contig_range); > > > -- Yours, Muchun