Linux-Fsdevel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
@ 2020-09-04  7:59 Hao Li
  2020-09-06 21:40 ` Dave Chinner
  2020-09-08 23:03 ` Ira Weiny
  0 siblings, 2 replies; 6+ messages in thread
From: Hao Li @ 2020-09-04  7:59 UTC (permalink / raw)
  To: linux-kernel, linux-fsdevel
  Cc: david, ira.weiny, linux-xfs, lihao2018.fnst, y-goto

If generic_drop_inode() returns true, it means iput_final() can evict
this inode regardless of whether it is dirty or not. If we check
I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
evicted unconditionally. This is not the desired behavior because
I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
As for whether we need to evict this inode, this is what
generic_drop_inode() should do. This patch corrects the usage of
I_DONTCACHE.

This patch was proposed in [1].

[1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/

Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
---
Changes in v2:
 - Adjust code format
 - Add Fixes tag in commit message

 fs/inode.c         | 4 +++-
 include/linux/fs.h | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/inode.c b/fs/inode.c
index 72c4c347afb7..19ad823f781c 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1625,7 +1625,9 @@ static void iput_final(struct inode *inode)
 	else
 		drop = generic_drop_inode(inode);
 
-	if (!drop && (sb->s_flags & SB_ACTIVE)) {
+	if (!drop &&
+	    !(inode->i_state & I_DONTCACHE) &&
+	    (sb->s_flags & SB_ACTIVE)) {
 		inode_add_lru(inode);
 		spin_unlock(&inode->i_lock);
 		return;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e019ea2f1347..93caee80ce47 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2922,8 +2922,7 @@ extern int inode_needs_sync(struct inode *inode);
 extern int generic_delete_inode(struct inode *inode);
 static inline int generic_drop_inode(struct inode *inode)
 {
-	return !inode->i_nlink || inode_unhashed(inode) ||
-		(inode->i_state & I_DONTCACHE);
+	return !inode->i_nlink || inode_unhashed(inode);
 }
 extern void d_mark_dontcache(struct inode *inode);
 
-- 
2.28.0




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
  2020-09-04  7:59 [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode() Hao Li
@ 2020-09-06 21:40 ` Dave Chinner
  2020-09-22  2:19   ` Hao Li
  2020-09-08 23:03 ` Ira Weiny
  1 sibling, 1 reply; 6+ messages in thread
From: Dave Chinner @ 2020-09-06 21:40 UTC (permalink / raw)
  To: Hao Li; +Cc: linux-kernel, linux-fsdevel, ira.weiny, linux-xfs, y-goto

On Fri, Sep 04, 2020 at 03:59:39PM +0800, Hao Li wrote:
> If generic_drop_inode() returns true, it means iput_final() can evict
> this inode regardless of whether it is dirty or not. If we check
> I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
> evicted unconditionally. This is not the desired behavior because
> I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
> As for whether we need to evict this inode, this is what
> generic_drop_inode() should do. This patch corrects the usage of
> I_DONTCACHE.
> 
> This patch was proposed in [1].
> 
> [1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
> 
> Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
> Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
> ---
> Changes in v2:
>  - Adjust code format
>  - Add Fixes tag in commit message
> 
>  fs/inode.c         | 4 +++-
>  include/linux/fs.h | 3 +--
>  2 files changed, 4 insertions(+), 3 deletions(-)

Looks good.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

-- 
Dave Chinner
david@fromorbit.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
  2020-09-04  7:59 [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode() Hao Li
  2020-09-06 21:40 ` Dave Chinner
@ 2020-09-08 23:03 ` Ira Weiny
  2020-10-23  7:49   ` Li, Hao
  1 sibling, 1 reply; 6+ messages in thread
From: Ira Weiny @ 2020-09-08 23:03 UTC (permalink / raw)
  To: Hao Li; +Cc: linux-kernel, linux-fsdevel, david, linux-xfs, y-goto

On Fri, Sep 04, 2020 at 03:59:39PM +0800, Hao Li wrote:
> If generic_drop_inode() returns true, it means iput_final() can evict
> this inode regardless of whether it is dirty or not. If we check
> I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
> evicted unconditionally. This is not the desired behavior because
> I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
> As for whether we need to evict this inode, this is what
> generic_drop_inode() should do. This patch corrects the usage of
> I_DONTCACHE.
> 
> This patch was proposed in [1].
> 
> [1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
> 
> Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
> Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
> Changes in v2:
>  - Adjust code format
>  - Add Fixes tag in commit message
> 
>  fs/inode.c         | 4 +++-
>  include/linux/fs.h | 3 +--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/inode.c b/fs/inode.c
> index 72c4c347afb7..19ad823f781c 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -1625,7 +1625,9 @@ static void iput_final(struct inode *inode)
>  	else
>  		drop = generic_drop_inode(inode);
>  
> -	if (!drop && (sb->s_flags & SB_ACTIVE)) {
> +	if (!drop &&
> +	    !(inode->i_state & I_DONTCACHE) &&
> +	    (sb->s_flags & SB_ACTIVE)) {
>  		inode_add_lru(inode);
>  		spin_unlock(&inode->i_lock);
>  		return;
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index e019ea2f1347..93caee80ce47 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -2922,8 +2922,7 @@ extern int inode_needs_sync(struct inode *inode);
>  extern int generic_delete_inode(struct inode *inode);
>  static inline int generic_drop_inode(struct inode *inode)
>  {
> -	return !inode->i_nlink || inode_unhashed(inode) ||
> -		(inode->i_state & I_DONTCACHE);
> +	return !inode->i_nlink || inode_unhashed(inode);
>  }
>  extern void d_mark_dontcache(struct inode *inode);
>  
> -- 
> 2.28.0
> 
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
  2020-09-06 21:40 ` Dave Chinner
@ 2020-09-22  2:19   ` Hao Li
  0 siblings, 0 replies; 6+ messages in thread
From: Hao Li @ 2020-09-22  2:19 UTC (permalink / raw)
  To: Dave Chinner; +Cc: linux-kernel, linux-fsdevel, linux-xfs, y-goto

On Mon, Sep 07, 2020 at 07:40:02AM +1000, Dave Chinner wrote:
> On Fri, Sep 04, 2020 at 03:59:39PM +0800, Hao Li wrote:
> > If generic_drop_inode() returns true, it means iput_final() can evict
> > this inode regardless of whether it is dirty or not. If we check
> > I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
> > evicted unconditionally. This is not the desired behavior because
> > I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
> > As for whether we need to evict this inode, this is what
> > generic_drop_inode() should do. This patch corrects the usage of
> > I_DONTCACHE.
> > 
> > This patch was proposed in [1].
> > 
> > [1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
> > 
> > Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
> > Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
> > ---
> > Changes in v2:
> >  - Adjust code format
> >  - Add Fixes tag in commit message
> > 
> >  fs/inode.c         | 4 +++-
> >  include/linux/fs.h | 3 +--
> >  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> Looks good.
> 
> Reviewed-by: Dave Chinner <dchinner@redhat.com>
> 

Hi,

As discussed in [1], this patch is the basis of another one. Could I
submit the second patch now to change the DCACHE_DONTCACHE behavior or I
have to wait for this patch to be merged.

[1]: https://lkml.org/lkml/2020/8/30/360

Thanks,
Hao Li

> -- 
> Dave Chinner
> david@fromorbit.com
> 
> 



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
  2020-09-08 23:03 ` Ira Weiny
@ 2020-10-23  7:49   ` Li, Hao
  2020-11-05 10:55     ` Li, Hao
  0 siblings, 1 reply; 6+ messages in thread
From: Li, Hao @ 2020-10-23  7:49 UTC (permalink / raw)
  To: viro; +Cc: linux-kernel, linux-fsdevel, david, linux-xfs, y-goto, Ira Weiny

Hello,

Ping.

This patch need to be merged... Thanks.

On 2020/9/9 7:03, Ira Weiny wrote:
> On Fri, Sep 04, 2020 at 03:59:39PM +0800, Hao Li wrote:
>> If generic_drop_inode() returns true, it means iput_final() can evict
>> this inode regardless of whether it is dirty or not. If we check
>> I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
>> evicted unconditionally. This is not the desired behavior because
>> I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
>> As for whether we need to evict this inode, this is what
>> generic_drop_inode() should do. This patch corrects the usage of
>> I_DONTCACHE.
>>
>> This patch was proposed in [1].
>>
>> [1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
>>
>> Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
>> Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
> Reviewed-by: Ira Weiny <ira.weiny@intel.com>
>
>> ---
>> Changes in v2:
>>  - Adjust code format
>>  - Add Fixes tag in commit message
>>
>>  fs/inode.c         | 4 +++-
>>  include/linux/fs.h | 3 +--
>>  2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/inode.c b/fs/inode.c
>> index 72c4c347afb7..19ad823f781c 100644
>> --- a/fs/inode.c
>> +++ b/fs/inode.c
>> @@ -1625,7 +1625,9 @@ static void iput_final(struct inode *inode)
>>  	else
>>  		drop = generic_drop_inode(inode);
>>  
>> -	if (!drop && (sb->s_flags & SB_ACTIVE)) {
>> +	if (!drop &&
>> +	    !(inode->i_state & I_DONTCACHE) &&
>> +	    (sb->s_flags & SB_ACTIVE)) {
>>  		inode_add_lru(inode);
>>  		spin_unlock(&inode->i_lock);
>>  		return;
>> diff --git a/include/linux/fs.h b/include/linux/fs.h
>> index e019ea2f1347..93caee80ce47 100644
>> --- a/include/linux/fs.h
>> +++ b/include/linux/fs.h
>> @@ -2922,8 +2922,7 @@ extern int inode_needs_sync(struct inode *inode);
>>  extern int generic_delete_inode(struct inode *inode);
>>  static inline int generic_drop_inode(struct inode *inode)
>>  {
>> -	return !inode->i_nlink || inode_unhashed(inode) ||
>> -		(inode->i_state & I_DONTCACHE);
>> +	return !inode->i_nlink || inode_unhashed(inode);
>>  }
>>  extern void d_mark_dontcache(struct inode *inode);
>>  
>> -- 
>> 2.28.0
>>
>>
>>
>



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode()
  2020-10-23  7:49   ` Li, Hao
@ 2020-11-05 10:55     ` Li, Hao
  0 siblings, 0 replies; 6+ messages in thread
From: Li, Hao @ 2020-11-05 10:55 UTC (permalink / raw)
  To: viro; +Cc: linux-kernel, linux-fsdevel, david, linux-xfs, y-goto, Ira Weiny

Ping :)


On 2020/10/23 15:49, Li, Hao wrote:
> Hello,
>
> Ping.
>
> This patch need to be merged... Thanks.
>
> On 2020/9/9 7:03, Ira Weiny wrote:
>> On Fri, Sep 04, 2020 at 03:59:39PM +0800, Hao Li wrote:
>>> If generic_drop_inode() returns true, it means iput_final() can evict
>>> this inode regardless of whether it is dirty or not. If we check
>>> I_DONTCACHE in generic_drop_inode(), any inode with this bit set will be
>>> evicted unconditionally. This is not the desired behavior because
>>> I_DONTCACHE only means the inode shouldn't be cached on the LRU list.
>>> As for whether we need to evict this inode, this is what
>>> generic_drop_inode() should do. This patch corrects the usage of
>>> I_DONTCACHE.
>>>
>>> This patch was proposed in [1].
>>>
>>> [1]: https://lore.kernel.org/linux-fsdevel/20200831003407.GE12096@dread.disaster.area/
>>>
>>> Fixes: dae2f8ed7992 ("fs: Lift XFS_IDONTCACHE to the VFS layer")
>>> Signed-off-by: Hao Li <lihao2018.fnst@cn.fujitsu.com>
>> Reviewed-by: Ira Weiny <ira.weiny@intel.com>
>>
>>> ---
>>> Changes in v2:
>>>  - Adjust code format
>>>  - Add Fixes tag in commit message
>>>
>>>  fs/inode.c         | 4 +++-
>>>  include/linux/fs.h | 3 +--
>>>  2 files changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/fs/inode.c b/fs/inode.c
>>> index 72c4c347afb7..19ad823f781c 100644
>>> --- a/fs/inode.c
>>> +++ b/fs/inode.c
>>> @@ -1625,7 +1625,9 @@ static void iput_final(struct inode *inode)
>>>  	else
>>>  		drop = generic_drop_inode(inode);
>>>  
>>> -	if (!drop && (sb->s_flags & SB_ACTIVE)) {
>>> +	if (!drop &&
>>> +	    !(inode->i_state & I_DONTCACHE) &&
>>> +	    (sb->s_flags & SB_ACTIVE)) {
>>>  		inode_add_lru(inode);
>>>  		spin_unlock(&inode->i_lock);
>>>  		return;
>>> diff --git a/include/linux/fs.h b/include/linux/fs.h
>>> index e019ea2f1347..93caee80ce47 100644
>>> --- a/include/linux/fs.h
>>> +++ b/include/linux/fs.h
>>> @@ -2922,8 +2922,7 @@ extern int inode_needs_sync(struct inode *inode);
>>>  extern int generic_delete_inode(struct inode *inode);
>>>  static inline int generic_drop_inode(struct inode *inode)
>>>  {
>>> -	return !inode->i_nlink || inode_unhashed(inode) ||
>>> -		(inode->i_state & I_DONTCACHE);
>>> +	return !inode->i_nlink || inode_unhashed(inode);
>>>  }
>>>  extern void d_mark_dontcache(struct inode *inode);
>>>  
>>> -- 
>>> 2.28.0
>>>
>>>
>>>
>



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-04  7:59 [PATCH v2] fs: Handle I_DONTCACHE in iput_final() instead of generic_drop_inode() Hao Li
2020-09-06 21:40 ` Dave Chinner
2020-09-22  2:19   ` Hao Li
2020-09-08 23:03 ` Ira Weiny
2020-10-23  7:49   ` Li, Hao
2020-11-05 10:55     ` Li, Hao

Linux-Fsdevel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-fsdevel/0 linux-fsdevel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-fsdevel linux-fsdevel/ https://lore.kernel.org/linux-fsdevel \
		linux-fsdevel@vger.kernel.org
	public-inbox-index linux-fsdevel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-fsdevel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git