Commit 3284da34 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

s390/dasd: reduce the default queue depth and nr of hardware queues 



Reduce the default values for the number of hardware queues and queue depth
to significantly reduce the memory footprint of a DASD device.
The memory consumption per DASD device reduces from approximately 40MB to
approximately 1.5MB.

This is necessary to build systems with a large number of DASD devices and
a reasonable amount of memory.
Performance measurements showed that good performance results are possible
with the new default values even on systems with lots of CPUs and lots of
alias devices.

Fixes: e443343e ("s390/dasd: blk-mq conversion")
Reviewed-by: default avatarJan Hoeppner <hoeppner@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 891f6a72

drivers/s390/block/dasd.c

+11 −2
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ 


#define DASD_DIAG_MOD		"dasd_diag_mod"



static unsigned int queue_depth = 32;

static unsigned int nr_hw_queues = 4;



module_param(queue_depth, uint, 0444);

MODULE_PARM_DESC(queue_depth, "Default queue depth for new DASD devices");



module_param(nr_hw_queues, uint, 0444);

MODULE_PARM_DESC(nr_hw_queues, "Default number of hardware queues for new DASD devices");



/*

 * SECTION: exported variables of dasd.c

 */
@@ -3115,8 +3124,8 @@ static int dasd_alloc_queue(struct dasd_block *block) 


	block->tag_set.ops = &dasd_mq_ops;

	block->tag_set.cmd_size = sizeof(struct dasd_ccw_req);

	block->tag_set.nr_hw_queues = DASD_NR_HW_QUEUES;

	block->tag_set.queue_depth = DASD_MAX_LCU_DEV * DASD_REQ_PER_DEV;

	block->tag_set.nr_hw_queues = nr_hw_queues;

	block->tag_set.queue_depth = queue_depth;

	block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;



	rc = blk_mq_alloc_tag_set(&block->tag_set);

drivers/s390/block/dasd_int.h

+0 −8
Original line number Diff line number Diff line
@@ -228,14 +228,6 @@ struct dasd_ccw_req { 
#define DASD_CQR_SUPPRESS_IL	6	/* Suppress 'Incorrect Length' error */

#define DASD_CQR_SUPPRESS_CR	7	/* Suppress 'Command Reject' error */



/*

 * There is no reliable way to determine the number of available CPUs on

 * LPAR but there is no big performance difference between 1 and the

 * maximum CPU number.

 * 64 is a good trade off performance wise.

 */

#define DASD_NR_HW_QUEUES 64

#define DASD_MAX_LCU_DEV 256

#define DASD_REQ_PER_DEV 4



/* Signature for error recovery functions. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE