From 3ea439dfe92e7917153f97ceeadb486583906252 Mon Sep 17 00:00:00 2001
From: Wenhao Ren <wenhaoren@mail.dlut.edu.cn>
Date: Tue, 24 Oct 2023 22:17:09 +0800
Subject: [PATCH] nydusd: add the config support of `amplify_io` Add the
 support of `amplify_io` in the config file of nydusd to configure read
 amplification.

Signed-off-by: Wenhao Ren <wenhaoren@mail.dlut.edu.cn>
---
 storage/src/cache/filecache/mod.rs |  8 ++++++--
 storage/src/cache/fscache/mod.rs   |  8 ++++++--
 storage/src/factory.rs             | 13 ++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/storage/src/cache/filecache/mod.rs b/storage/src/cache/filecache/mod.rs
index 2b158ca09b1..6e7b4bfd7a8 100644
--- a/storage/src/cache/filecache/mod.rs
+++ b/storage/src/cache/filecache/mod.rs
@@ -23,7 +23,6 @@ use crate::cache::state::{
 use crate::cache::worker::{AsyncPrefetchConfig, AsyncWorkerMgr};
 use crate::cache::{BlobCache, BlobCacheMgr};
 use crate::device::{BlobFeatures, BlobInfo};
-use crate::RAFS_DEFAULT_CHUNK_SIZE;
 
 pub const BLOB_RAW_FILE_SUFFIX: &str = ".blob.raw";
 pub const BLOB_DATA_FILE_SUFFIX: &str = ".blob.data";
@@ -46,6 +45,7 @@ pub struct FileCacheMgr {
     cache_convergent_encryption: bool,
     cache_encryption_key: String,
     closed: Arc<AtomicBool>,
+    ondemand_batch_size: Option<u64>,
 }
 
 impl FileCacheMgr {
@@ -55,6 +55,7 @@ impl FileCacheMgr {
         backend: Arc<dyn BlobBackend>,
         runtime: Arc<Runtime>,
         id: &str,
+        ondemand_batch_size: Option<u64>,
     ) -> Result<FileCacheMgr> {
         let blob_cfg = config.get_filecache_config()?;
         let work_dir = blob_cfg.get_work_dir()?;
@@ -77,6 +78,7 @@ impl FileCacheMgr {
             cache_convergent_encryption: blob_cfg.enable_convergent_encryption,
             cache_encryption_key: blob_cfg.encryption_key.clone(),
             closed: Arc::new(AtomicBool::new(false)),
+            ondemand_batch_size,
         })
     }
 
@@ -339,7 +341,9 @@ impl FileCacheEntry {
             is_zran,
             dio_enabled: false,
             need_validation,
-            batch_size: RAFS_DEFAULT_CHUNK_SIZE,
+            // If none, use default 0 since it's not used.
+            // e.g., at build time.
+            batch_size: mgr.ondemand_batch_size.unwrap_or(0),
             prefetch_config,
         })
     }
diff --git a/storage/src/cache/fscache/mod.rs b/storage/src/cache/fscache/mod.rs
index cf624f4f427..278054a5850 100644
--- a/storage/src/cache/fscache/mod.rs
+++ b/storage/src/cache/fscache/mod.rs
@@ -20,7 +20,6 @@ use crate::cache::worker::{AsyncPrefetchConfig, AsyncWorkerMgr};
 use crate::cache::{BlobCache, BlobCacheMgr};
 use crate::device::{BlobFeatures, BlobInfo, BlobObject};
 use crate::factory::BLOB_FACTORY;
-use crate::RAFS_DEFAULT_CHUNK_SIZE;
 
 use crate::cache::filecache::BLOB_DATA_FILE_SUFFIX;
 
@@ -40,6 +39,7 @@ pub struct FsCacheMgr {
     need_validation: bool,
     blobs_check_count: Arc<AtomicU8>,
     closed: Arc<AtomicBool>,
+    ondemand_batch_size: Option<u64>,
 }
 
 impl FsCacheMgr {
@@ -49,6 +49,7 @@ impl FsCacheMgr {
         backend: Arc<dyn BlobBackend>,
         runtime: Arc<Runtime>,
         id: &str,
+        ondemand_batch_size: Option<u64>,
     ) -> Result<FsCacheMgr> {
         if config.cache_compressed {
             return Err(enosys!("fscache doesn't support compressed cache mode"));
@@ -73,6 +74,7 @@ impl FsCacheMgr {
             need_validation: config.cache_validate,
             blobs_check_count: Arc::new(AtomicU8::new(0)),
             closed: Arc::new(AtomicBool::new(false)),
+            ondemand_batch_size,
         })
     }
 
@@ -290,7 +292,9 @@ impl FileCacheEntry {
             is_zran,
             dio_enabled: true,
             need_validation,
-            batch_size: RAFS_DEFAULT_CHUNK_SIZE,
+            // If none, use default 0 since it's not used.
+            // e.g., at build time.
+            batch_size: mgr.ondemand_batch_size.unwrap_or(0),
             prefetch_config,
         })
     }
diff --git a/storage/src/factory.rs b/storage/src/factory.rs
index cc37a4e913c..eeebfefb7e8 100644
--- a/storage/src/factory.rs
+++ b/storage/src/factory.rs
@@ -117,6 +117,10 @@ impl BlobFactory {
     ) -> IOResult<Arc<dyn BlobCache>> {
         let backend_cfg = config.get_backend_config()?;
         let cache_cfg = config.get_cache_config()?;
+        let ondemand_batch_size = match config.get_rafs_config() {
+            Ok(v) => Some(v.batch_size as u64),
+            Err(_) => None,
+        };
         let key = BlobCacheMgrKey {
             config: config.clone(),
         };
@@ -128,7 +132,13 @@ impl BlobFactory {
         let backend = Self::new_backend(backend_cfg, &blob_info.blob_id())?;
         let mgr = match cache_cfg.cache_type.as_str() {
             "blobcache" | "filecache" => {
-                let mgr = FileCacheMgr::new(cache_cfg, backend, ASYNC_RUNTIME.clone(), &config.id)?;
+                let mgr = FileCacheMgr::new(
+                    cache_cfg,
+                    backend,
+                    ASYNC_RUNTIME.clone(),
+                    &config.id,
+                    ondemand_batch_size,
+                )?;
                 mgr.init()?;
                 Arc::new(mgr) as Arc<dyn BlobCacheMgr>
             }
@@ -139,6 +149,7 @@ impl BlobFactory {
                     backend,
                     ASYNC_RUNTIME.clone(),
                     &config.id,
+                    ondemand_batch_size,
                 )?;
                 mgr.init()?;
                 Arc::new(mgr) as Arc<dyn BlobCacheMgr>