Skip to contentSkip to conversation

f2fs: add F2FS_IOC_GET_COMPRESS_OPTION ioctl

PATCH In review Daeho Jeong 3 participants 11 messages Oct 30, 2020 – Dec 3, 2020 F2FS file system

lore
Share & tools
lore
#0 lore raw

PATCH v7 1/2 f2fs: add F2FS_IOC_GET_COMPRESS_OPTION ioctl

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_GET_COMPRESS_OPTION ioctl to get file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

ioctl(fd, F2FS_IOC_GET_COMPRESS_OPTION, &option);

---

v7: changed inode_lock() to inode_lock_shared().
v4: changed commit message.
v3: changed the error number more specific.
v2: added ioctl description.

---
 fs/f2fs/f2fs.h |  7 +++++++
 fs/f2fs/file.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
fs/f2fs/f2fs.h +7 -0
index 53fe2853579c..a33c90cf979b 100644
@@ -433,6 +433,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
 					_IOR(F2FS_IOCTL_MAGIC, 19, __u64)
 #define F2FS_IOC_SEC_TRIM_FILE		_IOW(F2FS_IOCTL_MAGIC, 20,	\
 						struct f2fs_sectrim_range)
+#define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
+						struct f2fs_comp_option)
 
 /*
  * should be same as XFS_IOC_GOINGDOWN.
@@ -481,6 +483,11 @@ struct f2fs_sectrim_range {
 	u64 flags;
 };
 
+struct f2fs_comp_option {
+	u8 algorithm;
+	u8 log_cluster_size;
+};
+
 /* for inline stuff */
 #define DEF_INLINE_RESERVED_SIZE	1
 static inline int get_extra_isize(struct inode *inode);
fs/f2fs/file.c +30 -0
index ef5a844de53f..bd52df84219d 100644
@@ -3936,6 +3936,33 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)
 	return ret;
 }
 
+static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_comp_option option;
+
+	if (!f2fs_sb_has_compression(F2FS_I_SB(inode)))
+		return -EOPNOTSUPP;
+
+	inode_lock_shared(inode);
+
+	if (!f2fs_compressed_file(inode)) {
+		inode_unlock_shared(inode);
+		return -ENODATA;
+	}
+
+	option.algorithm = F2FS_I(inode)->i_compress_algorithm;
+	option.log_cluster_size = F2FS_I(inode)->i_log_cluster_size;
+
+	inode_unlock_shared(inode);
+
+	if (copy_to_user((struct f2fs_comp_option __user *)arg, &option,
+				sizeof(option)))
+		return -EFAULT;
+
+	return 0;
+}
+
 long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
 	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4024,6 +4051,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		return f2fs_reserve_compress_blocks(filp, arg);
 	case F2FS_IOC_SEC_TRIM_FILE:
 		return f2fs_sec_trim_file(filp, arg);
+	case F2FS_IOC_GET_COMPRESS_OPTION:
+		return f2fs_ioc_get_compress_option(filp, arg);
 	default:
 		return -ENOTTY;
 	}
@@ -4194,6 +4223,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	case F2FS_IOC_RELEASE_COMPRESS_BLOCKS:
 	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
 	case F2FS_IOC_SEC_TRIM_FILE:
+	case F2FS_IOC_GET_COMPRESS_OPTION:
 		break;
 	default:
 		return -ENOIOCTLCMD;
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
#1 lore raw

