From patchwork Thu Dec 22 19:48:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13080282 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 5D589C001B2 for ; Thu, 22 Dec 2022 19:48:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88693900004; Thu, 22 Dec 2022 14:48:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 83584900002; Thu, 22 Dec 2022 14:48:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61389900004; Thu, 22 Dec 2022 14:48:44 -0500 (EST) 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 50AD2900002 for ; Thu, 22 Dec 2022 14:48:44 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 327624034D for ; Thu, 22 Dec 2022 19:48:44 +0000 (UTC) X-FDA: 80270979768.27.90DB888 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by imf12.hostedemail.com (Postfix) with ESMTP id 6BAFB40015 for ; Thu, 22 Dec 2022 19:48:42 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MwlMQDoj; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=lstoakes@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=1671738522; 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=WF0czWG0z2T4oq6TY2ZkLRE6dWmClGYr0kuRjGhgjlc=; b=VAcACcebz2fWMVsLthuhwYyIvFfbPTCrK8R/mOeKb3TRhEIoPaFZIl2SSPKvz823+pI8UK 4nv2RAIxDTvngKwsrf9UtkdCWwCCrCLbU4lLB8O0ljXl0UyTr0jhnjrbVwgS3zHKQ2TQBX rNPzjNvwPaLmSlyUHQ5YhMw/rftRNrs= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MwlMQDoj; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671738522; a=rsa-sha256; cv=none; b=tKu6liJT2s54dkod3hiUcKgkaVLnyCQ6WZcRl+1sqsjo7XFci022bU6YvEVRyE3LbDpKVY FjA9nJd4houm1hHfdsv3VG1w4kzknHI1SHUY1A2Qw5NJK/qrsZwUjomv47gT1748VLn1GA hu3RRbf9or8dNggcOiDfozg6otvCI4w= Received: by mail-wr1-f51.google.com with SMTP id m14so2682177wrh.7 for ; Thu, 22 Dec 2022 11:48:42 -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=WF0czWG0z2T4oq6TY2ZkLRE6dWmClGYr0kuRjGhgjlc=; b=MwlMQDojPRl1N9RKswNye3CDEdP22NLQDZUxmKlxgtsd8sFEE9avKa8OUrmMpIrDOo Aon+VZIurNEFXw6IJhGWiW+VFEAsegrOwl4WFS1jMQhSQ5fZh3XoJaiY3BPkj5/zlcm9 aN38lXwyHCc7/V4rdO312r8Rzu8HSP5ddz77APwlAgLiQYiClEaE34pMSo61W49YSVT7 BwALNp1tPo0ADZziuee4Kvo+X8H5L0NfrheCjhDjPGWO+Th4gUZ2AKvDQ+t9agou4j6U FYgZ5sqQNPaMOSkhV9S2NrQpntsNyJKqeeJDicruSV1dKsr1Q2tLYk/lap/UrDzmUn+O lQFA== 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=WF0czWG0z2T4oq6TY2ZkLRE6dWmClGYr0kuRjGhgjlc=; b=m7rxoOAyJf+v8cQ1yI+dH9ghDpp4j+3ONaI0VFBVXQBfPo9WL403o2pfx9rEeeYYJx CCWBTSnfUkv0HJkbnMEssDuGx1qzwJgqBCt0Gkz6OqEfCV9czgdLfPgQZo1Ln+zwEVav r6xG5oEBeg0gJ+io3LP2b31g6UuDDWP4caDsrIzvldW9327oNDRGRoGpjPXQnqbQVa7s vP4jRIGhnYcoRMXDzHVrVfFsW6WLdQ7nVmyzWgboEj6csBsGpKfkmvdbxYWn+tDNfTgK cPmG+OJs8eoNhUMqsJQ8CMl95PbJ1k+rl5FQURQZ9DcSm/Ak6MK1AsSvzwYzfTfsG9Ho go/Q== X-Gm-Message-State: AFqh2ko5/YpclfZnu+3Hq76qsaCx11BhHFAHr3JFNuVpCwWHYUeaMrnL SDhVPekFmU4MYGZi4Yw49CvhGautX3TMsw== X-Google-Smtp-Source: AMrXdXsY64F/wSGDz+J4qfQmolIKAjlZatXRULqtAUfDbCSbyupYNuq2zWD2zglwlDhx08crJ3WGiQ== X-Received: by 2002:a05:6000:128a:b0:236:7591:cf13 with SMTP id f10-20020a056000128a00b002367591cf13mr4904284wrx.40.1671738520872; Thu, 22 Dec 2022 11:48:40 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:40 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 1/4] mm: pagevec: add folio_batch_reinit() Date: Thu, 22 Dec 2022 19:48:30 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: 3rowqfeoe1zb9st8jcsnwg3hpf3bbyq6 X-Rspam-User: X-Rspamd-Queue-Id: 6BAFB40015 X-Rspamd-Server: rspam06 X-HE-Tag: 1671738522-619257 X-HE-Meta: U2FsdGVkX1/cZwiRHxSjxxqCe2sXSqMYKPa4tHg5i1v0YSZ8HKKOW2fibO4+Pr9FO+PiLp/Dl42zHsmZr+EjMVATVTGJZ2SFQ4cFRXtL5IgBUcJVpygkMfJVUHQW6d3ZcK97WTYpvCVYmnWhOxlk9F3ask1rLdWSo8ZzsyuKBObQHibZou/LCI80fUN/lFiAtecDxK1PIgM1mgY0/9W8q42C6YKqovMVKdDiex7Z+Bo/8xHPUqyn/aGw6BzKMyTzdY9LJvOSZ/zW+XUtS4SHeFIqGZnWUcH85bvAi4Iv/B6gUy6eSZGvCHHbiTpg/qdWsCJdBLqhNFTrVYCVwfYFvwSGbxcHXiEPHvuTFJKIqSJWZpFzhGjJsx0NztgvVI+X7m6BKjA0PAIxJpQfcxAC9DJgekoa/4rsPhxT795W1ONGGXsd6+MrhYmq5RJPwbW//KGGlllkK6wJzAMXNuVIT0QQ2kEuZsxj6KOTbouWiILgezfMiLcElEUuSdpKbj1z4vfEo9Y4f5iH+NzEc5mSNtIeI1rQ/YRDIyd4WM1xjkGk0xfXi6zS5CtlR+uSvKNeomrgPCzo7sWUHcnjK7Z6S+8zGKP7BHpzbs2rrYEpA6YbL5JdMf+uRUkQQIFc9OaiP7iW4Ff/c7xDaaQYGO1cTCF6sbiMZzV8s8OyPmV3bc2SAQD5TCXvMf6d/qf23McGQVx4zdRlAeIye8Y1nzBe7DUTLzJUZuPAoIIuK9mcjR8ktd00rGCDZ3+qFbOceaO/xTPPwt7pmQyXLUvWfTuyx5WwqJZWPlglYjhG4T/q8aunrJyewm2fD7kHf1metcAK687+Pk0g0ZHd0KZi/C+NYXDq1WEsOVXlKBW+VM4LIpXRr8HhRuDXCH9Rf1nGoWYNPcKcOgawvV9PUgVFNKryqfmzIjXf4k043+KLRG66T6Ty7lEHw0vaZO1COrNJBQxSXAdwy+LrVwbX9UiugK0 KZP6RXg4 RQwFyxLnCGDBHnzD/iDFPuVQV8Zi6BcfQqAljEt0AiuLHTD8gOu0K8EpgKYT5xHZi1VmqlIQhE7X2iZVlR6C9Ku361GPyZlzztpl8C0f9UDtMS/P/eIuuUWqVyjT0rx0k1TOJgsVYsm+6NLV8w0Bw8kqrbg14wts/94FMMNuKLTnEfjBwqHjKXPtm0w== 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: This performs the same task as pagevec_reinit(), only modifying a folio batch rather than a pagevec. Signed-off-by: Lorenzo Stoakes --- include/linux/pagevec.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index 215eb6c3bdc9..2a6f61a0c10a 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -103,6 +103,11 @@ static inline void folio_batch_init(struct folio_batch *fbatch) fbatch->percpu_pvec_drained = false; } +static inline void folio_batch_reinit(struct folio_batch *fbatch) +{ + fbatch->nr = 0; +} + static inline unsigned int folio_batch_count(struct folio_batch *fbatch) { return fbatch->nr; From patchwork Thu Dec 22 19:48:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13080283 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 2064CC4332F for ; Thu, 22 Dec 2022 19:48:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0C60900002; Thu, 22 Dec 2022 14:48:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BD40940007; Thu, 22 Dec 2022 14:48:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C24B900005; Thu, 22 Dec 2022 14:48:46 -0500 (EST) 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 648B9900002 for ; Thu, 22 Dec 2022 14:48:46 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2077CA0200 for ; Thu, 22 Dec 2022 19:48:46 +0000 (UTC) X-FDA: 80270979852.06.7C42602 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by imf17.hostedemail.com (Postfix) with ESMTP id 662CF40018 for ; Thu, 22 Dec 2022 19:48:44 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qaVTeJBr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671738524; 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=VLkOKeT4uIbBG6ss89Hd1tlt6NrDYEFm7lc6id39hK0=; b=JEOmaCXvanHyBpYLOjWZmKHhVQC0pkLT+RiAzCORQ5iVKv+rVDEummRYR1/ctemSS0s4t6 XgcDc3Yr4uRPypK2aJo61VYiWGRqyo5QYNsdxYUAOg3YUuIAFLReAj/Wav85qbadDSGEoS UshHbdNuwknyHCZbI8asUTBrCHv9zZg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qaVTeJBr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671738524; a=rsa-sha256; cv=none; b=Agd9YMMNk6LmDVsqdFvgIxuWVWcrB+gYM1N/AyzND3vRG4AnaaYuPVXMPh1uCRuF6ClIlc IerNFIJw+mnv3lDrA7GqGvgYvO3gl+H0e5zSOYimK4+vrzooMjo+quutyiiBcKg/sjFcuP D127wzRvdK5FTiEVnG+Nn9lD726mC2Q= Received: by mail-wr1-f50.google.com with SMTP id bs20so589358wrb.3 for ; Thu, 22 Dec 2022 11:48:44 -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=VLkOKeT4uIbBG6ss89Hd1tlt6NrDYEFm7lc6id39hK0=; b=qaVTeJBr0AB0s3zFjlbBmH6X/y6e0XSR+iRAd0acuOKDc0gLhdkkp4b0e6i0+x6SVZ bTVRoj29yr3mjHORwcggnN8TK8ejdSwcJb/PMMRNz1VUf0Bk8jC4xTqW9Sl6TbHEOq7q +mag8pB/j9H7bNZgiBJjgYCe4IkYcuMfpiaedTzbN3o0MxeA1HAqc0/PmSiDVsF+pthU OV4fY9Ildjb3u0DXp7/W7QKRrOKexJaGdnn+D/DwQz8VncM77pYGYjtlnQVezc8OxQgk XMao8+aSfs7jz7UC871WOzc+CQXp+pl/Na/F5uk+t815ejTt3kCbHCPvtXXg1n4b8qtr 18RQ== 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=VLkOKeT4uIbBG6ss89Hd1tlt6NrDYEFm7lc6id39hK0=; b=pIfulJiBPgABSNz/jvgp5imxJWwiMn1xxGSBB65WXzSp1EXax9TZvNxxgtu65EPmB3 ztPIAG03RKQ4a5OJw/kvx+fuL2Wz2VrkYDouj2O4wcmKs0gN8eW20ad6O88K04vnWOhP jyKod/ZlKuzoEG76ieLx08aiVbPDDHl2ydn7zYyu5KuS8VNNPmZ5+kbQDjSqnvZxGs3g 5xa3T5UBMrP2umZLyeouR/23foLBimq80nwNOLkWl0ntcp4CfwvY80V6Vp25rJsW6Ns7 3ByoIoBt39UiK4ctb4Ajcx3g6/2j0fcxo2Q+q6FGIlXzX28ioffs1djTU/NH3JaaXoDR JkQw== X-Gm-Message-State: AFqh2koEUjjpcN9bT88Wogs+OuwWpNumxMokQWMWEpRG1CLikYXXIjKJ hudTuuvVcVtXjCExGrawSSXXt6qORvcKpQ== X-Google-Smtp-Source: AMrXdXuGSfcyX4JBZQVgEBq/oTLCneSYDqqUl8X2gg7SriuUfyRTav7lultTztWm9vrEl6sdsCDt8g== X-Received: by 2002:a5d:4568:0:b0:242:803:537f with SMTP id a8-20020a5d4568000000b002420803537fmr4497291wrc.18.1671738522730; Thu, 22 Dec 2022 11:48:42 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:41 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 2/4] mm: mlock: use folios and a folio batch internally Date: Thu, 22 Dec 2022 19:48:31 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 662CF40018 X-Stat-Signature: n6i9m7szzgc6fh7ac6qixeak5b3oh17f X-HE-Tag: 1671738524-981500 X-HE-Meta: U2FsdGVkX19TkkaED8/CENtl+Ml15p0snBxebmro5Aol9WTMnR852L1Iw9a/eS0BXIqO0zhU03q04UXlF1MhcIME8vEpX3zJdwoFxRCdQgq4XX4wlj8z2rjoBmBdN+0iv5rfK7p/7zK5RN98JiMVlrtlRpM/IyqQMLs8Gf+nGdzT/yuRNvzHJhulWIr5GhN4Q7EKeYWrX/DCDT0U7AxOmahqWyj5Axr4BbelL1w8lqPWyuxZMAUdc3lyv562OH0A59/0AwQN54FULTHUlnGsp9ykjPD/5peMVkVT32RTrRwvVhblHfo5Ds0FHnCmbqiG0k32jY79imVOAbcbEIyniY7l/3sSwP2EtKGYZAm/8vfpopWleYEPANnobbi5Th1cJwr0Tx996xPOdrx/Dv9G1v8DUDtBlrexmoYtJDQjUugIlWTrx3MvcBiunE0PI63IDE7508F6lWHbHvxElt9tK0q4ESonFsF25dTL4bRyLXkPNbqDhLZ4jhFWfQFKwmlN8FVDDs+XzsUdOQgUe4jodMKZLyK+nylv83A50jvfJfXGjoL7CA9Eyvu31z7YKosrbOkr3TQ/rMVYTnBUEKNCwXAgT8Cbr5BJ19MXuqBg7TVJHhHn9R79KXm1QwPm4npupBNnj9lSUzx9gDT5blsxidn8CcRqga+Yeu+UuPWCzgZzVEX2BCH8b9FIRwvULZ6qqMlAHLLZEj7vSSpTmCG6FM6QvCUa97dRdz4reqDun2bdo5CYtrrCLoK2XIUSODBTPaG1kYNEvK+Sm4fmDyqMCHwKtWYlJmZT9hyRYjeuqcO8H3owAT3ltGFaQoOAiwVS1ELxl/s9bolTjxb4NcYj8/0LXOC46FSMdqEB+cfmF7+lKCg4KeyOfn79QrLAZmPNe5UDhPbvAfoqCIBNy5huEWApw0kK99p7iNeIQwr6IexwpJZD6ZmlscWP6uebe575IAVHuCUiZDXBRq0iIkN KTK1ob9j +KcwpKvhcgfXwFa5gzkHvrMS6ZxaEY3V4VZWF/+73jr16uy55Ls76MNoRNRwu8uJH1oT6ka7R+xW+tNXf515HyT/EKw5B0ImAp/wnhKZEvmhzlJual64MBlml4wbsDbxp53rr 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: This brings mlock in line with the folio batches declared in mm/swap.c and makes the code more consistent across the two. The existing mechanism for identifying which operation each folio in the batch is undergoing is maintained, i.e. using the lower 2 bits of the struct folio address (previously struct page address). This should continue to function correctly as folios remain at least system word-aligned. All invoctions of mlock() pass either a non-compound page or the head of a THP-compound page and no tail pages need updating so this functionality works with struct folios being used internally rather than struct pages. In this patch the external interface is kept identical to before in order to maintain separation between patches in the series, using a rather awkward conversion from struct page to struct folio in relevant functions. However, this maintenance of the existing interface is intended to be temporary - the next patch in the series will update the interfaces to accept folios directly. Signed-off-by: Lorenzo Stoakes --- mm/mlock.c | 238 +++++++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 7032f6dd0ce1..e9ba47fe67ed 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -28,12 +28,12 @@ #include "internal.h" -struct mlock_pvec { +struct mlock_fbatch { local_lock_t lock; - struct pagevec vec; + struct folio_batch fbatch; }; -static DEFINE_PER_CPU(struct mlock_pvec, mlock_pvec) = { +static DEFINE_PER_CPU(struct mlock_fbatch, mlock_fbatch) = { .lock = INIT_LOCAL_LOCK(lock), }; @@ -48,192 +48,192 @@ bool can_do_mlock(void) EXPORT_SYMBOL(can_do_mlock); /* - * Mlocked pages are marked with PageMlocked() flag for efficient testing + * Mlocked folios are marked with the PG_mlocked flag for efficient testing * in vmscan and, possibly, the fault path; and to support semi-accurate * statistics. * - * An mlocked page [PageMlocked(page)] is unevictable. As such, it will - * be placed on the LRU "unevictable" list, rather than the [in]active lists. - * The unevictable list is an LRU sibling list to the [in]active lists. - * PageUnevictable is set to indicate the unevictable state. + * An mlocked folio [folio_test_mlocked(folio)] is unevictable. As such, it + * will be ostensibly placed on the LRU "unevictable" list (actually no such + * list exists), rather than the [in]active lists. PG_unevictable is set to + * indicate the unevictable state. */ -static struct lruvec *__mlock_page(struct page *page, struct lruvec *lruvec) +static struct lruvec *__mlock_folio(struct folio *folio, struct lruvec *lruvec) { /* There is nothing more we can do while it's off LRU */ - if (!TestClearPageLRU(page)) + if (!folio_test_clear_lru(folio)) return lruvec; - lruvec = folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec = folio_lruvec_relock_irq(folio, lruvec); - if (unlikely(page_evictable(page))) { + if (unlikely(folio_evictable(folio))) { /* - * This is a little surprising, but quite possible: - * PageMlocked must have got cleared already by another CPU. - * Could this page be on the Unevictable LRU? I'm not sure, - * but move it now if so. + * This is a little surprising, but quite possible: PG_mlocked + * must have got cleared already by another CPU. Could this + * folio be unevictable? I'm not sure, but move it now if so. */ - if (PageUnevictable(page)) { - del_page_from_lru_list(page, lruvec); - ClearPageUnevictable(page); - add_page_to_lru_list(page, lruvec); + if (folio_test_unevictable(folio)) { + lruvec_del_folio(lruvec, folio); + folio_clear_unevictable(folio); + lruvec_add_folio(lruvec, folio); + __count_vm_events(UNEVICTABLE_PGRESCUED, - thp_nr_pages(page)); + folio_nr_pages(folio)); } goto out; } - if (PageUnevictable(page)) { - if (PageMlocked(page)) - page->mlock_count++; + if (folio_test_unevictable(folio)) { + if (folio_test_mlocked(folio)) + folio->mlock_count++; goto out; } - del_page_from_lru_list(page, lruvec); - ClearPageActive(page); - SetPageUnevictable(page); - page->mlock_count = !!PageMlocked(page); - add_page_to_lru_list(page, lruvec); - __count_vm_events(UNEVICTABLE_PGCULLED, thp_nr_pages(page)); + lruvec_del_folio(lruvec, folio); + folio_clear_active(folio); + folio_set_unevictable(folio); + folio->mlock_count = !!folio_test_mlocked(folio); + lruvec_add_folio(lruvec, folio); + __count_vm_events(UNEVICTABLE_PGCULLED, folio_nr_pages(folio)); out: - SetPageLRU(page); + folio_set_lru(folio); return lruvec; } -static struct lruvec *__mlock_new_page(struct page *page, struct lruvec *lruvec) +static struct lruvec *__mlock_new_folio(struct folio *folio, struct lruvec *lruvec) { - VM_BUG_ON_PAGE(PageLRU(page), page); + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); - lruvec = folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec = folio_lruvec_relock_irq(folio, lruvec); /* As above, this is a little surprising, but possible */ - if (unlikely(page_evictable(page))) + if (unlikely(folio_evictable(folio))) goto out; - SetPageUnevictable(page); - page->mlock_count = !!PageMlocked(page); - __count_vm_events(UNEVICTABLE_PGCULLED, thp_nr_pages(page)); + folio_set_unevictable(folio); + folio->mlock_count = !!folio_test_mlocked(folio); + __count_vm_events(UNEVICTABLE_PGCULLED, folio_nr_pages(folio)); out: - add_page_to_lru_list(page, lruvec); - SetPageLRU(page); + lruvec_add_folio(lruvec, folio); + folio_set_lru(folio); return lruvec; } -static struct lruvec *__munlock_page(struct page *page, struct lruvec *lruvec) +static struct lruvec *__munlock_folio(struct folio *folio, struct lruvec *lruvec) { - int nr_pages = thp_nr_pages(page); + int nr_pages = folio_nr_pages(folio); bool isolated = false; - if (!TestClearPageLRU(page)) + if (!folio_test_clear_lru(folio)) goto munlock; isolated = true; - lruvec = folio_lruvec_relock_irq(page_folio(page), lruvec); + lruvec = folio_lruvec_relock_irq(folio, lruvec); - if (PageUnevictable(page)) { + if (folio_test_unevictable(folio)) { /* Then mlock_count is maintained, but might undercount */ - if (page->mlock_count) - page->mlock_count--; - if (page->mlock_count) + if (folio->mlock_count) + folio->mlock_count--; + if (folio->mlock_count) goto out; } /* else assume that was the last mlock: reclaim will fix it if not */ munlock: - if (TestClearPageMlocked(page)) { - __mod_zone_page_state(page_zone(page), NR_MLOCK, -nr_pages); - if (isolated || !PageUnevictable(page)) + if (folio_test_clear_mlocked(folio)) { + zone_stat_mod_folio(folio, NR_MLOCK, -nr_pages); + if (isolated || !folio_test_unevictable(folio)) __count_vm_events(UNEVICTABLE_PGMUNLOCKED, nr_pages); else __count_vm_events(UNEVICTABLE_PGSTRANDED, nr_pages); } - /* page_evictable() has to be checked *after* clearing Mlocked */ - if (isolated && PageUnevictable(page) && page_evictable(page)) { - del_page_from_lru_list(page, lruvec); - ClearPageUnevictable(page); - add_page_to_lru_list(page, lruvec); + /* folio_evictable() has to be checked *after* clearing Mlocked */ + if (isolated && folio_test_unevictable(folio) && folio_evictable(folio)) { + lruvec_del_folio(lruvec, folio); + folio_clear_unevictable(folio); + lruvec_add_folio(lruvec, folio); __count_vm_events(UNEVICTABLE_PGRESCUED, nr_pages); } out: if (isolated) - SetPageLRU(page); + folio_set_lru(folio); return lruvec; } /* - * Flags held in the low bits of a struct page pointer on the mlock_pvec. + * Flags held in the low bits of a struct folio pointer on the mlock_fbatch. */ #define LRU_PAGE 0x1 #define NEW_PAGE 0x2 -static inline struct page *mlock_lru(struct page *page) +static inline struct folio *mlock_lru(struct folio *folio) { - return (struct page *)((unsigned long)page + LRU_PAGE); + return (struct folio *)((unsigned long)folio + LRU_PAGE); } -static inline struct page *mlock_new(struct page *page) +static inline struct folio *mlock_new(struct folio *folio) { - return (struct page *)((unsigned long)page + NEW_PAGE); + return (struct folio *)((unsigned long)folio + NEW_PAGE); } /* - * mlock_pagevec() is derived from pagevec_lru_move_fn(): - * perhaps that can make use of such page pointer flags in future, - * but for now just keep it for mlock. We could use three separate - * pagevecs instead, but one feels better (munlocking a full pagevec - * does not need to drain mlocking pagevecs first). + * mlock_folio_batch() is derived from folio_batch_move_lru(): perhaps that can + * make use of such page pointer flags in future, but for now just keep it for + * mlock. We could use three separate folio batches instead, but one feels + * better (munlocking a full folio batch does not need to drain mlocking folio + * batches first). */ -static void mlock_pagevec(struct pagevec *pvec) +static void mlock_folio_batch(struct folio_batch *fbatch) { struct lruvec *lruvec = NULL; unsigned long mlock; - struct page *page; + struct folio *folio; int i; - for (i = 0; i < pagevec_count(pvec); i++) { - page = pvec->pages[i]; - mlock = (unsigned long)page & (LRU_PAGE | NEW_PAGE); - page = (struct page *)((unsigned long)page - mlock); - pvec->pages[i] = page; + for (i = 0; i < folio_batch_count(fbatch); i++) { + folio = fbatch->folios[i]; + mlock = (unsigned long)folio & (LRU_PAGE | NEW_PAGE); + folio = (struct folio *)((unsigned long)folio - mlock); + fbatch->folios[i] = folio; if (mlock & LRU_PAGE) - lruvec = __mlock_page(page, lruvec); + lruvec = __mlock_folio(folio, lruvec); else if (mlock & NEW_PAGE) - lruvec = __mlock_new_page(page, lruvec); + lruvec = __mlock_new_folio(folio, lruvec); else - lruvec = __munlock_page(page, lruvec); + lruvec = __munlock_folio(folio, lruvec); } if (lruvec) unlock_page_lruvec_irq(lruvec); - release_pages(pvec->pages, pvec->nr); - pagevec_reinit(pvec); + release_pages(fbatch->folios, fbatch->nr); + folio_batch_reinit(fbatch); } void mlock_page_drain_local(void) { - struct pagevec *pvec; + struct folio_batch *fbatch; - local_lock(&mlock_pvec.lock); - pvec = this_cpu_ptr(&mlock_pvec.vec); - if (pagevec_count(pvec)) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + local_lock(&mlock_fbatch.lock); + fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); + if (folio_batch_count(fbatch)) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } void mlock_page_drain_remote(int cpu) { - struct pagevec *pvec; + struct folio_batch *fbatch; WARN_ON_ONCE(cpu_online(cpu)); - pvec = &per_cpu(mlock_pvec.vec, cpu); - if (pagevec_count(pvec)) - mlock_pagevec(pvec); + fbatch = &per_cpu(mlock_fbatch.fbatch, cpu); + if (folio_batch_count(fbatch)) + mlock_folio_batch(fbatch); } bool need_mlock_page_drain(int cpu) { - return pagevec_count(&per_cpu(mlock_pvec.vec, cpu)); + return folio_batch_count(&per_cpu(mlock_fbatch.fbatch, cpu)); } /** @@ -242,10 +242,10 @@ bool need_mlock_page_drain(int cpu) */ void mlock_folio(struct folio *folio) { - struct pagevec *pvec; + struct folio_batch *fbatch; - local_lock(&mlock_pvec.lock); - pvec = this_cpu_ptr(&mlock_pvec.vec); + local_lock(&mlock_fbatch.lock); + fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); if (!folio_test_set_mlocked(folio)) { int nr_pages = folio_nr_pages(folio); @@ -255,10 +255,10 @@ void mlock_folio(struct folio *folio) } folio_get(folio); - if (!pagevec_add(pvec, mlock_lru(&folio->page)) || + if (!folio_batch_add(fbatch, mlock_lru(folio)) || folio_test_large(folio) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } /** @@ -267,20 +267,22 @@ void mlock_folio(struct folio *folio) */ void mlock_new_page(struct page *page) { - struct pagevec *pvec; - int nr_pages = thp_nr_pages(page); + struct folio_batch *fbatch; + struct folio *folio = page_folio(page); + int nr_pages = folio_nr_pages(folio); - local_lock(&mlock_pvec.lock); - pvec = this_cpu_ptr(&mlock_pvec.vec); - SetPageMlocked(page); - mod_zone_page_state(page_zone(page), NR_MLOCK, nr_pages); + local_lock(&mlock_fbatch.lock); + fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); + folio_set_mlocked(folio); + + zone_stat_mod_folio(folio, NR_MLOCK, nr_pages); __count_vm_events(UNEVICTABLE_PGMLOCKED, nr_pages); - get_page(page); - if (!pagevec_add(pvec, mlock_new(page)) || - PageHead(page) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + folio_get(folio); + if (!folio_batch_add(fbatch, mlock_new(folio)) || + folio_test_large(folio) || lru_cache_disabled()) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } /** @@ -289,20 +291,20 @@ void mlock_new_page(struct page *page) */ void munlock_page(struct page *page) { - struct pagevec *pvec; + struct folio_batch *fbatch; + struct folio *folio = page_folio(page); - local_lock(&mlock_pvec.lock); - pvec = this_cpu_ptr(&mlock_pvec.vec); + local_lock(&mlock_fbatch.lock); + fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); /* - * TestClearPageMlocked(page) must be left to __munlock_page(), - * which will check whether the page is multiply mlocked. + * folio_test_clear_mlocked(folio) must be left to __munlock_folio(), + * which will check whether the folio is multiply mlocked. */ - - get_page(page); - if (!pagevec_add(pvec, page) || - PageHead(page) || lru_cache_disabled()) - mlock_pagevec(pvec); - local_unlock(&mlock_pvec.lock); + folio_get(folio); + if (!folio_batch_add(fbatch, folio) || + folio_test_large(folio) || lru_cache_disabled()) + mlock_folio_batch(fbatch); + local_unlock(&mlock_fbatch.lock); } static int mlock_pte_range(pmd_t *pmd, unsigned long addr, From patchwork Thu Dec 22 19:48:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13080284 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 48CC1C4167B for ; Thu, 22 Dec 2022 19:48:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD1DE940008; Thu, 22 Dec 2022 14:48:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A0B1A940007; Thu, 22 Dec 2022 14:48:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88419940008; Thu, 22 Dec 2022 14:48:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7A126940007 for ; Thu, 22 Dec 2022 14:48:47 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 530D280EAC for ; Thu, 22 Dec 2022 19:48:47 +0000 (UTC) X-FDA: 80270979894.28.6480405 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by imf10.hostedemail.com (Postfix) with ESMTP id 9976CC0008 for ; Thu, 22 Dec 2022 19:48:45 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=YBprBzKR; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671738525; a=rsa-sha256; cv=none; b=Hl9bMsjyr88/hEKw3jPyVpuw/5pQujy3nm81g7SWMJn/NWcDbAxNTWJQ/JcsIhNY1tC3tT TdwCv+6UjIlR/keEL5ayzdjGJTuTA9IyhTzVHUvpNTEr1MlNzVm56O0DW425FECQ8fS++2 sjpz0jiRkdzKgVrRMnTDylLt8I5qZOY= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=YBprBzKR; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=lstoakes@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=1671738525; 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=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=UaCTFF0FEV6/LJFGkofQkaLReJybB7tUTlp98JnsCHzhaLpYxuVxuObFNk6cISmBidBYrE rEYZlnaOsv6VMPJUNUkOhY/4H88uFmaI+ZuI/FjSNYNQ6Kh46ojbvV3u4mKgwRPle9UqAd EszQ16iymcgj3L6+VfMAaX4zqV4QSXQ= Received: by mail-wr1-f44.google.com with SMTP id co23so2697740wrb.4 for ; Thu, 22 Dec 2022 11:48:45 -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=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=YBprBzKRdYFFFrBXK09fE8px7jN7JkycOZoSJJjAiu6CndU2eQZb8+Xf3fYy3GAD3v xOI+SAV6Tyr2acqkHoN6iTJgCS0kKqBa4EOfn+GAhaXMGw8g4kEDHhJgim8plbwr9lrO We2YZqoCMcMb6zNFjEVorjE+cjFFgVqXcJaeqtxsPWpn92qndZj8PK8KsfqHwzU4td/C MPlhABSyTCapn60sbkdAfW08wE4NoAKJKQoAiU7EPEuarT16lBvzWuNnxM+t2K3KlxY3 2HqOxVBD0J3fg/ynr/s8S+K1JG65FmbI4U4wG5wi5Gapw2WckkhNpufSa32HP49icntM LkVQ== 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=65qxl2pPQDnBMbGwdUZ+PFGonfHL4ihIaGu2BHcPC3E=; b=VOrnZBI+WfqMurTp7B4YDQFRMjG0488C07h02x5TfDh/BR1iM+9w3fnfGJdsPLgnOG kRk2Rxz/qJHUMuMqDa+ALIPih0MrL7N65uSJzmku9s3BPdZ+3boYLPaBC+ixwUXiZuPE McnIph7j+4wu2OQ1cynfjV+I5/Wb4GGiE1IFeR/yBycqntA6K3RhewT8Ke5LLaNax/L5 LtnJkMV9MOJ6YjKaFjYxC1jGdaJAq5MHvU/pKFroOXtDRzoyMiY4HXIkN5Qpxg/uoFEW 60ia9H8p63vFmWl3w5iv8Dg66hfVgB6TGKQNyUcg3GjYAQtRnPLhU1YatmzayIxaLfG6 EU6Q== X-Gm-Message-State: AFqh2kq6dCLc39kFwWAlfBWv+zeAgGTZfoH2jTxLPXuf/FgKibqhSXom nlUVrDTmW/+ACgfvX+75B2x0nOC9Scfh4Q== X-Google-Smtp-Source: AMrXdXtJv2D8LcU9sAIqibpjZPAJqk11UKT8kZq7nYM+2O+d3EGDGtD/EMLR6gF5i8Ha/6mz3lRcPg== X-Received: by 2002:a5d:4803:0:b0:26a:b8e3:b772 with SMTP id l3-20020a5d4803000000b0026ab8e3b772mr4200098wrq.23.1671738524060; Thu, 22 Dec 2022 11:48:44 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:43 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 3/4] mm: mlock: update the interface to use folios Date: Thu, 22 Dec 2022 19:48:32 +0000 Message-Id: <74874865335885dabe0751c1140a6d198dea333d.1671738120.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 9976CC0008 X-Stat-Signature: x1q5buseadh8rbf8e74nqbsxoqagwmpw X-HE-Tag: 1671738525-376938 X-HE-Meta: U2FsdGVkX1/f3iMKq8wzizi5R29eJb2+nlBuYkRCgBUuCgZE1tkC/d04petTngcCt4G7OGIoVxBcQDMM5s8xP2+bJ2n+/jqyisRgVnb52iaAQaFJOmPXp1MU3H3j67qkLuDhsY47kReDXM89raVcyr4Tp85Yn4/MUicV2sdle+7jHvMjxZR0imS9S4KeL+XFe57deO/xmlXwoh6GmwK0wv4CaOutk7vrYUe/plOApqgVFI/LPmbAlP1+5rHDcfmCw6+I2qVGmz/tb9t8ah4dmhpzn+rBsxU4bgDmUfsYfNE3A3rDyXItZQSfXSJ2FQyXWMvv6ahTvI3zRUt3JT0MFTie3otc2Q57HMK2u+tqBUrlEqdEO8kC68ee/gD1ipCExt1L8n7ubjBIuN+VLarGcZYt5J9nGSG9bl2Fj/hufvd1434HYdWuxbQBOtSenD8i1TZsb8kjObjsECdO2dXrJfB4vEHK+QsW+p6GEGVgs9I1045nA6I3SbvjU/xVJbH4XP2toJWzMSpyQHQFPU2RbtbpdKIE9U+QJEQTnRoYOHKszCY/W092ASdyootUugshUcK+IUJUZrKHCbG3ATZvmx1nUWW3m79iNta2kNShH/NaxaQCri7q6joH+OlL/xIe76IBAdr07NKg4AXlnmAfzZUCcdTl4LKeTUSGRZcb5tYtcK2bBcV1ChiO5OQuLfRUPKvM5RzvbTENwuyLQOAs0GPLMeyXu5p+/B25QSj0XsIkhI/g0ye4CJcPLfFEQXQxkrR09lOcoeosFU2iu9L88AeJLu1gFqnFOdy4lr+HwJgNV75k3VWhMbzV9QUIn6UUT9tyDMQ9kcJJM29Iu++A9bxVuB84nG303FYuHr7z1r4EaoCc9sspBGVnAmN48LftdZMguMinFN5f7XBFCHr0DhgHJhbUgDGuqGsR7ULvIGeNDLEI3VSENYXpDOzk7jjQLeq2V4L7dYN3I3+mNqJ s568bbOp vNi9Pd0UXMjZsX4j7TXKMxm3o6qvPdvQvSPOMIPRrw6qYxihQM/sc5XcmJyxuj4k3XJvtfRI5+c1nqg7kP5CmM/zmyYnAgEObQ+t/WUcQSL0sYQTzHkpUDNjcmpSeF/msX4cl 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: This patch updates the mlock interface to accept folios rather than pages, bringing the interface in line with the internal implementation. munlock_vma_page() still requires a page_folio() conversion, however this is consistent with the existent mlock_vma_page() implementation and a product of rmap still dealing in pages rather than folios. Signed-off-by: Lorenzo Stoakes --- mm/internal.h | 26 ++++++++++++++++---------- mm/mlock.c | 32 +++++++++++++++----------------- mm/swap.c | 2 +- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 1d6f4e168510..8a6e83315369 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -515,10 +515,9 @@ extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, * should be called with vma's mmap_lock held for read or write, * under page table lock for the pte/pmd being added or removed. * - * mlock is usually called at the end of page_add_*_rmap(), - * munlock at the end of page_remove_rmap(); but new anon - * pages are managed by lru_cache_add_inactive_or_unevictable() - * calling mlock_new_page(). + * mlock is usually called at the end of page_add_*_rmap(), munlock at + * the end of page_remove_rmap(); but new anon folios are managed by + * folio_add_lru_vma() calling mlock_new_folio(). * * @compound is used to include pmd mappings of THPs, but filter out * pte mappings of THPs, which cannot be consistently counted: a pte @@ -547,15 +546,22 @@ static inline void mlock_vma_page(struct page *page, mlock_vma_folio(page_folio(page), vma, compound); } -void munlock_page(struct page *page); -static inline void munlock_vma_page(struct page *page, +void munlock_folio(struct folio *folio); + +static inline void munlock_vma_folio(struct folio *folio, struct vm_area_struct *vma, bool compound) { if (unlikely(vma->vm_flags & VM_LOCKED) && - (compound || !PageTransCompound(page))) - munlock_page(page); + (compound || !folio_test_large(folio))) + munlock_folio(folio); +} + +static inline void munlock_vma_page(struct page *page, + struct vm_area_struct *vma, bool compound) +{ + munlock_vma_folio(page_folio(page), vma, compound); } -void mlock_new_page(struct page *page); +void mlock_new_folio(struct folio *folio); bool need_mlock_page_drain(int cpu); void mlock_page_drain_local(void); void mlock_page_drain_remote(int cpu); @@ -647,7 +653,7 @@ static inline void mlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } static inline void munlock_vma_page(struct page *page, struct vm_area_struct *vma, bool compound) { } -static inline void mlock_new_page(struct page *page) { } +static inline void mlock_new_folio(struct folio *folio) { } static inline bool need_mlock_page_drain(int cpu) { return false; } static inline void mlock_page_drain_local(void) { } static inline void mlock_page_drain_remote(int cpu) { } diff --git a/mm/mlock.c b/mm/mlock.c index e9ba47fe67ed..3982ef4d1632 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -262,13 +262,12 @@ void mlock_folio(struct folio *folio) } /** - * mlock_new_page - mlock a newly allocated page not yet on LRU - * @page: page to be mlocked, either a normal page or a THP head. + * mlock_new_folio - mlock a newly allocated folio not yet on LRU + * @folio: folio to be mlocked, either normal or a THP head. */ -void mlock_new_page(struct page *page) +void mlock_new_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio = page_folio(page); int nr_pages = folio_nr_pages(folio); local_lock(&mlock_fbatch.lock); @@ -286,13 +285,12 @@ void mlock_new_page(struct page *page) } /** - * munlock_page - munlock a page - * @page: page to be munlocked, either a normal page or a THP head. + * munlock_folio - munlock a folio + * @folio: folio to be munlocked, either normal or a THP head. */ -void munlock_page(struct page *page) +void munlock_folio(struct folio *folio) { struct folio_batch *fbatch; - struct folio *folio = page_folio(page); local_lock(&mlock_fbatch.lock); fbatch = this_cpu_ptr(&mlock_fbatch.fbatch); @@ -314,7 +312,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, struct vm_area_struct *vma = walk->vma; spinlock_t *ptl; pte_t *start_pte, *pte; - struct page *page; + struct folio *folio; ptl = pmd_trans_huge_lock(pmd, vma); if (ptl) { @@ -322,11 +320,11 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, goto out; if (is_huge_zero_pmd(*pmd)) goto out; - page = pmd_page(*pmd); + folio = page_folio(pmd_page(*pmd)); if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); goto out; } @@ -334,15 +332,15 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, for (pte = start_pte; addr != end; pte++, addr += PAGE_SIZE) { if (!pte_present(*pte)) continue; - page = vm_normal_page(vma, addr, *pte); - if (!page || is_zone_device_page(page)) + folio = vm_normal_folio(vma, addr, *pte); + if (!folio || folio_is_zone_device(folio)) continue; - if (PageTransCompound(page)) + if (folio_test_large(folio)) continue; if (vma->vm_flags & VM_LOCKED) - mlock_folio(page_folio(page)); + mlock_folio(folio); else - munlock_page(page); + munlock_folio(folio); } pte_unmap(start_pte); out: diff --git a/mm/swap.c b/mm/swap.c index e54e2a252e27..7df297b143f9 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -562,7 +562,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); if (unlikely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) == VM_LOCKED)) - mlock_new_page(&folio->page); + mlock_new_folio(folio); else folio_add_lru(folio); } From patchwork Thu Dec 22 19:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13080285 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 E7457C3DA7A for ; Thu, 22 Dec 2022 19:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0484C940009; Thu, 22 Dec 2022 14:48:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F400D940007; Thu, 22 Dec 2022 14:48:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB581940009; Thu, 22 Dec 2022 14:48:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CE026940007 for ; Thu, 22 Dec 2022 14:48:48 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id ACE891A0EFE for ; Thu, 22 Dec 2022 19:48:48 +0000 (UTC) X-FDA: 80270979936.11.B5D7687 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by imf28.hostedemail.com (Postfix) with ESMTP id 049A0C000C for ; Thu, 22 Dec 2022 19:48:46 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=kSlZyEuZ; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=lstoakes@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=1671738527; 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=r2F81c9AgLyck1wSShCjUojXRC7u44cFLH6IR6oWmN4=; b=NcM/czRDgC2GtKG0xyMXypSZ3WdVMuNivxlharzA8VxNzmEO65CI2xgzGv5OhpSIWbvCGa jLewS0FZA/JvGX6SZ4F0EeDRs/diUMbIuair3+UIZwfysGV56fzBXlK1miN9pzXM+MskYF bi3TPtEbUECWXek5amtuf/Z5PsgSxdk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=kSlZyEuZ; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671738527; a=rsa-sha256; cv=none; b=RJGKH885hPVkef0uyya4mf648ivUV+4X8BZ5z++16ROukcvQLwa1HrHRNCHq2V+58RpFh4 CjBHBIQYLV2rKhinBCTsUVBgrYkH00Rn3DhKdvMZigTjs9fohjIdMJev1AXDoq836OSsvQ 0+0TkYYOoY5/FMYG60tZlv/NJfcQJ+U= Received: by mail-wr1-f53.google.com with SMTP id bs20so589441wrb.3 for ; Thu, 22 Dec 2022 11:48:46 -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=r2F81c9AgLyck1wSShCjUojXRC7u44cFLH6IR6oWmN4=; b=kSlZyEuZcFe3XKq6gnldT7ZyYLU+Awg8l/XPuFUO6xWtYw2ql8CF2LrYCXZh+rLhpa 5AxuhZlgHyNYEFINeAHMf5n203LqWTNZnbPtsuL1cCbkHKpI/jcw7ADkXOCsfPfoyT2N 5Oz1QSJ0EFDUDuFRZQdw4VKokCQwLWCPmIjb76j42aHzWO13v65n6CUhnmHQ/jcj8pVW lI+Y9QO/g+vozwln/Eiq+pDvUEk86SJxIjVd3UUrCrRJdP3RbXSNo3nRqNm3CiDxZ5eO /829JKee1x2sONrCsGazWVX92jRgfQiH3jq76ofawUgUnCgeXLgzC3ERx62TFVQ602hc LkWQ== 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=r2F81c9AgLyck1wSShCjUojXRC7u44cFLH6IR6oWmN4=; b=4G11FWFVVji5b1OSCfzABwaSPoNhGNG3ppM/G2WTW1JqlzOgJui8doOXZ8ZzbFJtc6 nHBBd6EbkQCxbybIFR/7Ob9Tc6Y8nyqZbDsqi0lh4IdYrFVSKhS583lFYK2ZkJiFsOtc CG7kS9dpL1Bdmxfcyo/yB1zIxj0hluFYrmp+DIJvEaUVmMvb4snv+moFPra24cRm/7uM pmo2VdnLbATdxKQOB7z3wg/LvX5+bfo/GQ6gajW3HsA/Bw4ty1zfxgAyIuz7IdCOUm7e qgvN6TBWtW0HYd1W3ftcEJ6Rbnd7+8hzbJshpwbS0kcF2ujvtY1MIeNcDpMgnDBvy5S2 MiVA== X-Gm-Message-State: AFqh2krkL1ZmuhAc1fGivgF2RK+5yTM01N/RpSvQDU6tqWyOQmsW05dg vmwIEVzYAWGBPrk6tj4UJvh7oIBGw/aQwA== X-Google-Smtp-Source: AMrXdXspmFuBlfR7gc2dyZfjSGXzAUYJQsYI7d+BPRPXgeycabrEGMA3kSnSuTF+GM0HYPE8veGWIg== X-Received: by 2002:a5d:61ce:0:b0:242:fd7:285c with SMTP id q14-20020a5d61ce000000b002420fd7285cmr4337447wrv.48.1671738525359; Thu, 22 Dec 2022 11:48:45 -0800 (PST) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id i1-20020adfb641000000b002425787c5easm1349317wre.96.2022.12.22.11.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:48:44 -0800 (PST) From: Lorenzo Stoakes To: linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Hugh Dickins , Vlastimil Babka , Liam Howlett , William Kucharski , Christian Brauner , Jonathan Corbet , Mike Rapoport , Joel Fernandes , Lorenzo Stoakes Subject: [PATCH 4/4] Documentation/mm: Update references to __m[un]lock_page() to *_folio() Date: Thu, 22 Dec 2022 19:48:33 +0000 Message-Id: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 049A0C000C X-Stat-Signature: 14rhyxce8qebqgcn1mae4x5rt6jskkk1 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671738526-931314 X-HE-Meta: U2FsdGVkX1/JiRsSZmr50moimbYvk3PaVS5t4f6lnZRaxkMjxNG0FMPf6W20crbbJeZfcH7YWdvJQwSDZ8tmritfAUMhgHVKqMQD2bv98CGXqwF3gVmvyMYL11/rz0HsJ1mWMk+fKGm2wi1AYYLBWP7kHmDQ/Sib7SeSx1tBi34Nn0ukhYEtFcTIDxu4xzclkOPQy/cpUNewRkyunpmEnc4afbH5icTBIk2gT9kDjfhzC8lrYZzAAhQkXo6YR0bKcX70QDD29GjEG7jYeN8JG2bK9lIO4xYYqS3+InmChXz7608Zl02YEnM2HOmy9VcOp1Jd7yY8CET3iH3xBJ+Yc5Tj3lXGaOK43nbRC5WgKIcMkMhIYfPcSChiIHxMy5O5ARm7zobVLYtVINMGCbgUYX2SQZruhNVS797IbEwEMQjUbta2z/PB/y5nX4G+7VKLDrvkmUR4e6BHMCJS8tCXD7f7k0YGE3SXEzb8FEz62qnICnBWLlzQhySoAM9vDVcR112dgy/pXGWChL77wYiJd5j+esMd+qN/ulrMFaU+tiHHzUuT3pOUaNwHU46zylZlCv8lt+dndF5+mfOvnDS4PXu7Pbuuix3PLmL1wDJxarPhiVX/b4rosAen7ORJhDEf3ReFwLq8E/ikxdpqEww07uwSORYwpLP9J954HE2UUe2QCixXcQskIgWE8RIpPU8nq52StrypITjx1PeEBsOtNKNaaPCfGkeTfkUBvGFSiN/gJunU1NSx7XuHllRyxB1swheePRNauNksbQYJKjb2bH9kVvBEQNA4rZOdx52icpf6orHdIoUz0EQAcazuhlQ5uxl5qLj/EGY5DU7bA+kX0oUV/G2CkRxZ9aNF1cUmqwmsB5+Tt0PJjdRVXdY8nh3uGh8Z+4OR/eba31lga1mr0LWL6bvHOA2A8Ku2guFJvNj+ZxP5M+o9ICCE2vaZhVMJGDFGyq3ls1zUS/wYfG4 oaJZv6EG cEon6TPn2nODrYjSLq+ePfMJoFyBq9QUJTuScV+7Cd8mZrODItveEX6je533xOyWeXiD0mJyFyg3a2ZvYvBuiTaUx6kFWdXBu4aVoG6LE7rc4s2NN49FkbrW4QUxk5Y2dd34LAurvo3tghcLy3d9CU0hEM44lMdCGX7fvpVOwJyCnHnI= 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: We now pass folios to these functions, so update the documentation accordingly. Additionally, correct the outdated reference to __pagevec_lru_add_fn(), the referenced action occurs in __munlock_folio() directly now. Signed-off-by: Lorenzo Stoakes --- Documentation/mm/unevictable-lru.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/mm/unevictable-lru.rst b/Documentation/mm/unevictable-lru.rst index 4a0e158aa9ce..153629e0c100 100644 --- a/Documentation/mm/unevictable-lru.rst +++ b/Documentation/mm/unevictable-lru.rst @@ -308,22 +308,22 @@ do end up getting faulted into this VM_LOCKED VMA, they will be handled in the fault path - which is also how mlock2()'s MLOCK_ONFAULT areas are handled. For each PTE (or PMD) being faulted into a VMA, the page add rmap function -calls mlock_vma_page(), which calls mlock_page() when the VMA is VM_LOCKED +calls mlock_vma_page(), which calls mlock_folio() when the VMA is VM_LOCKED (unless it is a PTE mapping of a part of a transparent huge page). Or when it is a newly allocated anonymous page, lru_cache_add_inactive_or_unevictable() -calls mlock_new_page() instead: similar to mlock_page(), but can make better +calls mlock_new_folio() instead: similar to mlock_folio(), but can make better judgments, since this page is held exclusively and known not to be on LRU yet. -mlock_page() sets PageMlocked immediately, then places the page on the CPU's -mlock pagevec, to batch up the rest of the work to be done under lru_lock by -__mlock_page(). __mlock_page() sets PageUnevictable, initializes mlock_count +mlock_folio() sets PageMlocked immediately, then places the page on the CPU's +mlock folio batch, to batch up the rest of the work to be done under lru_lock by +__mlock_folio(). __mlock_folio() sets PageUnevictable, initializes mlock_count and moves the page to unevictable state ("the unevictable LRU", but with mlock_count in place of LRU threading). Or if the page was already PageLRU and PageUnevictable and PageMlocked, it simply increments the mlock_count. But in practice that may not work ideally: the page may not yet be on an LRU, or it may have been temporarily isolated from LRU. In such cases the mlock_count -field cannot be touched, but will be set to 0 later when __pagevec_lru_add_fn() +field cannot be touched, but will be set to 0 later when __munlock_folio() returns the page to "LRU". Races prohibit mlock_count from being set to 1 then: rather than risk stranding a page indefinitely as unevictable, always err with mlock_count on the low side, so that when munlocked the page will be rescued to