linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] f2fs: support statx
@ 2017-05-03 15:59 Chao Yu
  2017-05-03 15:59 ` [PATCH 2/3] f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS Chao Yu
  2017-05-03 15:59 ` [PATCH 3/3] f2fs: enhance scalability of trace macro Chao Yu
  0 siblings, 2 replies; 5+ messages in thread
From: Chao Yu @ 2017-05-03 15:59 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

From: Chao Yu <yuchao0@huawei.com>

Last kernel has already support new syscall statx() in commit a528d35e8bfc
("statx: Add a system call to make enhanced file info available"), with
this interface we can show more file info including file creation and some
attribute flags to user.

This patch tries to support this functionality.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 fs/f2fs/file.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index cdbf1add2a11..1c1c9bc4f19a 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -633,9 +633,30 @@ int f2fs_truncate(struct inode *inode)
 }
 
 int f2fs_getattr(const struct path *path, struct kstat *stat,
-		 u32 request_mask, unsigned int flags)
+		 u32 request_mask, unsigned int query_flags)
 {
 	struct inode *inode = d_inode(path->dentry);
+	struct f2fs_inode_info *fi = F2FS_I(inode);
+	unsigned int flags;
+
+	flags = fi->i_flags & FS_FL_USER_VISIBLE;
+	if (flags & FS_APPEND_FL)
+		stat->attributes |= STATX_ATTR_APPEND;
+	if (flags & FS_COMPR_FL)
+		stat->attributes |= STATX_ATTR_COMPRESSED;
+	if (f2fs_encrypted_inode(inode))
+		stat->attributes |= STATX_ATTR_ENCRYPTED;
+	if (flags & FS_IMMUTABLE_FL)
+		stat->attributes |= STATX_ATTR_IMMUTABLE;
+	if (flags & FS_NODUMP_FL)
+		stat->attributes |= STATX_ATTR_NODUMP;
+
+	stat->attributes_mask |= (STATX_ATTR_APPEND |
+				  STATX_ATTR_COMPRESSED |
+				  STATX_ATTR_ENCRYPTED |
+				  STATX_ATTR_IMMUTABLE |
+				  STATX_ATTR_NODUMP);
+
 	generic_fillattr(inode, stat);
 	stat->blocks <<= 3;
 	return 0;
-- 
2.12.2.575.gb14f27f

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/3] f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS
  2017-05-03 15:59 [PATCH 1/3] f2fs: support statx Chao Yu
@ 2017-05-03 15:59 ` Chao Yu
  2017-05-03 15:59 ` [PATCH 3/3] f2fs: enhance scalability of trace macro Chao Yu
  1 sibling, 0 replies; 5+ messages in thread
From: Chao Yu @ 2017-05-03 15:59 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

From: Chao Yu <yuchao0@huawei.com>

This patch expands cover region of inode->i_rwsem to keep setting flag
atomically.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 fs/f2fs/file.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1c1c9bc4f19a..e20a1c01e556 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1494,10 +1494,10 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 	if (ret)
 		return ret;
 
-	flags = f2fs_mask_flags(inode->i_mode, flags);
-
 	inode_lock(inode);
 
+	flags = f2fs_mask_flags(inode->i_mode, flags);
+
 	oldflags = fi->i_flags;
 
 	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
@@ -1511,10 +1511,11 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 	flags = flags & FS_FL_USER_MODIFIABLE;
 	flags |= oldflags & ~FS_FL_USER_MODIFIABLE;
 	fi->i_flags = flags;
-	inode_unlock(inode);
 
 	inode->i_ctime = current_time(inode);
 	f2fs_set_inode_flags(inode);
+
+	inode_unlock(inode);
 out:
 	mnt_drop_write_file(filp);
 	return ret;
