From patchwork Tue Feb 20 06:16:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13563444 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 9A46FC48BC3 for ; Tue, 20 Feb 2024 06:16:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 038256B0071; Tue, 20 Feb 2024 01:16:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F03236B0072; Tue, 20 Feb 2024 01:16:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA4C26B0074; Tue, 20 Feb 2024 01:16:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C4C886B0071 for ; Tue, 20 Feb 2024 01:16:48 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6FBBF1404E0 for ; Tue, 20 Feb 2024 06:16:47 +0000 (UTC) X-FDA: 81811173654.21.4C6E488 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf22.hostedemail.com (Postfix) with ESMTP id D8DC9C0012 for ; Tue, 20 Feb 2024 06:16:43 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=AZmUa5vy; spf=pass (imf22.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708409805; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=e1Tqntxb8WJb9FYr5Qxi5sfx12zCF/ZdGBjlVEejyj0=; b=NEj2RDEMTriCww5K9DUb3hEp+EqlzP49XFgQzTwczkNqCD71WR8MhrnW92j0LednfKuVYs ra+VzfMlsAJZxldFx+2hce5bykEsDdVNtqsEqtP/pysm5318PiYXvkO5n8ez4+TqdpAQlF 3SS83XDVRIkHqtgBLrkmXlpmVcEg9KY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708409805; a=rsa-sha256; cv=none; b=ljlYGJ4IHgY9ww5llWztjYHpv3O2GaWseHlkpnp3LBGetiOgJiOOD0PwBJAVFbw/yqSUEh BuJpf9PuiQqABFfPGRLmFLJ/V8y3nvKjyYZ48vTVU2qFb5ETcrtYqGW8pi+DpjiyCZ4BNr E5E8XkYJOVRB6ZMWnqW3sjMBzZrk0hg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=AZmUa5vy; spf=pass (imf22.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1708409800; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=e1Tqntxb8WJb9FYr5Qxi5sfx12zCF/ZdGBjlVEejyj0=; b=AZmUa5vyhAL3guw+eYMx7HxHk6vIrhUGbhCJhbzMFPmBP6qTJk9KkG2eF0MwEMg+nu/p0Bwt0BBKJR9p0F12sp/wt5dDQaZibba/B0i2+5UmakQTBQhc94OTojaJqIXQ9B0I2Fpir+kAO6VVX20M6DhEqEwUFdPfe4Z3unj+aAo= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0W0veO0d_1708409798; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W0veO0d_1708409798) by smtp.aliyun-inc.com; Tue, 20 Feb 2024 14:16:39 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, vbabka@suse.cz, ziy@nvidia.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] mm: compaction: update the cc->nr_migratepages when allocating or freeing the freepages Date: Tue, 20 Feb 2024 14:16:31 +0800 Message-Id: <6440493f18da82298152b6305d6b41c2962a3ce6.1708409245.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Rspamd-Queue-Id: D8DC9C0012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: tsc1mgjrtpmkbrqeueife93bbkjuhxmm X-HE-Tag: 1708409803-365791 X-HE-Meta: U2FsdGVkX19q51JdQTe7QKta2BDY3pYQoqPWTMmKhZ6T9azIEvzeOdsZ3rZtX6qyNOfa42Q9CdYu9xiyDtOvfzxfYiTa22J68w3Y3ykuBu/xrtyQvO1UjoHZsDlWBPr8VDfDPHuDMWUoHOE7ILswbczaw11zc0udCMGNpn54iRIYV9WEBqURlMzObVMsPzUYE5NT1gXNQ8CRF94qClwWYLx2w2CQ88QE8CyaZLIwPh5v6/LXq1oB7lzzzVBFotVYe3ZEVFkee7novypzFWeq752a56rdNmwJCod9ffEz+2kUUosTIJDhbgacBnII6/KR8yUEU2LA35io5IgPr2N5Yft1zSTCVuDeYooreQjVAlDGOYfZRAsh1FyI4F2fmckeQNUCHPgd92NNo25OqoqzbwkH1yjmcKtWCGutTctY1Kk4nIMwHkkyvkN4ZrdeDeknN3jrX9G3tf3CkULOc3vDNQn67P12kjgs662Qe1Sdrtxb6w1+KrTldKtWr5Q/0PkLwiuLTq3RC7LiVW87IKpFxC8cn85TL03auEvsMJk7yXVvyw6HJ+URP61UUoiClbUoiFzLGMg1I2Pq1b/PnMB3zieo5smpHgGMp4du/iVY760dFj99CogQWWMCHahLstSqrPe8O/Njrb51ouvGCFAj2YutLIfV4XRERlqanbilGv5OVbMPYHmOJp61wkVflcZtuBvYI4qhefgsSzVj5j3XdSeyqnlMYPMJw+gO9Ebs4Xp+lWcOXSsT3Ybvv1Di7QBZIqMR9mO9DlbHcVv9ssIX4K9GxFMiqHgGCxfLtEuunqOmfl7idjESLNG8ZSjJhjAx/l+Ox7qK4KS+i5UqTkIWhYjF9lSVfQ6smI2UszX7amR3Y7RmMwH5Qh2Dp86DhFRLeC15P8w6AFxzlaoBjHOmYYQB2zp7zedV2Zi+PgSLXjamY0sNgy9SMewOzNqGNX1mIiMgIWImDwQwkdcSspg IpQ== 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: Currently we will use 'cc->nr_freepages >= cc->nr_migratepages' comparison to ensure that enough freepages are isolated in isolate_freepages(), however it just decreases the cc->nr_freepages without updating cc->nr_migratepages in compaction_alloc(), which will waste more CPU cycles and cause too many freepages to be isolated. So we should also update the cc->nr_migratepages when allocating or freeing the freepages to avoid isolating excess freepages. And I can see fewer free pages are scanned and isolated when running thpcompact on my Arm64 server: k6.7 k6.7_patched Ops Compaction pages isolated 120692036.00 118160797.00 Ops Compaction migrate scanned 131210329.00 154093268.00 Ops Compaction free scanned 1090587971.00 1080632536.00 Ops Compact scan efficiency 12.03 14.26 Moreover, I did not see an obvious latency improvements, this is likely because isolating freepages is not the bottleneck in the thpcompact test case. k6.7 k6.7_patched Amean fault-both-1 1089.76 ( 0.00%) 1080.16 * 0.88%* Amean fault-both-3 1616.48 ( 0.00%) 1636.65 * -1.25%* Amean fault-both-5 2266.66 ( 0.00%) 2219.20 * 2.09%* Amean fault-both-7 2909.84 ( 0.00%) 2801.90 * 3.71%* Amean fault-both-12 4861.26 ( 0.00%) 4733.25 * 2.63%* Amean fault-both-18 7351.11 ( 0.00%) 6950.51 * 5.45%* Amean fault-both-24 9059.30 ( 0.00%) 9159.99 * -1.11%* Amean fault-both-30 10685.68 ( 0.00%) 11399.02 * -6.68%* Signed-off-by: Baolin Wang Acked-by: Mel Gorman Reviewed-by: Vlastimil Babka --- Hi Andrew, please use this patch to replace below 2 old patches. Thanks. https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/commit/?h=mm-everything-2024-02-20-04-19&id=cb30899d456d64fb83ee3e3d95cd9fbb18735d87 https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/commit/?h=mm-everything-2024-02-20-04-19&id=65713d1c4fc498d35dc1f7c1234ef815aa128429 Changes from v2: - Add acked tag from Mel. - Fix the mm_compaction_migratepages trace event. Changes from v1: - Rebased on the latest mm-unstable branch. --- include/trace/events/compaction.h | 6 +++--- mm/compaction.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index 2b2a975efd20..d05759d18538 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -78,10 +78,10 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_fast_isolate_freepage #ifdef CONFIG_COMPACTION TRACE_EVENT(mm_compaction_migratepages, - TP_PROTO(struct compact_control *cc, + TP_PROTO(unsigned int nr_migratepages, unsigned int nr_succeeded), - TP_ARGS(cc, nr_succeeded), + TP_ARGS(nr_migratepages, nr_succeeded), TP_STRUCT__entry( __field(unsigned long, nr_migrated) @@ -90,7 +90,7 @@ TRACE_EVENT(mm_compaction_migratepages, TP_fast_assign( __entry->nr_migrated = nr_succeeded; - __entry->nr_failed = cc->nr_migratepages - nr_succeeded; + __entry->nr_failed = nr_migratepages - nr_succeeded; ), TP_printk("nr_migrated=%lu nr_failed=%lu", diff --git a/mm/compaction.c b/mm/compaction.c index 4494b2914386..218089b29f13 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1798,6 +1798,7 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) dst = list_entry(cc->freepages.next, struct folio, lru); list_del(&dst->lru); cc->nr_freepages--; + cc->nr_migratepages--; return dst; } @@ -1813,6 +1814,7 @@ static void compaction_free(struct folio *dst, unsigned long data) list_add(&dst->lru, &cc->freepages); cc->nr_freepages++; + cc->nr_migratepages++; } /* possible outcome of isolate_migratepages */ @@ -2435,7 +2437,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) unsigned long last_migrated_pfn; const bool sync = cc->mode != MIGRATE_ASYNC; bool update_cached; - unsigned int nr_succeeded = 0; + unsigned int nr_succeeded = 0, nr_migratepages; /* * These counters track activities during zone compaction. Initialize @@ -2553,11 +2555,17 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) pageblock_start_pfn(cc->migrate_pfn - 1)); } + /* + * Record the number of pages to migrate since the + * compaction_alloc/free() will update cc->nr_migratepages + * properly. + */ + nr_migratepages = cc->nr_migratepages; err = migrate_pages(&cc->migratepages, compaction_alloc, compaction_free, (unsigned long)cc, cc->mode, MR_COMPACTION, &nr_succeeded); - trace_mm_compaction_migratepages(cc, nr_succeeded); + trace_mm_compaction_migratepages(nr_migratepages, nr_succeeded); /* All pages were either migrated or will be released */ cc->nr_migratepages = 0;