From patchwork Wed Jun 26 08:53:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13712428 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 7366DC30659 for ; Wed, 26 Jun 2024 08:54:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08E7E6B008C; Wed, 26 Jun 2024 04:54:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE2E66B0093; Wed, 26 Jun 2024 04:54:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE96A6B0092; Wed, 26 Jun 2024 04:54:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A4B3A6B008C for ; Wed, 26 Jun 2024 04:54:44 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5D5181A0C89 for ; Wed, 26 Jun 2024 08:54:44 +0000 (UTC) X-FDA: 82272429288.19.917900E Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf08.hostedemail.com (Postfix) with ESMTP id 5B679160022; Wed, 26 Jun 2024 08:54:40 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719392074; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TkSSK5PIGWIBqJEjoJP7tskJQuPJTT6Bph3CaZdqLz8=; b=Y+OJBLeTSz1QUdjfWhtWHVSpWNkRdT47EhL/p13KBLpHFx6G5fBlISmHnZt0tBDHnR1BfX B4KWPAq9PN/Ph8cAh+ajvlRt50fwilYSjewW7SIYz3U26KjOqPxXnYRUFcMMepvoTdE6/i druV1GpFoS8F98T/Mv2vwmw2vRMLLTE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719392074; a=rsa-sha256; cv=none; b=dBA3UMT41RHZ9CESTPNzxHW9uD2C4Zj98oDvLCaAVcbaZfFJbxa0Ou45RKkbWiknM1lVgY LxGxrWccNNmolaEnm2or9fuzuV6kblz97HCPSWOCvUhbNuLJ9mwWO6z9nnz7zADWNqOL3c Q9CRpZP/WlQQE9FwVLEdcIyLVwgmzu8= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4W8Fm12WLvzMqtD; Wed, 26 Jun 2024 16:50:57 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id AE9FC18009B; Wed, 26 Jun 2024 16:54:37 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 26 Jun 2024 16:54:36 +0800 From: Kefeng Wang To: , CC: Tony Luck , Miaohe Lin , , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , Jiaqi Yan , Hugh Dickins , Vishal Moola , Alistair Popple , Jane Chu , Oscar Salvador , Lance Yang , Kefeng Wang Subject: [PATCH v5 3/6] mm: migrate: split folio_migrate_mapping() Date: Wed, 26 Jun 2024 16:53:25 +0800 Message-ID: <20240626085328.608006-4-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240626085328.608006-1-wangkefeng.wang@huawei.com> References: <20240626085328.608006-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemf100008.china.huawei.com (7.185.36.138) X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 5B679160022 X-Stat-Signature: 95mcqmgdguoco6pwyz5n3ddetmtwj1sq X-HE-Tag: 1719392080-203933 X-HE-Meta: U2FsdGVkX1/rwQnBI3yO1feOj7Bd0Y4+/1+g7jbzfCeMq2U5UbnuuGFuFGjWwxcuNXKbwpz3xsEELy7t3hb2a7pfBTtQ/GYb91LxMw52+Kthq1+P3D3WE00vnK76tIsX7jCyNaepuCVe/1jKfR8AVXn6E1JGNrRxkHcuuhjiPzlJE2XW5Sl6nTKmPa+KDr6bRo1+/DHN49Cb+Fo7iDuomqvZCfj2UwtOBpjFZGBAvGpdhzofnB9MofnMnXhMOpEH1y0tl0+1gG7UIUuTwndjOg8t9quIPTKy3oJtGDHP99VA4gQOpGAibALkx2W5Xk0d/9Uq2ZVBroTHPYWZLatw0hrELds+TfIHhCa21IhzPTVHhln8rah9ujgL1ZmzDGDqGFs6A9VU7XBsLxlnQFKb/dYX3GcfXr0yPzzXAl8ZKSdi2yWrfxyWEzJDWtkSIoRq44aesf+xAguIbI3D+mG5mqGa2gC5aDerYOTqkZo/KqIbIFcelUnRzVXij8J7Ql0PA+Ri8C5K0iDkfU2rzOn1cIjqXc/4uSmmVlR35WI+u1rqUx5w3BcxdWCjDbzk7Flcx7NZqVxzonCcdIeDPhID4rPKnsXX0CZo6N9wsvAi1P/ZsxX1ZGngTrDE8ob1tAHVweagQSONGxU6iRWztkzoUTuNs3t7x150hP9+mzudXH03iPco8ibgX+K8Hg0qdG7B4UUkVVSBTGYb88E1CJ/NQZ6ZuaZ9l3vv/WgOHCfEx3V9ZRBmSJrfapiWNEJiE082qOJQVE60IrlFHmoqRKoC1E/F5ro1y+eLJhCFJzd0689CQXDw52m7YGuIvUahJxVUCuaQ6iGhPTm1mWZW8EtUE49AmXWh8ilsuxt4YewnC/VuwJJ3jtx10fz7BT8TiAuUdtdPEJCADg3VhfY6+UQaglRCnmPM+OPOaR+BE17VZ/QeIA0jQTFqfd5ZWGP6Dik9DOj9GG1FxftYPpZgMi/ +oSkSHAS BOIjZQdzQJ5hDWNuG9/SsCimbncuUa0nKL1m9oImmI6dRsQWe+3zCtf1Mq89H/+g3VmhiD8MJiCzAkbYs462rSkj4NnYkvLsE+pdmjcIF1riIUynESD0LvncVr5HS9ZpA/5yz9V0ionsdS4OzkCOIEwVplig5LeeMZEIt+gm9AgZkFYj4VsUBoE49qvKgB5cSr6KOUsB5VwkW54OT1qLt7JGglfTbvO14r8A8RAokKmWVhVyAzw6mJ1jOXVuiIEaflfzUpR6xo8sdM98= 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: List-Subscribe: List-Unsubscribe: The folio refcount check is moved out for both !mapping and mapping folio, also update comment from page to folio for folio_migrate_mapping(). No functional change intended. Signed-off-by: Kefeng Wang --- mm/migrate.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index c1ac9edf8e52..e97fbaed564d 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -393,29 +393,24 @@ static int folio_expected_refs(struct address_space *mapping, } /* - * Replace the page in the mapping. + * Replace the folio in the mapping. * * The number of remaining references must be: - * 1 for anonymous pages without a mapping - * 2 for pages with a mapping - * 3 for pages with a mapping and PagePrivate/PagePrivate2 set. + * 1 for anonymous folios without a mapping + * 2 for folios with a mapping + * 3 for folios with a mapping and PagePrivate/PagePrivate2 set. */ -int folio_migrate_mapping(struct address_space *mapping, - struct folio *newfolio, struct folio *folio, int extra_count) +static int __folio_migrate_mapping(struct address_space *mapping, + struct folio *newfolio, struct folio *folio, int expected_count) { XA_STATE(xas, &mapping->i_pages, folio_index(folio)); struct zone *oldzone, *newzone; int dirty; - int expected_count = folio_expected_refs(mapping, folio) + extra_count; long nr = folio_nr_pages(folio); long entries, i; if (!mapping) { - /* Anonymous page without mapping */ - if (folio_ref_count(folio) != expected_count) - return -EAGAIN; - - /* No turning back from here */ + /* Anonymous folio without mapping, no turning back from here */ newfolio->index = folio->index; newfolio->mapping = folio->mapping; if (folio_test_swapbacked(folio)) @@ -452,7 +447,7 @@ int folio_migrate_mapping(struct address_space *mapping, entries = 1; } - /* Move dirty while page refs frozen and newpage not yet exposed */ + /* Move dirty while folio refs frozen and newfolio not yet exposed */ dirty = folio_test_dirty(folio); if (dirty) { folio_clear_dirty(folio); @@ -466,7 +461,7 @@ int folio_migrate_mapping(struct address_space *mapping, } /* - * Drop cache reference from old page by unfreezing + * Drop cache reference from old folio by unfreezing * to one less reference. * We know this isn't the last reference. */ @@ -477,11 +472,11 @@ int folio_migrate_mapping(struct address_space *mapping, /* * If moved to a different zone then also account - * the page for that zone. Other VM counters will be + * the folio for that zone. Other VM counters will be * taken care of when we establish references to the - * new page and drop references to the old page. + * new folio and drop references to the old folio. * - * Note that anonymous pages are accounted for + * Note that anonymous folios are accounted for * via NR_FILE_PAGES and NR_ANON_MAPPED if they * are mapped to swap space. */ @@ -521,6 +516,17 @@ int folio_migrate_mapping(struct address_space *mapping, return MIGRATEPAGE_SUCCESS; } + +int folio_migrate_mapping(struct address_space *mapping, + struct folio *newfolio, struct folio *folio, int extra_count) +{ + int expected_count = folio_expected_refs(mapping, folio) + extra_count; + + if (folio_ref_count(folio) != expected_count) + return -EAGAIN; + + return __folio_migrate_mapping(mapping, newfolio, folio, expected_count); +} EXPORT_SYMBOL(folio_migrate_mapping); /*