[PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Nikolay Borisov]

Currently when enoscp_debug mount option is turned on we do not print
any debug info in case metadata reservation failures happen. Fix this
by adding the necessary hook in reserve_metadata_bytes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/extent-tree.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 4497f937e8fb..7a281fc97bc5 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5382,10 +5382,15 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
 		    !block_rsv_use_bytes(global_rsv, orig_bytes))
 			ret = 0;
 	}
-	if (ret == -ENOSPC)
+	if (ret == -ENOSPC) {
 		trace_btrfs_space_reservation(fs_info, "space_info:enospc",
 					      block_rsv->space_info->flags,
 					      orig_bytes, 1);
+
+		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
+			dump_space_info(fs_info, block_rsv->space_info,
+					orig_bytes, 0);
+	}
 	return ret;
 }
 
-- 
2.7.4

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Qu Wenruo]

[-- Attachment #1.1: Type: text/plain, Size: 1392 bytes --]



On 2017年12月15日 18:05, Nikolay Borisov wrote:
> Currently when enoscp_debug mount option is turned on we do not print
> any debug info in case metadata reservation failures happen. Fix this
> by adding the necessary hook in reserve_metadata_bytes.

Reviewed-by: Qu Wenruo <wqu@suse.com>

> 
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
>  fs/btrfs/extent-tree.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 4497f937e8fb..7a281fc97bc5 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -5382,10 +5382,15 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
>  		    !block_rsv_use_bytes(global_rsv, orig_bytes))
>  			ret = 0;
>  	}
> -	if (ret == -ENOSPC)
> +	if (ret == -ENOSPC) {
>  		trace_btrfs_space_reservation(fs_info, "space_info:enospc",
>  					      block_rsv->space_info->flags,
>  					      orig_bytes, 1);

Nothing related to this patch itself.

But btrfs_space_reservation() seems to be abused.
Every type from delalloc to enospc debug will use it.

What about splitting them into different trace events?

Thanks,
Qu

> +
> +		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> +			dump_space_info(fs_info, block_rsv->space_info,
> +					orig_bytes, 0);
> +	}
>  	return ret;
>  }
>  
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 520 bytes --]

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Nikolay Borisov]

On 15.12.2017 13:36, Qu Wenruo wrote:
> .
> 
> But btrfs_space_reservation() seems to be abused.
> Every type from delalloc to enospc debug will use it.
> 
> What about splitting them into different trace events?

I think trace events form some sort of an ABI so we can't really be
modifying current events, though I'd defer to David on that matter.

OTOH the trace event contains all the information we like - either if
it's an alloc/free operation, whether it's data or metadata and whether
it's enospc or not. Admittedly the last thing is a bit of a pain-point
since if you want to filter enospc you have to do string parsing on the
output from the trace_btrfs_space_reservation. But even this doesn't
sound too compelling to warrant a split. Either ways I'm fine with it.

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Nikolay Borisov]

On 15.12.2017 12:05, Nikolay Borisov wrote:
> Currently when enoscp_debug mount option is turned on we do not print
> any debug info in case metadata reservation failures happen. Fix this
> by adding the necessary hook in reserve_metadata_bytes.
> 
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
>  fs/btrfs/extent-tree.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 4497f937e8fb..7a281fc97bc5 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -5382,10 +5382,15 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
>  		    !block_rsv_use_bytes(global_rsv, orig_bytes))
>  			ret = 0;
>  	}
> -	if (ret == -ENOSPC)
> +	if (ret == -ENOSPC) {
>  		trace_btrfs_space_reservation(fs_info, "space_info:enospc",
>  					      block_rsv->space_info->flags,
>  					      orig_bytes, 1);
> +
> +		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> +			dump_space_info(fs_info, block_rsv->space_info,
> +					orig_bytes, 0);
> +	}
>  	return ret;
>  }
>  
> 

Ping

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Qu Wenruo]

