Commit 42612e77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs updates from Jaegeuk Kim:
 "In this round, we've added some knobs to enhance compression feature
  and harden testing environment. In addition, we've fixed several bugs
  reported from Android devices such as long discarding latency, device
  hanging during quota_sync, etc.

  Enhancements:
   - support lzo-rle algorithm
   - add two ioctls to release and reserve blocks for compression
   - support partial truncation/fiemap on compressed file
   - introduce sysfs entries to attach IO flags explicitly
   - add iostat trace point along with read io stat

  Bug fixes:
   - fix long discard latency
   - flush quota data by f2fs_quota_sync correctly
   - fix to recover parent inode number for power-cut recovery
   - fix lz4/zstd output buffer budget
   - parse checkpoint mount option correctly
   - avoid inifinite loop to wait for flushing node/meta pages
   - manage discard space correctly

  And some refactoring and clean up patches were added"

* tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (51 commits)
  f2fs: attach IO flags to the missing cases
  f2fs: add node_io_flag for bio flags likewise data_io_flag
  f2fs: remove unused parameter of f2fs_put_rpages_mapping()
  f2fs: handle readonly filesystem in f2fs_ioc_shutdown()
  f2fs: avoid utf8_strncasecmp() with unstable name
  f2fs: don't return vmalloc() memory from f2fs_kmalloc()
  f2fs: fix retry logic in f2fs_write_cache_pages()
  f2fs: fix wrong discard space
  f2fs: compress: don't compress any datas after cp stop
  f2fs: remove unneeded return value of __insert_discard_tree()
  f2fs: fix wrong value of tracepoint parameter
  f2fs: protect new segment allocation in expand_inode_data
  f2fs: code cleanup by removing ifdef macro surrounding
  f2fs: avoid inifinite loop to wait for flushing node pages at cp_error
  f2fs: flush dirty meta pages when flushing them
  f2fs: fix checkpoint=disable:%u%%
  f2fs: compress: fix zstd data corruption
  f2fs: add compressed/gc data read IO stat
  f2fs: fix potential use-after-free issue
  f2fs: compress: don't handle non-compressed data in workqueue
  ...
parents ad57a102 b7b911d5

Documentation/ABI/testing/sysfs-fs-f2fs

+24 −0
Original line number Diff line number Diff line
@@ -323,3 +323,27 @@ What: /sys/fs/f2fs/<disk>/mounted_time_sec 
Date:		February 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Show the mounted time in secs of this partition.



What:		/sys/fs/f2fs/<disk>/data_io_flag

Date:		April 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Give a way to attach REQ_META|FUA to data writes

		given temperature-based bits. Now the bits indicate:

		*      REQ_META     |      REQ_FUA      |

		*    5 |    4 |   3 |    2 |    1 |   0 |

		* Cold | Warm | Hot | Cold | Warm | Hot |



What:		/sys/fs/f2fs/<disk>/node_io_flag

Date:		June 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Give a way to attach REQ_META|FUA to node writes

		given temperature-based bits. Now the bits indicate:

		*      REQ_META     |      REQ_FUA      |

		*    5 |    4 |   3 |    2 |    1 |   0 |

		* Cold | Warm | Hot | Cold | Warm | Hot |



What:		/sys/fs/f2fs/<disk>/iostat_period_ms

Date:		April 2020

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Give a way to change iostat_period time. 3secs by default.

		The new iostat trace gives stats gap given the period.

Documentation/filesystems/f2fs.rst

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ checkpoint=%s[:%u[%]] Set to "disable" to turn off checkpointing. Set to "enabl 
                       would be unusable can be viewed at /sys/fs/f2fs/<disk>/unusable

                       This space is reclaimed once checkpoint=enable.

compress_algorithm=%s  Control compress algorithm, currently f2fs supports "lzo",

                       "lz4" and "zstd" algorithm.

                       "lz4", "zstd" and "lzo-rle" algorithm.

compress_log_size=%u   Support configuring compress cluster size, the size will

                       be 4KB * (1 << %u), 16KB is minimum size, also it's

                       default size.

fs/f2fs/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -127,3 +127,13 @@ config F2FS_FS_ZSTD 
	default y

	help

	  Support ZSTD compress algorithm, if unsure, say Y.



