Commit 286e95ee authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 's390-qeth-fixes-2021-01-07' 

Julian Wiedmann says:

====================
s390/qeth: fixes 2021-01-07

This brings two locking fixes for the device control path.
Also one fix for a path where our .ndo_features_check() attempts to
access a non-existent L2 header.
====================

Link: https://lore.kernel.org/r/20210107172442.1737-1-jwi@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d7083427 f9c48453

drivers/s390/net/qeth_core.h

+2 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,8 @@ struct qeth_card *qeth_get_card_by_busid(char *bus_id); 
void qeth_set_allowed_threads(struct qeth_card *card, unsigned long threads,

			      int clear_start_mask);

int qeth_threads_running(struct qeth_card *, unsigned long);

int qeth_set_offline(struct qeth_card *card, bool resetting);

int qeth_set_offline(struct qeth_card *card, const struct qeth_discipline *disc,

		     bool resetting);



int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,

		  int (*reply_cb)

drivers/s390/net/qeth_core_main.c

+25 −13
Original line number Diff line number Diff line
@@ -5507,12 +5507,12 @@ static int qeth_hardsetup_card(struct qeth_card *card, bool *carrier_ok) 
	return rc;

}



static int qeth_set_online(struct qeth_card *card)

static int qeth_set_online(struct qeth_card *card,

			   const struct qeth_discipline *disc)

{

	bool carrier_ok;

	int rc;



	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_CARD_TEXT(card, 2, "setonlin");
@@ -5529,7 +5529,7 @@ static int qeth_set_online(struct qeth_card *card) 
		/* no need for locking / error handling at this early stage: */

		qeth_set_real_num_tx_queues(card, qeth_tx_actual_queues(card));



	rc = card->discipline->set_online(card, carrier_ok);

	rc = disc->set_online(card, carrier_ok);

	if (rc)

		goto err_online;
@@ -5537,7 +5537,6 @@ static int qeth_set_online(struct qeth_card *card) 
	kobject_uevent(&card->gdev->dev.kobj, KOBJ_CHANGE);



	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->discipline_mutex);

	return 0;



err_online:
@@ -5552,15 +5551,14 @@ static int qeth_set_online(struct qeth_card *card) 
	qdio_free(CARD_DDEV(card));



	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->discipline_mutex);

	return rc;

}



int qeth_set_offline(struct qeth_card *card, bool resetting)

int qeth_set_offline(struct qeth_card *card, const struct qeth_discipline *disc,

		     bool resetting)

{

	int rc, rc2, rc3;



	mutex_lock(&card->discipline_mutex);

	mutex_lock(&card->conf_mutex);

	QETH_CARD_TEXT(card, 3, "setoffl");
@@ -5581,7 +5579,7 @@ int qeth_set_offline(struct qeth_card *card, bool resetting) 


	cancel_work_sync(&card->rx_mode_work);



	card->discipline->set_offline(card);

	disc->set_offline(card);



	qeth_qdio_clear_card(card, 0);

	qeth_drain_output_queues(card);
@@ -5602,16 +5600,19 @@ int qeth_set_offline(struct qeth_card *card, bool resetting) 
	kobject_uevent(&card->gdev->dev.kobj, KOBJ_CHANGE);



	mutex_unlock(&card->conf_mutex);

	mutex_unlock(&card->discipline_mutex);

	return 0;

}

EXPORT_SYMBOL_GPL(qeth_set_offline);



static int qeth_do_reset(void *data)

{

	const struct qeth_discipline *disc;

	struct qeth_card *card = data;

	int rc;



	/* Lock-free, other users will block until we are done. */

	disc = card->discipline;



	QETH_CARD_TEXT(card, 2, "recover1");

	if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))

		return 0;
@@ -5619,8 +5620,8 @@ static int qeth_do_reset(void *data) 
	dev_warn(&card->gdev->dev,

		 "A recovery process has been started for the device\n");



	qeth_set_offline(card, true);

	rc = qeth_set_online(card);

	qeth_set_offline(card, disc, true);

	rc = qeth_set_online(card, disc);

	if (!rc) {

		dev_info(&card->gdev->dev,

			 "Device successfully recovered!\n");
@@ -6584,6 +6585,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
		break;

	default:

		card->info.layer_enforced = true;

		/* It's so early that we don't need the discipline_mutex yet. */

		rc = qeth_core_load_discipline(card, enforced_disc);

		if (rc)

			goto err_load;
@@ -6616,10 +6618,12 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev) 


	QETH_CARD_TEXT(card, 2, "removedv");



	mutex_lock(&card->discipline_mutex);

	if (card->discipline) {

		card->discipline->remove(gdev);

		qeth_core_free_discipline(card);

	}

	mutex_unlock(&card->discipline_mutex);



	qeth_free_qdio_queues(card);
@@ -6634,6 +6638,7 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev) 
	int rc = 0;

	enum qeth_discipline_id def_discipline;



	mutex_lock(&card->discipline_mutex);

	if (!card->discipline) {

		def_discipline = IS_IQD(card) ? QETH_DISCIPLINE_LAYER3 :

						QETH_DISCIPLINE_LAYER2;
@@ -6647,16 +6652,23 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev) 
		}

	}



	rc = qeth_set_online(card);

	rc = qeth_set_online(card, card->discipline);



err:

	mutex_unlock(&card->discipline_mutex);

	return rc;

}



static int qeth_core_set_offline(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc;



	return qeth_set_offline(card, false);

	mutex_lock(&card->discipline_mutex);

	rc = qeth_set_offline(card, card->discipline, false);

	mutex_unlock(&card->discipline_mutex);



	return rc;

}



static void qeth_core_shutdown(struct ccwgroup_device *gdev)

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2208,7 +2208,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *gdev) 
	wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);



	if (gdev->state == CCWGROUP_ONLINE)

		qeth_set_offline(card, false);

		qeth_set_offline(card, card->discipline, false);



	cancel_work_sync(&card->close_dev_work);

	if (card->dev->reg_state == NETREG_REGISTERED)

drivers/s390/net/qeth_l3_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1813,7 +1813,7 @@ static netdev_features_t qeth_l3_osa_features_check(struct sk_buff *skb, 
						    struct net_device *dev,

						    netdev_features_t features)

{

	if (qeth_get_ip_version(skb) != 4)

	if (vlan_get_protocol(skb) != htons(ETH_P_IP))

		features &= ~NETIF_F_HW_VLAN_CTAG_TX;

	return qeth_features_check(skb, dev, features);

}
@@ -1971,7 +1971,7 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev) 
	wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);



	if (cgdev->state == CCWGROUP_ONLINE)

		qeth_set_offline(card, false);

		qeth_set_offline(card, card->discipline, false);



	cancel_work_sync(&card->close_dev_work);

	if (card->dev->reg_state == NETREG_REGISTERED)