[-- Attachment #1.1: Type: text/plain, Size: 1504 bytes --]



On 2018年02月06日 00:20, Nikolay Borisov wrote:
> 
> 
> On 15.12.2017 12:05, Nikolay Borisov wrote:
>> Currently when enoscp_debug mount option is turned on we do not print
>> any debug info in case metadata reservation failures happen. Fix this
>> by adding the necessary hook in reserve_metadata_bytes.
>>
>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>

Looks good.

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

>> ---
>>  fs/btrfs/extent-tree.c | 7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
>> index 4497f937e8fb..7a281fc97bc5 100644
>> --- a/fs/btrfs/extent-tree.c
>> +++ b/fs/btrfs/extent-tree.c
>> @@ -5382,10 +5382,15 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
>>  		    !block_rsv_use_bytes(global_rsv, orig_bytes))
>>  			ret = 0;
>>  	}
>> -	if (ret == -ENOSPC)
>> +	if (ret == -ENOSPC) {
>>  		trace_btrfs_space_reservation(fs_info, "space_info:enospc",
>>  					      block_rsv->space_info->flags,
>>  					      orig_bytes, 1);
>> +
>> +		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
>> +			dump_space_info(fs_info, block_rsv->space_info,
>> +					orig_bytes, 0);
>> +	}
>>  	return ret;
>>  }
>>  
>>
> 
> Ping
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 520 bytes --]

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[Nikolay Borisov]

On  6.02.2018 03:29, Qu Wenruo wrote:
> 
> 
> On 2018年02月06日 00:20, Nikolay Borisov wrote:
>>
>>
>> On 15.12.2017 12:05, Nikolay Borisov wrote:
>>> Currently when enoscp_debug mount option is turned on we do not print
>>> any debug info in case metadata reservation failures happen. Fix this
>>> by adding the necessary hook in reserve_metadata_bytes.
>>>
>>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> 
> Looks good.
> 
> Reviewed-by: Qu Wenruo <wqu@suse.com>

Yeah you already reviewed it back in December, I was bumping it to make
sure David won't miss it since it's a rather old patch :)

> 
> Thanks,
> Qu
> 
>>> ---
>>>  fs/btrfs/extent-tree.c | 7 ++++++-
>>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
>>> index 4497f937e8fb..7a281fc97bc5 100644
>>> --- a/fs/btrfs/extent-tree.c
>>> +++ b/fs/btrfs/extent-tree.c
>>> @@ -5382,10 +5382,15 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
>>>  		    !block_rsv_use_bytes(global_rsv, orig_bytes))
>>>  			ret = 0;
>>>  	}
>>> -	if (ret == -ENOSPC)
>>> +	if (ret == -ENOSPC) {
>>>  		trace_btrfs_space_reservation(fs_info, "space_info:enospc",
>>>  					      block_rsv->space_info->flags,
>>>  					      orig_bytes, 1);
>>> +
>>> +		if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
>>> +			dump_space_info(fs_info, block_rsv->space_info,
>>> +					orig_bytes, 0);
>>> +	}
>>>  	return ret;
>>>  }
>>>  
>>>
>>
>> Ping
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> 

Re: [PATCH] btrfs: Add enospc_debug printing in metadata_reserve_bytes

[David Sterba]

On Tue, Feb 06, 2018 at 11:18:41AM +0200, Nikolay Borisov wrote:
> >> On 15.12.2017 12:05, Nikolay Borisov wrote:
> >>> Currently when enoscp_debug mount option is turned on we do not print
> >>> any debug info in case metadata reservation failures happen. Fix this
> >>> by adding the necessary hook in reserve_metadata_bytes.
> >>>
> >>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> > 
> > Looks good.
> > 
> > Reviewed-by: Qu Wenruo <wqu@suse.com>
> 
> Yeah you already reviewed it back in December, I was bumping it to make
> sure David won't miss it since it's a rather old patch :)

Added to next, thanks.