From patchwork Wed Nov 16 02:10:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13044338 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 2402EC4321E for ; Wed, 16 Nov 2022 02:10:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0EE76B0072; Tue, 15 Nov 2022 21:10:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A98018E0002; Tue, 15 Nov 2022 21:10:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C47E8E0001; Tue, 15 Nov 2022 21:10:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7F0C96B0072 for ; Tue, 15 Nov 2022 21:10:18 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5FE8C1A0309 for ; Wed, 16 Nov 2022 02:10:18 +0000 (UTC) X-FDA: 80137675716.17.C79534E Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf06.hostedemail.com (Postfix) with ESMTP id 0EE50180002 for ; Wed, 16 Nov 2022 02:10:17 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id d192so2983903pfd.0 for ; Tue, 15 Nov 2022 18:10:17 -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=edTd/8en+S7nFCs7bvchEE9GA5NqYTbaAgFkDH59CPw=; b=cD9MV49WEAUYWQxdD69ZABkZwcvH/Sy01d2BEoajQL/UB3FK0pJWmFL16ABBRlMdah YI96fzjPXUi96FFTetnaBW5znWFlL0hqj6nYo65uDMWqTjqxd+FU0tJvx/WKZHKNBVPz yBGhVi1oAiGAZIwI6v1p6pWA3yzks5gxKvXJVHsQKni6IVm7qViZ6TuRA5kXqnwEHiAF lNGyejgS/WqIY2zJiA+MqV2vFEkR5GqyoMQALz1appaBZrLtRHUJm6XxkEALy7fkGieB +UhLTAtIOBGsBOdnXKz2nZC5qEj2bo4iNFeHe9GcwwmJuhZB65Aq2rUTjRGcDMw70j+5 zvWQ== 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=edTd/8en+S7nFCs7bvchEE9GA5NqYTbaAgFkDH59CPw=; b=OOp92V30wtd57YLqvot8jtHCG1+JtqAhITipcjbD02Qx08Luq8QItwSqo+4v5xG4N8 dcbCs5Opi8ctMDmhP8kQ349oHCuaDeTmjqFuawRi3MXB0nH1sA4sJcRcvvH69d/kAQIh ZT40LUGzykMb+o8VDQ1KO7ZHdBEuWRWgMqdbjKaicNHMilp92cJEjuhydN9iEe0Q7dnA 3nWjxR1J5vCatPJGe4aOfOXlCsPBXGzMYZ9ozH9dUDQ5fDK+AMBDYRIekgcMpVdLSE/t gcZKSktq5dumqRAEq7Hd1a/Nfuq6vrNta3kxgyhu5zZ3GN52RT/2yn7s5sfYYtZ+VjSK CCYQ== X-Gm-Message-State: ANoB5pnpXvV8/EydMxLmz0Eq5yytK8eo0p/yUYryoYQbWN1CPGz9ROPX sO9nhMj+uvxZkcfTy7aOtZU1bkr8MXv0Lg== X-Google-Smtp-Source: AA0mqf6VE+cIqZ132CIPFdm51AI+vVTW9iFk3WFUMCM2PAXHIKpEfwf11GrBWCmVT+8N77rIQ+bRhw== X-Received: by 2002:a63:f53:0:b0:456:d859:2143 with SMTP id 19-20020a630f53000000b00456d8592143mr18731335pgp.396.1668564616706; Tue, 15 Nov 2022 18:10:16 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id e18-20020a17090301d200b0018691ce1696sm10782926plh.131.2022.11.15.18.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 18:10:16 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, naoya.horiguchi@nec.com, tytso@mit.edu, "Vishal Moola (Oracle)" Subject: [PATCH 1/4] ext4: Convert move_extent_per_page() to use folios Date: Tue, 15 Nov 2022 18:10:08 -0800 Message-Id: <20221116021011.54164-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116021011.54164-1-vishal.moola@gmail.com> References: <20221116021011.54164-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668564618; 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=edTd/8en+S7nFCs7bvchEE9GA5NqYTbaAgFkDH59CPw=; b=43vyCTAYhm6jwHNWnFIhRBe/+kbsPczaeqnx75b5PfqbqbyK1293uJBff9KD3RVEreBTVc cnKMVfaI9CB74movvys2sWa+cEIY97bk3Ff3m1ZRGT6ZDK+DklZgUr7qun1ZOTR2hvS7c1 kmkkJvJRy3/QnrW8+lu5XBOtiP1k3DU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cD9MV49W; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668564618; a=rsa-sha256; cv=none; b=W7iI5LmN8i3f2bE210hrXtgD1dfYNUc4Kc9ZbkpNs/s6qvpzdgG/WgLS5853Sc0b+IaGpA CrYwEFDj5R5f2UzQQZIA0LfSPveiyjbKboiryrzwP2ROX2Ra4yf0JbuYVLuBcnZatyPY1G KI7MV88HznVKlZxsj45QRJ5cn+2tCQI= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0EE50180002 X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cD9MV49W; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com X-Stat-Signature: zjre6zotr647x9cjfobbndihfwsxyo5d X-HE-Tag: 1668564617-744367 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: Converts move_extent_per_page() to use folios. This change removes 5 calls to compound_head() and is in preparation for the removal of the try_to_release_page() wrapper. Signed-off-by: Vishal Moola (Oracle) --- fs/ext4/move_extent.c | 47 ++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 044e34cd835c..0c680d4a2929 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -253,6 +253,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, { struct inode *orig_inode = file_inode(o_filp); struct page *pagep[2] = {NULL, NULL}; + struct folio *folio[2] = {NULL, NULL}; handle_t *handle; ext4_lblk_t orig_blk_offset, donor_blk_offset; unsigned long blocksize = orig_inode->i_sb->s_blocksize; @@ -313,6 +314,8 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, * hold page's lock, if it is still the case data copy is not * necessary, just swap data blocks between orig and donor. */ + folio[0] = page_folio(pagep[0]); + folio[1] = page_folio(pagep[1]); if (unwritten) { ext4_double_down_write_data_sem(orig_inode, donor_inode); /* If any of extents in range became initialized we have to @@ -331,10 +334,10 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, ext4_double_up_write_data_sem(orig_inode, donor_inode); goto data_copy; } - if ((page_has_private(pagep[0]) && - !try_to_release_page(pagep[0], 0)) || - (page_has_private(pagep[1]) && - !try_to_release_page(pagep[1], 0))) { + if ((folio_has_private(folio[0]) && + !filemap_release_folio(folio[0], 0)) || + (folio_has_private(folio[1]) && + !filemap_release_folio(folio[1], 0))) { *err = -EBUSY; goto drop_data_sem; } @@ -344,19 +347,21 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, block_len_in_page, 1, err); drop_data_sem: ext4_double_up_write_data_sem(orig_inode, donor_inode); - goto unlock_pages; + goto unlock_folios; } data_copy: - *err = mext_page_mkuptodate(pagep[0], from, from + replaced_size); + *err = mext_page_mkuptodate(&folio[0]->page, from, from + replaced_size); if (*err) - goto unlock_pages; + goto unlock_folios; /* At this point all buffers in range are uptodate, old mapping layout * is no longer required, try to drop it now. */ - if ((page_has_private(pagep[0]) && !try_to_release_page(pagep[0], 0)) || - (page_has_private(pagep[1]) && !try_to_release_page(pagep[1], 0))) { + if ((folio_has_private(folio[0]) && + !filemap_release_folio(folio[0], 0)) || + (folio_has_private(folio[1]) && + !filemap_release_folio(folio[1], 0))) { *err = -EBUSY; - goto unlock_pages; + goto unlock_folios; } ext4_double_down_write_data_sem(orig_inode, donor_inode); replaced_count = ext4_swap_extents(handle, orig_inode, donor_inode, @@ -369,13 +374,13 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, replaced_size = block_len_in_page << orig_inode->i_blkbits; } else - goto unlock_pages; + goto unlock_folios; } /* Perform all necessary steps similar write_begin()/write_end() * but keeping in mind that i_size will not change */ - if (!page_has_buffers(pagep[0])) - create_empty_buffers(pagep[0], 1 << orig_inode->i_blkbits, 0); - bh = page_buffers(pagep[0]); + if (!folio_buffers(folio[0])) + create_empty_buffers(&folio[0]->page, 1 << orig_inode->i_blkbits, 0); + bh = folio_buffers(folio[0]); for (i = 0; i < data_offset_in_page; i++) bh = bh->b_this_page; for (i = 0; i < block_len_in_page; i++) { @@ -385,7 +390,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, bh = bh->b_this_page; } if (!*err) - *err = block_commit_write(pagep[0], from, from + replaced_size); + *err = block_commit_write(&folio[0]->page, from, from + replaced_size); if (unlikely(*err < 0)) goto repair_branches; @@ -395,11 +400,11 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, *err = ext4_jbd2_inode_add_write(handle, orig_inode, (loff_t)orig_page_offset << PAGE_SHIFT, replaced_size); -unlock_pages: - unlock_page(pagep[0]); - put_page(pagep[0]); - unlock_page(pagep[1]); - put_page(pagep[1]); +unlock_folios: + folio_unlock(folio[0]); + folio_put(folio[0]); + folio_unlock(folio[1]); + folio_put(folio[1]); stop_journal: ext4_journal_stop(handle); if (*err == -ENOSPC && @@ -430,7 +435,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, *err = -EIO; } replaced_count = 0; - goto unlock_pages; + goto unlock_folios; } /** From patchwork Wed Nov 16 02:10:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13044339 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 AAF8EC433FE for ; Wed, 16 Nov 2022 02:10:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 430D96B0073; Tue, 15 Nov 2022 21:10:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B9C18E0002; Tue, 15 Nov 2022 21:10:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20DD78E0001; Tue, 15 Nov 2022 21:10:20 -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 0A4A76B0073 for ; Tue, 15 Nov 2022 21:10:20 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D4FD6C105A for ; Wed, 16 Nov 2022 02:10:19 +0000 (UTC) X-FDA: 80137675758.09.126BFB6 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf28.hostedemail.com (Postfix) with ESMTP id 71DEEC0009 for ; Wed, 16 Nov 2022 02:10:19 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id v4-20020a17090a088400b00212cb0ed97eso973431pjc.5 for ; Tue, 15 Nov 2022 18:10:19 -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=3YDT/XAgh5QSXlyod86SZaadrvntYw6ff/cmVDaxdzo=; b=KUWjlw9wAvu8gqDJAwg6cHtHVqa2W7DdXEB14CWlGXOWQBL05awe9s9dxYdOmOMil7 RyOWv3MuMr+ShlBwAHzlInZpf9WXU4IuK1fknZkWVuLUhQ8t3qI15l9MkRSO5n+vHcVT 0G/GLoFUHkDLpMMPVn8nqBWlDH6Pk7924RR3Nv4EkBqE4naN+P+eE3gMl2w3L5JfiBO9 uLiInO8eB3pLYu1bfB9Et5ttZNn5/mdao/zMfopzKv6CaouWP5zWjCj25OIgmti1dk+O nFEpT78cOIq9/Ga/a+rQlgFiHnQYnpeeq5IQMaBWKdhVLtzfU4MlOuZxq9iWJZ0LgthU 2gzg== 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=3YDT/XAgh5QSXlyod86SZaadrvntYw6ff/cmVDaxdzo=; b=JDjy66In01vR5JjGE1jt1+SIH4mCktVYZKZZCFBk6AiGUwOCcz/iPaujwZoX2CxFBs qRWnT3xAf1QJO4eWuhR0ZpvcaeoqxE6lvcs2T//+dff/Uu520CZ1HYJhIahwNOwLxbqQ Hz6YiLS/pb4+3PUGNN39HhrZUo0QVAfg1eRbE/nz6FKYcGXkOU6UushPXvFewIX51eZ2 Lj8d0RkJXfvK2Ct05/kTCEhg3J1RvtmkqlBlKCxwFR5ubMX4TjPl6XagCJ9xLpZshMNJ +urq46W0Vtm7xZAVetXVySGGXUlts0KealRZJFR4oZ2b4Hgsp9w6NMF8JIHy4hTxdzjk ygMw== X-Gm-Message-State: ANoB5pngOMYvLr9VvJ4TwOmMfWHkNbfvF6eUyIC6kPKhrRJImxjG1shR XwHpvSW75UOevLF9xMJEf7gSgk5I8L0Nkw== X-Google-Smtp-Source: AA0mqf6ilXQxf7UfCBN93r79wPL21N0NY2osSPVfxzyouO00iRPUQVv81FYoeZnvWALfNK4uiq506A== X-Received: by 2002:a17:90a:c7c1:b0:213:1f29:2d0a with SMTP id gf1-20020a17090ac7c100b002131f292d0amr1334082pjb.154.1668564618296; Tue, 15 Nov 2022 18:10:18 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id e18-20020a17090301d200b0018691ce1696sm10782926plh.131.2022.11.15.18.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 18:10:17 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, naoya.horiguchi@nec.com, tytso@mit.edu, "Vishal Moola (Oracle)" Subject: [PATCH 2/4] khugepage: Replace try_to_release_page() with filemap_release_folio() Date: Tue, 15 Nov 2022 18:10:09 -0800 Message-Id: <20221116021011.54164-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116021011.54164-1-vishal.moola@gmail.com> References: <20221116021011.54164-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668564619; 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=3YDT/XAgh5QSXlyod86SZaadrvntYw6ff/cmVDaxdzo=; b=WGDwQfL+1rH1YyPd7Ar+QeQdswEWFMb5TehGga6i8BoRWYBh9WmT7c5YxieyNPl08UKyQH PrzfYf1m/PnOmbQWpC1hpw49TGe7MCMMHG7UzZtqZqh5E2SJKZTmQwbl1YqZ9CUKCun9XG IvWP9lxAaN5RfpvZez69oEThfcErXos= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KUWjlw9w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668564619; a=rsa-sha256; cv=none; b=IcAsgsrQH2reyDd/pXZMgek2YQaNCY1vB1EGCz8I11OFM70or7BEPW3VatBpktbmD+pxw4 os7N/OcnAo4wJ9K7nZL5ngY+ZEv17fpzhm8DxUX/mVnf6lAeiTMGCk+AECi0X1/XWqXxUC 9tdXALsOOWmlV3hLeFETnbwpVGcOpRU= X-Rspam-User: X-Stat-Signature: 6yip4r1s5aipz9j84ftsq9gxjnhpki3g X-Rspamd-Queue-Id: 71DEEC0009 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=KUWjlw9w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com X-Rspamd-Server: rspam07 X-HE-Tag: 1668564619-532203 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: Replaces some calls with their folio equivalents. This change removes 4 calls to compound_head() and is in preparation for the removal of the try_to_release_page() wrapper. Signed-off-by: Vishal Moola (Oracle) --- mm/khugepaged.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4734315f7940..3f21c010d2bd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1747,6 +1747,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, xas_set(&xas, start); for (index = start; index < end; index++) { struct page *page = xas_next(&xas); + struct folio *folio; VM_BUG_ON(index != xas.xa_index); if (is_shmem) { @@ -1773,8 +1774,6 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, } if (xa_is_value(page) || !PageUptodate(page)) { - struct folio *folio; - xas_unlock_irq(&xas); /* swap in or instantiate fallocated page */ if (shmem_get_folio(mapping->host, index, @@ -1862,13 +1861,15 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, goto out_unlock; } - if (page_mapping(page) != mapping) { + folio = page_folio(page); + + if (folio_mapping(folio) != mapping) { result = SCAN_TRUNCATED; goto out_unlock; } - if (!is_shmem && (PageDirty(page) || - PageWriteback(page))) { + if (!is_shmem && (folio_test_dirty(folio) || + folio_test_writeback(folio))) { /* * khugepaged only works on read-only fd, so this * page is dirty because it hasn't been flushed @@ -1878,20 +1879,20 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, goto out_unlock; } - if (isolate_lru_page(page)) { + if (folio_isolate_lru(folio)) { result = SCAN_DEL_PAGE_LRU; goto out_unlock; } - if (page_has_private(page) && - !try_to_release_page(page, GFP_KERNEL)) { + if (folio_has_private(folio) && + !filemap_release_folio(folio, GFP_KERNEL)) { result = SCAN_PAGE_HAS_PRIVATE; - putback_lru_page(page); + folio_putback_lru(folio); goto out_unlock; } - if (page_mapped(page)) - try_to_unmap(page_folio(page), + if (folio_mapped(folio)) + try_to_unmap(folio, TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH); xas_lock_irq(&xas); From patchwork Wed Nov 16 02:10:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13044340 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 3EE0FC43217 for ; Wed, 16 Nov 2022 02:10:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8763C8E0001; Tue, 15 Nov 2022 21:10:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 827DB6B0075; Tue, 15 Nov 2022 21:10:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62B608E0001; Tue, 15 Nov 2022 21:10:21 -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 553C86B0074 for ; Tue, 15 Nov 2022 21:10:21 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2AAFAAB899 for ; Wed, 16 Nov 2022 02:10:21 +0000 (UTC) X-FDA: 80137675842.27.3879DB6 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf18.hostedemail.com (Postfix) with ESMTP id B608D1C0006 for ; Wed, 16 Nov 2022 02:10:20 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so902075pjs.4 for ; Tue, 15 Nov 2022 18:10:20 -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=4nup6up+46eyh1lCBQu3VG6VwxyWmfFVyQ2yC43shVo=; b=kzTno0E757BuQUewd/lzW9JzWZhTRKoWJpj5TsOZemkW3irgjFx+JTcamrVEFZ+ZuK rd94aHMDRRsnMe5IjRTrRR0X2yA4oKZyt8VeJm0zlT3nKQE3H4iVnQ9nwf6cjVbIeRnN 9aAx+D1+N0y89hD+TmOP1QgFYR1ib5eKb91rk3P4CI2m5AyK49XRDYlA5AZv6+WkkBJ0 gu7a7WBBV/sVvJ43ubRL7RoJ8O18IT4nq/OSq62+8P+2AfbMzGGbzIWRDOwUmxcM/7kJ lr0+qQniPM4W/zw/ITl7D7XfrPmKiYARVg0tRSbciDRzhm5g/69Fs85CE+WQq0kwhja4 NOMg== 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=4nup6up+46eyh1lCBQu3VG6VwxyWmfFVyQ2yC43shVo=; b=qyzrb+/7qY8O7TQ7nPoE0ERfWCzRfKzyITvfBsR8/rXn05I+yN+2vjprCmQYNYyaqO ulTjUFFAAK/YPPJzZa10Y1+uigPffjBRGg4JTODvh+9JqH1lt1iZrgqqD6Kv8tttnR3W xPt3ZzfFQIFE0C9rS5PrUiE/DmvUMPtVO4kK4770Y5kV6cRBSZ1E2SOq4KrEJNT27oRj uJmy2ZYQ/ZPaCjz7QWCHfC3hURhAFpGPLSU7LJqji0+I/gomk8nDl3Pncmnwa4vPILZG Hcc9G8CnW0VgSwXOqP+RHvCKZeK+LHxELJr0VzVmwE8iRRHQ+BpiLoDKELIWU0AbCBBn JtnA== X-Gm-Message-State: ANoB5pkSjsSFBxHwDOkrqWq2lMJWBBqNWwi9nEJv+O1gcV+hdoqvu9Cr CSktjYoIwxTuKZGi3wOO2xH4zOHbERsYdQ== X-Google-Smtp-Source: AA0mqf6hvZars6XBjSem/60Am0lJSYcFCbloSRvfORBFk7lHG1Lk1xaJFIBqtkgbxbOvHTg/8ntrTg== X-Received: by 2002:a17:90a:b392:b0:212:de1a:355b with SMTP id e18-20020a17090ab39200b00212de1a355bmr1406088pjr.1.1668564619604; Tue, 15 Nov 2022 18:10:19 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id e18-20020a17090301d200b0018691ce1696sm10782926plh.131.2022.11.15.18.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 18:10:19 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, naoya.horiguchi@nec.com, tytso@mit.edu, "Vishal Moola (Oracle)" Subject: [PATCH 3/4] memory-failure: Convert truncate_error_page() to use folio Date: Tue, 15 Nov 2022 18:10:10 -0800 Message-Id: <20221116021011.54164-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116021011.54164-1-vishal.moola@gmail.com> References: <20221116021011.54164-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668564620; a=rsa-sha256; cv=none; b=HaIAeNkikhGIf68zXkDGS5uZYZGtY55nPe1CuCMw2QyDmJkUYlfzRby5Lmmg2ww1Fyt8S+ 6tvqhmm8Anfyb1JCji+UinZzujjG2a63oLBlRYaeMO4g1iD53RIMi5X7Loms7VWevqw1tP MUmx5oUjarLWv9MTgS1L2Fvir0SRWy8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=kzTno0E7; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.45 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=1668564620; 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=4nup6up+46eyh1lCBQu3VG6VwxyWmfFVyQ2yC43shVo=; b=tYKqEuaHFbxmwfqWjCDoJ65G9hdLh8E3k/N8Xdl3hoUTLsYxpXQcMDctk8PNqaxcsJSoxD U5XfJYiIE13P1ETCFnTLGTGQ2QcLaJ4mGoe68wMUhSXXnp9+6VuJN1FLUVDG01snLFJGhI t9CLoAFnFKkqzFmy+/j5HfAcQEW51rc= X-Stat-Signature: 6ddfy4ndpnq5fm96kjwjwfho4qmi4muf X-Rspamd-Queue-Id: B608D1C0006 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=kzTno0E7; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Rspam-User: X-HE-Tag: 1668564620-405803 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: Replaces try_to_release_page() with filemap_release_folio(). This change is in preparation for the removal of the try_to_release_page() wrapper. Signed-off-by: Vishal Moola (Oracle) Acked-by: Naoya Horiguchi --- mm/memory-failure.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 145bb561ddb3..92ec9b0e58a3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -827,12 +827,13 @@ static int truncate_error_page(struct page *p, unsigned long pfn, int ret = MF_FAILED; if (mapping->a_ops->error_remove_page) { + struct folio *folio = page_folio(p); int err = mapping->a_ops->error_remove_page(mapping, p); if (err != 0) { pr_info("%#lx: Failed to punch page: %d\n", pfn, err); - } else if (page_has_private(p) && - !try_to_release_page(p, GFP_NOIO)) { + } else if (folio_has_private(folio) && + !filemap_release_folio(folio, GFP_NOIO)) { pr_info("%#lx: failed to release buffers\n", pfn); } else { ret = MF_RECOVERED; From patchwork Wed Nov 16 02:10:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13044341 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 08077C433FE for ; Wed, 16 Nov 2022 02:10:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 607AF6B0074; Tue, 15 Nov 2022 21:10:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 591098E0002; Tue, 15 Nov 2022 21:10:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36BF26B007B; Tue, 15 Nov 2022 21:10:22 -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 299B66B0074 for ; Tue, 15 Nov 2022 21:10:22 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F11CC160B2F for ; Wed, 16 Nov 2022 02:10:21 +0000 (UTC) X-FDA: 80137675842.17.A65B171 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf28.hostedemail.com (Postfix) with ESMTP id 9388BC0009 for ; Wed, 16 Nov 2022 02:10:21 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id v4-20020a17090a088400b00212cb0ed97eso973507pjc.5 for ; Tue, 15 Nov 2022 18:10:21 -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=CejbmJMt8knLZkp2jnt3nSDaW2/iqvwuj8SHKIZ6DVU=; b=G/lcM5PwZ0+Ib/Xb9y7OrQjWRddNdmXLywgQSv385sHaURx8IljbeuN/Sbp+vTAI7e J+GBm0Oio9YIM/KXtdA9WGU19Y/4E+/6K1dfkB7Q3+K3PrsXhvC3Z6tROjHkkEaa7Y7v cZgHG2WtjhEhsZnB6nySPb+qXRk4Yo8a+pM/vwOZlgkcecKcsrnbJXxVv0J7htNHaMoK x52qgRJ/chHlnbyPgH/sb7ZdIZLoT/4WnOh6fHNX17pWc93N/x9YWGB0IbnlYTfH/VMa oN/sDsoKLLnSaAfbWJ9CAluV8Ep3aJdG0byCQ7rm3WvDxsWsS/GnsDEmjhs66e7EF9dH Ur7w== 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=CejbmJMt8knLZkp2jnt3nSDaW2/iqvwuj8SHKIZ6DVU=; b=TXJxzejg+AQrnOTjLfasmIGfgtHO4oZKqPAD4JcsMfpVoFwRVFTbGE1/muLSNP/ud6 rU2s3C/y4++LQn97uDl7JKP+LOQkqVpuIAYmCv4yjU8fG+kwQycpUUKMyGFXR1hRbMt2 lF/JJ6/jHrJSsustt29nHcWjLgVJF8FN1zqXuVzDsOXOOx1V+qZGE3HjlwLnn8flMx1x AySMLRj0x4dp6/bc/cThI0vUe29LfoMxpsBbQtfTKLksHfU7VA7HFdRMqewiSdBhKoep 7zNbbO/PZHwI5GjBv4npfGqxU0/FnSYkTZG0l+edwn4X0aJlf6/5mlieIKuDgy2pCjAI ld6g== X-Gm-Message-State: ANoB5pmqykVUfzhBd4NPCIpIN3fVR13AlwEUo68P7WJ7Ns6Qs2NQo54i bUdCjRgo4OEUxGcKLABTnBBYFN3u9laMxQ== X-Google-Smtp-Source: AA0mqf7uKcISWh7p7npTkea6Y8R0mC2+ZIlMKnRY0p+5XL9R9S9v5F0yJTMB8XVfcjk+yqVakExTKg== X-Received: by 2002:a17:90a:1a12:b0:20a:6ffc:f0c6 with SMTP id 18-20020a17090a1a1200b0020a6ffcf0c6mr1371340pjk.49.1668564620886; Tue, 15 Nov 2022 18:10:20 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id e18-20020a17090301d200b0018691ce1696sm10782926plh.131.2022.11.15.18.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 18:10:20 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, naoya.horiguchi@nec.com, tytso@mit.edu, "Vishal Moola (Oracle)" Subject: [PATCH 4/4] folio-compat: Remove try_to_release_page() Date: Tue, 15 Nov 2022 18:10:11 -0800 Message-Id: <20221116021011.54164-5-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116021011.54164-1-vishal.moola@gmail.com> References: <20221116021011.54164-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668564621; 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=CejbmJMt8knLZkp2jnt3nSDaW2/iqvwuj8SHKIZ6DVU=; b=OZIEDGH2nje1zWOsjhLCKa9UdKo9BfwVHnj6YFJfViHwH0qs2NIjd2oiHzNhIeW+xjKLAr Y8y1jxX1o+VDpGzXzQ4VROFahvB+9PP/Co62ad0bfT87tAYY7RKKnSo5aVpHxtDBs75w1N athYPCKpKa9yS5LZ6sNiEX78tYxGILw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="G/lcM5Pw"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668564621; a=rsa-sha256; cv=none; b=j1JsmAY9Jim1M2YAJhDiFz1urhQV4cR2kiieRzyncfcjAjQFtIzBsy3dxpZllTpnAIGD+T fu8YovGMVCzLjmjrke5H6YdlG6MtGyPN/ZCVUsWW4DF0sNEVgYstvP2t/QEAzNzSQdU3cG b3AK7rUIgzR1jcOR+WzK7WbOwGimUco= X-Rspam-User: X-Stat-Signature: zmdiihbdqwnaaqrpxeihfog11gz91qhp X-Rspamd-Queue-Id: 9388BC0009 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="G/lcM5Pw"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com X-Rspamd-Server: rspam07 X-HE-Tag: 1668564621-514100 X-Bogosity: Ham, tests=bogofilter, spamicity=0.001856, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: There are no more callers of try_to_release_page(), so remove it. This saves 149 bytes of kernel text. Signed-off-by: Vishal Moola (Oracle) --- include/linux/pagemap.h | 1 - mm/folio-compat.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bbccb4044222..daf5e1a1d313 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1107,7 +1107,6 @@ void __filemap_remove_folio(struct folio *folio, void *shadow); void replace_page_cache_page(struct page *old, struct page *new); void delete_from_page_cache_batch(struct address_space *mapping, struct folio_batch *fbatch); -int try_to_release_page(struct page *page, gfp_t gfp); bool filemap_release_folio(struct folio *folio, gfp_t gfp); loff_t mapping_seek_hole_data(struct address_space *, loff_t start, loff_t end, int whence); diff --git a/mm/folio-compat.c b/mm/folio-compat.c index e1e23b4947d7..9318a0bd9155 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -129,12 +129,6 @@ void delete_from_page_cache(struct page *page) return filemap_remove_folio(page_folio(page)); } -int try_to_release_page(struct page *page, gfp_t gfp) -{ - return filemap_release_folio(page_folio(page), gfp); -} -EXPORT_SYMBOL(try_to_release_page); - int isolate_lru_page(struct page *page) { if (WARN_RATELIMIT(PageTail(page), "trying to isolate tail page"))