Commit 832337cc authored by Yu Kuai's avatar Yu Kuai Committed by Zheng Zengkai
Browse files

blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init() 

stable inclusion
from stable-v5.10.152
commit 31b1570677e8bf85f48be8eb95e21804399b8295
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60HVY
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=31b1570677e8bf85f48be8eb95e21804399b8295



-------------------------------

commit 285febab upstream.

commit 8c5035df ("blk-wbt: call rq_qos_add() after wb_normal is
initialized") moves wbt_set_write_cache() before rq_qos_add(), which
is wrong because wbt_rq_qos() is still NULL.

Fix the problem by removing wbt_set_write_cache() and setting 'rwb->wc'
directly. Noted that this patch also remove the redundant setting of
'rab->wc'.

Fixes: 8c5035df ("blk-wbt: call rq_qos_add() after wb_normal is initialized")
Reported-by: default avatarkernel test robot <yujie.liu@intel.com>
Link: https://lore.kernel.org/r/202210081045.77ddf59b-yujie.liu@intel.com


Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20221009101038.1692875-1-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7a8507ed

block/blk-wbt.c

+1 −2
Original line number Diff line number Diff line
@@ -838,12 +838,11 @@ int wbt_init(struct request_queue *q) 
	rwb->last_comp = rwb->last_issue = jiffies;

	rwb->win_nsec = RWB_WINDOW_NSEC;

	rwb->enable_state = WBT_STATE_ON_DEFAULT;

	rwb->wc = 1;

	rwb->wc = test_bit(QUEUE_FLAG_WC, &q->queue_flags);

	rwb->rq_depth.default_depth = RWB_DEF_DEPTH;

	rwb->min_lat_nsec = wbt_default_latency_nsec(q);



	wbt_queue_depth_changed(&rwb->rqos);

	wbt_set_write_cache(q, test_bit(QUEUE_FLAG_WC, &q->queue_flags));



	/*

	 * Assign rwb and add the stats callback.