From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Chinner Date: Wed, 5 Apr 2023 09:40:19 +1000 Subject: [Cluster-devel] [PATCH v2 06/23] fsverity: add drop_page() callout In-Reply-To: <20230404145319.2057051-7-aalbersh@redhat.com> References: <20230404145319.2057051-1-aalbersh@redhat.com> <20230404145319.2057051-7-aalbersh@redhat.com> Message-ID: <20230404234019.GM3223426@dread.disaster.area> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Tue, Apr 04, 2023 at 04:53:02PM +0200, Andrey Albershteyn wrote: > Allow filesystem to make additional processing on verified pages > instead of just dropping a reference. This will be used by XFS for > internal buffer cache manipulation in further patches. The btrfs, > ext4, and f2fs just drop the reference. > > Signed-off-by: Andrey Albershteyn > --- > fs/btrfs/verity.c | 12 ++++++++++++ > fs/ext4/verity.c | 6 ++++++ > fs/f2fs/verity.c | 6 ++++++ > fs/verity/read_metadata.c | 4 ++-- > fs/verity/verify.c | 6 +++--- > include/linux/fsverity.h | 10 ++++++++++ > 6 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c > index c5ff16f9e9fa..4c2c09204bb4 100644 > --- a/fs/btrfs/verity.c > +++ b/fs/btrfs/verity.c > @@ -804,10 +804,22 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf, > pos, buf, size); > } > > +/* > + * fsverity op that releases the reference obtained by ->read_merkle_tree_page() > + * > + * @page: reference to the page which can be released > + * > + */ > +static void btrfs_drop_page(struct page *page) > +{ > + put_page(page); > +} > + > const struct fsverity_operations btrfs_verityops = { > .begin_enable_verity = btrfs_begin_enable_verity, > .end_enable_verity = btrfs_end_enable_verity, > .get_verity_descriptor = btrfs_get_verity_descriptor, > .read_merkle_tree_page = btrfs_read_merkle_tree_page, > .write_merkle_tree_block = btrfs_write_merkle_tree_block, > + .drop_page = &btrfs_drop_page, > }; Ok, that's a generic put_page() call. .... > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index f50e3b5b52c9..c2fc4c86af34 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -210,7 +210,7 @@ verify_data_block(struct inode *inode, struct fsverity_info *vi, > if (is_hash_block_verified(vi, hpage, hblock_idx)) { > memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > - put_page(hpage); > + inode->i_sb->s_vop->drop_page(hpage); > goto descend; fsverity_drop_page(hpage); static inline void fsverity_drop_page(struct inode *inode, struct page *page) { if (inode->i_sb->s_vop->drop_page) inode->i_sb->s_vop->drop_page(page); else put_page(page); } And then you don't need to add the functions to each of the filesystems nor make an indirect call just to run put_page(). Cheers, Dave. -- Dave Chinner david at fromorbit.com From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6192E3C07 for ; Tue, 4 Apr 2023 23:40:36 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id z19so32848067plo.2 for ; Tue, 04 Apr 2023 16:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20210112.gappssmtp.com; s=20210112; t=1680651635; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=l2RsFYI9/RVRWt/aDmW615qjr94XgOxAaXQ+UAkJU4YMTNxdL1SWonsdJUToBlbJ33 DPIu1jzsGIMef5CH+m4C2GOQV87eocIVgfGQ2KXn6+YS9XADLuJnuOSAx6h9+j9fnpY5 JTHYmubv4qSZWAR14+cgEjLy3uLmmEqMpfJ+lATcV1zLzTamDk02U3M8jBH7uG496lcD puuraASOSvX9+ur5puWLnEC9/61i1l5u5Gr181q9JcQG0znhvmDJq5XOdzeaXNEnNW05 1UU5+ld2OPAAE5dtXF9Jdb1D6TH+pXeDq+mDu/DmDkU3DEmpC9mQq6W3PJ67HVENlW/F mRiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680651635; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=EIHmwWIDbyNAZfWhGSD/rohWN8vPFyF7CMIIN/cnXzs2vRf75wk6L4h0uSO751jFIJ TeepZE6yMMVYzWNNCdtq2jkAHVFEGU2cUIOBAyofFJLAmqsdU2hn0WWAUUWt0dcZCzbu SfQ8l6Cn1uwqsg05jtO2RU+qGyjMp+QzDiTsUuHLKXsnrRyrejbuZx4luIdocluzd1+h QUmcF2tbBWGWUxMqWMyh3zUkA955+odC1PIyn4gKdGdamJsRf5pnPgdC9NWvcDYeRgnm wHWUfATWCBBsYa9/PpC/0XDDUREDwtQgLPsOE7Cr6lBx/DP0q6BoeVIolfg+QPpw8j2s XkWA== X-Gm-Message-State: AAQBX9cL64ANOZ2t2h9BlOC7dBqPG9SdlrCLnv8uuBd3QEmhFZvoNrDo ds5fort5tcKi+mjMF3RoL7qPCg== X-Google-Smtp-Source: AKy350aGtUyDc7dXm54tao9SO1Z52DtK7YHUJoaBCaBA1TXOYmz5/48+4yE+r2PZyPM8LNhcT3l0sw== X-Received: by 2002:a17:902:fb8c:b0:1a1:c945:4b23 with SMTP id lg12-20020a170902fb8c00b001a1c9454b23mr3916070plb.65.1680651635730; Tue, 04 Apr 2023 16:40:35 -0700 (PDT) Received: from dread.disaster.area (pa49-181-91-157.pa.nsw.optusnet.com.au. [49.181.91.157]) by smtp.gmail.com with ESMTPSA id q18-20020a170902b11200b001a216d44440sm8856651plr.200.2023.04.04.16.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 16:40:29 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1pjqGB-00H7Og-Tt; Wed, 05 Apr 2023 09:40:19 +1000 Date: Wed, 5 Apr 2023 09:40:19 +1000 From: Dave Chinner To: Andrey Albershteyn Cc: djwong@kernel.org, dchinner@redhat.com, ebiggers@kernel.org, hch@infradead.org, linux-xfs@vger.kernel.org, fsverity@lists.linux.dev, rpeterso@redhat.com, agruenba@redhat.com, xiang@kernel.org, chao@kernel.org, damien.lemoal@opensource.wdc.com, jth@kernel.org, linux-erofs@lists.ozlabs.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com Subject: Re: [PATCH v2 06/23] fsverity: add drop_page() callout Message-ID: <20230404234019.GM3223426@dread.disaster.area> References: <20230404145319.2057051-1-aalbersh@redhat.com> <20230404145319.2057051-7-aalbersh@redhat.com> Precedence: bulk X-Mailing-List: fsverity@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230404145319.2057051-7-aalbersh@redhat.com> On Tue, Apr 04, 2023 at 04:53:02PM +0200, Andrey Albershteyn wrote: > Allow filesystem to make additional processing on verified pages > instead of just dropping a reference. This will be used by XFS for > internal buffer cache manipulation in further patches. The btrfs, > ext4, and f2fs just drop the reference. > > Signed-off-by: Andrey Albershteyn > --- > fs/btrfs/verity.c | 12 ++++++++++++ > fs/ext4/verity.c | 6 ++++++ > fs/f2fs/verity.c | 6 ++++++ > fs/verity/read_metadata.c | 4 ++-- > fs/verity/verify.c | 6 +++--- > include/linux/fsverity.h | 10 ++++++++++ > 6 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c > index c5ff16f9e9fa..4c2c09204bb4 100644 > --- a/fs/btrfs/verity.c > +++ b/fs/btrfs/verity.c > @@ -804,10 +804,22 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf, > pos, buf, size); > } > > +/* > + * fsverity op that releases the reference obtained by ->read_merkle_tree_page() > + * > + * @page: reference to the page which can be released > + * > + */ > +static void btrfs_drop_page(struct page *page) > +{ > + put_page(page); > +} > + > const struct fsverity_operations btrfs_verityops = { > .begin_enable_verity = btrfs_begin_enable_verity, > .end_enable_verity = btrfs_end_enable_verity, > .get_verity_descriptor = btrfs_get_verity_descriptor, > .read_merkle_tree_page = btrfs_read_merkle_tree_page, > .write_merkle_tree_block = btrfs_write_merkle_tree_block, > + .drop_page = &btrfs_drop_page, > }; Ok, that's a generic put_page() call. .... > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index f50e3b5b52c9..c2fc4c86af34 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -210,7 +210,7 @@ verify_data_block(struct inode *inode, struct fsverity_info *vi, > if (is_hash_block_verified(vi, hpage, hblock_idx)) { > memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > - put_page(hpage); > + inode->i_sb->s_vop->drop_page(hpage); > goto descend; fsverity_drop_page(hpage); static inline void fsverity_drop_page(struct inode *inode, struct page *page) { if (inode->i_sb->s_vop->drop_page) inode->i_sb->s_vop->drop_page(page); else put_page(page); } And then you don't need to add the functions to each of the filesystems nor make an indirect call just to run put_page(). Cheers, Dave. -- Dave Chinner david@fromorbit.com 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 655D6C76188 for ; Tue, 4 Apr 2023 23:40:49 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Prklz5C6Fz3f44 for ; Wed, 5 Apr 2023 09:40:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ozlabs.org; s=201707; t=1680651647; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=K246zfbBNqjNsD1EJDf8wG9jkxYFMg0SDdsePliVwq/2Q41rnMqnPWChddliRGfkS tINklEWN1RBZdoV8uuL769jGN5vur5qEn0dT2X8FwVBgfhk+hoyzu5kzfmG8QumI2f qF+Xk3dAI3OJ4X20NoWp7quYMt+uypz8Ez502vihZpd6ClHJVrAtKGhiXi7m3762kA CqY7O7cUiHaP06CHESHfnuSwZamiS6y2FGMamyONwNtYPbMgqKF/VbZmuK4TUGsavn wDsq0tQ2Yc7O67cDICf5RmMvkYOg402t39OizkcNL1FJH7Zhl+rvTwz+lpkf8VIs9V jG/dEMbkAF/Xg== Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=fromorbit.com (client-ip=2607:f8b0:4864:20::1033; helo=mail-pj1-x1033.google.com; envelope-from=david@fromorbit.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fromorbit-com.20210112.gappssmtp.com header.i=@fromorbit-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=dQLF1Fgl; dkim-atps=neutral Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Prkls3qZfz3cdn for ; Wed, 5 Apr 2023 09:40:39 +1000 (AEST) Received: by mail-pj1-x1033.google.com with SMTP id ml21so10290867pjb.4 for ; Tue, 04 Apr 2023 16:40:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680651636; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=Zq6Ri5+OH/Wm4ZjZS4XsSkWbRSle0M4eeoVyTBp3yZlpNgdoaOG3VRKPIDICq/5Qna AjVXfsAwmO2RlgmKODfpBmzgskdHslwOCyZFJHYwvguRrlBaqFMdeW1aoaZ0ydupuSGB 8I5fRK6xJqWfrpzv3wykY8SS+ZfyUa92NmZlSAkBAVWhADqGD1vBVmoSiWZDErQ4nPJV 4fIvG+gfhdkf3RoLpb+XpSbaD5HhcfmamNcOOzAG45LNpFfnvXTg3ZDGhoRbtaUJIZx7 76ZNwO0VeoR0r6Zzn/1HB8dPZhJAgUpFJgN+5wFbFceUDXHV/D5WT3THzm9Kbb3JALRV 9MNQ== X-Gm-Message-State: AAQBX9cfzqZFHVlggWYJQLgmlp9cfisA5U6S0NtM5eut1TrMBgDbcBUm oGQYVD/aO7CU1HzrG1lDHAP4rg== X-Google-Smtp-Source: AKy350aGtUyDc7dXm54tao9SO1Z52DtK7YHUJoaBCaBA1TXOYmz5/48+4yE+r2PZyPM8LNhcT3l0sw== X-Received: by 2002:a17:902:fb8c:b0:1a1:c945:4b23 with SMTP id lg12-20020a170902fb8c00b001a1c9454b23mr3916070plb.65.1680651635730; Tue, 04 Apr 2023 16:40:35 -0700 (PDT) Received: from dread.disaster.area (pa49-181-91-157.pa.nsw.optusnet.com.au. [49.181.91.157]) by smtp.gmail.com with ESMTPSA id q18-20020a170902b11200b001a216d44440sm8856651plr.200.2023.04.04.16.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 16:40:29 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1pjqGB-00H7Og-Tt; Wed, 05 Apr 2023 09:40:19 +1000 Date: Wed, 5 Apr 2023 09:40:19 +1000 To: Andrey Albershteyn Subject: Re: [PATCH v2 06/23] fsverity: add drop_page() callout Message-ID: <20230404234019.GM3223426@dread.disaster.area> References: <20230404145319.2057051-1-aalbersh@redhat.com> <20230404145319.2057051-7-aalbersh@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230404145319.2057051-7-aalbersh@redhat.com> X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Dave Chinner via Linux-erofs Reply-To: Dave Chinner Cc: fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, agruenba@redhat.com, hch@infradead.org, djwong@kernel.org, damien.lemoal@opensource.wdc.com, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, dchinner@redhat.com, rpeterso@redhat.com, jth@kernel.org, linux-erofs@lists.ozlabs.org, linux-btrfs@vger.kernel.org Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" On Tue, Apr 04, 2023 at 04:53:02PM +0200, Andrey Albershteyn wrote: > Allow filesystem to make additional processing on verified pages > instead of just dropping a reference. This will be used by XFS for > internal buffer cache manipulation in further patches. The btrfs, > ext4, and f2fs just drop the reference. > > Signed-off-by: Andrey Albershteyn > --- > fs/btrfs/verity.c | 12 ++++++++++++ > fs/ext4/verity.c | 6 ++++++ > fs/f2fs/verity.c | 6 ++++++ > fs/verity/read_metadata.c | 4 ++-- > fs/verity/verify.c | 6 +++--- > include/linux/fsverity.h | 10 ++++++++++ > 6 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c > index c5ff16f9e9fa..4c2c09204bb4 100644 > --- a/fs/btrfs/verity.c > +++ b/fs/btrfs/verity.c > @@ -804,10 +804,22 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf, > pos, buf, size); > } > > +/* > + * fsverity op that releases the reference obtained by ->read_merkle_tree_page() > + * > + * @page: reference to the page which can be released > + * > + */ > +static void btrfs_drop_page(struct page *page) > +{ > + put_page(page); > +} > + > const struct fsverity_operations btrfs_verityops = { > .begin_enable_verity = btrfs_begin_enable_verity, > .end_enable_verity = btrfs_end_enable_verity, > .get_verity_descriptor = btrfs_get_verity_descriptor, > .read_merkle_tree_page = btrfs_read_merkle_tree_page, > .write_merkle_tree_block = btrfs_write_merkle_tree_block, > + .drop_page = &btrfs_drop_page, > }; Ok, that's a generic put_page() call. .... > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index f50e3b5b52c9..c2fc4c86af34 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -210,7 +210,7 @@ verify_data_block(struct inode *inode, struct fsverity_info *vi, > if (is_hash_block_verified(vi, hpage, hblock_idx)) { > memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > - put_page(hpage); > + inode->i_sb->s_vop->drop_page(hpage); > goto descend; fsverity_drop_page(hpage); static inline void fsverity_drop_page(struct inode *inode, struct page *page) { if (inode->i_sb->s_vop->drop_page) inode->i_sb->s_vop->drop_page(page); else put_page(page); } And then you don't need to add the functions to each of the filesystems nor make an indirect call just to run put_page(). Cheers, Dave. -- Dave Chinner david@fromorbit.com 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1EE3C76188 for ; Wed, 5 Apr 2023 00:10:21 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pjqjB-00062a-Gf; Wed, 05 Apr 2023 00:10:18 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pjqjA-00062U-Pz for linux-f2fs-devel@lists.sourceforge.net; Wed, 05 Apr 2023 00:10:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=Q4VKrb2n8nhax1AvSr0+wRDhtJ 2YWAXqbw35Nd+/gc+X+52oZi5xUYMEnQjvr8FBuM99PTQf4gvjbOm9bu2D/aDOO4FPBJTavWJDLqD AIsAMLythJ3ixi9/LiflD6l1SGbgAKMdjZ5AA+xAH4fK1P0r4/WQ7Cs44yfYO2DAw5RI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=bklCYVEMEbHGVlhgPSipg9sIwm kRjx2rCBVkEUr/8NL6TDYO8PiaWOaVmiFnc2IH+YQuTynVs67GmDaHSU8sCmyCoy6x4xRqrby4Sbd fTODBwx+fS+IMGC6l4NWTyv+eXUdRTNKDpaa8LI+PTqrw4BgUy7QOr2eZ8qbL/vrcDUE=; Received: from mail-pl1-f179.google.com ([209.85.214.179]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pjqj3-00FV6S-65 for linux-f2fs-devel@lists.sourceforge.net; Wed, 05 Apr 2023 00:10:17 +0000 Received: by mail-pl1-f179.google.com with SMTP id f22so28768489plr.0 for ; Tue, 04 Apr 2023 17:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20210112.gappssmtp.com; s=20210112; t=1680653403; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=16h9ftkx363dFwpnpTR7TyruTDXpxlaazKR9mDJeoyDk9FUKA2YE558q+d+TSH2xSa bj0YsbkSbnIY4wLXaCxkRMLE2z+2iPHFUmcm/bL5dAnl8Dj8o359hnhgdOxro0j8SfxT Rh3vt+PYAS67Cg2vfzTZVzyr1ENw7ygewK66KYchq9XiW9gWzh8pVRkZMCNvfq70J4gl UQft+4UtTrLTnWDawQiqMoRdBZamPWxVNkMGtMBggYvAWVsHbkj9H1ofSLRWRkWSKkUa RULy0kw/G6AjzZZamraljLs0Z1P/HWG1xUpL9OTIoqbtkVcUWl4LDjeB4ju4GD1z7iiu F0dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680653403; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=M/r2yyBxa2UjizT7DIESb3jdVn4T1vcr3JZCxz3Un80=; b=bbtBIjExB7fnpvAOUKiL17sXG7Ror83tQVL6jNIGiaOj5inBuvaBuCjfbJhS1ZOWot O7oF5kcgvIrrDdL9gmEbifgTXrSLqEmjbj5T7fb6KqeWNya2sgabNRA/8gKfDlQwUL66 jW5uokZRupF8hikkhNHN7XPyghIpjt5trLAaxMR578WhYEY5uiOT62iSxozC+1WOtIiB wgNhP4yIGTgZlErxpiKwxU2oFe5Ra6fsVwjCouayIc9dccXIWW4ISXCEq7d0IY6Q6P0I GSIfr0Fu3BDxFAxNLg3i4gyYi+6uy74n3Rjhpe/51TubigKI2f3rl0lBCd/aippvkYWz BKsg== X-Gm-Message-State: AAQBX9fol01S0UniAr3cKLQdJuCZdjSolP9bKxsiYzcXY4EKV5HdJGdm 4wIrUX7SWlsCHGLTrwhPs0zwuF5I16q2E7o/F6I= X-Google-Smtp-Source: AKy350aGtUyDc7dXm54tao9SO1Z52DtK7YHUJoaBCaBA1TXOYmz5/48+4yE+r2PZyPM8LNhcT3l0sw== X-Received: by 2002:a17:902:fb8c:b0:1a1:c945:4b23 with SMTP id lg12-20020a170902fb8c00b001a1c9454b23mr3916070plb.65.1680651635730; Tue, 04 Apr 2023 16:40:35 -0700 (PDT) Received: from dread.disaster.area (pa49-181-91-157.pa.nsw.optusnet.com.au. [49.181.91.157]) by smtp.gmail.com with ESMTPSA id q18-20020a170902b11200b001a216d44440sm8856651plr.200.2023.04.04.16.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 16:40:29 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1pjqGB-00H7Og-Tt; Wed, 05 Apr 2023 09:40:19 +1000 Date: Wed, 5 Apr 2023 09:40:19 +1000 To: Andrey Albershteyn Message-ID: <20230404234019.GM3223426@dread.disaster.area> References: <20230404145319.2057051-1-aalbersh@redhat.com> <20230404145319.2057051-7-aalbersh@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230404145319.2057051-7-aalbersh@redhat.com> X-Headers-End: 1pjqj3-00FV6S-65 Subject: Re: [f2fs-dev] [PATCH v2 06/23] fsverity: add drop_page() callout X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Dave Chinner via Linux-f2fs-devel Reply-To: Dave Chinner Cc: fsverity@lists.linux.dev, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, agruenba@redhat.com, hch@infradead.org, djwong@kernel.org, damien.lemoal@opensource.wdc.com, linux-f2fs-devel@lists.sourceforge.net, ebiggers@kernel.org, cluster-devel@redhat.com, dchinner@redhat.com, rpeterso@redhat.com, xiang@kernel.org, jth@kernel.org, linux-erofs@lists.ozlabs.org, linux-btrfs@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Tue, Apr 04, 2023 at 04:53:02PM +0200, Andrey Albershteyn wrote: > Allow filesystem to make additional processing on verified pages > instead of just dropping a reference. This will be used by XFS for > internal buffer cache manipulation in further patches. The btrfs, > ext4, and f2fs just drop the reference. > > Signed-off-by: Andrey Albershteyn > --- > fs/btrfs/verity.c | 12 ++++++++++++ > fs/ext4/verity.c | 6 ++++++ > fs/f2fs/verity.c | 6 ++++++ > fs/verity/read_metadata.c | 4 ++-- > fs/verity/verify.c | 6 +++--- > include/linux/fsverity.h | 10 ++++++++++ > 6 files changed, 39 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c > index c5ff16f9e9fa..4c2c09204bb4 100644 > --- a/fs/btrfs/verity.c > +++ b/fs/btrfs/verity.c > @@ -804,10 +804,22 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf, > pos, buf, size); > } > > +/* > + * fsverity op that releases the reference obtained by ->read_merkle_tree_page() > + * > + * @page: reference to the page which can be released > + * > + */ > +static void btrfs_drop_page(struct page *page) > +{ > + put_page(page); > +} > + > const struct fsverity_operations btrfs_verityops = { > .begin_enable_verity = btrfs_begin_enable_verity, > .end_enable_verity = btrfs_end_enable_verity, > .get_verity_descriptor = btrfs_get_verity_descriptor, > .read_merkle_tree_page = btrfs_read_merkle_tree_page, > .write_merkle_tree_block = btrfs_write_merkle_tree_block, > + .drop_page = &btrfs_drop_page, > }; Ok, that's a generic put_page() call. .... > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index f50e3b5b52c9..c2fc4c86af34 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -210,7 +210,7 @@ verify_data_block(struct inode *inode, struct fsverity_info *vi, > if (is_hash_block_verified(vi, hpage, hblock_idx)) { > memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > - put_page(hpage); > + inode->i_sb->s_vop->drop_page(hpage); > goto descend; fsverity_drop_page(hpage); static inline void fsverity_drop_page(struct inode *inode, struct page *page) { if (inode->i_sb->s_vop->drop_page) inode->i_sb->s_vop->drop_page(page); else put_page(page); } And then you don't need to add the functions to each of the filesystems nor make an indirect call just to run put_page(). Cheers, Dave. -- Dave Chinner david@fromorbit.com _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel