From patchwork Sat Aug 5 11:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13342473 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 77392C04A94 for ; Sat, 5 Aug 2023 03:07:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 242728D0005; Fri, 4 Aug 2023 23:07:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F2A18D0006; Fri, 4 Aug 2023 23:07:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0913E8D0005; Fri, 4 Aug 2023 23:07:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D085E8D0003 for ; Fri, 4 Aug 2023 23:07:07 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A067A1A033F for ; Sat, 5 Aug 2023 03:07:07 +0000 (UTC) X-FDA: 81088564494.18.DA037B1 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf08.hostedemail.com (Postfix) with ESMTP id 149A0160009 for ; Sat, 5 Aug 2023 03:07:04 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=none; spf=none (imf08.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691204825; 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:in-reply-to:references:references; bh=L25XJYbeGeYoEl8Y6AyBg6f6iV40zJxwNT5EL9bqX58=; b=hej1F944VInPPzuUG8kzda3v+K/itPBI9FJIkSNDLrjP3XJXwkhUub6O3uu7laa2BZUfRS xOoVpnt/cLaN5+A36D9avGwVZECHodgGXPxCpfWlC+oAZTViwA+R26ep/i4AoYVR0PKFT1 JaeMX9HArl4CVQ3fv4tzZyPpf4ljFZs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=none; spf=none (imf08.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691204825; a=rsa-sha256; cv=none; b=prQUiFKmsUwmJXjrM+OA6Ps1KJdDxAZb1dslCdiY3RsirSJoBlMj826YU/pv26PnI7l7Nl LfIpiu0Y5Omx/hTmJNXyzCclkVNzqSUfaIkneZ7lUcs2fv3hPB8I1fUJY1HSroHATz4r5Q 8vdcmo9XaSea6/sHvjsyqWi1M3ratow= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYb4ybVz4f3nKW for ; Sat, 5 Aug 2023 11:06:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S9; Sat, 05 Aug 2023 11:07:00 +0800 (CST) From: Kemeng Shi To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 7/9] mm/compaction: factor out code to test if we should run compaction for target order Date: Sat, 5 Aug 2023 19:07:09 +0800 Message-Id: <20230805110711.2975149-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230805110711.2975149-1-shikemeng@huaweicloud.com> References: <20230805110711.2975149-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrHQvM1k6A5ePg--.23962S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uF1rAw47ZryrKr15Zw4kCrg_yoW8Kw4xpF y8Z343K395XF13GFWIya18JF45Xw4xGF1DAwsFqwn2vw1ayay0v3WDta48ZFyUXry3Ar4j qFWYkFyDKFsxAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 149A0160009 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: htwhg6e8atbbx4qg4p77qcfzdsh4timg X-HE-Tag: 1691204824-547584 X-HE-Meta: U2FsdGVkX19oRcS5c+Y6IWQZzI+ldzhInKZrSI28HBEZZCz82wsiMpbJJlWbKq+RC9mGGOkhNlOiRfaYRGkzxH+Jvm2KdpW2DeppHdOkHVliEQjbAOJX3Xnaob6Vr7B7fc5mpsJ2svaloEKYFzXM1tr9bkQIpE6SvkdFssKAN8tbzR1eYxHj+AhHmd+kvQvfH9b+qC6QgdYBCxqZWmZJdPRQV0/zmNO4p/UkqZbCuDo/jnQ2CL08FllyrWCDA++hOQsyv976pGVKFI59yrS9OnFt2RD1jTuQAB/IeDoqZ2lTQuQnKxfZR5ho6z0SVjDfUN58aeupBw97haqbzFp3WqfqGu4PmNWUidEAPcihaxlbgCvNKgsPRdGUmhzGgeIzjjzvSe0rz3j3D6inVGW4U1G0WkgjfREemnKpt1+BP1VCipp0IfxZjwKVTDtGHdhnIUS6L2FhMX6iUSLVhijSR4oSIch4bSnpzhikEvOy7gkB0Sar9h2WdKFhbqO5y36q9ZneCcmZWFUTk53NEJfTHefbEWvAn/MsdR48q7pCyQDlsK0II142iAC+JkrYmy2DHguMI1HRnJSQXn7E6fi8H6pb3hWN6KwCo05l7Lxj5FVnc/Z373ef/Qa097RyqmIXynAAA3WWS38flP3RJnN8cO1dw1DYq0Kh561pTL1149IUEnf4rMMOWnlhtgJOBQMUUOs5+5cxEHCyP8DzlQaKNg4YA3Zvf4/MfrXdPij8aGJTkS+q5yhaayVh8VKF6Vn+9kd6zBFdjQf1VRO97YFcCzAMsTHcG3mPrea1tSEJwZRXOEr3oib7sP/jSmiWs294OIMRy+1tUFBSZre690bkwgz1Nbcy9AHm6KBwgoSXJgdyKR2dwO+PoQCgMQL3wDa8WAMvL9fXQBCGQ3Aki3aoTlF1TJR1dEBwsgWeHqR+SYE508KlRWhMP41ZJvid5B8RDPkhg2K6WK/YR5Fc12q 5CfaBHVp kREEkgMFEQttkd3JoNvG0jjiU9q92yti1k5X6q37v5DHtMA3SUidLthfrm7ufS3aLGkDBQyy6EFe/6+tSsRElKpJNrpT6ulD/Nwo+ZGletPZhkGtOzqWWk6HOlnbeEji3jrCHiBjr3wJgomEWC6l+96POUw88dcoKvjqjY1QU1VPKfpr2DxwnmYFzIQN0Ywka7/EBTSVQG40LFTUPSYGy6wYpLslTGC+3j+d7Vpl68zGlqTK3P0gmDH80ELZgyHnzx19xyGogc88mBqLNLcO+sPZlWkYxn/+ROQve 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: 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); + 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; } /*