-- 
2.12.2.575.gb14f27f

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 3/3] f2fs: enhance scalability of trace macro
  2017-05-03 15:59 [PATCH 1/3] f2fs: support statx Chao Yu
  2017-05-03 15:59 ` [PATCH 2/3] f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS Chao Yu
@ 2017-05-03 15:59 ` Chao Yu
  2017-05-03 18:47   ` Jaegeuk Kim
  1 sibling, 1 reply; 5+ messages in thread
From: Chao Yu @ 2017-05-03 15:59 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

From: Chao Yu <yuchao0@huawei.com>

Use __print_flags in show_bio_op_flags and show_cpreason instead of
__print_symbolic, it enables tracer function traverses and shows all
bits in the flag.

Additionally, add missing REQ_FUA into F2FS_OP_FLAGS.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 include/trace/events/f2fs.h | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index c78a223a0d9c..ad4cbeeeef44 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -59,8 +59,8 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
 		{ IPU,		"IN-PLACE" },				\
 		{ OPU,		"OUT-OF-PLACE" })
 
-#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_PREFLUSH | REQ_META |\
-			REQ_PRIO)
+#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_META | REQ_PRIO |	\
+			REQ_PREFLUSH | REQ_FUA)
 #define F2FS_BIO_FLAG_MASK(t)	(t & F2FS_OP_FLAGS)
 
 #define show_bio_type(op,op_flags)	show_bio_op(op),		\
@@ -79,15 +79,13 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
 		{ REQ_OP_WRITE_ZEROES,		"WRITE_ZEROES" })
 
 #define show_bio_op_flags(flags)					\
-	__print_symbolic(F2FS_BIO_FLAG_MASK(flags),			\
-		{ REQ_RAHEAD, 		"(RA)" },			\
-		{ REQ_SYNC, 		"(S)" },			\
-		{ REQ_SYNC | REQ_PRIO,	"(SP)" },			\
-		{ REQ_META, 		"(M)" },			\
-		{ REQ_META | REQ_PRIO,	"(MP)" },			\
-		{ REQ_SYNC | REQ_PREFLUSH , "(SF)" },			\
-		{ REQ_SYNC | REQ_META | REQ_PRIO, "(SMP)" },		\
-		{ REQ_PREFLUSH | REQ_META | REQ_PRIO, "(FMP)" },	\
+	__print_flags(F2FS_BIO_FLAG_MASK(flags), "|",			\
+		{ REQ_RAHEAD,		"R" },				\
+		{ REQ_SYNC,		"S" },				\
+		{ REQ_META,		"M" },				\
+		{ REQ_PRIO,		"P" },				\
+		{ REQ_PREFLUSH,		"PF" },				\
+		{ REQ_FUA,		"FUA" },			\
 		{ 0, " \b" })
 
 #define show_data_type(type)						\
@@ -121,13 +119,14 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
 		{ GC_CB,	"Cost-Benefit" })
 
 #define show_cpreason(type)						\
-	__print_symbolic(type,						\
+	__print_flags(type, "|",					\
 		{ CP_UMOUNT,	"Umount" },				\
 		{ CP_FASTBOOT,	"Fastboot" },				\
 		{ CP_SYNC,	"Sync" },				\
 		{ CP_RECOVERY,	"Recovery" },				\
 		{ CP_DISCARD,	"Discard" },				\
-		{ CP_UMOUNT | CP_TRIMMED,	"Umount,Trimmed" })
+		{ CP_UMOUNT,	"Umount" },				\
+		{ CP_TRIMMED,	"Trimmed" })
 
 struct victim_sel_policy;
 struct f2fs_map_blocks;
@@ -774,7 +773,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
 	),
 
 	TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
-		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s%s, type = %s",
+		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s,%s, type = %s",
 		show_dev_ino(__entry),
 		(unsigned long)__entry->index,
 		(unsigned long long)__entry->old_blkaddr,
@@ -827,7 +826,7 @@ DECLARE_EVENT_CLASS(f2fs__bio,
 		__entry->size		= bio->bi_iter.bi_size;
 	),
 
-	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s%s, %s, sector = %lld, size = %u",
+	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s,%s, %s, sector = %lld, size = %u",
 		show_dev(__entry->target),
 		show_dev(__entry->dev),
 		show_bio_type(__entry->op, __entry->op_flags),
-- 
2.12.2.575.gb14f27f

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] f2fs: enhance scalability of trace macro
  2017-05-03 15:59 ` [PATCH 3/3] f2fs: enhance scalability of trace macro Chao Yu
@ 2017-05-03 18:47   ` Jaegeuk Kim
  2017-05-04  1:19     ` Chao Yu
  0 siblings, 1 reply; 5+ messages in thread
From: Jaegeuk Kim @ 2017-05-03 18:47 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

Hi Chao,

