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 460E5C47422 for ; Sat, 27 Jan 2024 01:32:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F35D6B007D; Fri, 26 Jan 2024 20:32:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 97C716B0080; Fri, 26 Jan 2024 20:32:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81CD66B0081; Fri, 26 Jan 2024 20:32:44 -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 6CCA26B007D for ; Fri, 26 Jan 2024 20:32:44 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 35FEF120530 for ; Sat, 27 Jan 2024 01:32:44 +0000 (UTC) X-FDA: 81723366648.11.17ECFAB Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf24.hostedemail.com (Postfix) with ESMTP id D5B18180009 for ; Sat, 27 Jan 2024 01:32:41 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DDr9TpDb; spf=pass (imf24.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706319162; 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=fQIlMm13FGcIJaW8iMTmzHwCb+LCKyqRUFjCPg+hfSE=; b=Mw3UPeTwevZ4OdO6CTldaWLGcNOAm4irhrZEiOix84hJt8r5LpyUMK6R1AXP+97G8MY3CZ oBliUL/IHTg2mp3Rmaykn+9n0AYzFDXxVfiLnqTLgMJ8gFDXHtVq/mHsVAjVBVgjezM9+5 TIxRGXlm972It6CKyxaL1Euu1hFpI/c= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DDr9TpDb; spf=pass (imf24.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706319162; a=rsa-sha256; cv=none; b=TVu5GzAOvfqbwvoFeiPo1tU/g1tUKMxH9aSTNnAt/epR0wWVHJ8zprYSjWT0KLD4cod+uQ zv2NqHjfbkM23rfeqWSOq4j+WsV53ChNes+Ta1nHnqnFBC2r9Cw4/1QgFpYrmr69xOJd7i ZPs8pXUTG4X31tsN71XQHp9D1JaInKc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0887ECE387B; Sat, 27 Jan 2024 01:32:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A971C433C7; Sat, 27 Jan 2024 01:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706319156; bh=bLMAmfjl6R4KcLjz0Q1/rbi6OGKoPzz1cqeqrZ/iYQg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DDr9TpDb1P1O2NTy/qokcJjUBcUPs0EmOqm2roTZC866Km8S0meOOyCL8iSFaYjBC N7K8izkqrbFClzBa0Dg8xJDiqb3jXeyDRdP2e0IHgv1rmH6So39WsTXb/TFMO6/9o6 zKhYlZa7LsylRZQ++PuTmUCXe2jXwUCjxbxe80txUOVzw3JfVWHyIM+ZAK8iLX6myx jnCFVxugg8VbN7Oqmku2TZdy4jFQorFPOTGRQj6Vu1QHrvfnkEdbAJrCSD9ZoMqZEd G3TxG7T9xYWSEPjOXRiCZYZCmqbFT61/mu0QtucEu9hq19KPgFjEgTOQbGSLqcHWrZ uOpnOhEOSAd0A== Date: Fri, 26 Jan 2024 17:32:35 -0800 From: "Darrick J. Wong" To: Kent Overstreet Cc: Christoph Hellwig , Chandan Babu R , 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: <20240127013235.GE1371843@frogsfrogsfrogs> 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: X-Rspamd-Queue-Id: D5B18180009 X-Rspam-User: X-Stat-Signature: wny5ufeypsc7q85wc476asnxragppgwi X-Rspamd-Server: rspam01 X-HE-Tag: 1706319161-714595 X-HE-Meta: U2FsdGVkX1+hV/LSL225nAlvc3QSRXWJnvy4eeefMSvOsEGmZTHXhONZ1eht7fNiPkY4ujqj44R1oowb1FvlorOwMX6fr9TgWqI7rtU5gLTHYBpKeXzXB/C855lrk3tNXtxIxjKn+oLjIQkUa7QB8irDOEfxXzAgHAOrrZlcj6MYJGK1Ht7sBbsrWVZ1pgvd0icjAh7+LOOvkwBQA6hYDAmHBLiST/mcbSGn4hLyOtr7f7+W2RR2Fe0Wr4AHRcyJo1tsHWtXJmz6OyoV97EmuMn8AwEb3z79NxGUNp8BhKpDdqCuSFMXjws2GMJ9MWh2ckHfowsR8pKLusDBQabzrKxN1jZofBSniOWmiyfOTKctB/Ql589MVrfCtxIsxwISm+7wAVcZBCLxeNOisNb/PCSwsO7aegwmqpaVErz2NMd6i7Hw+LsDpnJDLezXeD8kNv8YAGkG6jn39jN+7pgFhBBTvwCcIrnC4048VyJKowz7FWqijsLkkyZT2C0a53SmzOQzB3KgwC8RP8tIWu3D8HpFP0M5BenE56YurSwh8VoT8biT5AA8KKd4BH4qZVRx6HNEUB4EyTMU970RfQF3kGnvCeFuqUErx0J2qNC865CN6ATNW/TnNRdYoICqrfmyYDff8gOvEohfmIxTEhdRf1ac5ItVmthrP6LHDe3A8cT+R85J39+atrB+G6WZ0Pjq7M1wbKRmgtUmt5P4Nw0Dyr5QvTIpizFybFhCmKwd62a/SdiqTHVpTzz/163wymTqG7pHdkP+Wh572nt3vUZ1ayDl+4u92oq8ga72bT9ZaB4ss2hZO3IMGh9CpkWFD/04hYllI+psmXDDy3lLDZFRvy+59sXpyoRPohswwcL1nGwjs/41Sr3mYPwfGAQ+gkYqt7PKODeLNVsENR6QjE9i+l1cKMfArtYQSKAjRcwjF4lbvhWB5TmO7Sw2umShx1Z/4cpHxK+rWEFrCcEnELr DCvQ1QbR Fb8U3dakW8o5N3oiiY/CjVorYP73xCMPnvSJ+TK3FlQQB/1W4TLREAJ7sLHpZYRY6rmulzMZgNGRxKwpLqGy2LalRloL8nyjlkZ8LYTE/kUD1JtVRti6dLSbkSgL129tUrGrYrV9P/aKaz7upVNqxhIQJH8eNBD0vkjFCTWMqc26F5ig1Et6n4CnFfn9+9ISouNUKUyU7zlIm+C64KwUZ92nUlFtNPI48gB4Nm4ZrhO62qjP+/But6jC69shXCUE7j4u8qu0ckradoH6fyuM+5oc34Q+heVzEHS6h 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 08:26:22PM -0500, Kent Overstreet wrote: > 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? I /think/ this is actually unnecessary since the xfs scrub code will have already allocated a (possibly empty) transaction, which will have set PF_MEMALLOC_NOFS. But. I'd rather concentrate on merging the code and fixing the correctness bugs; and later we can find and remove the unnecessary bits. (Yeah shameful copy pasta from shmem.c.) --D > 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 > > >