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 80F46C38A23 for ; Sat, 21 Jan 2023 00:56:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B8EA6B0078; Fri, 20 Jan 2023 19:56:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 841CE6B007D; Fri, 20 Jan 2023 19:56:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66CB86B007E; Fri, 20 Jan 2023 19:56:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 593F96B0078 for ; Fri, 20 Jan 2023 19:56:32 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2F163808F9 for ; Sat, 21 Jan 2023 00:56:32 +0000 (UTC) X-FDA: 80376990624.25.0306F97 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf25.hostedemail.com (Postfix) with ESMTP id 5AF4CA0004 for ; Sat, 21 Jan 2023 00:56:30 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=OU6CzD7S; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674262590; 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:dkim-signature; bh=dkXNorFtaPaGzwVFxzbZYEJpEcyIIYNIa70AwU0RnhU=; b=TQ9fxzhNCM0qSlIELEC4BQ2wDG62QQLOsVAFxMP3fT0Es6W6NQj2WP2et63cdhQgVsdrgA ZPryOHPvUHw1VRC91ep0yh27Q2yFprjdgQ1fefGvPyeba5bQZEWdsIzGfXORiAZQT5YYab Zn2QJKANOmx/t2LJsurrquCnowLZNmA= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=OU6CzD7S; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674262590; a=rsa-sha256; cv=none; b=DZpmA4S3Lqqe0tv/4Z+JEq/ihxFxDIm1JVPfwa0w3tmaiHiK8ET+pPztf0YwUlJfQxqjs8 y3M9JFmvqAm+m0VY2nB4tjuK/aUcePcZ1HAXCGgwVcaULEBAraJivu+pRrgid9Iqzzz3Rw V58eeEqRp6Q6TqUU9D06K/AXXyXUJcM= Received: by mail-pj1-f51.google.com with SMTP id bj3so7173611pjb.0 for ; Fri, 20 Jan 2023 16:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dkXNorFtaPaGzwVFxzbZYEJpEcyIIYNIa70AwU0RnhU=; b=OU6CzD7S2SXTi5dHeizCrqqyUa1E/S+1Xv9bL5KSlTsI2aFqfbefk+2ycerfdqRxhd 8YL3QZPjVDil05FoKXdnkZJjlW1wZfZPKVWdilIvw6LAdMo78a/ZgtD8F38roE33chrj EDi3VXK72Xts3yjaN/uxM+sQX+sQbp/Di+qqF+y7yobNFU0OdyB/pAGlAEsC/w++utef 7X8rd3cChqG32EgfywmG6uXNbzbZR5ID0ImPlRoXIyh9MtEZiPhonzrYEKh39xMdXuxq 8DghFm+3fyJVrZaAqCFZaTrMx4Uv8bjEvvF1/GOqE0IfHkDQG2KN3Mn6aaJQ9nNH65zm kHWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dkXNorFtaPaGzwVFxzbZYEJpEcyIIYNIa70AwU0RnhU=; b=PemO0iIYFfZZut96GFCerYO8p6OdSP8HeNyodzGURIZMg9kE7CBb0n/L5KkffbqizY Rgs5FOqoBpAu2gGOHdmS4+LxxRtue+7F0pmIdjlK4F1MuYujRoGOIhbyIPVBDk/IjlkQ JG+TL9kJVKS2Md0/WE1ENp3GBJzBWl1z96RqjURPTx8Ms8fzYzrmrnv7jjjXeEs6n+e+ UfUqc4ZmWaxjplpALLkwCha7oX0h96U/b1cseOCm+rJw/rdFl5qz1UYZZxKFd1iyeNRA mWvGTYFEWst/42bWe7kCPDIdoqS8Zp6NE32UykDeUjSKHGWHJMGlgHaAUzWyMdfL+grB FVCg== X-Gm-Message-State: AFqh2kr1Dp5TzNhvtyatjsuyyTkf62oh/q7KWMI4NXlonK3wfUsFAnYV 4KQKBqZONtMTNcyqTF+w3tqJaJj0Ww4= X-Google-Smtp-Source: AMrXdXuUy5kpul7xMIhJ28FxxHuxY8j1XCLUYpPVopPQ/CRV4dBrI4mTZspSM8R1fhwNdcrZ2jZwyg== X-Received: by 2002:a17:90a:7309:b0:228:e521:3430 with SMTP id m9-20020a17090a730900b00228e5213430mr17656529pjk.21.1674262589164; Fri, 20 Jan 2023 16:56:29 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::4e4b]) by smtp.googlemail.com with ESMTPSA id pc3-20020a17090b3b8300b001fde655225fsm11314371pjb.2.2023.01.20.16.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 16:56:28 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, sidhartha.kumar@oracle.com, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH 3/3] mm/migrate: Convert putback_movable_pages() to use folios Date: Fri, 20 Jan 2023 16:56:22 -0800 Message-Id: <20230121005622.57808-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230121005622.57808-1-vishal.moola@gmail.com> References: <20230121005622.57808-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: iemoicugcnnjmows56cbk31tfo1a3ekm X-Rspam-User: X-Rspamd-Queue-Id: 5AF4CA0004 X-Rspamd-Server: rspam06 X-HE-Tag: 1674262590-420288 X-HE-Meta: U2FsdGVkX1/J0qZvdruxCBuJO6Xy3wvSCcz34ueQ60FdxteqQRxrcPXNqZmc2RHYL3VvRjeRoTuUkPY9KXmOQw3blERr4AH+hVHVdNIOnQZAaCUHI3vzA4rOKV2QXbFW9ELFEMZFcjV3sEZNlZh0OPmAi/i6KEo93RPOoX2bAES8TlZzVCneiPG9zUjPpYZ4wU5BhwilBfVwXtfQCjxWABNGsWQayXu9WyRdI+oWnvJVk0t5rlCehx2itNS8DgiFAsQul3qBnSaRJdfCjAE40uA96mXmq2yaar0N9JOzMoUBEkk/o4NOmcSgGymYpO4e9LNPmAIHedpp8CqhngqFFWkgH5jLa15iHnZS1T0bMu307HocS0Rgx27WYbZyQfuiL6YHE8zhhwig4kffJajuZ7eGriyXRe3UJVr8HTkOlgZroQUOq02Ub7ly3yQ7R+6UzbGGp+ILDK4084bboQn4p75FarhCL8yxvCvyIimEpPOqhjUawYXe4a1vQJBgzrKd317QnLAuXrBbGn9Z12wAqUGx4cTuTnJOpia8mAyMn+6M3Sl7xUTz6nwLwERxbiCNBacGHURoMGR4MzhAgU+ofoxs2G3A32EowXVJlnhMsURbbhd4A7PN9snw2XHtx5utkvLHEvc/Ynflufu0YcHJMjuny9vdqGBgQoD7jbrzsZn+UcvxbRZ1cZTOgitxWsO1+SKW4wBpFiywmQQWtmjcH2MtJme80tuwRQ3isC4oJMXXmmWB0tnPk3GUjtVHxD282QYKkgxq1msGyJPGYWH1quP7dBseySMvNPxpuVie2yoYHUAT1eUy2Ri6735QegsOtFZxYUw4gElYMJvR1BTOht7Qa2hhAS03+QDtf40SV7zP5J+vl/1jdr4Sj/gvQp9t/OXF3QvvmDrMFvo5X7mXG51P0LE0s5dM9IggcTUBBTUIUH97Esz6wv+qr5oQP8zTrS4YZArbeddXkmNhLoY 8caOQjto 2tAISCyWBb+2wcWcNSpIkqHqfG+1gdUyNjxAjGAbjeiuxUdRdBWSs16DSkZUBIXmL2/CHs3yXsQuR+5PkryKVtB5carVxvuAzcStLHawqgOwhkw/gePmYqubQBNdHFcS5KpscCNwl2ANFpym/IJUZEblnDU5pe1KvjxW9KLn2fT33p1ZMa31jiuzKGb4uUEHCInvffyXtCXReXJHJnp+jrk8NhhranFXGX0dL/aGsCB3bOlUUee70LeDU/eT4Gh/Ix8n9DYz+qzlkJADc/T9z869KwpLp/CxQh6Z0o/e6L31p9ZH2wP3XGntzygppP6yyLWF9IYL6g1rMrzmh4r5o/7Aywwx4Hux57Wu1V3ylibzX6M3VvgoeWDbuJTmp7coPNAFiajd/VByNLYPyLg2w2zOMcAUG860eYvUzS0rcR7FivEiGW2YolqTqJQKpd+bLGa2I9EVa7p/93LEhS44piW5kp9QtP6vEn6AXHWFBahcbKww2SvmQPbxl2J9T5CLNyT3E7xJUD6HUgqIvY2SdrsaxbwewgbYPuFjc6i7a3Y0cXqfiEJnZkdSOKRvwCyvOFX+ZmqZCRIbivtyR+yaoWEtvp4j6UoruP/8i8VmiD7CLooUaTvL0iwci1Xh1CVrwjGmVSx76DArmqJU5DzR9gapSaQ== 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: Removes 6 calls to compound_head(), and replaces putback_movable_page() with putback_movable_folio() as well. Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: Vishal Moola (Oracle) --- mm/migrate.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index bcde3cbbc8c9..de65f7146ee6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -129,12 +129,12 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) return -EBUSY; } -static void putback_movable_page(struct page *page) +static void putback_movable_folio(struct folio *folio) { - const struct movable_operations *mops = page_movable_ops(page); + const struct movable_operations *mops = folio_movable_ops(folio); - mops->putback_page(page); - ClearPageIsolated(page); + mops->putback_page(&folio->page); + folio_clear_isolated(folio); } /* @@ -147,33 +147,33 @@ static void putback_movable_page(struct page *page) */ void putback_movable_pages(struct list_head *l) { - struct page *page; - struct page *page2; + struct folio *folio; + struct folio *folio2; - list_for_each_entry_safe(page, page2, l, lru) { - if (unlikely(PageHuge(page))) { - putback_active_hugepage(page); + list_for_each_entry_safe(folio, folio2, l, lru) { + if (unlikely(folio_test_hugetlb(folio))) { + putback_active_hugepage(&folio->page); continue; } - list_del(&page->lru); + list_del(&folio->lru); /* - * We isolated non-lru movable page so here we can use - * __PageMovable because LRU page's mapping cannot have + * We isolated non-lru movable folio so here we can use + * __PageMovable because LRU folio's mapping cannot have * PAGE_MAPPING_MOVABLE. */ - if (unlikely(__PageMovable(page))) { - VM_BUG_ON_PAGE(!PageIsolated(page), page); - lock_page(page); - if (PageMovable(page)) - putback_movable_page(page); + if (unlikely(__folio_test_movable(folio))) { + VM_BUG_ON_FOLIO(!folio_test_isolated(folio), folio); + folio_lock(folio); + if (folio_test_movable(folio)) + putback_movable_folio(folio); else - ClearPageIsolated(page); - unlock_page(page); - put_page(page); + folio_clear_isolated(folio); + folio_unlock(folio); + folio_put(folio); } else { - mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + - page_is_file_lru(page), -thp_nr_pages(page)); - putback_lru_page(page); + node_stat_mod_folio(folio, NR_ISOLATED_ANON + + folio_is_file_lru(folio), -folio_nr_pages(folio)); + folio_putback_lru(folio); } } } -- 2.38.1