Commit 52ad37a2 authored by Yu Kuai's avatar Yu Kuai Committed by Li Lingfeng
Browse files

blk-wbt: make enable_state more accurate 

mainline inclusion
from mainline-v6.2-rc1
commit a9a236d2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6Z1UG
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.3&id=a9a236d238a5e8ab2e74ca62c2c7ba5dd435af77



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

Currently, if user disable wbt through sysfs, 'enable_state' will be
'WBT_STATE_ON_MANUAL', which will be confusing. Add a new state
'WBT_STATE_OFF_MANUAL' to cover that case.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221019121518.3865235-4-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 82c66282

block/blk-wbt.c

+6 −1
Original line number Diff line number Diff line
@@ -432,8 +432,13 @@ void wbt_set_min_lat(struct request_queue *q, u64 val) 
	struct rq_qos *rqos = wbt_rq_qos(q);

	if (!rqos)

		return;



	RQWB(rqos)->min_lat_nsec = val;

	if (val)

		RQWB(rqos)->enable_state = WBT_STATE_ON_MANUAL;

	else

		RQWB(rqos)->enable_state = WBT_STATE_OFF_MANUAL;



	wbt_update_limits(RQWB(rqos));

}

block/blk-wbt.h

+7 −5
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@ enum { 
};



/*

 * Enable states. Either off, or on by default (done at init time),

 * or on through manual setup in sysfs.

 * If current state is WBT_STATE_ON/OFF_DEFAULT, it can be covered to any other

 * state, if current state is WBT_STATE_ON/OFF_MANUAL, it can only be covered

 * to WBT_STATE_OFF/ON_MANUAL.

 */

enum {

	WBT_STATE_ON_DEFAULT	= 1,

	WBT_STATE_ON_MANUAL	= 2,

	WBT_STATE_OFF_DEFAULT

	WBT_STATE_ON_DEFAULT	= 1,	/* on by default */

	WBT_STATE_ON_MANUAL	= 2,	/* on manually by sysfs */

	WBT_STATE_OFF_DEFAULT	= 3,	/* off by default */

	WBT_STATE_OFF_MANUAL	= 4,	/* off manually by sysfs */

};



struct rq_wb {