On 05/03, Chao Yu wrote:
> From: Chao Yu <yuchao0@huawei.com>
> 
> Use __print_flags in show_bio_op_flags and show_cpreason instead of
> __print_symbolic, it enables tracer function traverses and shows all
> bits in the flag.
> 
> Additionally, add missing REQ_FUA into F2FS_OP_FLAGS.
> 
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
>  include/trace/events/f2fs.h | 29 ++++++++++++++---------------
>  1 file changed, 14 insertions(+), 15 deletions(-)
> 
> diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
> index c78a223a0d9c..ad4cbeeeef44 100644
> --- a/include/trace/events/f2fs.h
> +++ b/include/trace/events/f2fs.h
> @@ -59,8 +59,8 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>  		{ IPU,		"IN-PLACE" },				\
>  		{ OPU,		"OUT-OF-PLACE" })
>  
> -#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_PREFLUSH | REQ_META |\
> -			REQ_PRIO)
> +#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_META | REQ_PRIO |	\
> +			REQ_PREFLUSH | REQ_FUA)
>  #define F2FS_BIO_FLAG_MASK(t)	(t & F2FS_OP_FLAGS)
>  
>  #define show_bio_type(op,op_flags)	show_bio_op(op),		\
> @@ -79,15 +79,13 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>  		{ REQ_OP_WRITE_ZEROES,		"WRITE_ZEROES" })
>  
>  #define show_bio_op_flags(flags)					\
> -	__print_symbolic(F2FS_BIO_FLAG_MASK(flags),			\
> -		{ REQ_RAHEAD, 		"(RA)" },			\
> -		{ REQ_SYNC, 		"(S)" },			\
> -		{ REQ_SYNC | REQ_PRIO,	"(SP)" },			\
> -		{ REQ_META, 		"(M)" },			\
> -		{ REQ_META | REQ_PRIO,	"(MP)" },			\
> -		{ REQ_SYNC | REQ_PREFLUSH , "(SF)" },			\
> -		{ REQ_SYNC | REQ_META | REQ_PRIO, "(SMP)" },		\
> -		{ REQ_PREFLUSH | REQ_META | REQ_PRIO, "(FMP)" },	\
> +	__print_flags(F2FS_BIO_FLAG_MASK(flags), "|",			\
> +		{ REQ_RAHEAD,		"R" },				\
> +		{ REQ_SYNC,		"S" },				\
> +		{ REQ_META,		"M" },				\
> +		{ REQ_PRIO,		"P" },				\
> +		{ REQ_PREFLUSH,		"PF" },				\
> +		{ REQ_FUA,		"FUA" },			\
>  		{ 0, " \b" })

We don't need the above last entry.

>  
>  #define show_data_type(type)						\
> @@ -121,13 +119,14 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>  		{ GC_CB,	"Cost-Benefit" })
>  
>  #define show_cpreason(type)						\
> -	__print_symbolic(type,						\
> +	__print_flags(type, "|",					\
>  		{ CP_UMOUNT,	"Umount" },				\
>  		{ CP_FASTBOOT,	"Fastboot" },				\
>  		{ CP_SYNC,	"Sync" },				\
>  		{ CP_RECOVERY,	"Recovery" },				\
>  		{ CP_DISCARD,	"Discard" },				\
> -		{ CP_UMOUNT | CP_TRIMMED,	"Umount,Trimmed" })
> +		{ CP_UMOUNT,	"Umount" },				\
> +		{ CP_TRIMMED,	"Trimmed" })
>  
>  struct victim_sel_policy;
>  struct f2fs_map_blocks;
> @@ -774,7 +773,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
>  	),
>  
>  	TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
> -		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s%s, type = %s",
> +		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s,%s, type = %s",

How about showing this like %s(%s) ?

>  		show_dev_ino(__entry),
>  		(unsigned long)__entry->index,
>  		(unsigned long long)__entry->old_blkaddr,
> @@ -827,7 +826,7 @@ DECLARE_EVENT_CLASS(f2fs__bio,
>  		__entry->size		= bio->bi_iter.bi_size;
>  	),
>  
> -	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s%s, %s, sector = %lld, size = %u",
> +	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s,%s, %s, sector = %lld, size = %u",

ditto.

Thanks,

>  		show_dev(__entry->target),
>  		show_dev(__entry->dev),
>  		show_bio_type(__entry->op, __entry->op_flags),
> -- 
> 2.12.2.575.gb14f27f

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] f2fs: enhance scalability of trace macro
  2017-05-03 18:47   ` Jaegeuk Kim
@ 2017-05-04  1:19     ` Chao Yu
  0 siblings, 0 replies; 5+ messages in thread
From: Chao Yu @ 2017-05-04  1:19 UTC (permalink / raw)
  To: Jaegeuk Kim, Chao Yu; +Cc: linux-f2fs-devel, linux-kernel

Hi Jaegeuk,