PATCH v7 2/2 f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
 fs/f2fs/compress.c |  5 +++++
 fs/f2fs/f2fs.h     |  7 ++++++
 fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
 	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
 }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
 static mempool_t *compress_page_pool;
 static int num_compress_pages = 512;
 module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
 						struct f2fs_sectrim_range)
 #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
 						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
 
 /*
  * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
 int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
 void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
 bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
 int f2fs_init_compress_mempool(void);
 void f2fs_destroy_compress_mempool(void);
 void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
 	/* not support compression */
 	return false;
 }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
 static inline struct page *f2fs_compress_control_page(struct page *page)
 {
 	WARN_ON_ONCE(1);
fs/f2fs/file.c +54 -0

72 lines not on this page · raw message

Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
Reviewed-by on v7 1/2
#10 lore raw
In reply to Daeho Jeong
Quoted 12 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_GET_COMPRESS_OPTION ioctl to get file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

Quoted 5 lines

struct f2fs_comp_option option;

ioctl(fd, F2FS_IOC_GET_COMPRESS_OPTION, &option);

Thanks,

#2 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

In reply to Daeho Jeong

Daeho,

If there is no change, we are used to not resend the patch with updated version.

Thanks,

Quoted 163 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
  	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
  						struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
  						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
 
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
  	/* not support compression */
  	return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
  	WARN_ON_ONCE(1);
fs/f2fs/file.c +54 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
  	return 0;
  }
 
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	struct f2fs_comp_option option;
+	int ret = 0;
+
+	if (!f2fs_sb_has_compression(sbi))
+		return -EOPNOTSUPP;
+
+	if (!(filp->f_mode & FMODE_WRITE))
+		return -EBADF;
+
+	if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+				sizeof(option)))
+		return -EFAULT;
+
+	if (!f2fs_compressed_file(inode) ||
+			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+			option.algorithm >= COMPRESS_MAX)
+		return -EINVAL;
+
+	file_start_write(filp);
+	inode_lock(inode);
+
+	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	if (inode->i_size != 0) {
+		ret = -EFBIG;
+		goto out;
+	}
+
+	F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+	F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+	f2fs_mark_inode_dirty_sync(inode, true);
+
+	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+		f2fs_warn(sbi, "compression algorithm is successfully set, "
+			"but current kernel doesn't support this algorithm.");
+out:
+	inode_unlock(inode);
+	file_end_write(filp);
+
+	return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  		return f2fs_sec_trim_file(filp, arg);
  	case F2FS_IOC_GET_COMPRESS_OPTION:
  		return f2fs_ioc_get_compress_option(filp, arg);
+	case F2FS_IOC_SET_COMPRESS_OPTION:
+		return f2fs_ioc_set_compress_option(filp, arg);
  	default:
  		return -ENOTTY;
  	}
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
  	case F2FS_IOC_SEC_TRIM_FILE:
  	case F2FS_IOC_GET_COMPRESS_OPTION:
+	case F2FS_IOC_SET_COMPRESS_OPTION:
  		break;
  	default:
  		return -ENOIOCTLCMD;
#3 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

Oh, even if those are patchset, then I have to send just changed ones? Got it.

2020년 10월 30일 (금) 오후 3:13, Chao Yu <[email protected]>님이 작성:

Quoted 164 lines

Daeho,

If there is no change, we are used to not resend the patch with updated version.

Thanks,

Quoted 155 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
      return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
                                              struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION        _IOR(F2FS_IOCTL_MAGIC, 21,      \
                                              struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION _IOW(F2FS_IOCTL_MAGIC, 22,      \
+                                             struct f2fs_comp_option)
 
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
      /* not support compression */
      return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
      WARN_ON_ONCE(1);
fs/f2fs/file.c +53 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
      return 0;
  }
 
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+     struct inode *inode = file_inode(filp);
+     struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+     struct f2fs_comp_option option;
+     int ret = 0;
+
+     if (!f2fs_sb_has_compression(sbi))
+             return -EOPNOTSUPP;
+
+     if (!(filp->f_mode & FMODE_WRITE))
+             return -EBADF;
+
+     if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+                             sizeof(option)))
+             return -EFAULT;
+
+     if (!f2fs_compressed_file(inode) ||
+                     option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+                     option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+                     option.algorithm >= COMPRESS_MAX)
+             return -EINVAL;
+
+     file_start_write(filp);
+     inode_lock(inode);
+
+     if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+             ret = -EBUSY;
+             goto out;
+     }
+
+     if (inode->i_size != 0) {
+             ret = -EFBIG;
+             goto out;
+     }
+
+     F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+     F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+     F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+     f2fs_mark_inode_dirty_sync(inode, true);
+
+     if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+             f2fs_warn(sbi, "compression algorithm is successfully set, "
+                     "but current kernel doesn't support this algorithm.");
+out:
+     inode_unlock(inode);
+     file_end_write(filp);
+
+     return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
      if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
              return f2fs_sec_trim_file(filp, arg);
      case F2FS_IOC_GET_COMPRESS_OPTION:
              return f2fs_ioc_get_compress_option(filp, arg);
+     case F2FS_IOC_SET_COMPRESS_OPTION:
+             return f2fs_ioc_set_compress_option(filp, arg);
      default:
              return -ENOTTY;
      }
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
Quoted 8 lines

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 8 lines
fs/f2fs/file.c +1 -0
      case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
      case F2FS_IOC_SEC_TRIM_FILE:
      case F2FS_IOC_GET_COMPRESS_OPTION:
