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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23454C47247 for ; Tue, 5 May 2020 18:49:42 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D6B22206CC; Tue, 5 May 2020 18:49:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="Q6iXsah6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="TQyTPRL+"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="1w9SfD7t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6B22206CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jW2dR-00007u-EH; Tue, 05 May 2020 18:49:41 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW2dQ-00007n-Bk for linux-f2fs-devel@lists.sourceforge.net; Tue, 05 May 2020 18:49:40 +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=ksPsJIaeL0ncNKYh89JwB4sw5OL93cz9qyv0XitmxJI=; b=Q6iXsah6yysEjSmbtAD7hdhRbL +cT2s7cr/OndlLjfrEIpWcZ1N3dnz9qBgsDFxn7Y4O4Rs0mOz5h324FEOJCXal+rpT7u9n4oUJDi6 nnMdzJi01CLuickkDR+MgQqfj3h3ZvUGLBDBcWkWYSarAt/mzgc6E9l0P8lq6JiRuDK0=; 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=ksPsJIaeL0ncNKYh89JwB4sw5OL93cz9qyv0XitmxJI=; b=TQyTPRL+WlVbnQ5YmAQzWehPXn a5zYO4db9MXF9H7D3j5U5MBm2rkEDOhfVlkEz5Bsnn6eXNpXr8hlyTnnoT5fn5miRdZpqo/v0OgCv cbmXZWzWDOYASAp/fEgiA/ErlmqyaWIBggwXUBSam0Is9YlHsFY2Cr3F4NQt+gGDrrdg=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jW2dP-00ElZP-1d for linux-f2fs-devel@lists.sourceforge.net; Tue, 05 May 2020 18:49:40 +0000 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67636206CC; Tue, 5 May 2020 18:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588704573; bh=ULAX6o6dV7Arr39+KWwF1GLk85Khtp18oTR1aa35nLc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=1w9SfD7t0QHoi2Cuzb+TJydGS28cJWuN2dBuFs/WTVmLa5agDw0MHj2ayxSZZ790F fHkgDJ+uzz9rUmekT3oDLN+PyV+1P3AW4zpEGR2yyY6aJKenZhrZtCclrTwq5OKst2 CN/xctFxbvpOV/AqzClp23pP5MHFTtrspZn+2WVA= Date: Tue, 5 May 2020 11:49:32 -0700 From: Jaegeuk Kim To: Eric Biggers Message-ID: <20200505184932.GC55221@google.com> References: <20200505153139.201697-1-jaegeuk@kernel.org> <20200505165847.GA98848@gmail.com> <20200505181323.GA55221@google.com> <20200505181941.GC98848@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200505181941.GC98848@gmail.com> X-Headers-End: 1jW2dP-00ElZP-1d Subject: Re: [f2fs-dev] [PATCH] f2fs: get parent inode when recovering pino 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: , Cc: kernel-team@android.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 05/05, Eric Biggers wrote: > On Tue, May 05, 2020 at 11:13:23AM -0700, Jaegeuk Kim wrote: > > On 05/05, Eric Biggers wrote: > > > On Tue, May 05, 2020 at 08:31:39AM -0700, Jaegeuk Kim wrote: > > > > We had to grab the inode before retrieving i_ino. > > > > > > > > Signed-off-by: Jaegeuk Kim > > > > --- > > > > fs/f2fs/file.c | 8 +++++++- > > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > > > > index a0a4413d6083b..9d4c3e3503567 100644 > > > > --- a/fs/f2fs/file.c > > > > +++ b/fs/f2fs/file.c > > > > @@ -168,6 +168,7 @@ static const struct vm_operations_struct f2fs_file_vm_ops = { > > > > static int get_parent_ino(struct inode *inode, nid_t *pino) > > > > { > > > > struct dentry *dentry; > > > > + struct inode *parent; > > > > > > > > inode = igrab(inode); > > > > dentry = d_find_any_alias(inode); > > > > @@ -175,8 +176,13 @@ static int get_parent_ino(struct inode *inode, nid_t *pino) > > > > if (!dentry) > > > > return 0; > > > > > > > > - *pino = parent_ino(dentry); > > > > + parent = igrab(d_inode(dentry->d_parent)); > > > > dput(dentry); > > > > + if (!parent) > > > > + return 0; > > > > + > > > > + *pino = parent->i_ino; > > > > + iput(parent); > > > > return 1; > > > > Hi Eric, > > > > > > > > This doesn't appear to be necessary. parent_ino() is: > > > > > > spin_lock(&dentry->d_lock); > > > res = dentry->d_parent->d_inode->i_ino; > > > spin_unlock(&dentry->d_lock); > > > > > > Since dentry is locked and referenced, ->d_parent is stable and positive. > > > > I see, thanks. :) > > > > > > > > In the encrypt+casefold patch I was reviewing, it's indeed necessary, but only > > > because there was a check of inode->i_flags added outside the locked region. > > > The following would be simpler: > > > > > > spin_lock(&dentry->d_lock); > > > dir = dentry->d_parent->d_inode; > > > *pino = dir->i_ino; > > > needs_recovery = IS_ENCRYPTED(dir) && IS_CASEFOLDED(dir); > > > spin_unlock(&dentry->d_lock); > > > > Ack. > > > > > > > > BTW, d_find_any_alias() is unnecessary too. This code should just be using > > > file_dentry(file) from f2fs_do_sync_file(). > > > > How about this? > > > > From 9aee969a413b1ed22b48573071bc93fbb4a2002d Mon Sep 17 00:00:00 2001 > > From: Jaegeuk Kim > > Date: Tue, 5 May 2020 11:08:58 -0700 > > Subject: [PATCH] f2fs: remove unnecessary dentry locks > > > > As Eric commented, let's kill unnecessary dentry ops when recovering > > parent inode number. > > > > Suggested-by: Eric Biggers > > Signed-off-by: Jaegeuk Kim > > --- > > fs/f2fs/file.c | 26 ++++++-------------------- > > 1 file changed, 6 insertions(+), 20 deletions(-) > > > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > > index a0a4413d6083b..711cebad36fc5 100644 > > --- a/fs/f2fs/file.c > > +++ b/fs/f2fs/file.c > > @@ -165,21 +165,6 @@ static const struct vm_operations_struct f2fs_file_vm_ops = { > > .page_mkwrite = f2fs_vm_page_mkwrite, > > }; > > > > -static int get_parent_ino(struct inode *inode, nid_t *pino) > > -{ > > - struct dentry *dentry; > > - > > - inode = igrab(inode); > > - dentry = d_find_any_alias(inode); > > - iput(inode); > > - if (!dentry) > > - return 0; > > - > > - *pino = parent_ino(dentry); > > - dput(dentry); > > - return 1; > > -} > > - > > static inline enum cp_reason_type need_do_checkpoint(struct inode *inode) > > { > > struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > @@ -223,14 +208,15 @@ static bool need_inode_page_update(struct f2fs_sb_info *sbi, nid_t ino) > > return ret; > > } > > > > -static void try_to_fix_pino(struct inode *inode) > > +static void try_to_fix_pino(struct dentry *dentry) > > { > > + struct inode *inode = d_inode(dentry); > > struct f2fs_inode_info *fi = F2FS_I(inode); > > - nid_t pino; > > > > down_write(&fi->i_sem); > > - if (file_wrong_pino(inode) && inode->i_nlink == 1 && > > - get_parent_ino(inode, &pino)) { > > + if (file_wrong_pino(inode) && inode->i_nlink == 1) { > > + nid_t pino = parent_ino(dentry); > > + > > f2fs_i_pino_write(inode, pino); > > file_got_pino(inode); > > } > > @@ -310,7 +296,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, > > * We've secured consistency through sync_fs. Following pino > > * will be used only for fsynced inodes after checkpoint. > > */ > > - try_to_fix_pino(inode); > > + try_to_fix_pino(file_dentry(file)); > > clear_inode_flag(inode, FI_APPEND_WRITE); > > clear_inode_flag(inode, FI_UPDATE_WRITE); > > goto out; > > Actually, I think this is wrong because the fsync can be done via a file > descriptor that was opened to a now-deleted link to the file. > > We need to find the dentry whose parent directory is still exists, i.e. the > parent directory that is counting towards 'inode->i_nlink == 1'. > > I think d_find_alias() is what we're looking for. Yeah, it seems to happen when open/rename/fsync calls, or race condition of file deletion. > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 6ab8f621a3c5..855f27468baa 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -165,13 +165,13 @@ static int get_parent_ino(struct inode *inode, nid_t *pino) > { > struct dentry *dentry; > > - inode = igrab(inode); > - dentry = d_find_any_alias(inode); > - iput(inode); > + dentry = d_find_alias(inode); > if (!dentry) > return 0; How about this? >From 2a6b0e53e592854306062a2dc35db2d8f79062f2 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Tue, 5 May 2020 11:33:29 -0700 Subject: [PATCH] f2fs: find a living dentry when finding parent ino We need to check any dentry still alive to get parent inode number. Suggested-by: Eric Biggers Signed-off-by: Jaegeuk Kim --- fs/f2fs/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index a0a4413d6083b..95139cb85faca 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -169,9 +169,8 @@ static int get_parent_ino(struct inode *inode, nid_t *pino) { struct dentry *dentry; - inode = igrab(inode); - dentry = d_find_any_alias(inode); - iput(inode); + /* Need to check if valid dentry still exists. */ + dentry = d_find_alias(inode); if (!dentry) return 0; -- 2.26.2.526.g744177e7f7-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel