From patchwork Mon Feb 19 06:27:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13562220 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 96EE5C48260 for ; Mon, 19 Feb 2024 06:28:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B00BC8D0016; Mon, 19 Feb 2024 01:28:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AB0508D0007; Mon, 19 Feb 2024 01:28:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DAF08D0016; Mon, 19 Feb 2024 01:28:13 -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 743B28D0007 for ; Mon, 19 Feb 2024 01:28:13 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4BD3FA0267 for ; Mon, 19 Feb 2024 06:28:13 +0000 (UTC) X-FDA: 81807573666.09.86DDEB2 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf02.hostedemail.com (Postfix) with ESMTP id D1DFD8000E for ; Mon, 19 Feb 2024 06:28:11 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=b89o2NlW; spf=none (imf02.hostedemail.com: domain of BATV+994827af29a55d2021e7+7484+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+994827af29a55d2021e7+7484+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708324091; 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=BY9QXf9JYyzFQugvtu1qyaPY3i+2wGC3CEzX5n8IPFA=; b=ik1yF4ZLuyEGglLzxoaVhWN75CQ2sPhvezRJhf6g9DjnAwez5nq6xddaUuFcW0zDxmg8Xc l7LTNJvxvdnhwMks+OxoI3hV/E9QnF9uCNc4Qo/7xYiKs8T0mbiVUFoahRHe+I6+ZGFUek Bt+fJWXdyKx0RbeoDkI9UNgCm3EdOkw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708324091; a=rsa-sha256; cv=none; b=ki1b4RYe4O/5W5/PdtWoTMuzamexqXL7/CNu3Sd68HNKAuZe3W0HcrvxDOMYsmXODjz6G0 aBZm5zLHPFgP6Mds/ZO1BQ2onoINaRWWkO+HEFoQhO+6ve5HkjnXrh8IiGOjOQgpy1IM8a zw9brwlwNWWo4WAg8l0fXl94UKIQgHE= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=b89o2NlW; spf=none (imf02.hostedemail.com: domain of BATV+994827af29a55d2021e7+7484+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+994827af29a55d2021e7+7484+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=BY9QXf9JYyzFQugvtu1qyaPY3i+2wGC3CEzX5n8IPFA=; b=b89o2NlWaoioaDR5zmAs4ZFj8r 9YQxn3xFdPdkmjpth/4Aq/DaMyJnREdJw8lvyo5PULsUUY7WR9gmwtoMTA3arynwHaDyE4BTO0Uvy cai2kbr/mkeSX16B/hvUjDTredgAvWEx+sAaqrv/w4U1oAxAEtPbLeamS3QrzLrs0s7mFfeVnVz2p jQ/QAGooUSg4oEg6BnXb1iUA3ihNuWCKyM0XX/mn639FB2etByX9cwvriD2ax8Tt7KkzxwJ0V/yI2 j1cRlvPGphGa95NE+kugmLfhI5Xy1pIF8aeKBBm+xrH3OrzURd1dC2a5M6/9mFylrmNXk//XUNi1o o1euaQjA==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rbx8K-00000009FMe-2iEY; Mon, 19 Feb 2024 06:28:09 +0000 From: Christoph Hellwig To: Chandan Babu R , "Darrick J. Wong" , Hugh Dickins , Andrew Morton Cc: Hui Su , linux-xfs@vger.kernel.org, linux-mm@kvack.org, Kent Overstreet Subject: [PATCH 18/22] xfs: add file_{get,put}_folio Date: Mon, 19 Feb 2024 07:27:26 +0100 Message-Id: <20240219062730.3031391-19-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240219062730.3031391-1-hch@lst.de> References: <20240219062730.3031391-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: D1DFD8000E X-Rspam-User: X-Stat-Signature: s16ep8qphtgzgg8syeaqnwdyt1je6fz3 X-Rspamd-Server: rspam03 X-HE-Tag: 1708324091-881767 X-HE-Meta: U2FsdGVkX1/TQHnelSSi5KEx+JQapDEie647KOKqphfcogDET8UUMrLLru0l1r7MDfRZW8ihLdBlxFr4P6teJjKiP1d90tHsZb49amUfFMstxKZzB86YzXvtNFGeOYn9O6P93cLM7RTutLdozd8j0KKh71JlCv3sLas5Q3yW3eAO7d+VQW0zGABNspZlwUwfBh1v915Y6tdOnjTby0c7UtlfDooLjTvgB1OIGvpaEpUl9dui0VFKhoDYYWw7EXFhfc/wPhpX2Qy/mkqyasogVl/YjPy8xBUgyEbpY/BbLYcq/FOTQVHB6degdTBW1huVw76mZTlLNOutmhsVOLnDSFPX54KVDMHNfyIXz4FIGnjeiHVukilhWVmMoKc4UoNrkD/Rr8u5sbaNt1bj/kAs50jInh1JZLaDkNq1mc4HxiZJffkP2Pc1yTDAQFFgNRGyPmpMqbf9uWmYfSqXqqKgAM0NZiJmj93MJxdqbe3Fa9wxFK+7vgdOsqcgG9rutUbZcoE46o04em3Ac7lBwX8SchlUXQWSkGIxsDKe1nVVRmXHj8BRGFdrdTCmKL8m5EJY0VUVwH9dMWRWr1+vnrFerBF6KJBRP+E/7sRy6FrT7/n8/H+Q+0Abt/tKOoE4RcdpVn8/YZtS8mmNspdXQT4vscnQk2foJdhq7Q96sPEQFTxJ9NtKk9rC2Bbh3KsSqj56be4PjJQvyavipsVKd1x6rrHC0f2Ig+b7AzXJ9a1PoLZQFSKTBOLLeNzo5zff1js+8W1wshKUS2mxKHGkgFc+SRduM1IV87rIhB05gYc24L+xNjafdqVivHCa/cf5bIIsVc84+CbZsmD/b+5FnZmjUbLVYJdlZvdk1+5KVvmvxCcLek4AbPNbsV4vr51Ag+lxRVZBmx0umCLCZMXAUvQUnN0fBQEs91Y8fdSauzSEvwQ1yeYLRAIwFXbc1VURchFTW8c8XYRCd8xJVC9RQAa wvSaoEUO oiaukjQ+hcmAx8QQrjYW+CZx/MabikL3kJ+WxcH/g2qHv2EiuISXy90R5Lvn9uFxHqtC8lC3EymMEDh8StZ2TfGmSHXkohRS+eZ4J9rZUkveWz6dBJWUqEKtIkj3tOdcclGKhdWn8JCui2+NusbyU4ziC0CZcDj9YWBtV7zQziEXKUyAlnfmahdBlL6v76h9QLTLcxcuPCfS23V38D3lLz2LpNQ== 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: From: "Darrick J. Wong" Add helper similar to file_{get,set}_page, but which deal with folios and don't allocate new folio unless explicitly asked to, which map to shmem_get_folio instead of calling into the aops. Signed-off-by: Darrick J. Wong Signed-off-by: Christoph Hellwig Reviewed-by: Kent Overstreet --- fs/xfs/scrub/trace.h | 2 ++ fs/xfs/scrub/xfile.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/xfile.h | 7 +++++ 3 files changed, 83 insertions(+) diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h index 0327cab606b070..c61fa7a95ef522 100644 --- a/fs/xfs/scrub/trace.h +++ b/fs/xfs/scrub/trace.h @@ -908,6 +908,8 @@ DEFINE_XFILE_EVENT(xfile_store); DEFINE_XFILE_EVENT(xfile_seek_data); DEFINE_XFILE_EVENT(xfile_get_page); DEFINE_XFILE_EVENT(xfile_put_page); +DEFINE_XFILE_EVENT(xfile_get_folio); +DEFINE_XFILE_EVENT(xfile_put_folio); TRACE_EVENT(xfarray_create, TP_PROTO(struct xfarray *xfa, unsigned long long required_capacity), diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c index 2229f0b7f9ca49..0cab9d529365bb 100644 --- a/fs/xfs/scrub/xfile.c +++ b/fs/xfs/scrub/xfile.c @@ -340,3 +340,77 @@ xfile_put_page( return -EIO; return 0; } + +/* + * Grab the (locked) folio for a memory object. The object cannot span a folio + * boundary. Returns the locked folio if successful, NULL if there was no + * folio or it didn't cover the range requested, or an ERR_PTR on failure. + */ +struct folio * +xfile_get_folio( + struct xfile *xf, + loff_t pos, + size_t len, + unsigned int flags) +{ + struct inode *inode = file_inode(xf->file); + struct folio *folio = NULL; + unsigned int pflags; + int error; + + if (inode->i_sb->s_maxbytes - pos < len) + return ERR_PTR(-ENOMEM); + + trace_xfile_get_folio(xf, pos, len); + + /* + * Increase the file size first so that shmem_get_folio(..., SGP_CACHE), + * actually allocates a folio instead of erroring out. + */ + if ((flags & XFILE_ALLOC) && pos + len > i_size_read(inode)) + i_size_write(inode, pos + len); + + pflags = memalloc_nofs_save(); + error = shmem_get_folio(inode, pos >> PAGE_SHIFT, &folio, + (flags & XFILE_ALLOC) ? SGP_CACHE : SGP_READ); + memalloc_nofs_restore(pflags); + if (error) + return ERR_PTR(error); + + if (!folio) + return NULL; + + if (len > folio_size(folio) - offset_in_folio(folio, pos)) { + folio_unlock(folio); + folio_put(folio); + return NULL; + } + + if (filemap_check_wb_err(inode->i_mapping, 0)) { + folio_unlock(folio); + folio_put(folio); + return ERR_PTR(-EIO); + } + + /* + * Mark the folio dirty so that it won't be reclaimed once we drop the + * (potentially last) reference in xfile_put_folio. + */ + if (flags & XFILE_ALLOC) + folio_set_dirty(folio); + return folio; +} + +/* + * Release the (locked) folio for a memory object. + */ +void +xfile_put_folio( + struct xfile *xf, + struct folio *folio) +{ + trace_xfile_put_folio(xf, folio_pos(folio), folio_size(folio)); + + folio_unlock(folio); + folio_put(folio); +} diff --git a/fs/xfs/scrub/xfile.h b/fs/xfs/scrub/xfile.h index 465b10f492b66d..afb75e9fbaf265 100644 --- a/fs/xfs/scrub/xfile.h +++ b/fs/xfs/scrub/xfile.h @@ -39,4 +39,11 @@ int xfile_get_page(struct xfile *xf, loff_t offset, unsigned int len, struct xfile_page *xbuf); int xfile_put_page(struct xfile *xf, struct xfile_page *xbuf); +#define XFILE_MAX_FOLIO_SIZE (PAGE_SIZE << MAX_PAGECACHE_ORDER) + +#define XFILE_ALLOC (1 << 0) /* allocate folio if not present */ +struct folio *xfile_get_folio(struct xfile *xf, loff_t offset, size_t len, + unsigned int flags); +void xfile_put_folio(struct xfile *xf, struct folio *folio); + #endif /* __XFS_SCRUB_XFILE_H__ */