Commit 68b781fe authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

[S390] dasd: optimize cpu usage in goodcase 



remove unnecessary dbf call, remove string operations for magic

Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 97f604b0

drivers/s390/block/dasd.c

+8 −13
Original line number Diff line number Diff line
@@ -669,14 +669,14 @@ static void dasd_profile_end(struct dasd_block *block, 
 * memory and 2) dasd_smalloc_request uses the static ccw memory

 * that gets allocated for each device.

 */

struct dasd_ccw_req *dasd_kmalloc_request(char *magic, int cplength,

struct dasd_ccw_req *dasd_kmalloc_request(int magic, int cplength,

					  int datasize,

					  struct dasd_device *device)

{

	struct dasd_ccw_req *cqr;



	/* Sanity checks */

	BUG_ON( magic == NULL || datasize > PAGE_SIZE ||

	BUG_ON(datasize > PAGE_SIZE ||

	     (cplength*sizeof(struct ccw1)) > PAGE_SIZE);



	cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
@@ -700,14 +700,13 @@ struct dasd_ccw_req *dasd_kmalloc_request(char *magic, int cplength, 
			return ERR_PTR(-ENOMEM);

		}

	}

	strncpy((char *) &cqr->magic, magic, 4);

	ASCEBC((char *) &cqr->magic, 4);

	cqr->magic =  magic;

	set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);

	dasd_get_device(device);

	return cqr;

}



struct dasd_ccw_req *dasd_smalloc_request(char *magic, int cplength,

struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength,

					  int datasize,

					  struct dasd_device *device)

{
@@ -717,7 +716,7 @@ struct dasd_ccw_req *dasd_smalloc_request(char *magic, int cplength, 
	int size;



	/* Sanity checks */

	BUG_ON( magic == NULL || datasize > PAGE_SIZE ||

	BUG_ON(datasize > PAGE_SIZE ||

	     (cplength*sizeof(struct ccw1)) > PAGE_SIZE);



	size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
@@ -744,8 +743,7 @@ struct dasd_ccw_req *dasd_smalloc_request(char *magic, int cplength, 
		cqr->data = data;

 		memset(cqr->data, 0, datasize);

	}

	strncpy((char *) &cqr->magic, magic, 4);

	ASCEBC((char *) &cqr->magic, 4);

	cqr->magic = magic;

	set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);

	dasd_get_device(device);

	return cqr;
@@ -899,9 +897,6 @@ int dasd_start_IO(struct dasd_ccw_req *cqr) 
	switch (rc) {

	case 0:

		cqr->status = DASD_CQR_IN_IO;

		DBF_DEV_EVENT(DBF_DEBUG, device,

			      "start_IO: request %p started successful",

			      cqr);

		break;

	case -EBUSY:

		DBF_DEV_EVENT(DBF_DEBUG, device, "%s",
@@ -2533,7 +2528,7 @@ EXPORT_SYMBOL_GPL(dasd_generic_restore_device); 
static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,

						   void *rdc_buffer,

						   int rdc_buffer_size,

						   char *magic)

						   int magic)

{

	struct dasd_ccw_req *cqr;

	struct ccw1 *ccw;
@@ -2564,7 +2559,7 @@ static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device, 
}





int dasd_generic_read_dev_chars(struct dasd_device *device, char *magic,

int dasd_generic_read_dev_chars(struct dasd_device *device, int magic,

				void *rdc_buffer, int rdc_buffer_size)

{

	int ret;

drivers/s390/block/dasd_alias.c

+1 −2
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ static int read_unit_address_configuration(struct dasd_device *device, 
	int rc;

	unsigned long flags;



	cqr = dasd_kmalloc_request("ECKD",

				   1 /* PSF */	+ 1 /* RSSD */ ,

	cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */	+ 1 /* RSSD */,

				   (sizeof(struct dasd_psf_prssd_data)),

				   device);

	if (IS_ERR(cqr))

drivers/s390/block/dasd_diag.c

+1 −2
Original line number Diff line number Diff line
@@ -523,8 +523,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, 
	/* Build the request */

	datasize = sizeof(struct dasd_diag_req) +

		count*sizeof(struct dasd_diag_bio);

	cqr = dasd_smalloc_request(dasd_diag_discipline.name, 0,

				   datasize, memdev);

	cqr = dasd_smalloc_request(DASD_DIAG_MAGIC, 0, datasize, memdev);

	if (IS_ERR(cqr))

		return cqr;

drivers/s390/block/dasd_eckd.c

+19 −26
Original line number Diff line number Diff line
@@ -730,7 +730,8 @@ static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device, 
	struct dasd_ccw_req *cqr;

	struct ccw1 *ccw;



	cqr = dasd_smalloc_request("ECKD", 1 /* RCD */, ciw->count, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* RCD */, ciw->count,

				   device);



	if (IS_ERR(cqr)) {

		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
@@ -934,8 +935,7 @@ static int dasd_eckd_read_features(struct dasd_device *device) 
	struct dasd_eckd_private *private;



	private = (struct dasd_eckd_private *) device->private;

	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   1 /* PSF */	+ 1 /* RSSD */ ,

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */	+ 1 /* RSSD */,

				   (sizeof(struct dasd_psf_prssd_data) +

				    sizeof(struct dasd_rssd_features)),

				   device);
@@ -998,7 +998,7 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device, 
	struct dasd_psf_ssc_data *psf_ssc_data;

	struct ccw1 *ccw;



	cqr = dasd_smalloc_request("ECKD", 1 /* PSF */ ,

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,

				  sizeof(struct dasd_psf_ssc_data),

				  device);
@@ -1149,8 +1149,8 @@ dasd_eckd_check_characteristics(struct dasd_device *device) 
		goto out_err3;



	/* Read Device Characteristics */

	rc = dasd_generic_read_dev_chars(device, "ECKD", &private->rdc_data,

					 64);

	rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,

					 &private->rdc_data, 64);

	if (rc) {

		DBF_EVENT(DBF_WARNING,

			  "Read device characteristics failed, rc=%d for "
@@ -1217,8 +1217,7 @@ dasd_eckd_analysis_ccw(struct dasd_device *device) 


	cplength = 8;

	datasize = sizeof(struct DE_eckd_data) + 2*sizeof(struct LO_eckd_data);

	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   cplength, datasize, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);

	if (IS_ERR(cqr))

		return cqr;

	ccw = cqr->cpaddr;
@@ -1499,8 +1498,7 @@ dasd_eckd_format_device(struct dasd_device * device, 
		return ERR_PTR(-EINVAL);

	}

	/* Allocate the format ccw request. */

	fcp = dasd_smalloc_request(dasd_eckd_discipline.name,

				   cplength, datasize, device);

	fcp = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);

	if (IS_ERR(fcp))

		return fcp;
@@ -1783,8 +1781,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single( 
		datasize += count*sizeof(struct LO_eckd_data);

	}

	/* Allocate the ccw request. */

	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   cplength, datasize, startdev);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,

				   startdev);

	if (IS_ERR(cqr))

		return cqr;

	ccw = cqr->cpaddr;
@@ -1948,8 +1946,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( 
		cidaw * sizeof(unsigned long long);



	/* Allocate the ccw request. */

	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   cplength, datasize, startdev);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,

				   startdev);

