From patchwork Sat Jan 21 00:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13110790 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 9454BC25B50 for ; Sat, 21 Jan 2023 00:56:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EABE66B0073; Fri, 20 Jan 2023 19:56:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E5B666B0074; Fri, 20 Jan 2023 19:56:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAE6C6B0075; Fri, 20 Jan 2023 19:56:30 -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 B76096B0073 for ; Fri, 20 Jan 2023 19:56:30 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8B15140775 for ; Sat, 21 Jan 2023 00:56:30 +0000 (UTC) X-FDA: 80376990540.03.046CB51 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf20.hostedemail.com (Postfix) with ESMTP id B94131C0003 for ; Sat, 21 Jan 2023 00:56:28 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A9nMCXlG; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.41 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=1674262588; 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=Ihs1lPGJTYH/n9uC2fe/fD/dm6RWAiMecmovGp89G+Q=; b=sXeRWep7S7692DrVspTfcK5X9nd+3e/CSbH0tfVHW4rrnhlUmNz4tbm6cyY+Wnrf9Sdnb/ Tdt+XJBnueoPeNfAolV4okZtJrNpmHQKrjllo7ThE67p6yLtHYQ7fG91WKLPu9fbVec0Cl qfTyr62dqWTqsqOFdepugkXTolCcmKU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A9nMCXlG; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.41 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=1674262588; a=rsa-sha256; cv=none; b=hIMEYxwqfHo7K+/TB9tLEN+5w8JrN/GEnx7xc9NXagisUxrgnZzFi554NRsjocvoQt3VQr yWjIwMGXac6MDz4Z8JpfCvTAcE+xAtPCe73igfN9ZXQauEoTCBz+hmyVawjSyub+qApcex 5u1FcesKqktgc7M+AktbJhIyhFYdZlQ= Received: by mail-pj1-f41.google.com with SMTP id z4-20020a17090a170400b00226d331390cso6450882pjd.5 for ; Fri, 20 Jan 2023 16:56:28 -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=Ihs1lPGJTYH/n9uC2fe/fD/dm6RWAiMecmovGp89G+Q=; b=A9nMCXlGrTqywtDFEfUariM/BfBgw9tPr05X918ldhS3Cu8cLbDOnUt4IHI8cDjU9w 49nw+/16Ryq22+rCTZUVMFGLFZgWulbUbprCZ3vfI16Ud7B4bZMF/ZhNzKbC6LVlsUJt +K2qy/EK67DYDoA200hvQRXG09r5dkMibL1V0xjVkIytwR2rScU+j9AFwwdm0E9ly3z0 SdOngM9jmr/53yHpdGwpEJ5Rn8wauhFJvD0MPQPIeKc9YtCtyrQ2Jq6H6ChN9/yey34J IQ0ZHqHln+eSb16AVAJJ7e+F4T25/ZoIbc2UwK7MDGBqBQCoiu4t4lkWgyXBhouCouZK GcqA== 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=Ihs1lPGJTYH/n9uC2fe/fD/dm6RWAiMecmovGp89G+Q=; b=lZ/XGZx1Dab/qHqMeCb8LXx55zV7+q/NHQC+T0WrTXlvm5HVLGqSnVuP0Z414T/ZzS 8dEhZi01BGyQT0yIAvorvUn31XXVRrQ1QrQWAPq+Vs7MQG35RDiDr8WLMGYTDRCjjUE/ 3Cb4DMUSORO39kvLo0BjiTNNnXuaHPi5Y4t7jtzaqKP7VYzUD2oRkcs6qx7kUO/2bTxY Od1mQrfbyQcTVI5fcmH3S0yYf5ZnqG/YxhXCJmvAKZ8LTjD27Jf96l7b8xA8yTUarljD dRCoFbCYqg3haGp49E7UKT0BLoIa9P4ADCmxDtPQrvLLZQCVfOYM9msPRdH1vIrq0ZQH 3oIA== X-Gm-Message-State: AFqh2kpLkW9rgyJo2C1nCeB0qDFEW2nCGauJL5Q2sfS1H3lweAlyycLp pQpnGJ0/2UzoiDVPGx2P8t/tn9wsrKg= X-Google-Smtp-Source: AMrXdXvL7hanGT1T1ZbT+ZacwQm3dlBDi8+nw4wDgXRp1QQbt4DzagEkee9xVp1F7Ltbp5BGj7kUjQ== X-Received: by 2002:a17:90a:b002:b0:229:932:a0f3 with SMTP id x2-20020a17090ab00200b002290932a0f3mr17793784pjq.27.1674262587454; Fri, 20 Jan 2023 16:56:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 16:56:27 -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 1/3] mm: Add folio_movable_ops() Date: Fri, 20 Jan 2023 16:56:20 -0800 Message-Id: <20230121005622.57808-2-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 X-Stat-Signature: wwhrigcx3sbp5f71g8tu8coctmrjkfon X-Rspam-User: X-Rspamd-Queue-Id: B94131C0003 X-Rspamd-Server: rspam06 X-HE-Tag: 1674262588-525609 X-HE-Meta: U2FsdGVkX18wP2FOLIHYF1P9tvq1uJiRXnNPWB07Z+zHaOh6YYBi6cLkN8cppbdPU5sCjtlvbOHdgeQWK9FN+DPg3psIbzybjsnBDDkfTGnQg6o201k9mQ3zXARfRABqh9rAZQVOAnhm3Zo61b9t2e0DfzplRtwhpgZ2BpOkV5hq8ZfH/nAj4P4NT0WlOUbX9TjVDwiJRqUhznYZpo/V83VSFiHDM7xea0z9q3+MLpJO2Tgscsr8x8Yq+e+4I4osWldncp5iacFM9BCga2ks2PFiK8XRl4g4EQp+Mjq4J9sC8imhHOBCvUZ/nZsPewCCBCcQf3H8/WsQM9Iygs77GaOAgcHrsf0lQPlG46Ma/J7Sj52wUfRb/oSz0OKK6sXXyp7ydBdAZCMWQxfadLReZDWH3OWo+q4RFyygU/t6rteeEwrlAx40Bo2U8iwrz2RBZXUIM/i2l2kUHvAZipKJm67GAAJJK3FyuXqU/mxfvtZExz1Z2GwcMSfeoTMzke3rEytrmfXq99PXmBBWdUH4OMsnXa5+uEsW1ottejO7nGbPcNc7jhQeiwC+4JJ+FWrK+gX8KTWY6yE8QcVWy97pqeCPUYPaKQuGXtKSF094O3qJeRaRoq25cSF4q1jlSpYCQUMoOsIUAl/YAJOVny2rdExqi8j4T/DMsJlDIXuItqTjR7IYE+bs+wFrDZJMI1fgFNyHY0EYTqNjNPIFfH+QjUWK7pSbclEVGU8AWTw4ICYvpPc+bnHTnDIecG/jGo7Qm4K/hzRC0jMlRgYrqVe5iKVgAJn+IFCO6qVp+ENuhULMkEtI3BuFpT7R7sxdole/5HMaOWw758c93VulzpXy7VxskaWZqpKYE4NTy/aS7Ivi847WObYrnJMum40s4NrH8nA28EFK/1SvZB8a37VzS0lsHwmHXeJepI2JOPgQQ6STyiRmle/kauiIFbqY0yHutjFAnYnZ9ymW93SV9kg vQWLbEly qmou6hseXuyh/D+Rl/KeuoDLS0ftL40+cx1b0CTvnXwJaUoBIhpmYd27x862WDpBVBOW91teAYFFYeGdrUmmMk/ZhYTKUcrFobuO9h9EwPVSUJUvC22JuNHm9SN9DfzE+wfiVyzn2glG+09TDiLSv0o7gD4neR6A3lYkhmOjtbTKXgqiS3AsROUJlt3ELUy2fDT4BoOlyn6z3Y0x3ZiYVAJcW60u0J354pRE5cBVdlvumGtRhSj3kgPVyTUoPrBI9StNgbaLF73JuQSX2KO7xxLabq+XsvSKzCdwng69fK9/dLvO9GWmr/LCOe4Dzd5kL8WYXhko/zq+s5yi23iQ/1N78IpcDaYIG56XALqv2Xpac9q6LdN6qOUDIdbECeDW37NNkCHYXbXaaSL3kz9/F7uUU+shpRsHnQO7g/9hW7Z7TCfa5MG6XT4LWW+oxS+h6KA//xBPzYwNfHiDwRuerPHkXgh927f67IM3ojJEFd3FOLvBtV8ejN1oVYtBz9+NvuKLaNM/6raLNoyPmzAjLPqtK/Kl7hV7qAVPmwAb2XxI/8AzXDorRPppC0THxOPbjKn1xYClcTONVaZoJoGquesQmbw== 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: folio_movable_ops() does the same as page_movable_ops() except uses folios instead of pages. This function will help make folio conversions in mm/migrate.c more readable. Signed-off-by: Vishal Moola (Oracle) --- include/linux/migrate.h | 9 +++++++++ mm/migrate.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 3ef77f52a4f0..bdff950a8bb4 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -122,6 +122,15 @@ static inline bool folio_test_movable(struct folio *folio) return PageMovable(&folio->page); } +static inline +const struct movable_operations *folio_movable_ops(struct folio *folio) +{ + VM_BUG_ON(!__folio_test_movable(folio)); + + return (const struct movable_operations *) + ((unsigned long)folio->mapping - PAGE_MAPPING_MOVABLE); +} + static inline const struct movable_operations *page_movable_ops(struct page *page) { diff --git a/mm/migrate.c b/mm/migrate.c index a4d3fc65085f..4c1776445c74 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -973,7 +973,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src, goto out; } - mops = page_movable_ops(&src->page); + mops = folio_movable_ops(src); rc = mops->migrate_page(&dst->page, &src->page, mode); WARN_ON_ONCE(rc == MIGRATEPAGE_SUCCESS && !folio_test_isolated(src)); From patchwork Sat Jan 21 00:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13110791 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 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; } From patchwork Sat Jan 21 00:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13110792 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 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); } } }