[f2fs-dev] [PATCH v3] f2fs: protect published gc_thread during teardown
Zhang Cen <[email protected]>
| Newsgroups | net.sourceforge.lists.linux-f2fs-devel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
f2fs stores the background GC worker in a heap-allocated sbi->gc_thread.
Foreground GC merge waiters, GC-thread sysfs callbacks, and victim-
selection readers can still touch waitqueues, policy knobs, or
f2fs_gc_task through that published object, but the dead-device shutdown
path can reach f2fs_stop_gc_thread() under shared s_umount coverage and
free it.
The buggy scenario involves two paths, with each column showing the order
within that path:
f2fs_balance_fs() reader: dead-device shutdown:
1. sees low free space and 1. enters f2fs_shutdown()
enters GC_MERGE 2. calls f2fs_do_shutdown(..., false)
2. borrows sbi->gc_thread 3. calls f2fs_stop_gc_thread()
3. queues on gc_th->fggc_wq 4. stops gc_th->f2fs_gc_task
4. wakes gc_th->gc_wait_queue_head 5. frees gc_th
5. sleeps in io_schedule() 6. clears sbi->gc_thread
6. resumes in finish_wait()
Fix this by making gc_thread a properly published object. Initialize it
fully before publishing it, remove it from sbi->gc_thread with xchg()
before teardown, keep f2fs_gc_task alive until an SRCU grace period has
drained the borrowed readers, and route the waitqueue, scalar, and sysfs
users through shared get/put helpers. Recheck f2fs_gc_task after
prepare_to_wait() in f2fs_balance_fs() so teardown cannot miss an
already-queued foreground waiter.
Validation reproduced this kernel report:
KASAN slab-use-after-free in _raw_spin_lock_irqsave()
Read of size 1
Call trace:
dump_stack_lvl() (?:?)
print_address_description() (mm/kasan/report.c:373)
_raw_spin_lock_irqsave() (?:?)
print_report() (?:?)
__virt_addr_valid() (?:?)
srso_alias_return_thunk() (arch/x86/include/asm/nospec-branch.h:375)
kasan_addr_to_slab() (mm/kasan/common.c:45)
kasan_report() (?:?)
__kasan_check_byte() (mm/kasan/common.c:571)
lock_acquire() (?:?)
rcu_is_watching() (?:?)
prepare_to_wait() (kernel/sched/wait.c:248)
f2fs_balance_fs() (fs/f2fs/segment.c:448)
f2fs_write_single_data_page() (fs/f2fs/f2fs.h:4184)
do_raw_spin_lock() (?:?)
find_held_lock() (kernel/locking/lockdep.c:5340)
folio_mkclean() (?:?)
f2fs_write_cache_pages() (fs/f2fs/data.c:3238)
__lock_acquire() (kernel/locking/lockdep.c:5077)
unwind_next_frame() (?:?)
arch_stack_walk() (?:?)
__f2fs_write_data_pages() (fs/f2fs/data.c:3565)
validate_chain() (kernel/locking/lockdep.c:3861)
insert_work() (kernel/workqueue.c:2220)
do_writepages() (mm/page-writeback.c:2560)
filemap_writeback() (mm/filemap.c:371)
__queue_work() (kernel/workqueue.c:2275)
file_write_and_wait_range() (?:?)
f2fs_do_sync_file() (fs/f2fs/file.c:285)
__lock_release() (kernel/locking/lockdep.c:5511)
f2fs_sync_file() (fs/f2fs/f2fs.h:3781)
do_fsync() (fs/sync.c:204)
__x64_sys_fsync() (?:?)
do_syscall_64() (arch/x86/entry/syscall_64.c:87)
entry_SYSCALL_64_after_hwframe() (?:?)
kasan_save_stack() (mm/kasan/common.c:52)
kasan_save_track() (mm/kasan/common.c:74)
__kasan_kmalloc() (?:?)
f2fs_start_gc_thread() (fs/f2fs/f2fs.h:4203)
f2fs_fill_super() (fs/f2fs/super.c:4993)
Fixes: 5911d2d1d1a3 ("f2fs: introduce gc_merge mount option")
Signed-off-by: Zhang Cen <[email protected]>
---
v3:
- Add the Fixes tag for the GC_MERGE foreground wait path.
- Add comments for the gc_thread release/acquire publication pair.
- Fix checkpatch alignment issues and avoid misleading indentation in
the critical_task_priority sysfs update path.
v2:
- Sashiko.dev pointed out that sysfs critical_task_priority could use
a stale f2fs_gc_task.
- Sashiko.dev pointed out that GC_MERGE foreground waiters could miss
teardown wakeups.
- Sashiko.dev pointed out that holding gc_thread_lock across
kthread_run() could deadlock with reclaim.
- Sashiko.dev pointed out that gc_urgent and gc_idle still touched GC
state without safe lifetime protection.
- Reset gc_thread_srcu_inited per f2fs_fill_super() attempt so cleanup
only covers the current SRCU state.
fs/f2fs/f2fs.h | 30 +++++++++-
fs/f2fs/gc.c | 78 ++++++++++++++++--------
fs/f2fs/gc.h | 8 ++-
fs/f2fs/segment.c | 34 +++++++----
fs/f2fs/super.c | 11 ++++
fs/f2fs/sysfs.c | 148 ++++++++++++++++++++++++++++++++++------------
6 files changed, 233 insertions(+), 76 deletions(-)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 91f506e7c9cfb..719c94119b71c 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -25,6 +25,7 @@
#include <linux/quotaops.h>
#include <linux/part_stat.h>
#include <linux/rw_hint.h>
+#include <linux/srcu.h>
#include <linux/fscrypt.h>
#include <linux/fsverity.h>
@@ -156,6 +157,8 @@ typedef u32 block_t; /*
*/
typedef u32 nid_t;
+struct f2fs_gc_kthread;
+
#define COMPRESS_EXT_NUM 16
enum blkzone_allocation_policy {
@@ -1873,7 +1876,8 @@ struct f2fs_sb_info {
* semaphore for GC, avoid
* race between GC and GC or CP
*/
- struct f2fs_gc_kthread *gc_thread; /* GC thread */
+ struct f2fs_gc_kthread *gc_thread; /* published GC thread */
+ struct srcu_struct gc_thread_srcu; /* protects gc_thread readers */
struct atgc_management am; /* atgc management */
unsigned int cur_victim_sec; /* current victim section num */
unsigned int gc_mode; /* current GC state */
@@ -4200,6 +4204,30 @@ extern const struct iomap_ops f2fs_iomap_ops;
/*
* gc.c
*/
+static inline struct f2fs_gc_kthread *
+f2fs_get_gc_thread(struct f2fs_sb_info *sbi, int *srcu_idx)
+{
+ struct f2fs_gc_kthread *gc_th;
+
+ *srcu_idx = srcu_read_lock(&sbi->gc_thread_srcu);
+ /*
+ * Pairs with the release store in f2fs_start_gc_thread() so readers
+ * see a fully initialized worker after observing sbi->gc_thread.
+ */
+ gc_th = smp_load_acquire(&sbi->gc_thread);
+ if (!gc_th) {
+ srcu_read_unlock(&sbi->gc_thread_srcu, *srcu_idx);
+ *srcu_idx = -1;
+ }
+
+ return gc_th;
+}
+
+static inline void f2fs_put_gc_thread(struct f2fs_sb_info *sbi, int srcu_idx)
+{
+ srcu_read_unlock(&sbi->gc_thread_srcu, srcu_idx);
+}
+
int f2fs_start_gc_thread(struct f2fs_sb_info *sbi);
void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi);
block_t f2fs_start_bidx_of_node(unsigned int node_ofs, struct inode *inode);
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index ba93010924c06..c38dc5e4f66de 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -30,10 +30,10 @@ static unsigned int count_bits(const unsigned long *addr,
static int gc_thread_func(void *data)
{
- struct f2fs_sb_info *sbi = data;
- struct f2fs_gc_kthread *gc_th = sbi->gc_thread;
- wait_queue_head_t *wq = &sbi->gc_thread->gc_wait_queue_head;
- wait_queue_head_t *fggc_wq = &sbi->gc_thread->fggc_wq;
+ struct f2fs_gc_kthread *gc_th = data;
+ struct f2fs_sb_info *sbi = gc_th->sbi;
+ wait_queue_head_t *wq = &gc_th->gc_wait_queue_head;
+ wait_queue_head_t *fggc_wq = &gc_th->fggc_wq;
unsigned int wait_ms;
struct f2fs_gc_control gc_control = {
.victim_segno = NULL_SEGNO,
@@ -134,7 +134,7 @@ static int gc_thread_func(void *data)
wait_ms = gc_th->max_sleep_time;
}
- if (need_to_boost_gc(sbi)) {
+ if (need_to_boost_gc(sbi, gc_th)) {
decrease_sleep_time(gc_th, &wait_ms);
if (f2fs_sb_has_blkzoned(sbi))
gc_boost = true;
@@ -194,6 +194,7 @@ static int gc_thread_func(void *data)
int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)
{
struct f2fs_gc_kthread *gc_th;
+ struct task_struct *task;
dev_t dev = sbi->sb->s_bdev->bd_dev;
gc_th = f2fs_kmalloc(sbi, sizeof(struct f2fs_gc_kthread), GFP_KERNEL);
@@ -219,36 +220,45 @@ int f2fs_start_gc_thread(struct f2fs_sb_info *sbi)
gc_th->boost_zoned_gc_percent = 0;
}
+ gc_th->sbi = sbi;
gc_th->gc_wake = false;
+ init_waitqueue_head(&gc_th->gc_wait_queue_head);
+ init_waitqueue_head(&gc_th->fggc_wq);
- sbi->gc_thread = gc_th;
- init_waitqueue_head(&sbi->gc_thread->gc_wait_queue_head);
- init_waitqueue_head(&sbi->gc_thread->fggc_wq);
- sbi->gc_thread->f2fs_gc_task = kthread_run(gc_thread_func, sbi,
- "f2fs_gc-%u:%u", MAJOR(dev), MINOR(dev));
- if (IS_ERR(gc_th->f2fs_gc_task)) {
- int err = PTR_ERR(gc_th->f2fs_gc_task);
+ task = kthread_run(gc_thread_func, gc_th, "f2fs_gc-%u:%u",
+ MAJOR(dev), MINOR(dev));
+ if (IS_ERR(task)) {
+ int err = PTR_ERR(task);
kfree(gc_th);
- sbi->gc_thread = NULL;
return err;
}
- set_user_nice(gc_th->f2fs_gc_task,
- PRIO_TO_NICE(sbi->critical_task_priority));
+ get_task_struct(task);
+ WRITE_ONCE(gc_th->f2fs_gc_task, task);
+ set_user_nice(task, PRIO_TO_NICE(sbi->critical_task_priority));
+ /* Publish only after gc_th and its task pointer are fully initialized. */
+ smp_store_release(&sbi->gc_thread, gc_th);
return 0;
}
void f2fs_stop_gc_thread(struct f2fs_sb_info *sbi)
{
- struct f2fs_gc_kthread *gc_th = sbi->gc_thread;
+ struct f2fs_gc_kthread *gc_th;
+ struct task_struct *task;
+ gc_th = xchg(&sbi->gc_thread, NULL);
if (!gc_th)
return;
- kthread_stop(gc_th->f2fs_gc_task);
+
+ task = xchg(&gc_th->f2fs_gc_task, NULL);
+ if (task)
+ kthread_stop(task);
wake_up_all(&gc_th->fggc_wq);
+ synchronize_srcu(&sbi->gc_thread_srcu);
+ if (task)
+ put_task_struct(task);
kfree(gc_th);
- sbi->gc_thread = NULL;
}
static int select_gc_type(struct f2fs_sb_info *sbi, int gc_type)
@@ -795,8 +805,16 @@ int f2fs_get_victim(struct f2fs_sb_info *sbi, unsigned int *result,
p.age_threshold = sbi->am.age_threshold;
if (one_time) {
p.one_time_gc = one_time;
- if (has_enough_free_secs(sbi, 0, NR_PERSISTENT_LOG))
- valid_thresh_ratio = sbi->gc_thread->valid_thresh_ratio;
+ if (has_enough_free_secs(sbi, 0, NR_PERSISTENT_LOG)) {
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (gc_th) {
+ valid_thresh_ratio = gc_th->valid_thresh_ratio;
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ }
+ }
}
retry:
@@ -1776,11 +1794,21 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
unsigned int window_granularity =
sbi->migration_window_granularity;
- if (f2fs_sb_has_blkzoned(sbi) &&
- !has_enough_free_blocks(sbi,
- sbi->gc_thread->boost_zoned_gc_percent))
- window_granularity *=
- sbi->gc_thread->boost_gc_multiple;
+ if (f2fs_sb_has_blkzoned(sbi)) {
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (gc_th) {
+ unsigned int boost_percent =
+ gc_th->boost_zoned_gc_percent;
+
+ if (!has_enough_free_blocks(sbi, boost_percent))
+ window_granularity *=
+ gc_th->boost_gc_multiple;
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ }
+ }
end_segno = start_segno + window_granularity;
}
diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index 6c4d4567571eb..b32d57a70f760 100644
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -45,7 +45,10 @@
#define NR_GC_CHECKPOINT_SECS (3) /* data/node/dentry sections */
+struct f2fs_sb_info;
+
struct f2fs_gc_kthread {
+ struct f2fs_sb_info *sbi;
struct task_struct *f2fs_gc_task;
wait_queue_head_t gc_wait_queue_head;
@@ -193,10 +196,11 @@ static inline bool has_enough_invalid_blocks(struct f2fs_sb_info *sbi)
limit_free_user_blocks(invalid_user_blocks));
}
-static inline bool need_to_boost_gc(struct f2fs_sb_info *sbi)
+static inline bool need_to_boost_gc(struct f2fs_sb_info *sbi,
+ struct f2fs_gc_kthread *gc_th)
{
if (f2fs_sb_has_blkzoned(sbi))
return !has_enough_free_blocks(sbi,
- sbi->gc_thread->boost_zoned_gc_percent);
+ gc_th->boost_zoned_gc_percent);
return has_enough_invalid_blocks(sbi);
}
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 788f8b0502492..cd8d5084c3f31 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -444,16 +444,30 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
if (has_enough_free_secs(sbi, 0, 0))
return;
- if (test_opt(sbi, GC_MERGE) && sbi->gc_thread &&
- sbi->gc_thread->f2fs_gc_task) {
- DEFINE_WAIT(wait);
-
- prepare_to_wait(&sbi->gc_thread->fggc_wq, &wait,
- TASK_UNINTERRUPTIBLE);
- wake_up(&sbi->gc_thread->gc_wait_queue_head);
- io_schedule();
- finish_wait(&sbi->gc_thread->fggc_wq, &wait);
- } else {
+ if (test_opt(sbi, GC_MERGE)) {
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (gc_th) {
+ if (READ_ONCE(gc_th->f2fs_gc_task)) {
+ DEFINE_WAIT(wait);
+
+ prepare_to_wait(&gc_th->fggc_wq, &wait,
+ TASK_UNINTERRUPTIBLE);
+ if (READ_ONCE(gc_th->f2fs_gc_task)) {
+ wake_up(&gc_th->gc_wait_queue_head);
+ io_schedule();
+ }
+ finish_wait(&gc_th->fggc_wq, &wait);
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ return;
+ }
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ }
+ }
+
+ {
struct f2fs_gc_control gc_control = {
.victim_segno = NULL_SEGNO,
.init_gc_type = f2fs_sb_has_blkzoned(sbi) ?
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index ccf806b676f53..a1c3784656fb2 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4954,11 +4954,13 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
int recovery, i, valid_super_block;
struct curseg_info *seg_i;
int retry_cnt = 1;
+ bool gc_thread_srcu_inited = false;
#ifdef CONFIG_QUOTA
bool quota_enabled = false;
#endif
try_onemore:
+ gc_thread_srcu_inited = false;
err = -EINVAL;
raw_super = NULL;
valid_super_block = -1;
@@ -4993,6 +4995,10 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
spin_lock_init(&sbi->inode_lock[i]);
}
mutex_init(&sbi->flush_lock);
+ err = init_srcu_struct(&sbi->gc_thread_srcu);
+ if (err)
+ goto free_sbi;
+ gc_thread_srcu_inited = true;
/* set a block size */
if (unlikely(!sb_set_blocksize(sb, F2FS_BLKSIZE))) {
@@ -5454,6 +5460,10 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
#ifdef CONFIG_DEBUG_LOCK_ALLOC
lockdep_unregister_key(&sbi->cp_global_sem_key);
#endif
+ if (gc_thread_srcu_inited) {
+ cleanup_srcu_struct(&sbi->gc_thread_srcu);
+ gc_thread_srcu_inited = false;
+ }
kfree(sbi);
sb->s_fs_info = NULL;
@@ -5538,6 +5548,7 @@ static void kill_f2fs_super(struct super_block *sb)
#ifdef CONFIG_DEBUG_LOCK_ALLOC
lockdep_unregister_key(&sbi->cp_global_sem_key);
#endif
+ cleanup_srcu_struct(&sbi->gc_thread_srcu);
kfree(sbi);
sb->s_fs_info = NULL;
}
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 352e96ad5c3a5..14f0d3c179789 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -375,12 +375,10 @@ static ssize_t __sbi_show_value(struct f2fs_attr *a,
}
}
-static ssize_t f2fs_sbi_show(struct f2fs_attr *a,
- struct f2fs_sb_info *sbi, char *buf)
+static ssize_t __f2fs_sbi_show(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi, char *buf,
+ unsigned char *ptr)
{
- unsigned char *ptr = NULL;
-
- ptr = __struct_ptr(sbi, a->struct_type);
if (!ptr)
return -EINVAL;
@@ -464,6 +462,29 @@ static ssize_t f2fs_sbi_show(struct f2fs_attr *a,
return __sbi_show_value(a, sbi, buf, ptr + a->offset);
}
+static ssize_t f2fs_sbi_show(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi, char *buf)
+{
+ return __f2fs_sbi_show(a, sbi, buf,
+ __struct_ptr(sbi, a->struct_type));
+}
+
+static ssize_t f2fs_gc_thread_show(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi, char *buf)
+{
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+ ssize_t ret;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (!gc_th)
+ return -EINVAL;
+
+ ret = __f2fs_sbi_show(a, sbi, buf, (unsigned char *)gc_th);
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ return ret;
+}
+
static void __sbi_store_value(struct f2fs_attr *a,
struct f2fs_sb_info *sbi,
unsigned char *ui, unsigned long value)
@@ -487,16 +508,47 @@ static void __sbi_store_value(struct f2fs_attr *a,
}
}
-static ssize_t __sbi_store(struct f2fs_attr *a,
- struct f2fs_sb_info *sbi,
- const char *buf, size_t count)
+static bool f2fs_wake_gc_thread(struct f2fs_sb_info *sbi)
+{
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (!gc_th)
+ return false;
+
+ gc_th->gc_wake = true;
+ wake_up_interruptible_all(&gc_th->gc_wait_queue_head);
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ return true;
+}
+
+static void f2fs_set_gc_thread_nice(struct f2fs_sb_info *sbi, long priority)
+{
+ struct f2fs_gc_kthread *gc_th;
+ struct task_struct *gc_task;
+ int srcu_idx;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (!gc_th)
+ return;
+
+ gc_task = READ_ONCE(gc_th->f2fs_gc_task);
+ if (gc_task)
+ set_user_nice(gc_task, PRIO_TO_NICE(priority));
+
+ f2fs_put_gc_thread(sbi, srcu_idx);
+}
+
+static ssize_t __f2fs_sbi_store(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi,
+ unsigned char *ptr,
+ const char *buf, size_t count)
{
- unsigned char *ptr;
unsigned long t;
unsigned int *ui;
ssize_t ret;
- ptr = __struct_ptr(sbi, a->struct_type);
if (!ptr)
return -EINVAL;
@@ -664,21 +716,13 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
sbi->gc_mode = GC_NORMAL;
} else if (t == 1) {
sbi->gc_mode = GC_URGENT_HIGH;
- if (sbi->gc_thread) {
- sbi->gc_thread->gc_wake = true;
- wake_up_interruptible_all(
- &sbi->gc_thread->gc_wait_queue_head);
+ if (f2fs_wake_gc_thread(sbi))
wake_up_discard_thread(sbi, true);
- }
} else if (t == 2) {
sbi->gc_mode = GC_URGENT_LOW;
} else if (t == 3) {
sbi->gc_mode = GC_URGENT_MID;
- if (sbi->gc_thread) {
- sbi->gc_thread->gc_wake = true;
- wake_up_interruptible_all(
- &sbi->gc_thread->gc_wait_queue_head);
- }
+ f2fs_wake_gc_thread(sbi);
} else {
return -EINVAL;
}
@@ -934,14 +978,14 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
if (!strcmp(a->attr.name, "gc_boost_gc_multiple")) {
if (t < 1 || t > SEGS_PER_SEC(sbi))
return -EINVAL;
- sbi->gc_thread->boost_gc_multiple = (unsigned int)t;
+ *ui = (unsigned int)t;
return count;
}
if (!strcmp(a->attr.name, "gc_boost_gc_greedy")) {
if (t > GC_GREEDY)
return -EINVAL;
- sbi->gc_thread->boost_gc_greedy = (unsigned int)t;
+ *ui = (unsigned int)t;
return count;
}
@@ -980,39 +1024,64 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
return count;
}
- if (!strcmp(a->attr.name, "critical_task_priority")) {
- if (t < NICE_TO_PRIO(MIN_NICE) || t > NICE_TO_PRIO(MAX_NICE))
- return -EINVAL;
- if (!capable(CAP_SYS_NICE))
- return -EPERM;
- sbi->critical_task_priority = t;
- if (sbi->cprc_info.f2fs_issue_ckpt)
- set_user_nice(sbi->cprc_info.f2fs_issue_ckpt,
- PRIO_TO_NICE(sbi->critical_task_priority));
- if (sbi->gc_thread && sbi->gc_thread->f2fs_gc_task)
- set_user_nice(sbi->gc_thread->f2fs_gc_task,
- PRIO_TO_NICE(sbi->critical_task_priority));
- return count;
- }
+ if (!strcmp(a->attr.name, "critical_task_priority")) {
+ int nice;
+
+ if (t < NICE_TO_PRIO(MIN_NICE) || t > NICE_TO_PRIO(MAX_NICE))
+ return -EINVAL;
+ if (!capable(CAP_SYS_NICE))
+ return -EPERM;
+ sbi->critical_task_priority = t;
+ nice = PRIO_TO_NICE(sbi->critical_task_priority);
+ if (sbi->cprc_info.f2fs_issue_ckpt)
+ set_user_nice(sbi->cprc_info.f2fs_issue_ckpt, nice);
+ f2fs_set_gc_thread_nice(sbi, sbi->critical_task_priority);
+ return count;
+ }
__sbi_store_value(a, sbi, ptr + a->offset, t);
return count;
}
+static ssize_t f2fs_gc_thread_store(struct f2fs_attr *a,
+ struct f2fs_sb_info *sbi,
+ const char *buf, size_t count)
+{
+ struct f2fs_gc_kthread *gc_th;
+ int srcu_idx;
+ ssize_t ret;
+
+ if (!down_read_trylock(&sbi->sb->s_umount))
+ return -EAGAIN;
+
+ gc_th = f2fs_get_gc_thread(sbi, &srcu_idx);
+ if (!gc_th) {
+ up_read(&sbi->sb->s_umount);
+ return -EINVAL;
+ }
+
+ ret = __f2fs_sbi_store(a, sbi, (unsigned char *)gc_th, buf, count);
+ f2fs_put_gc_thread(sbi, srcu_idx);
+ up_read(&sbi->sb->s_umount);
+ return ret;
+}
+
static ssize_t f2fs_sbi_store(struct f2fs_attr *a,
struct f2fs_sb_info *sbi,
const char *buf, size_t count)
{
ssize_t ret;
bool gc_entry = (!strcmp(a->attr.name, "gc_urgent") ||
+ !strcmp(a->attr.name, "gc_idle") ||
a->struct_type == GC_THREAD);
if (gc_entry) {
if (!down_read_trylock(&sbi->sb->s_umount))
return -EAGAIN;
}
- ret = __sbi_store(a, sbi, buf, count);
+ ret = __f2fs_sbi_store(a, sbi,
+ __struct_ptr(sbi, a->struct_type), buf, count);
if (gc_entry)
up_read(&sbi->sb->s_umount);
@@ -1173,7 +1242,10 @@ static struct f2fs_attr f2fs_attr_##name = __ATTR(name, 0444, name##_show, NULL)
#endif
#define GC_THREAD_RW_ATTR(name, elname) \
- F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, name, elname)
+ F2FS_ATTR_OFFSET(GC_THREAD, name, 0644, \
+ f2fs_gc_thread_show, f2fs_gc_thread_store, \
+ offsetof(struct f2fs_gc_kthread, elname), \
+ sizeof_field(struct f2fs_gc_kthread, elname))
#define SM_INFO_RW_ATTR(name, elname) \
F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, name, elname)
--
2.43.0
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel