Unverified Commit e33d399c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7015 Fixes and cleanups to fs-writeback 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhihao Cheng <chengzhihao1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O67VK5V5SUOXE3JKFNA2AWCRRRSOTRGL/ 
From: Zhihao Cheng <chengzhihao@huaweicloud.com>

Kemeng Shi (6):
  fs/writeback: avoid to writeback non-expired inode in kupdate
    writeback
  fs/writeback: bail out if there is no more inodes for IO and queued
    once
  fs/writeback: remove unused parameter wb of finish_writeback_work
  fs/writeback: only calculate dirtied_before when b_io is empty
  fs/writeback: correct comment of __wakeup_flusher_threads_bdi
  fs/writeback: remove unnecessary return in writeback_inodes_sb


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/I9NOHO 
 
Link:https://gitee.com/openeuler/kernel/pulls/7015

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 852fac5a c4123252

fs/fs-writeback.c

+33 −24
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ static void wb_wakeup(struct bdi_writeback *wb) 
	spin_unlock_irq(&wb->work_lock);

}



static void finish_writeback_work(struct bdi_writeback *wb,

				  struct wb_writeback_work *work)

static void finish_writeback_work(struct wb_writeback_work *work)

{

	struct wb_completion *done = work->done;
@@ -171,7 +170,7 @@ static void wb_queue_work(struct bdi_writeback *wb, 
		list_add_tail(&work->list, &wb->work_list);

		mod_delayed_work(bdi_wq, &wb->dwork, 0);

	} else

		finish_writeback_work(wb, work);

		finish_writeback_work(work);



	spin_unlock_irq(&wb->work_lock);

}
@@ -1536,7 +1535,8 @@ static void inode_sleep_on_writeback(struct inode *inode) 
 * thread's back can have unexpected consequences.

 */

static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,

			  struct writeback_control *wbc)

			  struct writeback_control *wbc,

			  unsigned long dirtied_before)

{

	if (inode->i_state & I_FREEING)

		return;
@@ -1569,7 +1569,8 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb, 
		 * We didn't write back all the pages.  nfs_writepages()

		 * sometimes bales out without doing anything.

		 */

		if (wbc->nr_to_write <= 0) {

		if (wbc->nr_to_write <= 0 &&

		    !inode_dirtied_after(inode, dirtied_before)) {

			/* Slice used up. Queue for next turn. */

			requeue_io(inode, wb);

		} else {
@@ -1837,6 +1838,11 @@ static long writeback_sb_inodes(struct super_block *sb, 
	unsigned long start_time = jiffies;

	long write_chunk;

	long total_wrote = 0;  /* count both pages and inodes */

	unsigned long dirtied_before = jiffies;



	if (work->for_kupdate)

		dirtied_before = jiffies -

			msecs_to_jiffies(dirty_expire_interval * 10);



	while (!list_empty(&wb->b_io)) {

		struct inode *inode = wb_inode(wb->b_io.prev);
@@ -1942,7 +1948,7 @@ static long writeback_sb_inodes(struct super_block *sb, 
		spin_lock(&inode->i_lock);

		if (!(inode->i_state & I_DIRTY_ALL))

			total_wrote++;

		requeue_inode(inode, tmp_wb, &wbc);

		requeue_inode(inode, tmp_wb, &wbc, dirtied_before);

		inode_sync_complete(inode);

		spin_unlock(&inode->i_lock);
@@ -2044,6 +2050,7 @@ static long wb_writeback(struct bdi_writeback *wb, 
	struct inode *inode;

	long progress;

	struct blk_plug plug;

	bool queued = false;



	blk_start_plug(&plug);

	for (;;) {
@@ -2073,21 +2080,24 @@ static long wb_writeback(struct bdi_writeback *wb, 


		spin_lock(&wb->list_lock);



		trace_writeback_start(wb, work);

		if (list_empty(&wb->b_io)) {

			/*

		 * Kupdate and background works are special and we want to

		 * include all inodes that need writing. Livelock avoidance is

		 * handled by these works yielding to any other work so we are

		 * safe.

			 * Kupdate and background works are special and we want

			 * to include all inodes that need writing. Livelock

			 * avoidance is handled by these works yielding to any

			 * other work so we are safe.

			 */

			if (work->for_kupdate) {

				dirtied_before = jiffies -

				msecs_to_jiffies(dirty_expire_interval * 10);

					msecs_to_jiffies(dirty_expire_interval *

							 10);

			} else if (work->for_background)

				dirtied_before = jiffies;



		trace_writeback_start(wb, work);

		if (list_empty(&wb->b_io))

			queue_io(wb, work, dirtied_before);

			queued = true;

		}

		if (work->sb)

			progress = writeback_sb_inodes(work->sb, wb, work);

		else
@@ -2102,7 +2112,7 @@ static long wb_writeback(struct bdi_writeback *wb, 
		 * mean the overall work is done. So we keep looping as long

		 * as made some progress on cleaning pages or inodes.

		 */

		if (progress) {

		if (progress || !queued) {

			spin_unlock(&wb->list_lock);

			continue;

		}
@@ -2237,7 +2247,7 @@ static long wb_do_writeback(struct bdi_writeback *wb) 
	while ((work = get_next_work_item(wb)) != NULL) {

		trace_writeback_exec(wb, work);

		wrote += wb_writeback(wb, work);

		finish_writeback_work(wb, work);

		finish_writeback_work(work);

	}



	/*
@@ -2297,8 +2307,7 @@ void wb_workfn(struct work_struct *work) 
}



/*

 * Start writeback of `nr_pages' pages on this bdi. If `nr_pages' is zero,

 * write back the whole world.

 * Start writeback of all dirty pages on this bdi.

 */

static void __wakeup_flusher_threads_bdi(struct backing_dev_info *bdi,

					 enum wb_reason reason)
@@ -2701,7 +2710,7 @@ EXPORT_SYMBOL(writeback_inodes_sb_nr); 
 */

void writeback_inodes_sb(struct super_block *sb, enum wb_reason reason)

{

	return writeback_inodes_sb_nr(sb, get_nr_dirty_pages(), reason);

	writeback_inodes_sb_nr(sb, get_nr_dirty_pages(), reason);

}

EXPORT_SYMBOL(writeback_inodes_sb);