From patchwork Sun Jan 29 03:39:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Wandun X-Patchwork-Id: 49935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1596694wrn; Sat, 28 Jan 2023 19:40:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXs7zF5M/Rj7HWtK2bR2tb4MqK/H8HsvFvgd8nCiilyAf1b9HbtoNfWbb9MQh8npkmokThuX X-Received: by 2002:a17:903:2c7:b0:189:f7c2:7245 with SMTP id s7-20020a17090302c700b00189f7c27245mr49425526plk.45.1674963647821; Sat, 28 Jan 2023 19:40:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674963647; cv=none; d=google.com; s=arc-20160816; b=C2RHEu2JgCPHRlWZPK5cIninrLBgvbDIlu5dPxNG8yF+sOnbiLn5PXjhJ56l2m/MqO bqwBy9QFyIoCOJqm1h7ROOqw4NVP2sb9+6kHOMj15PAwga8E79woaTngVn1X4X4ZPHKv N1CQZNJ78JmyeagH+6cpPgbmxJtiG5FrcYTZlKgSSiUejudrAq6bAFWfwJ4MmdmgFSD9 JivdAsN7GiEu+2Pf46zqnnYqvwaPjs9XOgp5q9fOQ8jxhqB5KOnAaAK5UvKGQrKDt1Sn Ty/wtzFrEUviSlgD3ELioSdt9FlbPKz5nOSzAEG+2LDlCKyb7UbcFSjH0kqrQekaQua5 er7Q== 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 :message-id:date:subject:cc:to:from; bh=T/ZaVvi5Wjw8TD8gHZ1vsadj+YnB5XGAbyKA2pXSmbU=; b=VizNDqCSELGzyXVmRNSWoA+AZBbW+2pfAZNGrXGs71X/5CzMvdoQCggEvA0VZfihAf jEVPvC7yTO93f/iYKpGBl+WEQJZIBC67idiqH1/lQw7Le3k7J8767mKji4/tAIT4v1NU Gko2nlY6yr8TJdPGy/INGeJL6ctRX55X4TB+iFJnAMd7ZuzDIDKxRsnsjwSuST7hhhM9 P+Sr8/JYI0zGzSWa7Yjj2SR9ONrtcHa+ticKbmpmOGEuEcWlqzPyc4LtR43wkC1qs1CJ /8sNHWudty/LHTL7x/ld6gx1gZypBGELm6bbFptCMOfWPD6e6CrfCZyiF+jFckEdirh0 YqBw== 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k71-20020a63844a000000b004ce76fa9ebdsi8407062pgd.387.2023.01.28.19.40.35; Sat, 28 Jan 2023 19:40:47 -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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232055AbjA2Dj0 (ORCPT + 99 others); Sat, 28 Jan 2023 22:39:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229513AbjA2DjZ (ORCPT ); Sat, 28 Jan 2023 22:39:25 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B43EE2068F for ; Sat, 28 Jan 2023 19:39:24 -0800 (PST) Received: from dggpemm500002.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4P4H7x6YHlzJrPk; Sun, 29 Jan 2023 11:37:49 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Sun, 29 Jan 2023 11:39:22 +0800 From: Chen Wandun To: , , , CC: Subject: [PATCH v2] mm/migrate: Continue to migrate for non-hugetlb folios Date: Sun, 29 Jan 2023 11:39:10 +0800 Message-ID: <20230129033910.1327277-1-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1756326681806532741?= X-GMAIL-MSGID: =?utf-8?q?1756326681806532741?= migrate_hugetlbs returns -ENOMEM when no enough hugetlb, however there may be free non-hugetlb folios available, so continue to migrate for non-hugetlb folios. Nowdays the only negtive return value of migrate_hugetlbs is -ENOMEM, keep compatible for coming negtive return value instead of ignore return value. Signed-off-by: Chen Wandun Reviewed-by: "Huang, Ying" --- v1 --> v2: modify changelog and comment. thanks Huang Ying. --- mm/migrate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index b971edbf32fc..68927aa06f9b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1939,7 +1939,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, rc_gather = migrate_hugetlbs(from, get_new_page, put_new_page, private, mode, reason, &stats, &ret_folios); - if (rc_gather < 0) + /* There may be free non-hugetlb folios available, continue to migrate. */ + if (rc_gather < 0 && rc_gather != -ENOMEM) goto out; again: nr_pages = 0;