Commit a20ee510 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2019-11-20

please apply two late qeth fixes to your net tree.

The first fixes a deadlock that can occur if a qeth device is set
offline while in the middle of processing deferred HW events.
The second patch converts the return value of an error path to
use -EIO, so that it can be passed back to userspace.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 004b3942 2f3c269d

drivers/s390/net/qeth_core.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -839,6 +839,7 @@ struct qeth_card { 
	struct service_level qeth_service_level;

	struct service_level qeth_service_level;

	struct qdio_ssqd_desc ssqd;

	struct qdio_ssqd_desc ssqd;

	debug_info_t *debug;

	debug_info_t *debug;

	struct mutex sbp_lock;

	struct mutex conf_mutex;

	struct mutex conf_mutex;

	struct mutex discipline_mutex;

	struct mutex discipline_mutex;

	struct napi_struct napi;

	struct napi_struct napi;

drivers/s390/net/qeth_core_main.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -901,30 +901,30 @@ static int qeth_get_problem(struct qeth_card *card, struct ccw_device *cdev, 
				 CCW_DEVID(cdev), dstat, cstat);

				 CCW_DEVID(cdev), dstat, cstat);

		print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,

		print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,

				16, 1, irb, 64, 1);

				16, 1, irb, 64, 1);

		return 1;

		return -EIO;

	}

	}





	if (dstat & DEV_STAT_UNIT_CHECK) {

	if (dstat & DEV_STAT_UNIT_CHECK) {

		if (sense[SENSE_RESETTING_EVENT_BYTE] &

		if (sense[SENSE_RESETTING_EVENT_BYTE] &

		    SENSE_RESETTING_EVENT_FLAG) {

		    SENSE_RESETTING_EVENT_FLAG) {

			QETH_CARD_TEXT(card, 2, "REVIND");

			QETH_CARD_TEXT(card, 2, "REVIND");

			return 1;

			return -EIO;

		}

		}

		if (sense[SENSE_COMMAND_REJECT_BYTE] &

		if (sense[SENSE_COMMAND_REJECT_BYTE] &

		    SENSE_COMMAND_REJECT_FLAG) {

		    SENSE_COMMAND_REJECT_FLAG) {

			QETH_CARD_TEXT(card, 2, "CMDREJi");

			QETH_CARD_TEXT(card, 2, "CMDREJi");

			return 1;

			return -EIO;

		}

		}

		if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {

		if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {

			QETH_CARD_TEXT(card, 2, "AFFE");

			QETH_CARD_TEXT(card, 2, "AFFE");

			return 1;

			return -EIO;

		}

		}

		if ((!sense[0]) && (!sense[1]) && (!sense[2]) && (!sense[3])) {

		if ((!sense[0]) && (!sense[1]) && (!sense[2]) && (!sense[3])) {

			QETH_CARD_TEXT(card, 2, "ZEROSEN");

			QETH_CARD_TEXT(card, 2, "ZEROSEN");

			return 0;

			return 0;

		}

		}

		QETH_CARD_TEXT(card, 2, "DGENCHK");

		QETH_CARD_TEXT(card, 2, "DGENCHK");

			return 1;

			return -EIO;

	}

	}

	return 0;

	return 0;

}

}

drivers/s390/net/qeth_l2_main.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -467,10 +467,14 @@ static void qeth_l2_set_promisc_mode(struct qeth_card *card) 
	if (card->info.promisc_mode == enable)

	if (card->info.promisc_mode == enable)

		return;

		return;





	if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))

	if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) {

		qeth_setadp_promisc_mode(card, enable);

		qeth_setadp_promisc_mode(card, enable);

	else if (card->options.sbp.reflect_promisc)

	} else {

		mutex_lock(&card->sbp_lock);

		if (card->options.sbp.reflect_promisc)

			qeth_l2_promisc_to_bridge(card, enable);

			qeth_l2_promisc_to_bridge(card, enable);

		mutex_unlock(&card->sbp_lock);

	}

}

}





