From patchwork Tue Jul 25 18:04:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 125515 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2382780vqg; Tue, 25 Jul 2023 03:53:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlHbdceHhFVsJFTP1hQ4b2vR5srDi/bev9aSHeOiv4JlqtWXma1Sc7URUqLjutglYzro2v3T X-Received: by 2002:a05:6808:1489:b0:399:8529:6726 with SMTP id e9-20020a056808148900b0039985296726mr16716586oiw.51.1690282437151; Tue, 25 Jul 2023 03:53:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690282437; cv=none; d=google.com; s=arc-20160816; b=JIFJfRyLuVbDHm2wo5sf6gB/N47hgJZ9cTmWc0zkzm5DI+wmEH3ytS7f+yULijzfN5 mHpUNS/YSU7XSXXglRpmNbOQ24XCi8NMdzlgq1jU8rdS6osKdkjx54YGLxXQTZ+yFUPs 9Mqjwaw5fzStAj/DoA8KZ/kSieZs22PdjyY2P5HMNDtsHOzBr7mbu0YBYF72KG8rlHSc 9nqK07S40B0MVn4SUNnDZRuE24AIYDIU2XsN6gTgPFvbd0ejYLiiqncECaeciXlq7UnA YhrKj01hjqbA+hDV2iCLTdMH1hnTE5BZwFGDUzeV5GyExYlvY8mbqWT9B8gusxxfuK9+ qvXQ== 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=50uNZzvRhbuSWPxxkttm0/TipH+3RrUphsB+jTiuJPY=; fh=0zX8MkeZhwj7F3yOeQkt2lukWIQJcBZJTqPdFT68mvc=; b=bx0ZHdv7q1345mmfzSGMAeNMKXTqn37oxhYvBTOb/q9lRZwXIKgopEtHP7HG1mfvrh fexsY0vuapIBzT9CcRmRKX/oEwIWoORzxCPCfRUW1dIbRK1fjXuk1kSsqtxwtH3s8C24 9Ra6ZWuDCjXOmI4AxYSrp/LCwU1X80lA44gmntTGZfaAufRHpCsaYImLWSLyLmH/2Gy+ JpcsNC7ffRId1nbJOGtQn30yw/eeluSu6SJRuk+efO00WRo3l9Cl35jUrkSg1I0CNTsh I8IH2/MdZlcUoU58FEBUeB/AEC8BaVtxGQ+5b6YCIRqZa2VHJ9uZfuXvAbANg9PwViME NdDA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w30-20020a63af1e000000b0055a5434684bsi655388pge.106.2023.07.25.03.53.43; Tue, 25 Jul 2023 03:53:57 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229459AbjGYKFm (ORCPT + 99 others); Tue, 25 Jul 2023 06:05:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233212AbjGYKFC (ORCPT ); Tue, 25 Jul 2023 06:05:02 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 791A71FC9 for ; Tue, 25 Jul 2023 03:04:32 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R9CLM1PSwz4f3q3F for ; Tue, 25 Jul 2023 18:04:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgAXC+ksnr9kFkPOOg--.2821S5; Tue, 25 Jul 2023 18:04:29 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: willy@infradead.org, baolin.wang@linux.alibaba.com, david@redhat.com, shikemeng@huaweicloud.com Subject: [PATCH 3/4] mm/compaction: use compact_unlock_should_abort in isolate_migratepages_block Date: Wed, 26 Jul 2023 02:04:55 +0800 Message-Id: <20230725180456.2146626-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725180456.2146626-1-shikemeng@huaweicloud.com> References: <20230725180456.2146626-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAXC+ksnr9kFkPOOg--.2821S5 X-Coremail-Antispam: 1UD129KBjvdXoWrtr48tFWktFy7urW8tF4xWFg_yoWDWFg_Za 40q3Zaqr43ZryrJFZxCr4xAFn5KrZ5ur1xW3srtFZ0kr9IyF48tFsrZr43Wr13XasruFZx Ca4kZr12kF12yjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRMmhwUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, KHOP_HELO_FCRDNS,MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772389596421684298 X-GMAIL-MSGID: 1772389596421684298 Use compact_unlock_should_abort in isolate_migratepages_block to remove repeat code. Signed-off-by: Kemeng Shi --- mm/compaction.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 638146a49e89..c1dc821ac6e1 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -909,20 +909,10 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * contention, to give chance to IRQs. Abort completely if * a fatal signal is pending. */ - if (!(low_pfn % COMPACT_CLUSTER_MAX)) { - if (locked) { - spin_unlock_irqrestore(locked, flags); - locked = NULL; - } - - if (fatal_signal_pending(current)) { - cc->contended = true; - ret = -EINTR; - - goto fatal_pending; - } - - cond_resched(); + if (!(low_pfn % COMPACT_CLUSTER_MAX) && + compact_unlock_should_abort(&locked, flags, cc)) { + ret = -EINTR; + goto fatal_pending; } nr_scanned++;