From mboxrd@z Thu Jan 1 00:00:00 1970 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 37AD9C433FE for ; Mon, 7 Nov 2022 18:50:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 695866B0073; Mon, 7 Nov 2022 13:50:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 645BF8E0002; Mon, 7 Nov 2022 13:50:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50D348E0001; Mon, 7 Nov 2022 13:50:05 -0500 (EST) 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 42EB06B0073 for ; Mon, 7 Nov 2022 13:50:05 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 08033A01EC for ; Mon, 7 Nov 2022 18:50:05 +0000 (UTC) X-FDA: 80107535970.08.2033AF9 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf09.hostedemail.com (Postfix) with ESMTP id 91D30140008 for ; Mon, 7 Nov 2022 18:50:03 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id 130so11470586pfu.8 for ; Mon, 07 Nov 2022 10:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=OkbKD0hurujVVht024zGU2voP/dZ56F3Wcwu4hfe930=; b=KmgMr4fg8fm5HvUimY4RdQQ8xjZ+apNEJhUFiN0Rthjs6EsZq1zZ5xXNMVLcBcHvrA B17ZgZXm6YQL6OPa3mKazq2r4czfm6uqIznM7NdhOy+3tUzcQWneZCJxv9ftKUblUlhB 1+pPko7GmCd8GugIZRVPa/m9bTaQdDq0QjYbugCAfY07b3B/8GGDXc7yYsv6dBHDjQ06 METzd+DMDLfcVD8bpKoFaMVzeeQY3ceepjqsYQxnh8Zbs48CZROkpteBzdc5QXwo2zq6 L4TilUYqlKZME4bhtAHxCJJqFMwhJwvjsTRYYONZpOjCe0OxM8JUhhltoZNjY34rE0Zc ipVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OkbKD0hurujVVht024zGU2voP/dZ56F3Wcwu4hfe930=; b=fl2JR9Yv0sB0J7cnX6mJLLu8Jj05GsBj/IgNpQL+O3McvkI9BCSQrPnyx2VbsPWq9E sQtXUd/rrbyoAgpbN8tQeAIZHXnsTEWKFUAamjJt9YMrFTnWaBn2cgXFc/t7mHQQJgeE J8pwKIvw9jVLcEtw39qmbKBNTCUTJEw+iq8C2lSKRLzx7fl2WRXApFHyVqEkPtdXw8ZH LRSOusF4tSdEwYV49LcrUAhFxrME4rSqGYWt/KQv2+a76ZJaUYhyBrzrKWUMNMJu44b+ hSo7I7nrGTWfpvSrwIF3yD1btD378qIRfwII/SYVPmZly0Vr858Cjgy1eKQpIy4gdHh0 /LDg== X-Gm-Message-State: ACrzQf2NExAzfmFT/w1xSAMF9uv1pnUtQL2fP6YOyFsQi7sKG9UmPli3 3zQMtbBOP+9pd3bdF2uPA1xp6slp414fsIR+Eqo= X-Google-Smtp-Source: AMsMyM5Y8LwFqWZxqbLJRDyGi6N/+7BCwghS/FKamv+4uC4Ip9PGJdyi6pZxOoAEVANWG+oi9x9/T1taSfkaa8yLtU8= X-Received: by 2002:a63:6d8a:0:b0:46f:57e9:f933 with SMTP id i132-20020a636d8a000000b0046f57e9f933mr44624820pgc.195.1667847002500; Mon, 07 Nov 2022 10:50:02 -0800 (PST) MIME-Version: 1.0 References: <20221104083020.155835-1-ying.huang@intel.com> <20221104083020.155835-2-ying.huang@intel.com> In-Reply-To: <20221104083020.155835-2-ying.huang@intel.com> From: Yang Shi Date: Mon, 7 Nov 2022 10:49:50 -0800 Message-ID: Subject: Re: [PATCH 1/2] migrate: convert unmap_and_move() to use folios To: Huang Ying Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Zi Yan , Baolin Wang , Oscar Salvador , Matthew Wilcox Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KmgMr4fg; spf=pass (imf09.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667847003; a=rsa-sha256; cv=none; b=2fPhK1gXqxmnIE9qOIYW/ZL59/3Qm4qZH6l9+Spm4uOqAkOBVmvP/FKjSdxHGGg5c+xXM/ 5e/HFcnSTUo8K4nKdLMGdKZba3Ok3eJOngcunDzgiu575W5v4mvzX5aXXaKc55/lbEAeNd qCfvRLNpmzcXxXlGn5QAO2P060ywPso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667847003; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OkbKD0hurujVVht024zGU2voP/dZ56F3Wcwu4hfe930=; b=FNQ31NZkUfcN8+af9WfRnLltal4bkZFwMBZa8rOrZgcm0yV81cXAlhApwfYz5a1M+n060b HoOKEmvFWHOgIe4vdIGA46wKe2bPmA/jeMHeaCWo7Iy+ZAX/7PO9suqpYVsUQDOIzIhFuT hiXnJgVpAjNYUzHaMdBqmznUj/ldyBw= X-Stat-Signature: mcsiy6fwduhk61zwpb4h8dehy9nis319 X-Rspamd-Queue-Id: 91D30140008 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KmgMr4fg; spf=pass (imf09.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1667847003-456794 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: On Fri, Nov 4, 2022 at 1:31 AM Huang Ying wrote: > > Quite straightforward, the page functions are converted to > corresponding folio functions. Same for comments. Reviewed-by: Yang Shi > > Signed-off-by: "Huang, Ying" > Cc: Andrew Morton > Cc: Zi Yan > Cc: Yang Shi > Cc: Baolin Wang > Cc: Oscar Salvador > Cc: Matthew Wilcox > --- > mm/migrate.c | 54 ++++++++++++++++++++++++++-------------------------- > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index dff333593a8a..f6dd749dd2f8 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1150,79 +1150,79 @@ static int __unmap_and_move(struct folio *src, struct folio *dst, > } > > /* > - * Obtain the lock on page, remove all ptes and migrate the page > - * to the newly allocated page in newpage. > + * Obtain the lock on folio, remove all ptes and migrate the folio > + * to the newly allocated folio in dst. > */ > static int unmap_and_move(new_page_t get_new_page, > free_page_t put_new_page, > - unsigned long private, struct page *page, > + unsigned long private, struct folio *src, > int force, enum migrate_mode mode, > enum migrate_reason reason, > struct list_head *ret) > { > - struct folio *dst, *src = page_folio(page); > + struct folio *dst; > int rc = MIGRATEPAGE_SUCCESS; > struct page *newpage = NULL; > > - if (!thp_migration_supported() && PageTransHuge(page)) > + if (!thp_migration_supported() && folio_test_transhuge(src)) > return -ENOSYS; > > - if (page_count(page) == 1) { > - /* Page was freed from under us. So we are done. */ > - ClearPageActive(page); > - ClearPageUnevictable(page); > + if (folio_ref_count(src) == 1) { > + /* Folio was freed from under us. So we are done. */ > + folio_clear_active(src); > + folio_clear_unevictable(src); > /* free_pages_prepare() will clear PG_isolated. */ > goto out; > } > > - newpage = get_new_page(page, private); > + newpage = get_new_page(&src->page, private); > if (!newpage) > return -ENOMEM; > dst = page_folio(newpage); > > - newpage->private = 0; > + dst->private = 0; > rc = __unmap_and_move(src, dst, force, mode); > if (rc == MIGRATEPAGE_SUCCESS) > - set_page_owner_migrate_reason(newpage, reason); > + set_page_owner_migrate_reason(&dst->page, reason); > > out: > if (rc != -EAGAIN) { > /* > - * A page that has been migrated has all references > - * removed and will be freed. A page that has not been > + * A folio that has been migrated has all references > + * removed and will be freed. A folio that has not been > * migrated will have kept its references and be restored. > */ > - list_del(&page->lru); > + list_del(&src->lru); > } > > /* > * If migration is successful, releases reference grabbed during > - * isolation. Otherwise, restore the page to right list unless > + * isolation. Otherwise, restore the folio to right list unless > * we want to retry. > */ > if (rc == MIGRATEPAGE_SUCCESS) { > /* > - * Compaction can migrate also non-LRU pages which are > + * Compaction can migrate also non-LRU folios which are > * not accounted to NR_ISOLATED_*. They can be recognized > - * as __PageMovable > + * as __folio_test_movable > */ > - if (likely(!__PageMovable(page))) > - mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + > - page_is_file_lru(page), -thp_nr_pages(page)); > + if (likely(!__folio_test_movable(src))) > + mod_node_page_state(folio_pgdat(src), NR_ISOLATED_ANON + > + folio_is_file_lru(src), -folio_nr_pages(src)); > > if (reason != MR_MEMORY_FAILURE) > /* > - * We release the page in page_handle_poison. > + * We release the folio in page_handle_poison. > */ > - put_page(page); > + folio_put(src); > } else { > if (rc != -EAGAIN) > - list_add_tail(&page->lru, ret); > + list_add_tail(&src->lru, ret); > > if (put_new_page) > - put_new_page(newpage, private); > + put_new_page(&dst->page, private); > else > - put_page(newpage); > + folio_put(dst); > } > > return rc; > @@ -1459,7 +1459,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > &ret_pages); > else > rc = unmap_and_move(get_new_page, put_new_page, > - private, page, pass > 2, mode, > + private, page_folio(page), pass > 2, mode, > reason, &ret_pages); > /* > * The rules are: > -- > 2.35.1 >