+     case F2FS_IOC_SET_COMPRESS_OPTION:
              break;
      default:
              return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#4 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

Quoted 1 line · Daeho Jeong

Oh, even if those are patchset, then I have to send just changed ones?

There is no strict constraint condition, and I'm okay with both ways, however, I prefer the way just sending changed one because IMO it can help to save review time on those unchanged patches. :P

Thanks,

Quoted 177 lines

Got it.

2020년 10월 30일 (금) 오후 3:13, Chao Yu <[email protected]>님이 작성:

Quoted 164 lines

Daeho,

If there is no change, we are used to not resend the patch with updated version.

Thanks,

Quoted 155 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
   fs/f2fs/compress.c |  5 +++++
   fs/f2fs/f2fs.h     |  7 ++++++
   fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
   3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
       return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
   }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return f2fs_cops[algorithm] != NULL;
+}
+
   static mempool_t *compress_page_pool;
   static int num_compress_pages = 512;
   module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
                                               struct f2fs_sectrim_range)
   #define F2FS_IOC_GET_COMPRESS_OPTION        _IOR(F2FS_IOCTL_MAGIC, 21,      \
                                               struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION _IOW(F2FS_IOCTL_MAGIC, 22,      \
+                                             struct f2fs_comp_option)
 
   /*
    * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
   int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
   void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
   bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
   int f2fs_init_compress_mempool(void);
   void f2fs_destroy_compress_mempool(void);
   void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
       /* not support compression */
       return false;
   }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return false;
+}
   static inline struct page *f2fs_compress_control_page(struct page *page)
   {
       WARN_ON_ONCE(1);
fs/f2fs/file.c +53 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
       return 0;
   }
 
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+     struct inode *inode = file_inode(filp);
+     struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+     struct f2fs_comp_option option;
+     int ret = 0;
+
+     if (!f2fs_sb_has_compression(sbi))
+             return -EOPNOTSUPP;
+
+     if (!(filp->f_mode & FMODE_WRITE))
+             return -EBADF;
+
+     if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+                             sizeof(option)))
+             return -EFAULT;
+
+     if (!f2fs_compressed_file(inode) ||
+                     option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+                     option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+                     option.algorithm >= COMPRESS_MAX)
+             return -EINVAL;
+
+     file_start_write(filp);
+     inode_lock(inode);
+
+     if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+             ret = -EBUSY;
+             goto out;
+     }
+
+     if (inode->i_size != 0) {
+             ret = -EFBIG;
+             goto out;
+     }
+
+     F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+     F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+     F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+     f2fs_mark_inode_dirty_sync(inode, true);
+
+     if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+             f2fs_warn(sbi, "compression algorithm is successfully set, "
+                     "but current kernel doesn't support this algorithm.");
+out:
+     inode_unlock(inode);
+     file_end_write(filp);
+
+     return ret;
+}
+
   long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
   {
       if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
               return f2fs_sec_trim_file(filp, arg);
       case F2FS_IOC_GET_COMPRESS_OPTION:
               return f2fs_ioc_get_compress_option(filp, arg);
+     case F2FS_IOC_SET_COMPRESS_OPTION:
+             return f2fs_ioc_set_compress_option(filp, arg);
       default:
               return -ENOTTY;
       }
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
Quoted 8 lines

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 8 lines
fs/f2fs/file.c +1 -0
       case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
       case F2FS_IOC_SEC_TRIM_FILE:
       case F2FS_IOC_GET_COMPRESS_OPTION:
+     case F2FS_IOC_SET_COMPRESS_OPTION:
               break;
       default:
               return -ENOIOCTLCMD;

.

#5 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

In reply to Daeho Jeong

Jaegeuk, not sure, is it too late to merge this cleanup into original patch?

From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Thu, 3 Dec 2020 10:04:26 +0800
Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup

No logic changes.

---
 fs/f2fs/compress.c | 5 -----
 fs/f2fs/f2fs.h     | 5 -----
 fs/f2fs/file.c     | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)
fs/f2fs/compress.c +0 -5
index dfadbc78946c..869b047a4801 100644
@@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
 	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
 }
 
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return f2fs_cops[algorithm] != NULL;
-}
-
 static mempool_t *compress_page_pool;
 static int num_compress_pages = 512;
 module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +0 -5
