github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #924 from jfckm/add_mq_blocking_config

Browse Source 
Add config for BLK_MQ_F_BLOCKING flag
This commit is contained in:
Robert Baldyga 2021-08-20 10:21:11 +02:00 committed by GitHub
commit feb7134e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configure.d/1_mq_flags.conf
View File

@ -7,28 +7,41 @@
. $(dirname $3)/conf_framework . $(dirname $3)/conf_framework
check() { check() {
cur_name=$(basename $2) cur_name=$(basename $2)
config_file_path=$1 config_file_path=$1
if compile_module $cur_name "BLK_MQ_F_STACKING " "linux/blk-mq.h"
then output=0
echo $cur_name "1" >> $config_file_path
else if compile_module $cur_name "BLK_MQ_F_STACKING " "linux/blk-mq.h"
echo $cur_name "2" >> $config_file_path then
fi output=1
fi
if compile_module $cur_name "BLK_MQ_F_BLOCKING " "linux/blk-mq.h"
then
output=$((output+2))
fi
echo $cur_name $output >> $config_file_path
} }
apply() { apply() {
case "$1" in arg=$1
"1") if ((arg & 1))
add_define "CAS_BLK_MQ_F_STACKING \\ then
BLK_MQ_F_STACKING" add_define "CAS_BLK_MQ_F_STACKING \\
;; BLK_MQ_F_STACKING"
"2") else
add_define "CAS_BLK_MQ_F_STACKING 0" add_define "CAS_BLK_MQ_F_STACKING 0"
;; fi
*)
exit 1 if ((arg & 2))
esac then
add_define "CAS_BLK_MQ_F_BLOCKING \\
BLK_MQ_F_BLOCKING"
else
add_define "CAS_BLK_MQ_F_BLOCKING 0"
fi
} }
conf_run $@ conf_run $@

2
modules/cas_disk/exp_obj.c
View File

@ -478,7 +478,7 @@ static int _casdsk_init_tag_set(struct casdsk_disk *dsk, struct blk_mq_tag_set *
set->queue_depth = BLKDEV_MAX_RQ; set->queue_depth = BLKDEV_MAX_RQ;
set->cmd_size = 0; set->cmd_size = 0;
set->flags = BLK_MQ_F_SHOULD_MERGE | CAS_BLK_MQ_F_STACKING | BLK_MQ_F_BLOCKING; set->flags = BLK_MQ_F_SHOULD_MERGE | CAS_BLK_MQ_F_STACKING | CAS_BLK_MQ_F_BLOCKING;
set->driver_data = dsk; set->driver_data = dsk;