	if (IS_ERR(cqr))

		return cqr;

	ccw = cqr->cpaddr;
@@ -2249,8 +2247,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track( 


	/* Allocate the ccw request. */

	itcw_size = itcw_calc_size(0, ctidaw, 0);

	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   0, itcw_size, startdev);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);

	if (IS_ERR(cqr))

		return cqr;
@@ -2557,8 +2554,7 @@ dasd_eckd_release(struct dasd_device *device) 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   1, 32, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);

	if (IS_ERR(cqr)) {

		DBF_DEV_EVENT(DBF_WARNING, device, "%s",

			    "Could not allocate initialization request");
@@ -2600,8 +2596,7 @@ dasd_eckd_reserve(struct dasd_device *device) 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   1, 32, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);

	if (IS_ERR(cqr)) {

		DBF_DEV_EVENT(DBF_WARNING, device, "%s",

			    "Could not allocate initialization request");
@@ -2642,8 +2637,7 @@ dasd_eckd_steal_lock(struct dasd_device *device) 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   1, 32, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);

	if (IS_ERR(cqr)) {

		DBF_DEV_EVENT(DBF_WARNING, device, "%s",

			    "Could not allocate initialization request");
@@ -2681,8 +2675,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp) 
	struct ccw1 *ccw;

	int rc;



	cqr = dasd_smalloc_request(dasd_eckd_discipline.name,

				   1 /* PSF */  + 1 /* RSSD */ ,

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */  + 1 /* RSSD */,

				   (sizeof(struct dasd_psf_prssd_data) +

				    sizeof(struct dasd_rssd_perf_stats_t)),

				   device);
@@ -2828,7 +2821,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp) 
	}



	/* setup CCWs for PSF + RSSD */

	cqr = dasd_smalloc_request("ECKD", 2 , 0, device);

	cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 2 , 0, device);

	if (IS_ERR(cqr)) {

		DBF_DEV_EVENT(DBF_WARNING, device, "%s",

			"Could not allocate initialization request");
@@ -3254,7 +3247,7 @@ int dasd_eckd_restore_device(struct dasd_device *device) 


	/* Read Device Characteristics */

	memset(&private->rdc_data, 0, sizeof(private->rdc_data));

	rc = dasd_generic_read_dev_chars(device, "ECKD",

	rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,

					 &private->rdc_data, 64);

	if (rc) {

		DBF_EVENT(DBF_WARNING,

drivers/s390/block/dasd_eer.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ int dasd_eer_enable(struct dasd_device *device) 
	if (!device->discipline || strcmp(device->discipline->name, "ECKD"))

		return -EPERM;	/* FIXME: -EMEDIUMTYPE ? */



	cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,

	cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* SNSS */,

				   SNSS_DATA_SIZE, device);

	if (IS_ERR(cqr))

		return -ENOMEM;