index b70c8d553439..17b45c2d2b04 100644
@@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
 int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
 void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
 bool f2fs_is_compress_backend_ready(struct inode *inode);
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
 int f2fs_init_compress_mempool(void);
 void f2fs_destroy_compress_mempool(void);
 void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity);
@@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
 	/* not support compression */
 	return false;
 }
-static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return false;
-}
 static inline struct page *f2fs_compress_control_page(struct page *page)
 {
 	WARN_ON_ONCE(1);
fs/f2fs/file.c +1 -1
index 300355fe25f0..0453b441228d 100644
@@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
 	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
 	f2fs_mark_inode_dirty_sync(inode, true);
 
-	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+	if (!f2fs_is_compress_backend_ready(inode))
 		f2fs_warn(sbi, "compression algorithm is successfully set, "
 			"but current kernel doesn't support this algorithm.");
 out:
Signature · 1 line
2.26.2
Quoted 156 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
  	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
  						struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
  						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
 
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
  	/* not support compression */
  	return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
  	WARN_ON_ONCE(1);
fs/f2fs/file.c +53 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
  	return 0;
  }
 
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	struct f2fs_comp_option option;
+	int ret = 0;
+
+	if (!f2fs_sb_has_compression(sbi))
+		return -EOPNOTSUPP;
+
+	if (!(filp->f_mode & FMODE_WRITE))
+		return -EBADF;
+
+	if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+				sizeof(option)))
+		return -EFAULT;
+
+	if (!f2fs_compressed_file(inode) ||
+			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+			option.algorithm >= COMPRESS_MAX)
+		return -EINVAL;
+
+	file_start_write(filp);
+	inode_lock(inode);
+
+	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	if (inode->i_size != 0) {
+		ret = -EFBIG;
+		goto out;
+	}
+
+	F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+	F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+	f2fs_mark_inode_dirty_sync(inode, true);
+
+	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+		f2fs_warn(sbi, "compression algorithm is successfully set, "
+			"but current kernel doesn't support this algorithm.");
+out:
+	inode_unlock(inode);
+	file_end_write(filp);
+
+	return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  		return f2fs_sec_trim_file(filp, arg);
  	case F2FS_IOC_GET_COMPRESS_OPTION:
  		return f2fs_ioc_get_compress_option(filp, arg);
+	case F2FS_IOC_SET_COMPRESS_OPTION:
+		return f2fs_ioc_set_compress_option(filp, arg);
  	default:
  		return -ENOTTY;
  	}

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 7 lines
fs/f2fs/file.c +1 -0
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
  	case F2FS_IOC_SEC_TRIM_FILE:
  	case F2FS_IOC_GET_COMPRESS_OPTION:
+	case F2FS_IOC_SET_COMPRESS_OPTION:
  		break;
  	default:
  		return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#6 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

Oh, by the control logic changed in the previous patch, we don't need to use f2fs_is_compress_algorithm_valid() anymore.
Looks good~

2020년 12월 3일 (목) 오전 11:49, Chao Yu <[email protected]>님이 작성:

Quoted 232 lines

Jaegeuk, not sure, is it too late to merge this cleanup into original patch?

From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Thu, 3 Dec 2020 10:04:26 +0800
Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup

No logic changes.

---
  fs/f2fs/compress.c | 5 -----
  fs/f2fs/f2fs.h     | 5 -----
  fs/f2fs/file.c     | 2 +-
  3 files changed, 1 insertion(+), 11 deletions(-)
fs/f2fs/compress.c +0 -5
index dfadbc78946c..869b047a4801 100644
@@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
        return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-       return f2fs_cops[algorithm] != NULL;
-}
-
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +0 -5
index b70c8d553439..17b45c2d2b04 100644
@@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity);
@@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
        /* not support compression */
        return false;
  }
-static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-       return false;
-}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
        WARN_ON_ONCE(1);
fs/f2fs/file.c +1 -2
index 300355fe25f0..0453b441228d 100644
@@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
        F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
        f2fs_mark_inode_dirty_sync(inode, true);
 
-       if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+       if (!f2fs_is_compress_backend_ready(inode))
                f2fs_warn(sbi, "compression algorithm is successfully set, "
                        "but current kernel doesn't support this algorithm.");
  out:
--

2.26.2

