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 2B87EC27C76 for ; Sat, 21 Jan 2023 00:56:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC7236B0075; Fri, 20 Jan 2023 19:56:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B4E476B0078; Fri, 20 Jan 2023 19:56:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A1636B007B; Fri, 20 Jan 2023 19:56:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 879B26B0075 for ; Fri, 20 Jan 2023 19:56:31 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 644581C42C4 for ; Sat, 21 Jan 2023 00:56:31 +0000 (UTC) X-FDA: 80376990582.27.1361B22 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf03.hostedemail.com (Postfix) with ESMTP id 98B5720006 for ; Sat, 21 Jan 2023 00:56:29 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=L7W7cMik; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.44 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=1674262589; 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=Sn9o4Cmt0XJxCzEv3cd/09WP6t7BNy+VXQN0hb/gQmY=; b=Nm6KHHlsANErTtFLN1oQX4FMnOijZKVSjIMovp7n8mJs1pUTMfkNDzQBSjlf3QrlrKhVEb GmFZcAJ3+3j/33tS/L85EsxiF0GiyR4CmQ4VjRUfXdLLRIQynUvGa04KgdiixjltEUN5R8 NQDs85WXlUX0F5WPgmlI3jQ9T6E2jp4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=L7W7cMik; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.44 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=1674262589; a=rsa-sha256; cv=none; b=EbSmpKOgUH+XSbbcQG3JBQoO35l9DFSLb1B5lrLxTlUqW0GFpCJsko8lLhzYPo/itzH1nH 8wqSidGpvCMz1En02ekJ+GF2aqKPWth7WY8EyJkpVXarBbhQzaHAJELsjf9WAB6tdA6fN/ 3dnU3FSdDHqZ+d2k6Tqq6fi2QoKiwDQ= Received: by mail-pj1-f44.google.com with SMTP id n20-20020a17090aab9400b00229ca6a4636so9740712pjq.0 for ; Fri, 20 Jan 2023 16:56:29 -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=Sn9o4Cmt0XJxCzEv3cd/09WP6t7BNy+VXQN0hb/gQmY=; b=L7W7cMikTHvBje5bd7kfQZcvqe7I9YVqBuam/72E3VPsV4fW8Fz5HVOPOoM8ZCO2Vb RqblFxtiXWWheR6EI23wpxFqsJx+1nPFAs7ifLo/N/e00dmMCl8MyHMiB/0iFkYlMgh/ PMhP3brtJ0ug4/IjaDJgT1x9G9VE47AiX8lRtwPJvHjZ1GQtwOke1W7gUTiSvvuaACB6 I2lftS6Vz7IwApi0l+OHCIWshkXQ2Eie3SxSvHlptoVmmdY3zyNg7J2dpTub0jD50GD6 4aIdOj0DgnaFsKArlq3sQ6wFqgXJVKkGW2AaSsvM77tEBCPC8miw1eczujeEJVZKgwnS HRsA== 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=Sn9o4Cmt0XJxCzEv3cd/09WP6t7BNy+VXQN0hb/gQmY=; b=zfRd0yQpvLQeKDY9WpN3S7wfo+Yxn0+vSFbUwuGZQw434mz2Zr1xCDBPIkSD5z7JG9 kFHX++QRYVflruvBJOHB7Ti/7wmSe+nUgAtatuTWKSt82FbpMr93pKQs7LySB78j+U+M wHJeq2ApkvFd0So93CQR9OahdojQCMcf79ufm0icYSPYRmaMCGmdeHyQV2XKUp8XmgE4 MUgj00lJH2ChXVwaJFb2ExKY6CuKgIyNT+X3UCkmfWE7ZKlr7W25r82hMt7nj1wDhYoi dJlTFyv8Jt+jsy/FcixK+YKQQqIkS0aFpia6shR7OgPkDoOfBvdBN6geKW81RvExnKAd bJsg== X-Gm-Message-State: AFqh2krH/FI2qAQ6ad9e2YTn8WsfZifj/I1pR8a9RSxcXrZCEOxlqa0a bLEzz8vHeELqDdAOZF+zjwW3C1wthVk= X-Google-Smtp-Source: AMrXdXupG4jNmpCUVU0/GCYE088g0/9TDQgMX6l2qNXRcGzWrfWMP3+CEqCU/5KhCaxKXELoHEkDag== X-Received: by 2002:a17:90a:67c2:b0:226:c364:2d1d with SMTP id g2-20020a17090a67c200b00226c3642d1dmr17331993pjm.41.1674262588360; Fri, 20 Jan 2023 16:56:28 -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.27 (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 2/3] mm/migrate: Convert isolate_movable_page() to use folios Date: Fri, 20 Jan 2023 16:56:21 -0800 Message-Id: <20230121005622.57808-3-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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: zfaui1a1nhxuum5bsmixr7zbbsyjoexz X-Rspamd-Queue-Id: 98B5720006 X-HE-Tag: 1674262589-999594 X-HE-Meta: U2FsdGVkX19Q8xxsTw7vDBavH8L/QjDMym/2LIr9hr3mUFaqOjBfd3PtnK4S54eiy+lg5pvFdl7Wd6ZWtt9xI7pkbqSUtq82qdWHmZOofZ8jsRVlwGWuLe/fm3o+Kwu/tsDcVV9n6te0IQ0at9XlF86e3uOzjvFFppwH0d2OJPx1C8XsfqwnCGTl/wWIiuoa014enE9NwBCOWR/dB6jj07DxWsmgnXN3Twc8Vzx9JG64i62EFcGgRy8UieGLj90J6nTTG4g+/D47brpHEY5Y17Zgvfuoq9IGoL8/Yw5kOkY0acpVJ0n7hBbbmGCVRlE7z2xFrS9FS7Plhl15GFy5avYrrJ4vjNfVIK544AUtalkL+xvQYOeguLfm3Xuk4DQTOwjyGbC1yVcVkqpamaFp76zbFnQqUTEqppcg+hhCUTtu2m3bd+ZMbe5xW5npNUaLP4TaYlcSjE65KxxgCB4fsuQNtRaNALeVYd6EOQR9dMomIn4a2A6PgTR9IGBk6vhEJwSjLgfnpXtSGkGOvdzvLrtqk5y00/GLyukxqT29AZIvEUhiCSOnMQk1DfKWrfAVFBuju8N7btkxJ8+BeO/ZzP8pG2pl9Y4ei/5ync1ovc6a1h9aZOCsWiDsGIU/MKVXipNektNTExs+ComHE4aZj3fEX23ezauACs8KQBTwsPfQV558R9DWwMMt6Dgm6QHnePL4yPyBj3s88Nh0TRheG4wenz/j1KPRqHoMAD1xykFvmXZQ6HRvvaafyqQ9BhnsDjUwritm+D/lR4HmOr60DVs+GEhTfYRPyuH1IxqMCWQGu8HSHY507d4cS0KQJeA3RrwuUyscg3RxlgWRpISDUY+RRP79MPAfTHKGI9CwavQElhq8JXhbNQgob1LsTGwvdgb/J3oPHHjCOnoAhuR34/Y5SHYRbCdfgPZvXvAVXUqSzKtZadi2YDq9ZOWy6Xy741Z3b6jitqvFKF+kW5E ghFaa7AR 2tEJwj0UJesOd+ZHVfgrc9j2vgdRSBA4M6YFE9veZTNglVW30G1L321nYt2spBEp3X8IPpluYYom+YDNEoWgoNHTsl71ijr95C79spkBU5dAYRL0q3PniKufcIAg5eRsqAo1uCx5snTBaGBV73148PbfcWVSHTTQ8Biuz3H9/c1fC1kMC7gVBDtav//RQt+QkCSyaQ4qzJyTt9LQfrX9HAH3KlFscShlSYH8P9uf8HFvTMhh/iJFhfshSSwGfMoAHOgo7vJE0tROmz4s3ShdlxFTRRHgJpDO34kyAW4Rz8ivortQ2YmPnItaOKgsVxFbVcCNmIUBqFNE3U0Hcu+YZk+ixn6m23Zbg5m1cLlWsPa1F1/R/zSljksg421AfYCC+TWauVvTsyMPnIiZeWZRPJw/TbpaS+qBxnPijMzJvSnpqjVT3c84amN1mlWq90xFcU6EpLKymoyzA8m0WGf7MIk0O5S2y2g8SvMMJJ49xQ9F884h1262G/H90Ai8N1SpshsrTD0nX3vLXItkKOc2agS0BbeSxNDAgqneH4EsfUUfamEwE+rgCFcF611tw9TAO6/fDfOK/QRG8dck9URE4ZCMqwA== 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 prepares the function to take in a folio instead of page argument. Signed-off-by: Vishal Moola (Oracle) --- mm/migrate.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 4c1776445c74..bcde3cbbc8c9 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -60,6 +60,7 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) { + struct folio *folio = page_folio(page); const struct movable_operations *mops; /* @@ -71,11 +72,11 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) * the put_page() at the end of this block will take care of * release this page, thus avoiding a nasty leakage. */ - if (unlikely(!get_page_unless_zero(page))) + if (unlikely(!folio_try_get(folio))) goto out; - if (unlikely(PageSlab(page))) - goto out_putpage; + if (unlikely(folio_test_slab(folio))) + goto out_putfolio; /* Pairs with smp_wmb() in slab freeing, e.g. SLUB's __free_slab() */ smp_rmb(); /* @@ -83,12 +84,12 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) * we use non-atomic bitops on newly allocated page flags so * unconditionally grabbing the lock ruins page's owner side. */ - if (unlikely(!__PageMovable(page))) - goto out_putpage; + if (unlikely(!__folio_test_movable(folio))) + goto out_putfolio; /* Pairs with smp_wmb() in slab allocation, e.g. SLUB's alloc_slab_page() */ smp_rmb(); - if (unlikely(PageSlab(page))) - goto out_putpage; + if (unlikely(folio_test_slab(folio))) + goto out_putfolio; /* * As movable pages are not isolated from LRU lists, concurrent @@ -101,29 +102,29 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) * lets be sure we have the page lock * before proceeding with the movable page isolation steps. */ - if (unlikely(!trylock_page(page))) - goto out_putpage; + if (unlikely(!folio_trylock(folio))) + goto out_putfolio; - if (!PageMovable(page) || PageIsolated(page)) + if (!folio_test_movable(folio) || folio_test_isolated(folio)) goto out_no_isolated; - mops = page_movable_ops(page); - VM_BUG_ON_PAGE(!mops, page); + mops = folio_movable_ops(folio); + VM_BUG_ON_FOLIO(!mops, folio); - if (!mops->isolate_page(page, mode)) + if (!mops->isolate_page(&folio->page, mode)) goto out_no_isolated; /* Driver shouldn't use PG_isolated bit of page->flags */ - WARN_ON_ONCE(PageIsolated(page)); - SetPageIsolated(page); - unlock_page(page); + WARN_ON_ONCE(folio_test_isolated(folio)); + folio_set_isolated(folio); + folio_unlock(folio); return 0; out_no_isolated: - unlock_page(page); -out_putpage: - put_page(page); + folio_unlock(folio); +out_putfolio: + folio_put(folio); out: return -EBUSY; } -- 2.38.1