[PATCH] s390: dasd extended error reporting (20c64468) · Commits · 戴 / test

drivers/s390/block/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,12 @@ config DASD_DIAG
		Disks under VM. If you are not running under VM or unsure what it is,
		say "N".

		config DASD_EER
		bool "Extended error reporting (EER)"
		depends on DASD
		help
		This driver provides a character device interface to the
		DASD extended error reporting. This is only needed if you want to
		use applications written for the EER facility.

		endif

drivers/s390/block/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,9 @@ dasd_fba_mod-objs := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
		dasd_diag_mod-objs := dasd_diag.o
		dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
		dasd_genhd.o dasd_erp.o
		ifdef CONFIG_DASD_EER
		dasd_mod-objs += dasd_eer.o
		endif

		obj-$(CONFIG_DASD) += dasd_mod.o
		obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o

drivers/s390/block/dasd.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -151,6 +151,8 @@ dasd_state_new_to_known(struct dasd_device *device)
		static inline void
		dasd_state_known_to_new(struct dasd_device * device)
		{
		/* Disable extended error reporting for this device. */
		dasd_eer_disable(device);
		/* Forget the discipline information. */
		if (device->discipline)
		module_put(device->discipline->owner);
		@@ -892,6 +894,9 @@ dasd_handle_state_change_pending(struct dasd_device *device)
		struct dasd_ccw_req *cqr;
		struct list_head l, n;

		/* First of all start sense subsystem status request. */
		dasd_eer_snss(device);

		device->stopped &= ~DASD_STOPPED_PENDING;

		/* restart all 'running' IO on queue */
		@@ -1111,6 +1116,19 @@ restart:
		}
		goto restart;
		}

		/* First of all call extended error reporting. */
		if (dasd_eer_enabled(device) &&
		cqr->status == DASD_CQR_FAILED) {
		dasd_eer_write(device, cqr, DASD_EER_FATALERROR);

		/* restart request */
		cqr->status = DASD_CQR_QUEUED;
		cqr->retries = 255;
		device->stopped \|= DASD_STOPPED_QUIESCE;
		goto restart;
		}

		/* Process finished ERP request. */
		if (cqr->refers) {
		__dasd_process_erp(device, cqr);
		@@ -1248,7 +1266,8 @@ __dasd_start_head(struct dasd_device * device)
		cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list);
		/* check FAILFAST */
		if (device->stopped & ~DASD_STOPPED_PENDING &&
		test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags)) {
		test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
		(!dasd_eer_enabled(device))) {
		cqr->status = DASD_CQR_FAILED;
		dasd_schedule_bh(device);
		}
		@@ -1807,6 +1826,7 @@ dasd_exit(void)
		#ifdef CONFIG_PROC_FS
		dasd_proc_exit();
		#endif
		dasd_eer_exit();
		if (dasd_page_cache != NULL) {
		kmem_cache_destroy(dasd_page_cache);
		dasd_page_cache = NULL;
		@@ -2003,6 +2023,9 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
		switch (event) {
		case CIO_GONE:
		case CIO_NO_PATH:
		/* First of all call extended error reporting. */
		dasd_eer_write(device, NULL, DASD_EER_NOPATH);

		if (device->state < DASD_STATE_BASIC)
		break;
		/* Device is active. We want to keep it. */
		@@ -2060,6 +2083,7 @@ dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)
		put_driver(drv);
		}


		static int __init
		dasd_init(void)
		{
		@@ -2092,6 +2116,9 @@ dasd_init(void)
		rc = dasd_parse();
		if (rc)
		goto failed;
		rc = dasd_eer_init();
		if (rc)
		goto failed;
		#ifdef CONFIG_PROC_FS
		rc = dasd_proc_init();
		if (rc)

drivers/s390/block/dasd_3990_erp.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1108,6 +1108,9 @@ dasd_3990_handle_env_data(struct dasd_ccw_req * erp, char *sense)
		case 0x0B:
		DEV_MESSAGE(KERN_WARNING, device, "%s",
		"FORMAT F - Volume is suspended duplex");
		/* call extended error reporting (EER) */
		dasd_eer_write(device, erp->refers,
		DASD_EER_PPRCSUSPEND);
		break;
		case 0x0C:
		DEV_MESSAGE(KERN_WARNING, device, "%s",

drivers/s390/block/dasd_devmap.c

+41 −0

Original line number	Diff line number	Diff line
		@@ -715,10 +715,51 @@ dasd_discipline_show(struct device dev, struct device_attribute attr, char *bu

		static DEVICE_ATTR(discipline, 0444, dasd_discipline_show, NULL);

		/*
		* extended error-reporting
		*/
		static ssize_t
		dasd_eer_show(struct device dev, struct device_attribute attr, char *buf)
		{
		struct dasd_devmap *devmap;
		int eer_flag;

		devmap = dasd_find_busid(dev->bus_id);
		if (!IS_ERR(devmap) && devmap->device)
		eer_flag = dasd_eer_enabled(devmap->device);
		else
		eer_flag = 0;
		return snprintf(buf, PAGE_SIZE, eer_flag ? "1\n" : "0\n");
		}

		static ssize_t
		dasd_eer_store(struct device dev, struct device_attribute attr,
		const char *buf, size_t count)
		{
		struct dasd_devmap *devmap;
		int rc;

		devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
		if (IS_ERR(devmap))
		return PTR_ERR(devmap);
		if (!devmap->device)
		return count;
		if (buf[0] == '1') {
		rc = dasd_eer_enable(devmap->device);
		if (rc)
		return rc;
		} else
		dasd_eer_disable(devmap->device);
		return count;
		}

		static DEVICE_ATTR(eer_enabled, 0644, dasd_eer_show, dasd_eer_store);

		static struct attribute * dasd_attrs[] = {
		&dev_attr_readonly.attr,
		&dev_attr_discipline.attr,
		&dev_attr_use_diag.attr,
		&dev_attr_eer_enabled.attr,
		NULL,
		};

Admin message