From patchwork Sat Aug 5 11:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13342474 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 02A9FC41513 for ; Sat, 5 Aug 2023 03:07:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5763B8D0001; Fri, 4 Aug 2023 23:07:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B14F8D0003; 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 23EBE8D0001; Fri, 4 Aug 2023 23:07:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id ED4928D0001 for ; Fri, 4 Aug 2023 23:07:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C0F7B1C97B3 for ; Sat, 5 Aug 2023 03:07:07 +0000 (UTC) X-FDA: 81088564494.16.4162CB5 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 968DE120015 for ; Sat, 5 Aug 2023 03:07:05 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=none (imf29.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691204826; 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=3s7tC4jnWijTGwovFlPyZOZKXQlPOjFb94YEx7hM6S4=; b=0vV/rYnG1VIrW79jQXkjFJvGGe2hvMK+K+WmAnJln9NNGGQ3CGN7Sr1XgNievk/DRqd2um FAFQgHrBbVGXn7+TmP/JEI8iln6mFhlneODN5EJPNLbAoRXq5tBWZ8diAB4KXYnJzvQQpI Y1e4+4IQB++e4k8JJerMjS0Qg+R8+go= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691204826; a=rsa-sha256; cv=none; b=F5Es2TarUT0JfbMsGZwqwfD/G/rI08qf0BD/C0o6T74W1cOMLz3ViKfY8r9m1XCSCQYiJj r2odbjHN+3Z0yxdze3WXmgp/z26oU3809vETRQpUG+kWKLVY+8EUABVD4vRSUBDZ2PU4/E mwoUecEvrcLEVAVObiRBHffPn3I2mZA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=none (imf29.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYb6vNcz4f3jqj 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--.23962S8; 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 6/9] mm/compaction: rename is_via_compact_memory to compaction_with_allocation_order Date: Sat, 5 Aug 2023 19:07:08 +0800 Message-Id: <20230805110711.2975149-7-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--.23962S8 X-Coremail-Antispam: 1UD129KBjvJXoW7KF1fKF1fKryxJw4ktry5Jwb_yoW8Xw15pF 10yw1xZ3WvqFy3GF4Iya18C3W5Gw4xKFyUJrs29w48Xw1ak3WFk3ZrtFyFvryUX3sakrWY vFZ8K3WUt39xA3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 968DE120015 X-Rspam-User: X-Stat-Signature: 5gnyo61qmanncs5pj89woimcx8ip9rhm X-Rspamd-Server: rspam03 X-HE-Tag: 1691204825-620688 X-HE-Meta: U2FsdGVkX19HlG/Smd7PW4nkqupNjFoLUtgsTEGiZrWDSACJJ4wvvDZc/NEWmBVHOkrGeV8e/20lPW7nWr4Q/gcY10+gh7sg2/B4I7qj1tAMAo+PT/Jjehldenz6WckywxMJS0ypxIZNLI6nYq359LAfzZvypd2LvLfPzlxKEzTLO+cCLqang1r3ZKn/Cty9A6s+A35Pky8vlYeRYiv9BmT7ZlIds8Q8siGVsepdlRWOTGlzkn7+3AayiTSCqactT2kmYdxyM5b4+Yov/TjiZET6HLHYq/ZDz3UDpar8S7h7Z+fNHmRuZrPvn9cFdV9j1l3E2K36Qlg5ssgPtU3ZUSdjje212kHQwFtTCLL0B+9JNQQJFPPMk8WSWzEp83xmWCYOuHMJMT1dhxguutGz1UhmwmRWDVsZSD2+5zbD53S7vK48DF1WUuhePbZlSMIiNnFt2vc+ZJTV1TKdrxRPPsGAFPSoyWJw67zl+QbziCeDycgXfpYirxvbIsuzpfOs9GfAJm7rxYiiQXqXw3vzDnNcP5vFwBtf9iwFdm10RRlaGRSe7jC3rtni3VmRFZV1sUic1lv9FdEf3razod/WAyk7UlRTHt+/ldAYeARYyJdyNWOwXxax4nDDAeTi61dTGEVEKnVm7hJg16W5xzEvtkZnDSE5p1bZSkCFoc2kdDWn8vSb8WWnBjx2Ymc5nF3om7jV8xLRVdkt9ZaUpkEm+VcmZ2Pd1ediED8qZ+BmrGy1Z9ZLOV/v0V37nh6DZCW1hs1n8bT+jCPummQMB7xtibmSJhje73UlrmzQQTl8NNobSmEhSVbpobZ5y40L2TRaqMJG64iObRNzksqy45ri4RffEOpbSWLuW2nkgNUEBhpLn9vecbnhHOQGcbdnqdGvd1skkCYGoDRpoTnigOLIgKUOjFhTGPa1omD53zwO3xd/RupoDdHn+qLpbfxSdm5MazSxEaoKdqhSQI9thu/ KlueN5Hq /AgZH0EfOcle7VBHBrrTML0PnL3NQupPltzA9IpmFjBWKD5FANJtUmkvODIiSiuGEUEbWXCY+x6RNfB6N+szuKQKzN/pQwp3KC5AQxP+ai73+d4l24Ry2ca4YCAl1PETWg7lOcyTqDceCCXxDgEe8YjNQeU6t+zEfFgJFzahAWnCGLkSdOhAR/U4c6FyfYjUYPdJXtg4oHytiSEVT0L5vdOG8J+sI9q+B1Ic1Fdyj1aNCjKQk21AVmNanD3p0S+E+iK2PJyCa5oMdk8g= 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 have order = -1 via proactive compaction, the is_via_compact_memory is not proper name anymore. As cc->order informs the compaction to satisfy a allocation with that order, so rename it to compaction_with_allocation_order. Signed-off-by: Kemeng Shi --- mm/compaction.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index d8416d3dd445..b5a699ed526b 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2055,12 +2055,11 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) } /* - * order == -1 is expected when compacting via - * /proc/sys/vm/compact_memory + * compact to satisfy allocation with target order */ -static inline bool is_via_compact_memory(int order) +static inline bool compaction_with_allocation_order(int order) { - return order == -1; + return order != -1; } /* @@ -2200,7 +2199,7 @@ static enum compact_result __compact_finished(struct compact_control *cc) goto out; } - if (is_via_compact_memory(cc->order)) + if (!compaction_with_allocation_order(cc->order)) return COMPACT_CONTINUE; /* @@ -2390,7 +2389,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) cc->migratetype = gfp_migratetype(cc->gfp_mask); - if (!is_via_compact_memory(cc->order)) { + if (compaction_with_allocation_order(cc->order)) { unsigned long watermark; /* Allocation can already succeed, nothing to do */