/* New MAC address is added to the hash table and marked to be written on card

/* New MAC address is added to the hash table and marked to be written on card
@@ -631,6 +635,7 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	int rc;

	int rc;





	qeth_l2_vnicc_set_defaults(card);

	qeth_l2_vnicc_set_defaults(card);

	mutex_init(&card->sbp_lock);





	if (gdev->dev.type == &qeth_generic_devtype) {

	if (gdev->dev.type == &qeth_generic_devtype) {

		rc = qeth_l2_create_device_attributes(&gdev->dev);

		rc = qeth_l2_create_device_attributes(&gdev->dev);
@@ -804,10 +809,12 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 
	} else

	} else

		card->info.hwtrap = 0;

		card->info.hwtrap = 0;





	mutex_lock(&card->sbp_lock);

	qeth_bridgeport_query_support(card);

	qeth_bridgeport_query_support(card);

	if (card->options.sbp.supported_funcs)

	if (card->options.sbp.supported_funcs)

		dev_info(&card->gdev->dev,

		dev_info(&card->gdev->dev,

		"The device represents a Bridge Capable Port\n");

		"The device represents a Bridge Capable Port\n");

	mutex_unlock(&card->sbp_lock);





	qeth_l2_register_dev_addr(card);

	qeth_l2_register_dev_addr(card);
@@ -1162,9 +1169,9 @@ static void qeth_bridge_state_change_worker(struct work_struct *work) 




	/* Role should not change by itself, but if it did, */

	/* Role should not change by itself, but if it did, */

	/* information from the hardware is authoritative.  */

	/* information from the hardware is authoritative.  */

	mutex_lock(&data->card->conf_mutex);

	mutex_lock(&data->card->sbp_lock);

	data->card->options.sbp.role = entry->role;

	data->card->options.sbp.role = entry->role;

	mutex_unlock(&data->card->conf_mutex);

	mutex_unlock(&data->card->sbp_lock);





	snprintf(env_locrem, sizeof(env_locrem), "BRIDGEPORT=statechange");

	snprintf(env_locrem, sizeof(env_locrem), "BRIDGEPORT=statechange");

	snprintf(env_role, sizeof(env_role), "ROLE=%s",

	snprintf(env_role, sizeof(env_role), "ROLE=%s",
@@ -1230,9 +1237,9 @@ static void qeth_bridge_host_event_worker(struct work_struct *work) 
			: (data->hostevs.lost_event_mask == 0x02)

			: (data->hostevs.lost_event_mask == 0x02)

			? "Bridge port state change"

			? "Bridge port state change"

			: "Unknown reason");

			: "Unknown reason");

		mutex_lock(&data->card->conf_mutex);

		mutex_lock(&data->card->sbp_lock);

		data->card->options.sbp.hostnotification = 0;

		data->card->options.sbp.hostnotification = 0;

		mutex_unlock(&data->card->conf_mutex);

		mutex_unlock(&data->card->sbp_lock);

		qeth_bridge_emit_host_event(data->card, anev_abort,

		qeth_bridge_emit_host_event(data->card, anev_abort,

			0, NULL, NULL);

			0, NULL, NULL);

	} else

	} else

drivers/s390/net/qeth_l2_sys.c

