From mboxrd@z Thu Jan 1 00:00:00 1970 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 C1053C47422 for ; Sat, 27 Jan 2024 01:26:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AF9B6B0078; Fri, 26 Jan 2024 20:26:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 160436B007B; Fri, 26 Jan 2024 20:26:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 04E6F6B007D; Fri, 26 Jan 2024 20:26:30 -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 EACB66B0078 for ; Fri, 26 Jan 2024 20:26:30 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id ADD9D41004 for ; Sat, 27 Jan 2024 01:26:30 +0000 (UTC) X-FDA: 81723350940.27.41BC4ED Received: from out-185.mta1.migadu.com (out-185.mta1.migadu.com [95.215.58.185]) by imf17.hostedemail.com (Postfix) with ESMTP id AC06440011 for ; Sat, 27 Jan 2024 01:26:28 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=BaDk5GW7; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.185 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706318789; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Akf18JN8rrX0hJsrfsuEeXzfXlwZhkA1uJ+oIzKUYNs=; b=rWX/avPhz1la8zaCMfIVSXcB5JNAXUuUcsGYZ4H3lJCWAroVSY3abE+AKHbSA7vyv6SBjH L0BKk7df00+dTpmnYoWOsY7LLWJzbjSBHVm2e3SBw32I5yGbSbvwKJiL/aWjnQ56PNylDI 6wb3QLbPWSbaNCAAHMNz2E309+Csjvc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=BaDk5GW7; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.185 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706318789; a=rsa-sha256; cv=none; b=a4y9bZ0yMZechTimpzDfoG5pLp6HZhlZCkD7jGH5Bxd38xC0z+SAFQ8Jn5SjNIfNDAFXLe n18uZHO/Euw+4lhJiia02eTHPVvQQ0Fu2Xi54qo3+WQ1EhhkQ0v/rqrpPr8o0tXmcRZSnz GbfG5Hy3FPn8oJbjM1l5LdzMGvZelJQ= Date: Fri, 26 Jan 2024 20:26:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706318786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Akf18JN8rrX0hJsrfsuEeXzfXlwZhkA1uJ+oIzKUYNs=; b=BaDk5GW7tEypSSCVI2N7K3xzkUNp0qvEC+FRaYDFuw0HBCy+WA/oVfUy+BLok9l68e19jt /jLNm5Shla+h1nBT26fb53J4UcaOHVuua35n2Xus59tFatBBCiPLMmt/RSltfWdagChs3b cyyzXBbYpxoVY+DzM9GIpPxqAw8HkbE= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Kent Overstreet To: Christoph Hellwig Cc: Chandan Babu R , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 17/21] xfs: add file_{get,put}_folio Message-ID: References: <20240126132903.2700077-1-hch@lst.de> <20240126132903.2700077-18-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240126132903.2700077-18-hch@lst.de> X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: AC06440011 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: h6s54eta6s918pusp758zcyhw6osw1ox X-HE-Tag: 1706318788-104413 X-HE-Meta: U2FsdGVkX1/EeTD+mFKs9YlekdVylfSWQSX1xu3rC0u7uTw32KqdINeNANyMH//JNQ2zlxfgR2xp9ZpqQSeEEL7HDp6DnmAX4cjGQ4xglL1ruPcBFqqe/hsm2qx98qNcR7Reai4byG4PrMH2okSmCymntRYOyUtWpFh/AIln3ose6WkC+NwpEfD7sqB2+bq6gZYxnWKZcI5IrQ1Y8DxOwbd+FGV1EI0ODBHBm3Zl8CzDvsApb7YCyWcBbrw/mqmeUKEwCVUj1zjpENKFkKVAgyyKs1pvOf98XIX/NQO39WmJ998z9OfAHCSG4nYV2DNVAAZGVz8eOn8fFYbW7wEjBhgvtdcRn0O2nfAu9UwKMwFpbrU7no6Mw2M4GftIlE26J4DwA+Iq5DHAg0UY8BwwFRO8V+/LkzbKgowagIHhyuFgl9kNZpP4zh6RyyID0CHXXswjJpdALh0PTZeAn79h6iqDpJ11g5mQEwC6J9kDp/2P/sNyx01VO8TBVcI3V2GfJcHbAgrK4LUrMmmpg/RK9EfLJINOR8EqodGde+1ioY6/XysJPR9Xx7RBfjWR+inm6toxqCJFPfD8lzwGXdTIyz4MpFxRVCvYO7eEzE865hIVJcXx139ZXUXKpdhoBlAXWd62XriMOR6bb8C/PNU8EJvAFdwfYG/Gjt+oGAPao9QAOqpM6OnSZ3Oub5yPAm6BbHkPT/riQCfU4eLV81O98VgotR29Snx5QOhJFdfzAidzHouDR+btztenzBJyDNXibIryMQaTytpSsG6GUgZqEtRaGvaOp1yE2v6Et2U8U1hkV1REizq7hxej6Bi68XcK/wDLVSPIlfap1jxVCZy578qt73AKPeA6YO5mIwp6e0zDsgFGOqaSuRxpsJvB+7fGnialT+Nffaz7QQbfzMaKYjOOq7b+RDSt8w2sLEh748YBcarqXGRtnKFDQ7JThbQYI1uzXjZUOj+nCYhjSUY FnZgs/Ib 6Pe/rLc1K5H5jO2PWpb7EIGOOA6PjSbZ5nOUruWC4oUhLbGTNPC2tvCluguAIK7ZWfTZ+U7CtKbW7Qe3dF5159Lk9wCmmO1EzBeK2IdQswB14YUBFR4hDkXiS5AK21iS0JwYJn9XWclb9Eyi33mhoHWG7DaY0jaQKErypW7KnE3rPcLF9abBBs2moHVajggk8nB/e 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: On Fri, Jan 26, 2024 at 02:28:59PM +0100, Christoph Hellwig wrote: > 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 looks boilerplatey to my eyes, but this is all new conceptual stuff and the implementation will be evolving, so... one nit: that's really not the right place for memalloc_nofs_save(), can we try to start figuring out the proper locations for those? 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 2d802c20a8ddfe..1c1db4ae1ba6ee 100644 > --- a/fs/xfs/scrub/xfile.c > +++ b/fs/xfs/scrub/xfile.c > @@ -365,3 +365,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 (xfile_has_lost_data(inode, folio)) { > + 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__ */ > -- > 2.39.2 >