Quoted 155 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
      return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
                                              struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION        _IOR(F2FS_IOCTL_MAGIC, 21,      \
                                              struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION _IOW(F2FS_IOCTL_MAGIC, 22,      \
+                                             struct f2fs_comp_option)
 
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
      /* not support compression */
      return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+     return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
      WARN_ON_ONCE(1);
fs/f2fs/file.c +53 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
      return 0;
  }
 
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+     struct inode *inode = file_inode(filp);
+     struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+     struct f2fs_comp_option option;
+     int ret = 0;
+
+     if (!f2fs_sb_has_compression(sbi))
+             return -EOPNOTSUPP;
+
+     if (!(filp->f_mode & FMODE_WRITE))
+             return -EBADF;
+
+     if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+                             sizeof(option)))
+             return -EFAULT;
+
+     if (!f2fs_compressed_file(inode) ||
+                     option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+                     option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+                     option.algorithm >= COMPRESS_MAX)
+             return -EINVAL;
+
+     file_start_write(filp);
+     inode_lock(inode);
+
+     if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+             ret = -EBUSY;
+             goto out;
+     }
+
+     if (inode->i_size != 0) {
+             ret = -EFBIG;
+             goto out;
+     }
+
+     F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+     F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+     F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+     f2fs_mark_inode_dirty_sync(inode, true);
+
+     if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+             f2fs_warn(sbi, "compression algorithm is successfully set, "
+                     "but current kernel doesn't support this algorithm.");
+out:
+     inode_unlock(inode);
+     file_end_write(filp);
+
+     return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
      if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
              return f2fs_sec_trim_file(filp, arg);
      case F2FS_IOC_GET_COMPRESS_OPTION:
              return f2fs_ioc_get_compress_option(filp, arg);
+     case F2FS_IOC_SET_COMPRESS_OPTION:
+             return f2fs_ioc_set_compress_option(filp, arg);
      default:
              return -ENOTTY;
      }
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
Quoted 8 lines

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 8 lines
fs/f2fs/file.c +1 -0
      case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
      case F2FS_IOC_SEC_TRIM_FILE:
      case F2FS_IOC_GET_COMPRESS_OPTION:
+     case F2FS_IOC_SET_COMPRESS_OPTION:
              break;
      default:
              return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#7 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

In reply to Chao Yu
Quoted 1 line · Chao Yu

Jaegeuk, not sure, is it too late to merge this cleanup into original patch?

Let me merge this on top of tree. Thanks. :)

Quoted 235 lines

From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Thu, 3 Dec 2020 10:04:26 +0800
Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup

No logic changes.

---
 fs/f2fs/compress.c | 5 -----
 fs/f2fs/f2fs.h     | 5 -----
 fs/f2fs/file.c     | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)
fs/f2fs/compress.c +0 -5
index dfadbc78946c..869b047a4801 100644
@@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
 	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
 }
 
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return f2fs_cops[algorithm] != NULL;
-}
-
 static mempool_t *compress_page_pool;
 static int num_compress_pages = 512;
 module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +0 -5
index b70c8d553439..17b45c2d2b04 100644
@@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
 int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
 void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
 bool f2fs_is_compress_backend_ready(struct inode *inode);
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
 int f2fs_init_compress_mempool(void);
 void f2fs_destroy_compress_mempool(void);
 void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity);
@@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
 	/* not support compression */
 	return false;
 }
-static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return false;
-}
 static inline struct page *f2fs_compress_control_page(struct page *page)
 {
 	WARN_ON_ONCE(1);
fs/f2fs/file.c +1 -1
index 300355fe25f0..0453b441228d 100644
@@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
 	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
 	f2fs_mark_inode_dirty_sync(inode, true);
 
-	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+	if (!f2fs_is_compress_backend_ready(inode))
 		f2fs_warn(sbi, "compression algorithm is successfully set, "
 			"but current kernel doesn't support this algorithm.");
 out:
Signature · 1 line
2.26.2
Quoted 153 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
  	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
  						struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
  						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
  	/* not support compression */
  	return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
  	WARN_ON_ONCE(1);
fs/f2fs/file.c +53 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
  	return 0;
  }
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	struct f2fs_comp_option option;
+	int ret = 0;
+
+	if (!f2fs_sb_has_compression(sbi))
+		return -EOPNOTSUPP;
+
+	if (!(filp->f_mode & FMODE_WRITE))
+		return -EBADF;
+
+	if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+				sizeof(option)))
+		return -EFAULT;
+
+	if (!f2fs_compressed_file(inode) ||
+			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+			option.algorithm >= COMPRESS_MAX)
+		return -EINVAL;
+
+	file_start_write(filp);
+	inode_lock(inode);
+
+	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	if (inode->i_size != 0) {
+		ret = -EFBIG;
+		goto out;
+	}
+
+	F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+	F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+	f2fs_mark_inode_dirty_sync(inode, true);
+
+	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+		f2fs_warn(sbi, "compression algorithm is successfully set, "
+			"but current kernel doesn't support this algorithm.");
+out:
+	inode_unlock(inode);
+	file_end_write(filp);
+
+	return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  		return f2fs_sec_trim_file(filp, arg);
  	case F2FS_IOC_GET_COMPRESS_OPTION:
  		return f2fs_ioc_get_compress_option(filp, arg);
+	case F2FS_IOC_SET_COMPRESS_OPTION:
+		return f2fs_ioc_set_compress_option(filp, arg);
  	default:
  		return -ENOTTY;
  	}

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 7 lines
fs/f2fs/file.c +1 -0
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
  	case F2FS_IOC_SEC_TRIM_FILE:
  	case F2FS_IOC_GET_COMPRESS_OPTION:
+	case F2FS_IOC_SET_COMPRESS_OPTION:
  		break;
  	default:
  		return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#8 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

Quoted 4 lines · Jaegeuk Kim
Quoted 1 line · Chao Yu

Jaegeuk, not sure, is it too late to merge this cleanup into original patch?

Let me merge this on top of tree. Thanks. :)

I integrated this into the original patch since I had to revise this commit. :( ("f2fs: avoid race condition for shinker count")

Quoted 234 lines
Quoted 234 lines

From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Thu, 3 Dec 2020 10:04:26 +0800
Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup

No logic changes.

---
 fs/f2fs/compress.c | 5 -----
 fs/f2fs/f2fs.h     | 5 -----
 fs/f2fs/file.c     | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)
fs/f2fs/compress.c +0 -5
index dfadbc78946c..869b047a4801 100644
@@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
 	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
 }
 
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return f2fs_cops[algorithm] != NULL;
-}
-
 static mempool_t *compress_page_pool;
 static int num_compress_pages = 512;
 module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +0 -5
index b70c8d553439..17b45c2d2b04 100644
@@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
 int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
 void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
 bool f2fs_is_compress_backend_ready(struct inode *inode);
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
 int f2fs_init_compress_mempool(void);
 void f2fs_destroy_compress_mempool(void);
 void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity);
@@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
 	/* not support compression */
 	return false;
 }
-static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return false;
-}
 static inline struct page *f2fs_compress_control_page(struct page *page)
 {
 	WARN_ON_ONCE(1);
fs/f2fs/file.c +1 -1
index 300355fe25f0..0453b441228d 100644
@@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
 	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
 	f2fs_mark_inode_dirty_sync(inode, true);
 
-	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+	if (!f2fs_is_compress_backend_ready(inode))
 		f2fs_warn(sbi, "compression algorithm is successfully set, "
 			"but current kernel doesn't support this algorithm.");
 out:
Signature · 1 line
2.26.2
Quoted 158 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
  fs/f2fs/compress.c |  5 +++++
  fs/f2fs/f2fs.h     |  7 ++++++
  fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
  	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
  						struct f2fs_sectrim_range)
  #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
  						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
  /*
   * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
  	/* not support compression */
  	return false;
  }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
  	WARN_ON_ONCE(1);
fs/f2fs/file.c +54 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
  	return 0;
  }
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	struct f2fs_comp_option option;
+	int ret = 0;
+
+	if (!f2fs_sb_has_compression(sbi))
+		return -EOPNOTSUPP;
+
+	if (!(filp->f_mode & FMODE_WRITE))
+		return -EBADF;
+
+	if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+				sizeof(option)))
+		return -EFAULT;
+
+	if (!f2fs_compressed_file(inode) ||
+			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+			option.algorithm >= COMPRESS_MAX)
+		return -EINVAL;
+
+	file_start_write(filp);
+	inode_lock(inode);
+
+	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	if (inode->i_size != 0) {
+		ret = -EFBIG;
+		goto out;
+	}
+
+	F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+	F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+	f2fs_mark_inode_dirty_sync(inode, true);
+
+	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+		f2fs_warn(sbi, "compression algorithm is successfully set, "
+			"but current kernel doesn't support this algorithm.");
+out:
+	inode_unlock(inode);
+	file_end_write(filp);
+
+	return ret;
+}
+
  long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  		return f2fs_sec_trim_file(filp, arg);
  	case F2FS_IOC_GET_COMPRESS_OPTION:
  		return f2fs_ioc_get_compress_option(filp, arg);
