From patchwork Fri Apr 5 18:00:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13619300 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 5042ECD11C2 for ; Fri, 5 Apr 2024 18:00:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0FAC6B009D; Fri, 5 Apr 2024 14:00:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC94C6B009E; Fri, 5 Apr 2024 14:00:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A87816B009F; Fri, 5 Apr 2024 14:00:47 -0400 (EDT) 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 87BF56B009D for ; Fri, 5 Apr 2024 14:00:47 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1E13D161226 for ; Fri, 5 Apr 2024 18:00:47 +0000 (UTC) X-FDA: 81976243734.17.6263594 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id AAB49C0033 for ; Fri, 5 Apr 2024 18:00:44 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="AU/CDJNw"; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712340045; 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:references:dkim-signature; bh=M4riCvTPkZb+WtxBvfsCwZTYI/DsC93Onz8kbQCsRn4=; b=o/MbuFce17DVdbUjPJmyW7vCzSX2rmwkkdz3k3chDJAGU/O6qMGl1KDiixjGXV2R/rTEvh EJF08FBwrNIJQQB6dSMMFEam2f39KXesB4RWOXeXaMGdIm7fzfh+8FKBd9moWwnvAmnTKx 1D8SUygiUX408Ohww3F8fj20Gl7jw80= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712340045; a=rsa-sha256; cv=none; b=JKF5iBFMj7kNUbTDPz1vJvfmA+5Ei+RkgMKktHdf1qdUrLlcQglkcpckyAMkHiMK3wshnH XpN/nQaKRnYUTWctJt2IJ+AVCU0NueFeTxM1LvWlcvQcFSeqFJKb27Zyqh2NQXI868QjVX /79OXbqmVHLKYeWOs78iEbuys32vxq0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="AU/CDJNw"; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=M4riCvTPkZb+WtxBvfsCwZTYI/DsC93Onz8kbQCsRn4=; b=AU/CDJNwaRYN1UsFM4SmhTELRn ZekAtC/91hXhUGtKDJ4baLx6thDE6G3cj2YCpkORgniXWa27DOXQPVGqCk+DY5lL62NuNESuYFflX QUV/LA2GLnyFAmn1qD8pK1ywjW1pHAVPDV8pPa8QoVrH/Msy7SmxGv8SI5MUaqC5lU+sJL8V0VIXe kWzshSISNI77GCNu3MIekXcHolS90GUo5gkZvbcWFafTZ0iF8krHtvREzAj4Drk4FJttEeYCMdWLI TCurxArypOtOQzwtrTNj8aBuzmAhmGYnPhgbtGwGIBlEPQgC4BzyFkoP68xptdFdVQDxyNpxouIjD s4Hj6lag==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsnrj-0000000AzEO-0g9H; Fri, 05 Apr 2024 18:00:39 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Pankaj Raghav Subject: [PATCH] mm: Convert pagecache_isize_extended to use a folio Date: Fri, 5 Apr 2024 19:00:36 +0100 Message-ID: <20240405180038.2618624-1-willy@infradead.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: AAB49C0033 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: oc5b5wkz96tkd1w1cdtuidgwbp79iymo X-HE-Tag: 1712340044-241102 X-HE-Meta: U2FsdGVkX190N9Sk76na9I+paDMUz88qgIxjqkgiGoVxX7xJQ29CZCmn7nwnTc+j08WRSR+A2NsumglXcUJAxlDoZm88pUXl0Z1EEX3JgwHbpDhj58iC8AiTmUxBzeUoPAddgBENbRps67qEfdm9ae8QzaRlQAtjnmHx9YZZfmZ74/qF2H0PWjZlsQhCTfhRBbRSK2KAYv6/19kPJ6iuDIV8vSPcgs56y88cTykHSB4Pt5roXemimd8fVsv1SYZcjwmmbvOGr4Zr5QTM1AI/YoMVw0HY9wybl6yKXud+ltdenkQaEk8tQGHyvUbeNdq9RkSm+O4zx+7d+3WksO5T8Tz0ctXnhMYox3Ka86Cu3QXQIVZEAtl6eEyuU/mbr3gZYNnCLXqZXcYalGmmFhfPr7S/0hPD88ZjKH7UIxqME833JsOvtd1SBA0QrweA/7FFtQIgxAB88DipO8/z9C/2LJeEvLgmvz8A2Ju8eFCTAMyuYvhWs2rBLat2xtMS0K0RJmtlTnO+YPafHkCElQkCoywB1/BBBz+5Cy1NPnZvOAZCrdiPV9XLdC96j1Wr/5cp2B3ZA9uTvdI5IX/B3tTGufEmeNxjds3ErnrvGa0/dYhMRp5878H2Eibh5TwjOPeFjljcCplKAWNGp+gSZ/9NSX1denUfi6ncCQf8PXqnATYawpWJTsBZv/JBX3XJvj5UEzvfhq9Sdp3+G5FPelWbQDGZtSaRHWXsWTTlWTo2+hVEmRYAIITjxi5XJh1+XETy3I+ALYcPWQzoYcEEpfr9YCD9FuW7rPUcjbdEOdz/XHLdSYmWslg3J8ACdyoPfRQU91jd+KPu8folbg00Wy8XqdgbFzbWsnCuCJNhglqeQTfoXP/iqFKQSDYWDpJdWO5LO+p+tlhiFffhYlC0O8kHy4JC3GOG4xF5z/jjuO3k06AOu4tfUaHunu/ZVSR29g4hVIwmBVjfbP/R8OLisIs CK2wKBTS FX7URYdQxH/U5DokbqXrlraNIqlr4hBiekFiRVpC1F4ZVHuPMCKyDYTZFgtJA+FnJgIDgpa+z4kxuBZnR8RYSpCf7OkaKaYwKi3KtcB53sMY4IzeI2o5nuO2NYiZMQKuzMDSsGneiCuTtWHqBGSnKotGiBYZdZSCTzY1erEYhlYJeyL6mROSG6A2Wk/kCG+CRC2t1OOMK46E3qQNxBhJlCtDaXqAw7lsaX/jbJ+dEOZKy+8+B684zbKVTxg== 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: List-Subscribe: List-Unsubscribe: Remove four hidden calls to compound_head(). Also exit early if the filesystem block size is >= PAGE_SIZE instead of just equal to PAGE_SIZE. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Pankaj Raghav Reviewed-by: David Hildenbrand --- mm/truncate.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index 725b150e47ac..e99085bf3d34 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -764,15 +764,15 @@ EXPORT_SYMBOL(truncate_setsize); * @from: original inode size * @to: new inode size * - * Handle extension of inode size either caused by extending truncate or by - * write starting after current i_size. We mark the page straddling current - * i_size RO so that page_mkwrite() is called on the nearest write access to - * the page. This way filesystem can be sure that page_mkwrite() is called on - * the page before user writes to the page via mmap after the i_size has been - * changed. + * Handle extension of inode size either caused by extending truncate or + * by write starting after current i_size. We mark the page straddling + * current i_size RO so that page_mkwrite() is called on the first + * write access to the page. The filesystem will update its per-block + * information before user writes to the page via mmap after the i_size + * has been changed. * * The function must be called after i_size is updated so that page fault - * coming after we unlock the page will already see the new i_size. + * coming after we unlock the folio will already see the new i_size. * The function must be called while we still hold i_rwsem - this not only * makes sure i_size is stable but also that userspace cannot observe new * i_size value before we are prepared to store mmap writes at new inode size. @@ -781,31 +781,29 @@ void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to) { int bsize = i_blocksize(inode); loff_t rounded_from; - struct page *page; - pgoff_t index; + struct folio *folio; WARN_ON(to > inode->i_size); - if (from >= to || bsize == PAGE_SIZE) + if (from >= to || bsize >= PAGE_SIZE) return; /* Page straddling @from will not have any hole block created? */ rounded_from = round_up(from, bsize); if (to <= rounded_from || !(rounded_from & (PAGE_SIZE - 1))) return; - index = from >> PAGE_SHIFT; - page = find_lock_page(inode->i_mapping, index); - /* Page not cached? Nothing to do */ - if (!page) + folio = filemap_lock_folio(inode->i_mapping, from / PAGE_SIZE); + /* Folio not cached? Nothing to do */ + if (IS_ERR(folio)) return; /* - * See clear_page_dirty_for_io() for details why set_page_dirty() + * See folio_clear_dirty_for_io() for details why folio_mark_dirty() * is needed. */ - if (page_mkclean(page)) - set_page_dirty(page); - unlock_page(page); - put_page(page); + if (folio_mkclean(folio)) + folio_mark_dirty(folio); + folio_unlock(folio); + folio_put(folio); } EXPORT_SYMBOL(pagecache_isize_extended);