libf2fs_io: Add user-space cache
PATCH 1/2 libf2fs_io: Add user-space cache
From: Robin Hsu <[email protected]>
Implemented cache options in F2FS configuration 'c' (i.e. user options):
* use c.cache_config.num_cache_entry to set the number of cache entries (in block), minimum 1024, or 0 to disable cache.
* use c.cache_config.max_hash_collision to set maximum hash collision (max 16).
* use c.cavhe_config.dbg_en to enable printing of debug messages.
Cache properties:
* Per block save based (block size = f2fs block size = 4K Bytes)
* Device block indices are used to hash (simple modular hash function) to cache indices.
* A hash collision (when a block is hashed to an already occupied cache block) will trigger offset-based relocation to max 16 other places, at first empty slot found policy.
* A hash collision with all 17 possible relocating places occupied will evict the oldest used one (replaced by the new read block). A global 'use' tick is kept ticking-up per block read for this purpose.
* On write cache hit, it will update the corresponding cached block.
* On write cache miss, the data won't be cached.
* Write-through policy only: never delayed write.
* On read cache hit, it returns the cached block.
* On read cache miss, it issues an I/O read to the kernel, and then caches and returns the block.
* Currently read ahead is not implemented. Yet, the read ahead logic is kept as before, i.e. using kernel's read ahead mechanism.
--- include/f2fs_fs.h | 18 +++ lib/libf2fs_io.c | 331 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 348 insertions(+), 1 deletion(-)
include/f2fs_fs.h +18 -0
@@ -3,6 +3,8 @@* * Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ +* Copyright (c) 2019 Google Inc. +* http://www.google.com/ * * Dual licensed under the GPL or LGPL version 2 licenses. *
@@ -329,6 +331,16 @@ struct device_info {size_t zone_blocks; }; +typedef struct { +/* Value 0 means no cache, minimum 1024 */ +long num_cache_entry; + +/* Value 0 means always overwrite (no collision allowed). maximum 16 */ +unsigned max_hash_collision; + +bool dbg_en; +}dev_cache_config_t ; +struct f2fs_configuration {u_int32_t reserved_segments;u_int32_t new_reserved_segments;
@@ -419,6 +431,9 @@ struct f2fs_configuration {/* precomputed fs UUID checksum for seeding other checksums */ u_int32_t chksum_seed; + +/* cache parameters */ +dev_cache_config_t cache_config; };#ifdef CONFIG_64BIT
@@ -1185,6 +1200,9 @@ extern int f2fs_init_sparse_file(void);extern int f2fs_finalize_device (void );extern int f2fs_fsync_device (void ); +extern void dcache_init (void ); +extern void dcache_release (void ); +extern int dev_read (void *,__u64 ,size_t );#ifdef POSIX_FADV_WILLNEED extern int dev_readahead (__u64 ,size_t );
lib/libf2fs_io.c +330 -1
367 lines not on this page · raw message
Signature · 8 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 2/2 fsck.f2fs: Enable user-space cache
From: Robin Hsu <[email protected]>
Added command line options -c <num_cache_entry> and -m <max_hash_collision> to activate cache for fsck. It may significantly speed up fsck.
--- fsck/main.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
fsck/main.c +25 -2
@@ -10,6 +10,9 @@* Liu Shuoran <[email protected]> * Jaegeuk Kim <[email protected]> * : add sload.f2fs +* Copyright (c) 2019 Google Inc. +* Robin Hsu <[email protected]> +* : add cache layer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -20,6 +23,7 @@#include <ctype.h> #include <time.h> #include <getopt.h> +#include <stdbool.h> #include "quotaio.h" struct f2fs_fsck gfsck;
@@ -54,7 +58,12 @@ void fsck_usage()MSG (0 ,"\nUsage: fsck.f2fs [options] device\n" );MSG (0 ,"[options]:\n" );MSG (0 ," -a check/fix potential corruption, reported by f2fs\n" ); -MSG (0 ," -C encoding[:flag1,flag2] Set options for enabling casefolding\n" ); +MSG (0 ," -c <num-cache-entry> set number of cache entries" +" (default 0)\n" ); +MSG (0 ," -m <max-hash-collision> set max cache hash collision" +" (default 16)\n" ); +MSG (0 ," -C encoding[:flag1,flag2] Set options for enabling" +" casefolding\n" );MSG (0 ," -d debug level [default:0]\n" );MSG (0 ," -f check/fix entire partition\n" );MSG (0 ," -g add default options\n" );
@@ -66,6 +75,7 @@ void fsck_usage()MSG (0 ," -y fix all the time\n" );MSG (0 ," -V print the version number and exit\n" );MSG (0 ," --dry-run do not really fix corruptions\n" ); +MSG (0 ," --debug-cache to debug cache when -c is used\n" );exit (1 ); }
@@ -187,15 +197,18 @@ void f2fs_parse_options(int argc, char *argv[]) }if (!strcmp ("fsck.f2fs" , prog)) { -const char *option_string =":aC:d:fg:O:p:q:StyV" ; +const char *option_string =":aC:c:m:d:fg:O:p:q:StyV" ;int opt =0 , val;char *token;struct option long_opt[] = { {"dry-run" , no_argument,0 ,1 }, + {"debug-cache" , no_argument,0 ,2 }, {0 ,0 ,0 ,0 } }; c.func =FSCK ; + c.cache_config.max_hash_collision =16 ; + c.cache_config.dbg_en = false;while ((option =getopt_long (argc, argv, option_string, long_opt, &opt)) !=EOF ) {switch (option) {
@@ -203,10 +216,20 @@ void f2fs_parse_options(int argc, char *argv[]) c.dry_run =1 ;MSG (0 ,"Info: Dry run\n" );break ; +case 2 : + c.cache_config.dbg_en = true; +break ;case 'a' : c.auto_fix =1 ;MSG (0 ,"Info: Fix the reported corruption.\n" );break ; +case 'c' : + c.cache_config.num_cache_entry =atoi (optarg); +break ; +case 'm' : + c.cache_config.max_hash_collision = +atoi (optarg); +break ;case 'g' :if (!strcmp (optarg,"android" )) c.defset =CONF_ANDROID ;
Signature · 8 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel