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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 CC10AC433DB for ; Mon, 11 Jan 2021 15:00:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D1F822A84 for ; Mon, 11 Jan 2021 15:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731201AbhAKPAL (ORCPT ); Mon, 11 Jan 2021 10:00:11 -0500 Received: from mx2.suse.de ([195.135.220.15]:42178 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730214AbhAKPAL (ORCPT ); Mon, 11 Jan 2021 10:00:11 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 85BC0AD1E; Mon, 11 Jan 2021 14:59:29 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 4933C1E0807; Mon, 11 Jan 2021 15:59:29 +0100 (CET) Date: Mon, 11 Jan 2021 15:59:29 +0100 From: Jan Kara To: Eric Biggers Cc: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Theodore Ts'o , Christoph Hellwig Subject: Re: [PATCH v2 07/12] fs: clean up __mark_inode_dirty() a bit Message-ID: <20210111145929.GF18475@quack2.suse.cz> References: <20210109075903.208222-1-ebiggers@kernel.org> <20210109075903.208222-8-ebiggers@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210109075903.208222-8-ebiggers@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Fri 08-01-21 23:58:58, Eric Biggers wrote: > From: Eric Biggers > > Improve some comments, and don't bother checking for the I_DIRTY_TIME > flag in the case where we just cleared it. > > Also, warn if I_DIRTY_TIME and I_DIRTY_PAGES are passed to > __mark_inode_dirty() at the same time, as this case isn't handled. > > Reviewed-by: Christoph Hellwig > Signed-off-by: Eric Biggers Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/fs-writeback.c | 49 +++++++++++++++++++++++++++++------------------ > 1 file changed, 30 insertions(+), 19 deletions(-) > > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > index 2e6064012f7d3..80ee9816d9df5 100644 > --- a/fs/fs-writeback.c > +++ b/fs/fs-writeback.c > @@ -2219,23 +2219,24 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode) > } > > /** > - * __mark_inode_dirty - internal function > + * __mark_inode_dirty - internal function to mark an inode dirty > * > * @inode: inode to mark > - * @flags: what kind of dirty (i.e. I_DIRTY_SYNC) > + * @flags: what kind of dirty, e.g. I_DIRTY_SYNC. This can be a combination of > + * multiple I_DIRTY_* flags, except that I_DIRTY_TIME can't be combined > + * with I_DIRTY_PAGES. > * > - * Mark an inode as dirty. Callers should use mark_inode_dirty or > - * mark_inode_dirty_sync. > + * Mark an inode as dirty. We notify the filesystem, then update the inode's > + * dirty flags. Then, if needed we add the inode to the appropriate dirty list. > * > - * Put the inode on the super block's dirty list. > + * Most callers should use mark_inode_dirty() or mark_inode_dirty_sync() > + * instead of calling this directly. > * > - * CAREFUL! We mark it dirty unconditionally, but move it onto the > - * dirty list only if it is hashed or if it refers to a blockdev. > - * If it was not hashed, it will never be added to the dirty list > - * even if it is later hashed, as it will have been marked dirty already. > + * CAREFUL! We only add the inode to the dirty list if it is hashed or if it > + * refers to a blockdev. Unhashed inodes will never be added to the dirty list > + * even if they are later hashed, as they will have been marked dirty already. > * > - * In short, make sure you hash any inodes _before_ you start marking > - * them dirty. > + * In short, ensure you hash any inodes _before_ you start marking them dirty. > * > * Note that for blockdevs, inode->dirtied_when represents the dirtying time of > * the block-special inode (/dev/hda1) itself. And the ->dirtied_when field of > @@ -2247,25 +2248,34 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode) > void __mark_inode_dirty(struct inode *inode, int flags) > { > struct super_block *sb = inode->i_sb; > - int dirtytime; > + int dirtytime = 0; > > trace_writeback_mark_inode_dirty(inode, flags); > > - /* > - * Don't do this for I_DIRTY_PAGES - that doesn't actually > - * dirty the inode itself > - */ > if (flags & I_DIRTY_INODE) { > + /* > + * Notify the filesystem about the inode being dirtied, so that > + * (if needed) it can update on-disk fields and journal the > + * inode. This is only needed when the inode itself is being > + * dirtied now. I.e. it's only needed for I_DIRTY_INODE, not > + * for just I_DIRTY_PAGES or I_DIRTY_TIME. > + */ > trace_writeback_dirty_inode_start(inode, flags); > - > if (sb->s_op->dirty_inode) > sb->s_op->dirty_inode(inode, flags & I_DIRTY_INODE); > - > trace_writeback_dirty_inode(inode, flags); > > + /* I_DIRTY_INODE supersedes I_DIRTY_TIME. */ > flags &= ~I_DIRTY_TIME; > + } else { > + /* > + * Else it's either I_DIRTY_PAGES, I_DIRTY_TIME, or nothing. > + * (We don't support setting both I_DIRTY_PAGES and I_DIRTY_TIME > + * in one call to __mark_inode_dirty().) > + */ > + dirtytime = flags & I_DIRTY_TIME; > + WARN_ON_ONCE(dirtytime && flags != I_DIRTY_TIME); > } > - dirtytime = flags & I_DIRTY_TIME; > > /* > * Paired with smp_mb() in __writeback_single_inode() for the > @@ -2288,6 +2298,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) > > inode_attach_wb(inode, NULL); > > + /* I_DIRTY_INODE supersedes I_DIRTY_TIME. */ > if (flags & I_DIRTY_INODE) > inode->i_state &= ~I_DIRTY_TIME; > inode->i_state |= flags; > -- > 2.30.0 > -- Jan Kara SUSE Labs, CR 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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 0C44EC433E6 for ; Mon, 11 Jan 2021 14:59:48 +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 7227522C7C; Mon, 11 Jan 2021 14:59:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7227522C7C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz 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 1kyyfa-0006hR-N7; Mon, 11 Jan 2021 14:59:46 +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 1kyyfZ-0006hK-Eh for linux-f2fs-devel@lists.sourceforge.net; Mon, 11 Jan 2021 14:59:45 +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=jpf0oVhDqoXcgY4ra3WLZbLcSMugjBMzl8DWT6tUjLY=; b=VtWnKKs6NQ8UXHuIWNHhDxtieB mC0tVx49K29ECIIeTyX3XEHZTWG3G17FDv2FUflNhfE62LsWLmPysgci06gltCR0T7xGsMA2fj5z7 dcFoEw/3hBk8qkpoMQWEjXX2RauZjpkJ0sMvOnosZQ4OLjrrtg4yoTShzGfqdi+6kCtE=; 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=jpf0oVhDqoXcgY4ra3WLZbLcSMugjBMzl8DWT6tUjLY=; b=OGebHIecirrerFk6Sog0+UUCvf w6WQImUPEcQkoKEKKCs6xUk2jtgl4MrV8GZbGDen86XzD7zGU9E/cpvhC1Gl/CowVi/2/lTVojG/G jcqaq5ePCwAlvXWw/ycCCnKKm5brnXqViAWcuhtCfOqdo+iT+LUcL6uQ8uBAea0h+GY4=; Received: from mx2.suse.de ([195.135.220.15]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kyyfP-009bHW-Rd for linux-f2fs-devel@lists.sourceforge.net; Mon, 11 Jan 2021 14:59:45 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 85BC0AD1E; Mon, 11 Jan 2021 14:59:29 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 4933C1E0807; Mon, 11 Jan 2021 15:59:29 +0100 (CET) Date: Mon, 11 Jan 2021 15:59:29 +0100 From: Jan Kara To: Eric Biggers Message-ID: <20210111145929.GF18475@quack2.suse.cz> References: <20210109075903.208222-1-ebiggers@kernel.org> <20210109075903.208222-8-ebiggers@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210109075903.208222-8-ebiggers@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Headers-End: 1kyyfP-009bHW-Rd Subject: Re: [f2fs-dev] [PATCH v2 07/12] fs: clean up __mark_inode_dirty() a bit 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: Theodore Ts'o , linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Fri 08-01-21 23:58:58, Eric Biggers wrote: > From: Eric Biggers > > Improve some comments, and don't bother checking for the I_DIRTY_TIME > flag in the case where we just cleared it. > > Also, warn if I_DIRTY_TIME and I_DIRTY_PAGES are passed to > __mark_inode_dirty() at the same time, as this case isn't handled. > > Reviewed-by: Christoph Hellwig > Signed-off-by: Eric Biggers Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/fs-writeback.c | 49 +++++++++++++++++++++++++++++------------------ > 1 file changed, 30 insertions(+), 19 deletions(-) > > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > index 2e6064012f7d3..80ee9816d9df5 100644 > --- a/fs/fs-writeback.c > +++ b/fs/fs-writeback.c > @@ -2219,23 +2219,24 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode) > } > > /** > - * __mark_inode_dirty - internal function > + * __mark_inode_dirty - internal function to mark an inode dirty > * > * @inode: inode to mark > - * @flags: what kind of dirty (i.e. I_DIRTY_SYNC) > + * @flags: what kind of dirty, e.g. I_DIRTY_SYNC. This can be a combination of > + * multiple I_DIRTY_* flags, except that I_DIRTY_TIME can't be combined > + * with I_DIRTY_PAGES. > * > - * Mark an inode as dirty. Callers should use mark_inode_dirty or > - * mark_inode_dirty_sync. > + * Mark an inode as dirty. We notify the filesystem, then update the inode's > + * dirty flags. Then, if needed we add the inode to the appropriate dirty list. > * > - * Put the inode on the super block's dirty list. > + * Most callers should use mark_inode_dirty() or mark_inode_dirty_sync() > + * instead of calling this directly. > * > - * CAREFUL! We mark it dirty unconditionally, but move it onto the > - * dirty list only if it is hashed or if it refers to a blockdev. > - * If it was not hashed, it will never be added to the dirty list > - * even if it is later hashed, as it will have been marked dirty already. > + * CAREFUL! We only add the inode to the dirty list if it is hashed or if it > + * refers to a blockdev. Unhashed inodes will never be added to the dirty list > + * even if they are later hashed, as they will have been marked dirty already. > * > - * In short, make sure you hash any inodes _before_ you start marking > - * them dirty. > + * In short, ensure you hash any inodes _before_ you start marking them dirty. > * > * Note that for blockdevs, inode->dirtied_when represents the dirtying time of > * the block-special inode (/dev/hda1) itself. And the ->dirtied_when field of > @@ -2247,25 +2248,34 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode) > void __mark_inode_dirty(struct inode *inode, int flags) > { > struct super_block *sb = inode->i_sb; > - int dirtytime; > + int dirtytime = 0; > > trace_writeback_mark_inode_dirty(inode, flags); > > - /* > - * Don't do this for I_DIRTY_PAGES - that doesn't actually > - * dirty the inode itself > - */ > if (flags & I_DIRTY_INODE) { > + /* > + * Notify the filesystem about the inode being dirtied, so that > + * (if needed) it can update on-disk fields and journal the > + * inode. This is only needed when the inode itself is being > + * dirtied now. I.e. it's only needed for I_DIRTY_INODE, not > + * for just I_DIRTY_PAGES or I_DIRTY_TIME. > + */ > trace_writeback_dirty_inode_start(inode, flags); > - > if (sb->s_op->dirty_inode) > sb->s_op->dirty_inode(inode, flags & I_DIRTY_INODE); > - > trace_writeback_dirty_inode(inode, flags); > > + /* I_DIRTY_INODE supersedes I_DIRTY_TIME. */ > flags &= ~I_DIRTY_TIME; > + } else { > + /* > + * Else it's either I_DIRTY_PAGES, I_DIRTY_TIME, or nothing. > + * (We don't support setting both I_DIRTY_PAGES and I_DIRTY_TIME > + * in one call to __mark_inode_dirty().) > + */ > + dirtytime = flags & I_DIRTY_TIME; > + WARN_ON_ONCE(dirtytime && flags != I_DIRTY_TIME); > } > - dirtytime = flags & I_DIRTY_TIME; > > /* > * Paired with smp_mb() in __writeback_single_inode() for the > @@ -2288,6 +2298,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) > > inode_attach_wb(inode, NULL); > > + /* I_DIRTY_INODE supersedes I_DIRTY_TIME. */ > if (flags & I_DIRTY_INODE) > inode->i_state &= ~I_DIRTY_TIME; > inode->i_state |= flags; > -- > 2.30.0 > -- Jan Kara SUSE Labs, CR _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel