Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'ibmvnic-Fix-parameter-change-request-handling' 



Nathan Fontenot says:

====================
ibmvnic: Fix parameter change request handling

When updating parameters for the ibmvnic driver there is a possibility
of entering an infinite loop if a return value other that a partial
success is received from sending the login CRQ.

Also, a deadlock can occur on the rtnl lock if netdev_notify_peers()
is called during driver reset for a parameter change reset.

This patch set corrects both of these issues by updating the return
code handling in ibmvnic_login() nand gaurding against calling
netdev_notify_peers() for parameter change requests.

Updates for V2: Correct spelling mistakes in commit messages.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7dd07c14 ebc701b7

drivers/net/ethernet/ibm/ibmvnic.c

+37 −21
Original line number Diff line number Diff line
@@ -794,46 +794,61 @@ static int ibmvnic_login(struct net_device *netdev) 
{

	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

	unsigned long timeout = msecs_to_jiffies(30000);

	struct device *dev = &adapter->vdev->dev;

	int retry_count = 0;

	int rc;



	do {

		if (adapter->renegotiate) {

			adapter->renegotiate = false;

		if (retry_count > IBMVNIC_MAX_QUEUES) {

			netdev_warn(netdev, "Login attempts exceeded\n");

			return -1;

		}



		adapter->init_done_rc = 0;

		reinit_completion(&adapter->init_done);

		rc = send_login(adapter);

		if (rc) {

			netdev_warn(netdev, "Unable to login\n");

			return rc;

		}



		if (!wait_for_completion_timeout(&adapter->init_done,

						 timeout)) {

			netdev_warn(netdev, "Login timed out\n");

			return -1;

		}



		if (adapter->init_done_rc == PARTIALSUCCESS) {

			retry_count++;

			release_sub_crqs(adapter, 1);



			adapter->init_done_rc = 0;

			reinit_completion(&adapter->init_done);

			send_cap_queries(adapter);

			if (!wait_for_completion_timeout(&adapter->init_done,

							 timeout)) {

				dev_err(dev, "Capabilities query timeout\n");

				netdev_warn(netdev,

					    "Capabilities query timed out\n");

				return -1;

			}



			rc = init_sub_crqs(adapter);

			if (rc) {

				dev_err(dev,

					"Initialization of SCRQ's failed\n");

				netdev_warn(netdev,

					    "SCRQ initialization failed\n");

				return -1;

			}



			rc = init_sub_crq_irqs(adapter);

			if (rc) {

				dev_err(dev,

					"Initialization of SCRQ's irqs failed\n");

				netdev_warn(netdev,

					    "SCRQ irq initialization failed\n");

				return -1;

			}

		}



		reinit_completion(&adapter->init_done);

		rc = send_login(adapter);

		if (rc) {

			dev_err(dev, "Unable to attempt device login\n");

			return rc;

		} else if (!wait_for_completion_timeout(&adapter->init_done,

						 timeout)) {

			dev_err(dev, "Login timeout\n");

		} else if (adapter->init_done_rc) {

			netdev_warn(netdev, "Adapter login failed\n");

			return -1;

		}

	} while (adapter->renegotiate);

	} while (adapter->init_done_rc == PARTIALSUCCESS);



	/* handle pending MAC address changes after successful login */

	if (adapter->mac_change_pending) {
@@ -1828,7 +1843,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
	for (i = 0; i < adapter->req_rx_queues; i++)

		napi_schedule(&adapter->napi[i]);



	if (adapter->reset_reason != VNIC_RESET_FAILOVER)

	if (adapter->reset_reason != VNIC_RESET_FAILOVER &&

	    adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)

		netdev_notify_peers(netdev);



	netif_carrier_on(netdev);
@@ -3942,7 +3958,7 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq, 
	 * to resend the login buffer with fewer queues requested.

	 */

	if (login_rsp_crq->generic.rc.code) {

		adapter->renegotiate = true;

		adapter->init_done_rc = login_rsp_crq->generic.rc.code;

		complete(&adapter->init_done);

		return 0;

	}

drivers/net/ethernet/ibm/ibmvnic.h

+0 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,6 @@ struct ibmvnic_adapter { 


	struct ibmvnic_sub_crq_queue **tx_scrq;

	struct ibmvnic_sub_crq_queue **rx_scrq;

	bool renegotiate;



	/* rx structs */

	struct napi_struct *napi;