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 303D0C47247 for ; Tue, 5 May 2020 18:13:35 +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 F2D4A20663; Tue, 5 May 2020 18:13:34 +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="lmZNAvxE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="VL4YA954"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="gZ60ss3C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2D4A20663 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 1jW24U-00070E-I0; Tue, 05 May 2020 18:13:34 +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 1jW24U-000707-0x for linux-f2fs-devel@lists.sourceforge.net; Tue, 05 May 2020 18:13:34 +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=VI8hD+KdzSd73XSwLvOzgW+PGF2u4DCmnjX4rXhYS9E=; b=lmZNAvxEvzCLkxAcWIVoIiwX6Y vYs/uR7JxkMdsQqEG/f9kyWRP4O7YsCciLewT5wQ6IrKQyu2MugOS7ktFKz1itnM2DElO4YjKtx+/ lAdiL8jLB5+uS4MOjYwlr6vy6WuTVg75rEorKZAFWVUcyhbJrgRGckck9D6ZBOxv7GCg=; 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=VI8hD+KdzSd73XSwLvOzgW+PGF2u4DCmnjX4rXhYS9E=; b=VL4YA9541F552Yi6px3/bnafP9 CF9fWBdCVtMK8SxPGT1kdemzwPPXgLwt6XRRfWMru7e9m4YiWjd3H5pNH7k6it6ej+pm/o9A8s4S8 zCchoA3IC2VCvqWy6L78gLGl/lOvFdsMvLrapxOKhu8J3MrBe5Sk1kAVj8eMEAEiKsF0=; 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 1jW24P-00EiIk-Eq for linux-f2fs-devel@lists.sourceforge.net; Tue, 05 May 2020 18:13:33 +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 CF9A7206B8; Tue, 5 May 2020 18:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588702403; bh=GmW9mQvHRC2Cd+ADxz/wgUVnW2SrOFLgvsOsFvoyrWg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gZ60ss3C4IR6xeevDKzqUS/95khLsTvk+PrFSive0K2J/tK0Pb+U/Lk9j6H+h94rX vMBKXVsyALZ8Dlz1Wzz9PlgjkuKR3w8AucNWlYg/j8iWZ51Or7chsj5JUuwpRaogf1 c61ueuFcl4mPNdrnLAkBFK5mQBjJ+LH0IdQnQKA4= Date: Tue, 5 May 2020 11:13:23 -0700 From: Jaegeuk Kim To: Eric Biggers Message-ID: <20200505181323.GA55221@google.com> References: <20200505153139.201697-1-jaegeuk@kernel.org> <20200505165847.GA98848@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200505165847.GA98848@gmail.com> X-Headers-End: 1jW24P-00EiIk-Eq 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 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; -- 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