+13 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ static ssize_t qeth_bridge_port_role_state_show(struct device *dev, 
	if (qeth_l2_vnicc_is_in_use(card))

	if (qeth_l2_vnicc_is_in_use(card))

		return sprintf(buf, "n/a (VNIC characteristics)\n");

		return sprintf(buf, "n/a (VNIC characteristics)\n");





	mutex_lock(&card->sbp_lock);

	if (qeth_card_hw_is_reachable(card) &&

	if (qeth_card_hw_is_reachable(card) &&

					card->options.sbp.supported_funcs)

					card->options.sbp.supported_funcs)

		rc = qeth_bridgeport_query_ports(card,

		rc = qeth_bridgeport_query_ports(card,
@@ -57,6 +58,7 @@ static ssize_t qeth_bridge_port_role_state_show(struct device *dev, 
		else

		else

			rc = sprintf(buf, "%s\n", word);

			rc = sprintf(buf, "%s\n", word);

	}

	}

	mutex_unlock(&card->sbp_lock);





	return rc;

	return rc;

}

}
@@ -91,6 +93,7 @@ static ssize_t qeth_bridge_port_role_store(struct device *dev, 
		return -EINVAL;

		return -EINVAL;





	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->sbp_lock);





	if (qeth_l2_vnicc_is_in_use(card))

	if (qeth_l2_vnicc_is_in_use(card))

		rc = -EBUSY;

		rc = -EBUSY;
@@ -104,6 +107,7 @@ static ssize_t qeth_bridge_port_role_store(struct device *dev, 
	} else

	} else

		card->options.sbp.role = role;

		card->options.sbp.role = role;





	mutex_unlock(&card->sbp_lock);

	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->conf_mutex);





	return rc ? rc : count;

	return rc ? rc : count;
@@ -158,6 +162,7 @@ static ssize_t qeth_bridgeport_hostnotification_store(struct device *dev, 
		return rc;

		return rc;





	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->sbp_lock);





	if (qeth_l2_vnicc_is_in_use(card))

	if (qeth_l2_vnicc_is_in_use(card))

		rc = -EBUSY;

		rc = -EBUSY;
@@ -168,6 +173,7 @@ static ssize_t qeth_bridgeport_hostnotification_store(struct device *dev, 
	} else

	} else

		card->options.sbp.hostnotification = enable;

		card->options.sbp.hostnotification = enable;





	mutex_unlock(&card->sbp_lock);

	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->conf_mutex);





	return rc ? rc : count;

	return rc ? rc : count;
@@ -223,6 +229,7 @@ static ssize_t qeth_bridgeport_reflect_store(struct device *dev, 
		return -EINVAL;

		return -EINVAL;





	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->conf_mutex);

	mutex_lock(&card->sbp_lock);





	if (qeth_l2_vnicc_is_in_use(card))

	if (qeth_l2_vnicc_is_in_use(card))

		rc = -EBUSY;

		rc = -EBUSY;
@@ -234,6 +241,7 @@ static ssize_t qeth_bridgeport_reflect_store(struct device *dev, 
		rc = 0;

		rc = 0;

	}

	}





	mutex_unlock(&card->sbp_lock);

	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->conf_mutex);





	return rc ? rc : count;

	return rc ? rc : count;
@@ -269,6 +277,8 @@ void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card) 
		return;

		return;

	if (!card->options.sbp.supported_funcs)

	if (!card->options.sbp.supported_funcs)

		return;

		return;



	mutex_lock(&card->sbp_lock);

	if (card->options.sbp.role != QETH_SBP_ROLE_NONE) {

	if (card->options.sbp.role != QETH_SBP_ROLE_NONE) {

		/* Conditional to avoid spurious error messages */

		/* Conditional to avoid spurious error messages */

		qeth_bridgeport_setrole(card, card->options.sbp.role);

		qeth_bridgeport_setrole(card, card->options.sbp.role);
@@ -280,9 +290,11 @@ void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card) 
		rc = qeth_bridgeport_an_set(card, 1);

		rc = qeth_bridgeport_an_set(card, 1);

		if (rc)

		if (rc)

			card->options.sbp.hostnotification = 0;

			card->options.sbp.hostnotification = 0;

	} else

	} else {

		qeth_bridgeport_an_set(card, 0);

		qeth_bridgeport_an_set(card, 0);

	}

	}

	mutex_unlock(&card->sbp_lock);

}





/* VNIC CHARS support */

/* VNIC CHARS support */

CRA Git | Maintained and supported by SUSTech CRA and CCSE