Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0239e1b authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: detect idle time depending on user behavior 



This patch adds last time that user requested filesystem operations.
This information is used to detect whether system is idle or not later.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6beceb54

Documentation/ABI/testing/sysfs-fs-f2fs

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ Contact: "Jaegeuk Kim" <jaegeuk@kernel.org> 
Description:

		 Controls the checkpoint timing.



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

Date:		January 2016

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

Description:

		 Controls the idle timing.



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

Date:		October 2015

Contact:	"Chao Yu" <chao2.yu@samsung.com>

fs/f2fs/data.c

+1 −0
Original line number Diff line number Diff line
@@ -1596,6 +1596,7 @@ static int f2fs_write_end(struct file *file, 
	}



	f2fs_put_page(page, 1);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return copied;

}

fs/f2fs/dir.c

+4 −0
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ int __f2fs_add_link(struct inode *dir, const struct qstr *name, 
	f2fs_put_page(dentry_page, 1);

out:

	f2fs_fname_free_filename(&fname);

	f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);

	return err;

}
@@ -657,6 +658,7 @@ int f2fs_do_tmpfile(struct inode *inode, struct inode *dir) 
	clear_inode_flag(F2FS_I(inode), FI_NEW_INODE);

fail:

	up_write(&F2FS_I(inode)->i_sem);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return err;

}
@@ -701,6 +703,8 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));

	int i;



	f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);



	if (f2fs_has_inline_dentry(dir))

		return f2fs_delete_inline_entry(dentry, page, dir, inode);

fs/f2fs/f2fs.h

+15 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/sched.h>

#include <linux/vmalloc.h>

#include <linux/bio.h>

#include <linux/blkdev.h>



#ifdef CONFIG_F2FS_CHECK_FS

#define f2fs_bug_on(sbi, condition)	BUG_ON(condition)
@@ -126,6 +127,7 @@ enum { 
#define BATCHED_TRIM_BLOCKS(sbi)	\

		(BATCHED_TRIM_SEGMENTS(sbi) << (sbi)->log_blocks_per_seg)

#define DEF_CP_INTERVAL			60	/* 60 secs */

#define DEF_IDLE_INTERVAL		120	/* 2 mins */



struct cp_control {

	int reason;
@@ -723,6 +725,7 @@ enum { 


enum {

	CP_TIME,

	REQ_TIME,

	MAX_TIME,

};
@@ -856,6 +859,18 @@ static inline bool f2fs_time_over(struct f2fs_sb_info *sbi, int type) 
	return time_after(jiffies, sbi->last_time[type] + interval);

}



static inline bool is_idle(struct f2fs_sb_info *sbi)

{

	struct block_device *bdev = sbi->sb->s_bdev;

	struct request_queue *q = bdev_get_queue(bdev);

	struct request_list *rl = &q->root_rl;



	if (rl->count[BLK_RW_SYNC] || rl->count[BLK_RW_ASYNC])

		return 0;



	return f2fs_time_over(sbi, REQ_TIME);

}



/*

 * Inline functions

 */

fs/f2fs/file.c

+12 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, 
	clear_cold_data(page);

out:

	sb_end_pagefault(inode->i_sb);

	f2fs_update_time(sbi, REQ_TIME);

	return block_page_mkwrite_return(err);

}
@@ -280,6 +281,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	remove_ino_entry(sbi, ino, UPDATE_INO);

	clear_inode_flag(fi, FI_UPDATE_WRITE);

	ret = f2fs_issue_flush(sbi);

	f2fs_update_time(sbi, REQ_TIME);

out:

	trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret);

	f2fs_trace_ios(NULL, 1);
@@ -485,6 +487,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count) 
	}

	dn->ofs_in_node = ofs;



	f2fs_update_time(sbi, REQ_TIME);

	trace_f2fs_truncate_data_blocks_range(dn->inode, dn->nid,

					 dn->ofs_in_node, nr_free);

	return nr_free;
@@ -1236,6 +1239,7 @@ static long f2fs_fallocate(struct file *file, int mode, 
	if (!ret) {

		inode->i_mtime = inode->i_ctime = CURRENT_TIME;

		mark_inode_dirty(inode);

		f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	}



out:
@@ -1351,6 +1355,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) 
		return ret;



	set_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);



	return 0;

}
@@ -1398,6 +1404,7 @@ static int f2fs_ioc_start_volatile_write(struct file *filp) 
		return ret;



	set_inode_flag(F2FS_I(inode), FI_VOLATILE_FILE);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return 0;

}
@@ -1439,6 +1446,7 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp) 
	}



	mnt_drop_write_file(filp);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return ret;

}
@@ -1478,6 +1486,7 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg) 
	default:

		return -EINVAL;

	}

	f2fs_update_time(sbi, REQ_TIME);

	return 0;

}
@@ -1508,6 +1517,7 @@ static int f2fs_ioc_fitrim(struct file *filp, unsigned long arg) 
	if (copy_to_user((struct fstrim_range __user *)arg, &range,

				sizeof(range)))

		return -EFAULT;

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return 0;

}
@@ -1531,6 +1541,7 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg) 
				sizeof(policy)))

		return -EFAULT;



	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return f2fs_process_policy(&policy, inode);

#else

	return -EOPNOTSUPP;
@@ -1807,6 +1818,7 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg) 
	}



	err = f2fs_defragment_range(sbi, filp, &range);

	f2fs_update_time(sbi, REQ_TIME);

	if (err < 0)

		goto out;