config F2FS_FS_LZORLE

	bool "LZO-RLE compression support"

	depends on F2FS_FS_COMPRESSION

	depends on F2FS_FS_LZO

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	default y

	help

	  Support LZO-RLE compress algorithm, if unsure, say Y.

fs/f2fs/acl.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * fs/f2fs/acl.h

 *

fs/f2fs/checkpoint.c

+24 −13
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ repeat: 
		return ERR_PTR(err);

	}



	f2fs_update_iostat(sbi, FS_META_READ_IO, F2FS_BLKSIZE);



	lock_page(page);

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);
@@ -220,6 +222,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		.is_por = (type == META_POR),

	};

	struct blk_plug plug;

	int err;



	if (unlikely(type == META_POR))

		fio.op_flags &= ~REQ_META;
@@ -263,8 +266,11 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		}



		fio.page = page;

		f2fs_submit_page_bio(&fio);

		f2fs_put_page(page, 0);

		err = f2fs_submit_page_bio(&fio);

		f2fs_put_page(page, err ? 1 : 0);



		if (!err)

			f2fs_update_iostat(sbi, FS_META_READ_IO, F2FS_BLKSIZE);

	}

out:

	blk_finish_plug(&plug);
@@ -889,7 +895,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	int i;

	int err;



	sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks),

	sbi->ckpt = f2fs_kvzalloc(sbi, array_size(blk_size, cp_blks),

				  GFP_KERNEL);

	if (!sbi->ckpt)

		return -ENOMEM;
@@ -1160,10 +1166,12 @@ static int block_operations(struct f2fs_sb_info *sbi) 
		.nr_to_write = LONG_MAX,

		.for_reclaim = 0,

	};

	struct blk_plug plug;

	int err = 0, cnt = 0;



	blk_start_plug(&plug);

	/*

	 * Let's flush inline_data in dirty node pages.

	 */

	f2fs_flush_inline_data(sbi);



retry_flush_quotas:

	f2fs_lock_all(sbi);
@@ -1192,7 +1200,7 @@ retry_flush_dents: 
		f2fs_unlock_all(sbi);

		err = f2fs_sync_dirty_inodes(sbi, DIR_INODE);

		if (err)

			goto out;

			return err;

		cond_resched();

		goto retry_flush_quotas;

	}
@@ -1208,7 +1216,7 @@ retry_flush_dents: 
		f2fs_unlock_all(sbi);

		err = f2fs_sync_inode_meta(sbi);

		if (err)

			goto out;

			return err;

		cond_resched();

		goto retry_flush_quotas;

	}
@@ -1224,7 +1232,7 @@ retry_flush_nodes: 
		if (err) {

			up_write(&sbi->node_change);

			f2fs_unlock_all(sbi);

			goto out;

			return err;

		}

		cond_resched();

		goto retry_flush_nodes;
@@ -1236,8 +1244,6 @@ retry_flush_nodes: 
	 */

	__prepare_cp_block(sbi);

	up_write(&sbi->node_change);

out:

	blk_finish_plug(&plug);

	return err;

}
@@ -1260,6 +1266,9 @@ void f2fs_wait_on_all_pages(struct f2fs_sb_info *sbi, int type) 
		if (unlikely(f2fs_cp_error(sbi)))

			break;



		if (type == F2FS_DIRTY_META)

			f2fs_sync_meta_pages(sbi, META, LONG_MAX,

							FS_CP_META_IO);

		io_schedule_timeout(DEFAULT_IO_TIMEOUT);

	}

	finish_wait(&sbi->cp_wait, &wait);
@@ -1553,6 +1562,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
			return 0;

		f2fs_warn(sbi, "Start checkpoint disabled!");

	}

	if (cpc->reason != CP_RESIZE)

		mutex_lock(&sbi->cp_mutex);



	if (!is_sbi_flag_set(sbi, SBI_IS_DIRTY) &&
@@ -1622,6 +1632,7 @@ stop: 
	f2fs_update_time(sbi, CP_TIME);

	trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish checkpoint");

out:

	if (cpc->reason != CP_RESIZE)

		mutex_unlock(&sbi->cp_mutex);

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE