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 DBBFBC67861 for ; Tue, 9 Apr 2024 06:23:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FD196B0095; Tue, 9 Apr 2024 02:23:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5864F6B0096; Tue, 9 Apr 2024 02:23:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B1D96B0098; Tue, 9 Apr 2024 02:23:25 -0400 (EDT) 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 1AEA56B0095 for ; Tue, 9 Apr 2024 02:23:25 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9AA26C029D for ; Tue, 9 Apr 2024 06:23:24 +0000 (UTC) X-FDA: 81989001528.07.D7F8708 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf22.hostedemail.com (Postfix) with ESMTP id 4936CC0005 for ; Tue, 9 Apr 2024 06:23:22 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="AU/Eam+X"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="37CR/FUU"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="AU/Eam+X"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="37CR/FUU"; spf=pass (imf22.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712643802; 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=2wv4dy4qt5fBaBHru1E7dQVRFP0uGbCdZP6F+NXrKhY=; b=TtOEgAltEt6p1X/SQQV7P2oJLiZWMtikJzkwZM1UXPrWWMgOFCcWIUfbBDOoKkTZwfMfFa cUt1H9JFGN8XF5meq0WtLruITVIZGwtPg04vAFtdmEsNDaxyN0YQmXY4J5DqMj+zm4I9yW pV6NnGJG45Q6iFjx08eBSV2hf/hpvhg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712643802; a=rsa-sha256; cv=none; b=MhY+EaDOMOr7fMyP1xg2uT8ew6K38Sx8L9NAKw5R5GvX5V5huJP9Fl9uEVFY3lf+VeTlzQ JFydAr9rSVy72qwsQzfeOc3SM3JEyd4tdnXfWE8fIqAr3Q0DtJyX9XDRg7uUYFfQjuuZuY rFQqOenbEqrDK57vE1hsn5jc1OWyu/w= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="AU/Eam+X"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="37CR/FUU"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="AU/Eam+X"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="37CR/FUU"; spf=pass (imf22.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AA2FD2080A; Tue, 9 Apr 2024 06:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1712643800; h=from:from:reply-to: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=2wv4dy4qt5fBaBHru1E7dQVRFP0uGbCdZP6F+NXrKhY=; b=AU/Eam+X4HqvNCnR0fB0Rky9yxPCOoHo+Fc9SxirD+LGR/q7/0AmGLvWJ/rD8UfMMePyAq PokQnLP2jaXUZaVl8X1ckd6TH8Bmv+e0VOBENN/eKsUZm1Og/n6vVa2m3CDeEWmGYqzsPs Nlt3If2xLqD98zxFewP7mbaEZ82B0AA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1712643800; h=from:from:reply-to: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=2wv4dy4qt5fBaBHru1E7dQVRFP0uGbCdZP6F+NXrKhY=; b=37CR/FUUZstI7p9VLLJfFENOSFX4ylFsqKRbQh9NZ+vYaG2BjvdulGI4Vy30nYKI1Wdp47 20/qMtLCCIjTleAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1712643800; h=from:from:reply-to: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=2wv4dy4qt5fBaBHru1E7dQVRFP0uGbCdZP6F+NXrKhY=; b=AU/Eam+X4HqvNCnR0fB0Rky9yxPCOoHo+Fc9SxirD+LGR/q7/0AmGLvWJ/rD8UfMMePyAq PokQnLP2jaXUZaVl8X1ckd6TH8Bmv+e0VOBENN/eKsUZm1Og/n6vVa2m3CDeEWmGYqzsPs Nlt3If2xLqD98zxFewP7mbaEZ82B0AA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1712643800; h=from:from:reply-to: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=2wv4dy4qt5fBaBHru1E7dQVRFP0uGbCdZP6F+NXrKhY=; b=37CR/FUUZstI7p9VLLJfFENOSFX4ylFsqKRbQh9NZ+vYaG2BjvdulGI4Vy30nYKI1Wdp47 20/qMtLCCIjTleAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9134C13313; Tue, 9 Apr 2024 06:23:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qzMoI9jeFGbnLAAAD6G6ig (envelope-from ); Tue, 09 Apr 2024 06:23:20 +0000 Message-ID: <1cc1e3d1-4646-436c-92cb-f8584406bf88@suse.cz> Date: Tue, 9 Apr 2024 08:23:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 10/10] mm: page_alloc: consolidate free page accounting Content-Language: en-US To: Johannes Weiner Cc: Baolin Wang , Andrew Morton , Mel Gorman , Zi Yan , "Huang, Ying" , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240320180429.678181-1-hannes@cmpxchg.org> <20240320180429.678181-11-hannes@cmpxchg.org> <7b3b7f2e-7109-4e72-b1cf-259cb56f3629@linux.alibaba.com> <20240408142340.GA1057805@cmpxchg.org> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20240408142340.GA1057805@cmpxchg.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: wroe816bo6auqdo6ssqf53p9s6b3eksf X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4936CC0005 X-Rspam-User: X-HE-Tag: 1712643802-426758 X-HE-Meta: U2FsdGVkX18HjXzcOwGdGKMVQ2m9RJlZTF1ce5DAuk49QOQKQxssXzs2D2IQDFyI+D1/Jbj1Mv/6NQqQnLpkUKGbWQC7oiciwzhBSkfkvijYG1wV81MwcdHjIwgEXpZuZvmyqQykrtLfRipHHn5QN08D9JJlaobI6jjVTWrn8zZHBLb2zrTJLg7n7U7viOi1+cGDgJ1e6N8wwGUEndogXkAFh6w0ADkke3zo9PIsKjPA/g1QpfOc8uZNxfoz7B7O4dx6m9bLkSgOPmZP3lXmXPJ52rn7GoxrIN5I0QwZBLg0Z0CI8G7sZdtGSlWWi2gAd4BA72VyfAcAW+YHBjjfZYL8MOIH9hvK3RPg/HD1apjN4AUSuLa2QE5uJY5ojWS+qtO2/u43zvEGwygMT8pX5WUZKEcjHRXw4+6u/s8JoKXO4U91CiWEiosWvLMePj8rFT+7Ww47nlX9o79GPoutAqv2XPcEPexVsNyNTFZVfJ2Hk5hLMBAJ4YWfImXSEjVd9NXoKpX+riIdd1zHct6n1k6F9IEh6hg+Sb0mM6QPIeLEcVOYy56/PKoFTqIUa9MfJg/Fkn5ppZ8ZfVN6tOZen2Hw5D4l4JnYrEhCfYSiHTGvbnMjfctuZeYnBvNGqEAJTibThlEo1lceIsl3qWBJFbBRQ4+3++XC82pN9gfIiDusuammOwN0HUxtrxilC/bLrxWP63QiHfa1H7LBAmbqz/VplALO5aXFeRlsrF5CP+9MYz+EudpZlC7v7RLov6kHEGDL/REGyw7hcPLFVgYBv0nc95/PvRshyIn3EAN1Gz2A96gla3YLtxE777oBuoZgbTK8bTHDeje3GMoIY5evneSl5PG5Rtp17+3zTyWtAMwkDs0Pqc7mpkv0vo4W6QJtwa/wHEMDW3V4RQNrHLm+yeJmB34vnIr03aGsxPtQMrdLh+i7RtuJHqi3gqUqf+0CZnATbpQxymwbcsBjS58 ExsHdelW 6vR/dLmDnLvjM69oFQhSW4WDPJkz3eGJ3CnIVU9MQV0lef+1vRLR8QjFPlaUQzHQN5Ca+D6ijtCu3Poc69xqMvXp+jUgyyVIZEW1I/ExcSSkpo2ilMKMSzPjTJjLKob02IVvhKK0x/YkQrNuDPq5jsb1k3VH9RTWHqkp5DkaFzbxzjAqym6HDb8I+zTbhaK81aH9c3B0jwyA/USR8U+efHiHLG3YoX3gv738XW2cy6TRdgjagipOlPh/rf8WYSDbjKjXU5F3XK2zBiNM9MFuR1650yErqNWEg37DDh58H9FHkC9Pu7YRUVnMc0UaIoAsg5KIqboSHZQDe2D1e5fbBJAG8fiVVuo7Jx4Tlqm1ARH0hHDirOq60q38zrA== 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 4/8/24 4:23 PM, Johannes Weiner wrote: > On Mon, Apr 08, 2024 at 09:38:20AM +0200, Vlastimil Babka wrote: >> On 4/7/24 12:19 PM, Baolin Wang wrote: >> > On 2024/3/21 02:02, Johannes Weiner wrote: >> >> >> >> + account_freepages(page, zone, 1 << order, migratetype); >> >> + >> >> while (order < MAX_PAGE_ORDER) { >> >> - if (compaction_capture(capc, page, order, migratetype)) { >> >> - __mod_zone_freepage_state(zone, -(1 << order), >> >> - migratetype); >> >> + int buddy_mt = migratetype; >> >> + >> >> + if (compaction_capture(capc, page, order, migratetype)) >> >> return; >> >> - } >> > >> > IIUC, if the released page is captured by compaction, then the >> > statistics for free pages should be correspondingly decreased, >> > otherwise, there will be a slight regression for my thpcompact benchmark. >> > >> > thpcompact Percentage Faults Huge >> > k6.9-rc2-base base + patch10 + 2 fixes >> > Percentage huge-1 78.18 ( 0.00%) 71.92 ( -8.01%) >> > Percentage huge-3 86.70 ( 0.00%) 86.07 ( -0.73%) >> > Percentage huge-5 90.26 ( 0.00%) 78.02 ( -13.57%) >> > Percentage huge-7 92.34 ( 0.00%) 78.67 ( -14.81%) >> > Percentage huge-12 91.18 ( 0.00%) 81.04 ( -11.12%) >> > Percentage huge-18 89.00 ( 0.00%) 79.57 ( -10.60%) >> > Percentage huge-24 90.52 ( 0.00%) 80.07 ( -11.54%) >> > Percentage huge-30 94.44 ( 0.00%) 96.28 ( 1.95%) >> > Percentage huge-32 93.09 ( 0.00%) 99.39 ( 6.77%) >> > >> > I add below fix based on your fix 2, then the thpcompact Percentage >> > looks good. How do you think for the fix? >> >> Yeah another well spotted, thanks. "slight regression" is an understatement, >> this affects not just a "statistics" but very important counter >> NR_FREE_PAGES which IIUC would eventually become larger than reality, make >> the watermark checks false positive and result in depleted reserves etc etc. >> Actually wondering why we're not seeing -next failures already (or maybe I >> just haven't noticed). > > Good catch indeed. > > Trying to understand why I didn't notice this during testing, and I > think it's because I had order-10 pageblocks in my config. There is > this in compaction_capture(): > > if (order < pageblock_order && migratetype == MIGRATE_MOVABLE) > return false; > > Most compaction is for order-9 THPs on movable blocks, so I didn't get > much capturing in practice in order for that leak to be noticable. > > In earlier versions of the patches I had more aggressive capturing, > but also did the accounting in add_page_to/del_page_from_freelist(), > so capturing only steals what's already accounted to be off list. > > With the __add/__del and the consolidated account_freepages() > optimization, compaction_capture() needs explicit accounting again. > >> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c >> > index 8330c5c2de6b..2facf844ef84 100644 >> > --- a/mm/page_alloc.c >> > +++ b/mm/page_alloc.c >> > @@ -805,8 +805,10 @@ static inline void __free_one_page(struct page *page, >> > while (order < MAX_PAGE_ORDER) { >> > int buddy_mt = migratetype; >> > >> > - if (compaction_capture(capc, page, order, migratetype)) >> > + if (compaction_capture(capc, page, order, migratetype)) { >> > + account_freepages(zone, -(1 << order), migratetype); >> > return; >> > + } >> > >> > buddy = find_buddy_page_pfn(page, pfn, order, &buddy_pfn); >> > if (!buddy) >> > >> > With my fix, the THP percentage looks better: >> > k6.9-rc2-base base + patch10 + 2 fixes + >> > my fix >> > Percentage huge-1 78.18 ( 0.00%) 82.83 ( 5.94%) >> > Percentage huge-3 86.70 ( 0.00%) 93.47 ( 7.81%) >> > Percentage huge-5 90.26 ( 0.00%) 94.73 ( 4.95%) >> > Percentage huge-7 92.34 ( 0.00%) 95.22 ( 3.12%) >> > Percentage huge-12 91.18 ( 0.00%) 92.40 ( 1.34%) >> > Percentage huge-18 89.00 ( 0.00%) 85.39 ( -4.06%) >> > Percentage huge-24 90.52 ( 0.00%) 94.70 ( 4.61%) >> > Percentage huge-30 94.44 ( 0.00%) 97.00 ( 2.71%) >> > Percentage huge-32 93.09 ( 0.00%) 92.87 ( -0.24%) > > Acked-by: Johannes Weiner Acked-by: Vlastimil Babka > With fixed indentation: Maybe Baolin could resend the finalized 2 fixups in a more ready-to-pick form? > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 70f82635f650..96815e3c22f2 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -805,8 +805,10 @@ static inline void __free_one_page(struct page *page, > while (order < MAX_PAGE_ORDER) { > int buddy_mt = migratetype; > > - if (compaction_capture(capc, page, order, migratetype)) > + if (compaction_capture(capc, page, order, migratetype)) { > + account_freepages(zone, -(1 << order), migratetype); > return; > + } > > buddy = find_buddy_page_pfn(page, pfn, order, &buddy_pfn); > if (!buddy)