On 2017/5/4 2:47, Jaegeuk Kim wrote:
> Hi Chao,
> 
> On 05/03, Chao Yu wrote:
>> From: Chao Yu <yuchao0@huawei.com>
>>
>> Use __print_flags in show_bio_op_flags and show_cpreason instead of
>> __print_symbolic, it enables tracer function traverses and shows all
>> bits in the flag.
>>
>> Additionally, add missing REQ_FUA into F2FS_OP_FLAGS.
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>>  include/trace/events/f2fs.h | 29 ++++++++++++++---------------
>>  1 file changed, 14 insertions(+), 15 deletions(-)
>>
>> diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
>> index c78a223a0d9c..ad4cbeeeef44 100644
>> --- a/include/trace/events/f2fs.h
>> +++ b/include/trace/events/f2fs.h
>> @@ -59,8 +59,8 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>>  		{ IPU,		"IN-PLACE" },				\
>>  		{ OPU,		"OUT-OF-PLACE" })
>>  
>> -#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_PREFLUSH | REQ_META |\
>> -			REQ_PRIO)
>> +#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_META | REQ_PRIO |	\
>> +			REQ_PREFLUSH | REQ_FUA)
>>  #define F2FS_BIO_FLAG_MASK(t)	(t & F2FS_OP_FLAGS)
>>  
>>  #define show_bio_type(op,op_flags)	show_bio_op(op),		\
>> @@ -79,15 +79,13 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>>  		{ REQ_OP_WRITE_ZEROES,		"WRITE_ZEROES" })
>>  
>>  #define show_bio_op_flags(flags)					\
>> -	__print_symbolic(F2FS_BIO_FLAG_MASK(flags),			\
>> -		{ REQ_RAHEAD, 		"(RA)" },			\
>> -		{ REQ_SYNC, 		"(S)" },			\
>> -		{ REQ_SYNC | REQ_PRIO,	"(SP)" },			\
>> -		{ REQ_META, 		"(M)" },			\
>> -		{ REQ_META | REQ_PRIO,	"(MP)" },			\
>> -		{ REQ_SYNC | REQ_PREFLUSH , "(SF)" },			\
>> -		{ REQ_SYNC | REQ_META | REQ_PRIO, "(SMP)" },		\
>> -		{ REQ_PREFLUSH | REQ_META | REQ_PRIO, "(FMP)" },	\
>> +	__print_flags(F2FS_BIO_FLAG_MASK(flags), "|",			\
>> +		{ REQ_RAHEAD,		"R" },				\
>> +		{ REQ_SYNC,		"S" },				\
>> +		{ REQ_META,		"M" },				\
>> +		{ REQ_PRIO,		"P" },				\
>> +		{ REQ_PREFLUSH,		"PF" },				\
>> +		{ REQ_FUA,		"FUA" },			\
>>  		{ 0, " \b" })
> 
> We don't need the above last entry.

Agreed.

> 
>>  
>>  #define show_data_type(type)						\
>> @@ -121,13 +119,14 @@ TRACE_DEFINE_ENUM(CP_TRIMMED);
>>  		{ GC_CB,	"Cost-Benefit" })
>>  
>>  #define show_cpreason(type)						\
>> -	__print_symbolic(type,						\
>> +	__print_flags(type, "|",					\
>>  		{ CP_UMOUNT,	"Umount" },				\
>>  		{ CP_FASTBOOT,	"Fastboot" },				\
>>  		{ CP_SYNC,	"Sync" },				\
>>  		{ CP_RECOVERY,	"Recovery" },				\
>>  		{ CP_DISCARD,	"Discard" },				\
>> -		{ CP_UMOUNT | CP_TRIMMED,	"Umount,Trimmed" })
>> +		{ CP_UMOUNT,	"Umount" },				\
>> +		{ CP_TRIMMED,	"Trimmed" })
>>  
>>  struct victim_sel_policy;
>>  struct f2fs_map_blocks;
>> @@ -774,7 +773,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
>>  	),
>>  
>>  	TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
>> -		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s%s, type = %s",
>> +		"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s,%s, type = %s",
> 
> How about showing this like %s(%s) ?

OK, let do the change in next version.

thanks,

> 
>>  		show_dev_ino(__entry),
>>  		(unsigned long)__entry->index,
>>  		(unsigned long long)__entry->old_blkaddr,
>> @@ -827,7 +826,7 @@ DECLARE_EVENT_CLASS(f2fs__bio,
>>  		__entry->size		= bio->bi_iter.bi_size;
>>  	),
>>  
>> -	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s%s, %s, sector = %lld, size = %u",
>> +	TP_printk("dev = (%d,%d)/(%d,%d), rw = %s,%s, %s, sector = %lld, size = %u",
> 
> ditto.
> 
> Thanks,
> 
>>  		show_dev(__entry->target),
>>  		show_dev(__entry->dev),
>>  		show_bio_type(__entry->op, __entry->op_flags),
>> -- 
>> 2.12.2.575.gb14f27f
> 
> .
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-04  1:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-03 15:59 [PATCH 1/3] f2fs: support statx Chao Yu
2017-05-03 15:59 ` [PATCH 2/3] f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS Chao Yu
2017-05-03 15:59 ` [PATCH 3/3] f2fs: enhance scalability of trace macro Chao Yu
2017-05-03 18:47   ` Jaegeuk Kim
2017-05-04  1:19     ` Chao Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).