From patchwork Tue Jan 10 13:36:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 41472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2752004wrt; Tue, 10 Jan 2023 05:40:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXul9LGhJkfNrd+BkbZwO/N1aeZ5X8U4Hlu+ns/l/4uqR2apVzNcRmEwudX9YvJNhcTT6RtV X-Received: by 2002:a17:906:d052:b0:7c1:5098:907a with SMTP id bo18-20020a170906d05200b007c15098907amr61197144ejb.35.1673358056661; Tue, 10 Jan 2023 05:40:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673358056; cv=none; d=google.com; s=arc-20160816; b=zYRvXuk7CTGhMdK1kUIMlwlYmZUANBXVSBUgLJb5HLtoov7MaoqR1lcmpGWxRZ8CPO 8EM3Mgn2cx/TWrmZDw2oGe1AmrWwPNNhP2mS4nyszurkFC7ieBED8hGM2yIbgcyxYlK5 7ah6pKhl1bhovl2+zg/xRePPVt0RT4Qjo8byYDg6ZfejhLeTP/evZMGiZHXY2ueMjLLT zL1n4RU2qli1wMWHwACCG9jy4T7KwsZcMcYrAXaSQlhg4Js60f8m50OT2/AKYWKHuGZb WKLE2FK3aqTZJQWZvc3JiQVC18NU3fa7XDIgeifEfvltymRvZytiEwCQoRPFQWn7avnJ m9GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=79EipwoUGWr7Dt7aei0D+jzzxgqlEkuV8Uc+tPdrsQM=; b=TzJAbAVVUUcw2ereh9ZivBXDZla4jGOl19+Gh0ZLxXullqUe5NL88svLD3qaE1ksFq WtmGip08OJNU+2jZuB6zBjAI6tlT/bcsL3twtr+ATPc+0f/t7mzrpdghNwgmozWyteqQ JEYwkWQenNPU+nWNzZD4oWLA4tAtW92tBJyFaBsMO13MzP7xttk0bRXOCSN9IuSgvw/u XntK90ZFZdALci1SPVSPRzjvRQdR5g2om+kUwaHJm5Q+hAoi/aM3c8/Z3xiP+4Xu2xrd i5pBuF6t0GL4TwvDWIi/i0fDl1yVo4bF6mlMqiKfg1gcLhYEL4gggtu3QKNgiFX3TS1B iWgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xe9-20020a170907318900b007c31c5206c5si11334107ejb.436.2023.01.10.05.40.33; Tue, 10 Jan 2023 05:40:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238608AbjAJNgs (ORCPT + 99 others); Tue, 10 Jan 2023 08:36:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232833AbjAJNgf (ORCPT ); Tue, 10 Jan 2023 08:36:35 -0500 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CFD8BA3 for ; Tue, 10 Jan 2023 05:36:32 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;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=4;SR=0;TI=SMTPD_---0VZJNeww_1673357787; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZJNeww_1673357787) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 21:36:27 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] mm: compaction: Remove redundant VM_BUG_ON() in compact_zone() Date: Tue, 10 Jan 2023 21:36:18 +0800 Message-Id: <740a2396d9b98154dba76e326cba5e798b640ead.1673342761.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754643097551687004?= X-GMAIL-MSGID: =?utf-8?q?1754643097551687004?= The compaction_suitable() will never return values other than COMPACT_SUCCESS, COMPACT_SKIPPED and COMPACT_CONTINUE, so after validation of COMPACT_SUCCESS and COMPACT_SKIPPED, we will never hit other unexpected case. Thus remove the redundant VM_BUG_ON() validation for the return values of compaction_suitable(). Signed-off-by: Baolin Wang --- mm/compaction.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 62a61de44658..5e6f5e35748d 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2313,9 +2313,6 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) if (ret == COMPACT_SUCCESS || ret == COMPACT_SKIPPED) return ret; - /* huh, compaction_suitable is returning something unexpected */ - VM_BUG_ON(ret != COMPACT_CONTINUE); - /* * Clear pageblock skip if there were failures recently and compaction * is about to be retried after being deferred. From patchwork Tue Jan 10 13:36:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 41475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2753486wrt; Tue, 10 Jan 2023 05:44:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXsguF/bR/rwhQmQpRsjQgoAGvdS9TmLz98UromeoG4/N/CdnWm01nklbak38YcsNHzGCmld X-Received: by 2002:aa7:da0c:0:b0:499:b5a0:fe0c with SMTP id r12-20020aa7da0c000000b00499b5a0fe0cmr6331623eds.36.1673358251661; Tue, 10 Jan 2023 05:44:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673358251; cv=none; d=google.com; s=arc-20160816; b=s2b8QfJvtmwcYC93saKgpSYIfVwhjgxDouzmhZuNotoxewxkHURjNboAlJmkl3iNG2 5qFWh+eQbpMsWWYp0SFpfwpekw76vKOo8Ky+L8dr64u3UxIkHBXJqr4yR4gIdcfSwH/R jvYUjGEaRTPG24RjPJbIHG6wJZmiC69yyGchCthcvEHnXlWS2Gr0N5hZ1imYUsoCErqv tBZdyARSAA9ZELagxP8HTZC9ZbL1cPrziLIUgfo0Empt2rmtxaRN1CQuMaulemrb/ke/ TEDhaDgYajURR4gyCcaUXXXuPqyuVlDTKjjQEFo1ug/BYiOj4chk+VWoXpJSdCltTwoF jtQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=R9gg3StsoPQY3OtUR1oMOtD83gEFvGWsX8gEYE4vlx8=; b=NXP3WkeN7CDQOz5BrYdceycWf6F/ZFQMw2ULwP4cHTjzlwLLyT0V2hw+XEx2OgV6PR 7mJHzUIlMpcSSGvG+SB165rPcCQWC2L+2PVsCt46mT3eWuqalsMybJ7CzkUAx7zae2bo dA7hs1W+l2HzUJi/fVj7bcnAnp9MmJPgsulhsM1yIz8eB6EquQP308JpouWxRsc48oCj VBM+nYCMcT/mWm5p+v+8BLKqDh+yWnuymek+ZJIpXa867vi9d+XBoFvUcgaZRowhNbrn u5X7davEZ/hcHdTkfqbySsSLaX1E7rfiBz91A007KkE34VnrLW1kCXdn2RO89muHDEaT yMXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x2-20020a05640225c200b0048d63df54d7si11507139edb.20.2023.01.10.05.43.47; Tue, 10 Jan 2023 05:44:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238725AbjAJNg5 (ORCPT + 99 others); Tue, 10 Jan 2023 08:36:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233543AbjAJNgg (ORCPT ); Tue, 10 Jan 2023 08:36:36 -0500 Received: from out30-8.freemail.mail.aliyun.com (out30-8.freemail.mail.aliyun.com [115.124.30.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD1EDBC8 for ; Tue, 10 Jan 2023 05:36:33 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R501e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VZJUhj7_1673357788; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZJUhj7_1673357788) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 21:36:28 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] mm: compaction: Move list validation into compact_zone() Date: Tue, 10 Jan 2023 21:36:19 +0800 Message-Id: <15cf54f7d762e87b04ac3cc74536f7d1ebbcd8cd.1673342761.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754643302041125713?= X-GMAIL-MSGID: =?utf-8?q?1754643302041125713?= Move the cc.freepages and cc.migratepages list validation into compact_zone() to remove some duplicate code. Signed-off-by: Baolin Wang --- mm/compaction.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 5e6f5e35748d..f8e8addc8664 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2488,6 +2488,9 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) trace_mm_compaction_end(cc, start_pfn, end_pfn, sync, ret); + VM_BUG_ON(!list_empty(&cc->freepages)); + VM_BUG_ON(!list_empty(&cc->migratepages)); + return ret; } @@ -2526,9 +2529,6 @@ static enum compact_result compact_zone_order(struct zone *zone, int order, ret = compact_zone(&cc, &capc); - VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); - /* * Make sure we hide capture control first before we read the captured * page pointer, otherwise an interrupt could free and capture a page @@ -2659,9 +2659,6 @@ static void proactive_compact_node(pg_data_t *pgdat) cc.zone = zone; compact_zone(&cc, NULL); - - VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); } } @@ -2689,9 +2686,6 @@ static void compact_node(int nid) cc.zone = zone; compact_zone(&cc, NULL); - - VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); } } @@ -2868,9 +2862,6 @@ static void kcompactd_do_work(pg_data_t *pgdat) cc.total_migrate_scanned); count_compact_events(KCOMPACTD_FREE_SCANNED, cc.total_free_scanned); - - VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); } /* From patchwork Tue Jan 10 13:36:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 41474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2752967wrt; Tue, 10 Jan 2023 05:43:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXt4WjvGPD5O2MI0Oz+zvKnaAGnPT3E6nKpefkjGgS6F8nd/DFlIJ/INZ7X92S6I1ITeTgyW X-Received: by 2002:a17:906:1398:b0:84d:47e3:fe49 with SMTP id f24-20020a170906139800b0084d47e3fe49mr6823744ejc.39.1673358187949; Tue, 10 Jan 2023 05:43:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673358187; cv=none; d=google.com; s=arc-20160816; b=lLpyk8Q2c3KXpahFEWU8SZ03iIw6LTQdHNqJvlM5yyBXNrgaIR09Oe1y6AMhLhJE7u 71kLoSIYMgx6QUvYZCN7EmENxLzH6ugAwnWuwoDgiNoJre4cqdjr4sTtNH7OrpSxp+5Q Q3H3VQtVTcF7G1S/ZGYrucFz8WSYS4w/WiV6rJAie6sTDMlpQYUAMNmutDj/IkJr53LV RrJ+bxu+a/ouEO8TIrdStp76Qv8zVJ938q90N6wc+BI+i0qr97Bsd/gKcfk59vf8Fd7W M0dxI2E0xMB2Snljg0TYy9YnO2xnemST9+5Saf3X6psuu+MzP7n3K27dSA/3JomOjzoi tU3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hNGjI/01A2MPHFDvkldjhdG0u5k0DY1eIN4Z0OtkkoA=; b=Jq+BIirRBKxEVpT2LgtO/ciIvo0R9XQc3ral5GHXKkKfjir0akcrarmFfWhfgO7n+C yK0rdIjyLpapMqm3YKK5tunHhnED/J6G3prXNW4Rg/g0kv65FNdd4DgXYIXQqCX6Ocj3 BegtQI8G3vbpSpLrvlvUBVP2uyRKCUubiHjl5j8lg1q1UfrIQMLdENJFFfA2bmYEj80U SfW/bX464S1alnOGNX/qXCvqo+7uyHTUFpxPG78IHmY6gHE5WTASQgBwovbCA6/qZCs6 ZYcyLSyNUd2XYOdHX+3r03pYE3BY0nvh23kCfWrFQUjh2j6z+m82PLTlnCe1euKICk7/ kraw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qw10-20020a1709066a0a00b0080f0493b9c2si11033733ejc.249.2023.01.10.05.42.43; Tue, 10 Jan 2023 05:43:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238705AbjAJNgz (ORCPT + 99 others); Tue, 10 Jan 2023 08:36:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231409AbjAJNgh (ORCPT ); Tue, 10 Jan 2023 08:36:37 -0500 Received: from out30-43.freemail.mail.aliyun.com (out30-43.freemail.mail.aliyun.com [115.124.30.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD776C41 for ; Tue, 10 Jan 2023 05:36:33 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R291e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VZJNexH_1673357788; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZJNexH_1673357788) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 21:36:29 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] mm: compaction: Count the migration scanned pages events for proactive compaction Date: Tue, 10 Jan 2023 21:36:20 +0800 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754643235077824053?= X-GMAIL-MSGID: =?utf-8?q?1754643235077824053?= The proactive compaction will reuse per-node kcompactd threads, so we should also count the KCOMPACTD_MIGRATE_SCANNED and KCOMPACTD_FREE_SCANNED events for proactive compaction. Signed-off-by: Baolin Wang --- mm/compaction.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/compaction.c b/mm/compaction.c index f8e8addc8664..62f6bb68c9cb 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2659,6 +2659,11 @@ static void proactive_compact_node(pg_data_t *pgdat) cc.zone = zone; compact_zone(&cc, NULL); + + count_compact_events(KCOMPACTD_MIGRATE_SCANNED, + cc.total_migrate_scanned); + count_compact_events(KCOMPACTD_FREE_SCANNED, + cc.total_free_scanned); } } From patchwork Tue Jan 10 13:36:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 41473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2752010wrt; Tue, 10 Jan 2023 05:40:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXv+TGJxptSgtFPGToNP0oDW8Xj240ZD3yaL/oOnMphG6ReBsD0xM28vYNS5n6oUPwsRZq/I X-Received: by 2002:a17:906:4d4f:b0:84d:45d9:6bcf with SMTP id b15-20020a1709064d4f00b0084d45d96bcfmr6714112ejv.42.1673358057008; Tue, 10 Jan 2023 05:40:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673358056; cv=none; d=google.com; s=arc-20160816; b=CH5tEhHLz8Xb7xtP1nUK5RvWBHwVI81RGlvIYUF03Tji3MXJGbeMlm4PoH1cOQWI4+ Jf7i7iKdxjCFcxCWnrKhhG2/yEb+LQ4BrnM7s9Yx0rI5I6hOWAxvGFEsioK803v26ynN t046Z6nXUGoKzhGqwAvmUi/aV/wq28U2pd7mCO+x6zPS9eVUG1JmG0X56t5GZHa1c9em Ty9+FUdPJKFoi84Y0nwv6IYt9/4WC2/IIRHeialb4nHTv7bnn3eJnXxvUjNw43jIDHnK hHoernh+tVatoRj/Ttt6y8lR+b4kjem9smh5jmlDkB7HFjal61FihEm+m3fIcePd6Cil W07Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=aUqvJwZ3zTaTE2hwZW4/UAX21kQ42gjk8DtqU35VbJ4=; b=PSG/Q9bEAg+GvMV+Q6CPFuDXbLzuuktoa0b6pnf0wyAGkScU3CYn4NV8I+u8Wn311V y37b5arShXVkI3iWpy2qjYZMYOH/coX8MCESoNq9zpWnNz/oD02j57ZkYoeh4pDmsZWh uEnDL+T6xkc5XuECcJhihtEq98Gq0csKFxO3nptOQIxwEjU69SqTCyJTGWfOfj1M3LCU rrnsNw2bDPS4EOvIfCMiZPJPxzYp6F6210J0kJwsZXSzwel8YbJmvufK+MpeNmOTdb55 0CgO9ikMK3xqqdIFF4ETJo7UqfOwS5/P7bolKty0mMwFuKdDYNwHE9lqgSyAmZkXxbCv 5nLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa39-20020a1709076d2700b00782627f37d6si13480227ejc.778.2023.01.10.05.40.33; Tue, 10 Jan 2023 05:40:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238656AbjAJNgv (ORCPT + 99 others); Tue, 10 Jan 2023 08:36:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232931AbjAJNgf (ORCPT ); Tue, 10 Jan 2023 08:36:35 -0500 Received: from out30-7.freemail.mail.aliyun.com (out30-7.freemail.mail.aliyun.com [115.124.30.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD545BDB for ; Tue, 10 Jan 2023 05:36:33 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VZJNexU_1673357789; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZJNexU_1673357789) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 21:36:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] mm: compaction: Add missing kcompactd wakeup trace event Date: Tue, 10 Jan 2023 21:36:21 +0800 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754643098040487295?= X-GMAIL-MSGID: =?utf-8?q?1754643098040487295?= Add missing kcompactd wakeup trace event for proactive compaction, meanwhile use order = -1 and the highest zone index of the pgdat for the kcompactd wakeup trace event by proactive compaction. Signed-off-by: Baolin Wang --- mm/compaction.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/compaction.c b/mm/compaction.c index 62f6bb68c9cb..0fd6c81a7809 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2730,6 +2730,8 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write, continue; pgdat->proactive_compact_trigger = true; + trace_mm_compaction_wakeup_kcompactd(pgdat->node_id, -1, + pgdat->nr_zones - 1); wake_up_interruptible(&pgdat->kcompactd_wait); } } From patchwork Tue Jan 10 13:36:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 41471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2751873wrt; Tue, 10 Jan 2023 05:40:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfxnH3QEck0z3Le24zWif8NKxiYUcVDy81kwclLxdRYc0DnGxS6bKkhuTDqChStDzVNq08 X-Received: by 2002:a17:906:d217:b0:7af:1139:de77 with SMTP id w23-20020a170906d21700b007af1139de77mr58207847ejz.4.1673358041864; Tue, 10 Jan 2023 05:40:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673358041; cv=none; d=google.com; s=arc-20160816; b=dNhvXN5MGtm2WTnR2MKMBihSOCM6ApGvbE3PTm9VkgHKgAlZcWWc9xE4GSGmgrjdOs 0eGuk90C2jU2PtJHxxoVmo4NOvc971ljTYHg2Y94tyZ+RDOw83HDoVgboWTE++8Fou70 yVe4axHJzo0nKeO0Fo1RiKMzo3kKeuiVpQKBmnv810S6wcWJx18fOf7h1OHqcU14w1Av dP7i5aQ4I/nHKYbI4hupJ5HFjnGwiXm4XDt6kPSzJMqFUfeEsNadC5PdTCIlByFL63th ENf5E6kH781dkuCkMNaanouAm/I6WnVqq5+Og/Ipvp7hovZAiVYsPy7cqF7QDXiK9cLd LxzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=aUz5wuXddfVU8PbRGdBJ86wOUc4sRQaM/iFEVaa7T9s=; b=yUJccwcVgZYbT0eXsPIINUsDqiv4n+bK1jafgEzSpe9ygswgUgmOUGVl/ckHKwmLqY LlqcA3RzmMi54+HRYI0kZi6KE5Ov+cS/MGLE2fyNENxf9N8PGKLwziivI2sG+K+5Kf/q vBG1ABTgiQQGzBcqLo1tnh8gn0kMcoG/aQgGWOQasBBZm4MYJFE324bciqPr+2Frc1u5 40uoCdU6SjyszBTMrhRfAKBZlrOe1wUNCdDd1gRLpwT4TfT/33PlkP+9mnQm2itgj4/k S8KaqwFX1AxsmEffaDfFezkt/6BDgY7mpr0ghFgqhq1R/LUnr6ZSgPtohrGASrInRm2k Op3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds19-20020a170907725300b0073dd7598686si10332454ejc.270.2023.01.10.05.40.17; Tue, 10 Jan 2023 05:40:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231534AbjAJNgp (ORCPT + 99 others); Tue, 10 Jan 2023 08:36:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232932AbjAJNgf (ORCPT ); Tue, 10 Jan 2023 08:36:35 -0500 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B2ECBA4 for ; Tue, 10 Jan 2023 05:36:33 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VZJUhjw_1673357790; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZJUhjw_1673357790) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 21:36:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] mm: compaction: Avoid fragmentation score calculation for empty zones Date: Tue, 10 Jan 2023 21:36:22 +0800 Message-Id: <100331ad9d274a9725e687b00d85d75d7e4a17c7.1673342761.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754643081970610230?= X-GMAIL-MSGID: =?utf-8?q?1754643081970610230?= There is no need to calculate the fragmentation score for empty zones. Signed-off-by: Baolin Wang --- mm/compaction.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/compaction.c b/mm/compaction.c index 0fd6c81a7809..b758b00a4885 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2025,6 +2025,8 @@ static unsigned int fragmentation_score_node(pg_data_t *pgdat) struct zone *zone; zone = &pgdat->node_zones[zoneid]; + if (!populated_zone(zone)) + continue; score += fragmentation_score_zone_weighted(zone); }