+	case F2FS_IOC_SET_COMPRESS_OPTION:
+		return f2fs_ioc_set_compress_option(filp, arg);
  	default:
  		return -ENOTTY;
  	}
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
  	case F2FS_IOC_SEC_TRIM_FILE:
  	case F2FS_IOC_GET_COMPRESS_OPTION:
+	case F2FS_IOC_SET_COMPRESS_OPTION:
  		break;
  	default:
Quoted 8 lines
Quoted 2 lines

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 2 lines
fs/f2fs/file.c +0 -0
  		return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#9 lore raw

Re: [f2fs-dev] [PATCH v7 2/2] f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl

Quoted 8 lines · Jaegeuk Kim
Quoted 4 lines · Jaegeuk Kim
Quoted 1 line · Chao Yu

Jaegeuk, not sure, is it too late to merge this cleanup into original patch?

Let me merge this on top of tree. Thanks. :)

I integrated this into the original patch since I had to revise this commit. :( ("f2fs: avoid race condition for shinker count")

It's fine to me. :)

Thanks,

Quoted 245 lines
Quoted 235 lines
Quoted 235 lines

From a5c63ec58e0cda6eb5d186b46942eea46422b7a9 Mon Sep 17 00:00:00 2001
From: Chao Yu <[email protected]>
Date: Thu, 3 Dec 2020 10:04:26 +0800
Subject: [PATCH] f2fs: remove f2fs_is_compress_algorithm_valid() for cleanup

No logic changes.

---
  fs/f2fs/compress.c | 5 -----
  fs/f2fs/f2fs.h     | 5 -----
  fs/f2fs/file.c     | 2 +-
  3 files changed, 1 insertion(+), 11 deletions(-)
fs/f2fs/compress.c +0 -5
index dfadbc78946c..869b047a4801 100644
@@ -574,11 +574,6 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
  	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
  }
 
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return f2fs_cops[algorithm] != NULL;
-}
-
  static mempool_t *compress_page_pool;
  static int num_compress_pages = 512;
  module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +0 -5
index b70c8d553439..17b45c2d2b04 100644
@@ -3882,7 +3882,6 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
  int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
  void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
  bool f2fs_is_compress_backend_ready(struct inode *inode);
-bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
  int f2fs_init_compress_mempool(void);
  void f2fs_destroy_compress_mempool(void);
  void f2fs_do_decompress_pages(struct decompress_io_ctx *dic, bool verity);
@@ -3927,10 +3926,6 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
  	/* not support compression */
  	return false;
  }
-static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
-{
-	return false;
-}
  static inline struct page *f2fs_compress_control_page(struct page *page)
  {
  	WARN_ON_ONCE(1);
fs/f2fs/file.c +1 -1
index 300355fe25f0..0453b441228d 100644
@@ -4016,7 +4016,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
  	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
  	f2fs_mark_inode_dirty_sync(inode, true);
 
-	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+	if (!f2fs_is_compress_backend_ready(inode))
  		f2fs_warn(sbi, "compression algorithm is successfully set, "
  			"but current kernel doesn't support this algorithm.");
  out:
Signature · 1 line
2.26.2
Quoted 158 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Added a new F2FS_IOC_SET_COMPRESS_OPTION ioctl to change file compression option of a file.

struct f2fs_comp_option {
u8 algorithm; => compression algorithm
=> 0:lzo, 1:lz4, 2:zstd, 3:lzorle
u8 log_cluster_size; => log scale cluster size
=> 2 ~ 8
};

struct f2fs_comp_option option;

option.algorithm = 1;
option.log_cluster_size = 7;

ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);

---

v6: changed the function name of checking compression algorithm validity.
v5: allowed to set algorithm which is not currently enabled by kernel.
v4: changed commit message.
v3: changed the error number more specific.
folded in fix for build breakage reported by kernel test robot <[email protected]> and Dan Carpenter <[email protected]>.
v2: added ioctl description.

---
   fs/f2fs/compress.c |  5 +++++
   fs/f2fs/f2fs.h     |  7 ++++++
   fs/f2fs/file.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++
   3 files changed, 66 insertions(+)
