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 A0ACBC04FDF for ; Tue, 15 Aug 2023 08:54:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E0D590000B; Tue, 15 Aug 2023 04:54:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 290D18D0001; Tue, 15 Aug 2023 04:54:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A6FE90000B; Tue, 15 Aug 2023 04:54:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0C14F8D0001 for ; Tue, 15 Aug 2023 04:54:07 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C24C2140CE8 for ; Tue, 15 Aug 2023 08:54:06 +0000 (UTC) X-FDA: 81125726892.17.895E916 Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) by imf01.hostedemail.com (Postfix) with ESMTP id 2324540012 for ; Tue, 15 Aug 2023 08:54:03 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692089645; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=za/DycLHf7nnP3/8JQKjGybii+XnSsj7STIu5boU9Pc=; b=XBGXSi8Uxnfm/USXSF3FNpGY0TZ4ssbKp8VrUxpxpcx7m9UJ5A/o0MhlQ4N+hWrQRBRUG/ LV/rN0XEE/ELM2bKYPHvRQKAIkXJ/+l2VR+rjqinNPfXPZXlywBHghoq0LeQyh9oBtHnSv Ionuxlzf5kMdc+js4XgwAcmemzp4cHY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692089645; a=rsa-sha256; cv=none; b=33xP1F+1bQMvBCl5h3v/f/gVjiFRB+5uB5AzdBt46+8MeWziDuWKTlBSueH6wZRxeg0nAP CAHtBG5bhLfYkWBYRLQQb/rC4Ne079ntH1PysAycsVWxD/vnGoYjczshoxmIDy3t/TAH0v JWXW7Suy0K98+a18oxqYqgggOfNJXmY= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com 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=ay29a033018046051;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VprFaX6_1692089636; Received: from 30.97.48.59(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VprFaX6_1692089636) by smtp.aliyun-inc.com; Tue, 15 Aug 2023 16:53:57 +0800 Message-ID: <7b337eca-1c45-c802-0aea-50d8d149efb4@linux.alibaba.com> Date: Tue, 15 Aug 2023 16:53:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH 7/9] mm/compaction: factor out code to test if we should run compaction for target order To: Kemeng Shi , linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mgorman@techsingularity.net, david@redhat.com References: <20230805110711.2975149-1-shikemeng@huaweicloud.com> <20230805110711.2975149-8-shikemeng@huaweicloud.com> From: Baolin Wang In-Reply-To: <20230805110711.2975149-8-shikemeng@huaweicloud.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: 3dcfeafokpyodmx38mhx49yo1y8ydtj5 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2324540012 X-Rspam-User: X-HE-Tag: 1692089643-53424 X-HE-Meta: U2FsdGVkX1/rkNlnQqnPokdLycIp2v8XoUKeAvWImx6eVVwTfbOc6N/6BMPHLQUICGQN+di8THXjHfrZAgE/ftH50FvzeUq85y7FBNSswgJlrwlX4ipKASx4P23pbPgxuFMCWUxHhtekZFPN1GuWlHQhxGK3fiEjJjo8MBcG/8SeuDsoSID5OxwjmspxJvtgQnaa/xj9tLoAKVmLPEWaWVHWRWRGJzxdU4BzZiCVxz5QwljBDWo8cytQ7sU+9LKjSdsc5EpArAG5m9y34n+jwMbz0b/sU1ZqsL+LBfNbOwsGJ5eRPACFGmNITqmYBjek5832Q+metm2WO4DuZ2D36mSBrFoOOXKGhG8ohbglpcJhsAr2etJsc5/bG/ddRsv2aQqY/cde0DMqgXx73lHTUgsiovsQRQaag0xX+k2oFXLWyacgPq2r3P/assg0/AIaGR44avY8+cONz5Uva2DLT8GkRVvAUrGOo3zbLaiDvAJ+2VqeYW7XF1+UlcDkVp1zlbsUmE0wfAxedrtHE6f1bOkJUUNw8pSfu7w+UE1VXya7/yTM6hW/jITkKfKVpDCku/z/b1zJNNgjtxicZwUER+aAy30mOMuqlFN3C9fV7jaSruiILEm05j04lcyWGInmGzmCIRFqj8M7/DuaRGCl+euc+azDJNvS+xq8GjV/2Hl8AiUvY6iqVE4YBLhavsyc0N5qSx7m/kZTnHQGJP5y9tCTcdXvpGdDSEWFVhhq0Q6atDDmeRJUJq0gZzwbyXkML/YEWdE0uKmJuyr7WnKwWiSz1oULqbPLj0qHTkxoN9lXZNWt8yOZ0G9Wf/FBbWNXGjLLau6QdIAlY/eWfiRVPjS3/6ijx5dpAB0gGMe8JltMVJlOEDgmMmWIH1/GOV8Jg+wIghmIz/Jjsz66pL2dlvhVcC4+XJFLXEJRezK9ADTJKviDgSZfWmRUQwIZhg5ZnxmQ8mJ+1zc048ovrzQ Me7CPCe8 Jhx0Fh7yGYvonmpJ++KEmGQAl2TU3H+tnSZ7JYHDH16kSP5aU64HRfjK0hL1ZE8Oa3D91JWFC6Og4DGv0uCUU785pw8AX3Ld/yFVDzS5F91Rf+xeIAhiBNge7SjTTmH/i+uyWi3YGKehjp/urt1I83jrDxFshfUrH/dwU 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 8/5/2023 7:07 PM, Kemeng Shi wrote: > We always do zone_watermark_ok check and compaction_suitable check > together to test if compaction for target order should be runned. > Factor these code out for preparation to remove repeat code. > > Signed-off-by: Kemeng Shi > --- > mm/compaction.c | 42 +++++++++++++++++++++++++++++------------- > 1 file changed, 29 insertions(+), 13 deletions(-) > > diff --git a/mm/compaction.c b/mm/compaction.c > index b5a699ed526b..26787ebb0297 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -2365,6 +2365,30 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, int order, > return false; > } > > +/* > + * Should we do compaction for target allocation order. > + * Return COMPACT_SUCCESS if allocation for target order can be already > + * satisfied > + * Return COMPACT_SKIPPED if compaction for target order is likely to fail > + * Return COMPACT_CONTINUE if compaction for target order should be runned > + */ > +static inline enum compact_result > +compaction_suit_allocation_order(struct zone *zone, unsigned int order, > + int highest_zoneidx, unsigned int alloc_flags) > +{ > + unsigned long watermark; > + > + watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK); IIUC, the watermark used in patch 8 and patch 9 is different, right? Have you measured the impact of modifying this watermark? > + if (zone_watermark_ok(zone, order, watermark, highest_zoneidx, > + alloc_flags)) > + return COMPACT_SUCCESS; > + > + if (!compaction_suitable(zone, order, highest_zoneidx)) > + return COMPACT_SKIPPED; > + > + return COMPACT_CONTINUE; > +} > + > static enum compact_result > compact_zone(struct compact_control *cc, struct capture_control *capc) > { > @@ -2390,19 +2414,11 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) > cc->migratetype = gfp_migratetype(cc->gfp_mask); > > if (compaction_with_allocation_order(cc->order)) { > - unsigned long watermark; > - > - /* Allocation can already succeed, nothing to do */ > - watermark = wmark_pages(cc->zone, > - cc->alloc_flags & ALLOC_WMARK_MASK); > - if (zone_watermark_ok(cc->zone, cc->order, watermark, > - cc->highest_zoneidx, cc->alloc_flags)) > - return COMPACT_SUCCESS; > - > - /* Compaction is likely to fail */ > - if (!compaction_suitable(cc->zone, cc->order, > - cc->highest_zoneidx)) > - return COMPACT_SKIPPED; > + ret = compaction_suit_allocation_order(cc->zone, cc->order, > + cc->highest_zoneidx, > + cc->alloc_flags); > + if (ret != COMPACT_CONTINUE) > + return ret; > } > > /*