fs/f2fs/compress.c +5 -0
index 7895186cc765..b0144670d320 100644
@@ -514,6 +514,11 @@ bool f2fs_is_compress_backend_ready(struct inode *inode)
   	return f2fs_cops[F2FS_I(inode)->i_compress_algorithm];
   }
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return f2fs_cops[algorithm] != NULL;
+}
+
   static mempool_t *compress_page_pool;
   static int num_compress_pages = 512;
   module_param(num_compress_pages, uint, 0444);
fs/f2fs/f2fs.h +7 -0
index a33c90cf979b..70a8a2196888 100644
@@ -435,6 +435,8 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal,
   						struct f2fs_sectrim_range)
   #define F2FS_IOC_GET_COMPRESS_OPTION	_IOR(F2FS_IOCTL_MAGIC, 21,	\
   						struct f2fs_comp_option)
+#define F2FS_IOC_SET_COMPRESS_OPTION	_IOW(F2FS_IOCTL_MAGIC, 22,	\
+						struct f2fs_comp_option)
   /*
    * should be same as XFS_IOC_GOINGDOWN.
@@ -3915,6 +3917,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
   int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock);
   void f2fs_compress_write_end_io(struct bio *bio, struct page *page);
   bool f2fs_is_compress_backend_ready(struct inode *inode);
+bool f2fs_is_compress_algorithm_valid(unsigned char algorithm);
   int f2fs_init_compress_mempool(void);
   void f2fs_destroy_compress_mempool(void);
   void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity);
@@ -3945,6 +3948,10 @@ static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
   	/* not support compression */
   	return false;
   }
+static inline bool f2fs_is_compress_algorithm_valid(unsigned char algorithm)
+{
+	return false;
+}
   static inline struct page *f2fs_compress_control_page(struct page *page)
   {
   	WARN_ON_ONCE(1);
fs/f2fs/file.c +54 -0
index bd52df84219d..be56702e4939 100644
@@ -3963,6 +3963,57 @@ static int f2fs_ioc_get_compress_option(struct file *filp, unsigned long arg)
   	return 0;
   }
+static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
+{
+	struct inode *inode = file_inode(filp);
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+	struct f2fs_comp_option option;
+	int ret = 0;
+
+	if (!f2fs_sb_has_compression(sbi))
+		return -EOPNOTSUPP;
+
+	if (!(filp->f_mode & FMODE_WRITE))
+		return -EBADF;
+
+	if (copy_from_user(&option, (struct f2fs_comp_option __user *)arg,
+				sizeof(option)))
+		return -EFAULT;
+
+	if (!f2fs_compressed_file(inode) ||
+			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+			option.algorithm >= COMPRESS_MAX)
+		return -EINVAL;
+
+	file_start_write(filp);
+	inode_lock(inode);
+
+	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	if (inode->i_size != 0) {
+		ret = -EFBIG;
+		goto out;
+	}
+
+	F2FS_I(inode)->i_compress_algorithm = option.algorithm;
+	F2FS_I(inode)->i_log_cluster_size = option.log_cluster_size;
+	F2FS_I(inode)->i_cluster_size = 1 << option.log_cluster_size;
+	f2fs_mark_inode_dirty_sync(inode, true);
+
+	if (!f2fs_is_compress_algorithm_valid(option.algorithm))
+		f2fs_warn(sbi, "compression algorithm is successfully set, "
+			"but current kernel doesn't support this algorithm.");
+out:
+	inode_unlock(inode);
+	file_end_write(filp);
+
+	return ret;
+}
+
   long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
   {
   	if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
@@ -4053,6 +4104,8 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
   		return f2fs_sec_trim_file(filp, arg);
   	case F2FS_IOC_GET_COMPRESS_OPTION:
   		return f2fs_ioc_get_compress_option(filp, arg);
+	case F2FS_IOC_SET_COMPRESS_OPTION:
+		return f2fs_ioc_set_compress_option(filp, arg);
   	default:
   		return -ENOTTY;
   	}
@@ -4224,6 +4277,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
   	case F2FS_IOC_RESERVE_COMPRESS_BLOCKS:
   	case F2FS_IOC_SEC_TRIM_FILE:
   	case F2FS_IOC_GET_COMPRESS_OPTION:
+	case F2FS_IOC_SET_COMPRESS_OPTION:
   		break;
   	default:
Quoted 8 lines
Quoted 2 lines

fs/f2fs/file.c long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · line 4283

Quoted 2 lines
fs/f2fs/file.c +0 -0
   		return -ENOIOCTLCMD;

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

.