Skip to content

Commit

Permalink
ibmvnic: Free and re-allocate scrqs when tx/rx scrqs change
Browse files Browse the repository at this point in the history 
When the driver resets it is possible that the number of tx/rx
sub-crqs can change. This patch handles this so that the driver does
not try to access non-existent sub-crqs.

The count for releasing sub crqs depends on the adapter state. The
active queue count is not set in probe, so if we are relasing in probe
state we use the request queue count.

Additionally, a parameter is added to release_sub_crqs() so that
we know if the h_call to free the sub-crq needs to be made. In
the reset path we have to do a reset of the main crq, which is
a free followed by a register of the main crq. The free of main
crq results in all of the sub crq's being free'ed. When updating
sub-crq count in the reset path we do not want to h_free the
sub-crqs, they are already free'ed.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nathan Fontenot authored and David S. Miller committed Feb 21, 2018
1 parent d9043c1 commit d7c0ef3
Showing 1 changed file with 52 additions and 26 deletions.
78 changes: 52 additions & 26 deletions drivers/net/ethernet/ibm/ibmvnic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ MODULE_VERSION(IBMVNIC_DRIVER_VERSION);

static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
static int ibmvnic_remove(struct vio_dev *);
static void release_sub_crqs(struct ibmvnic_adapter *);
static void release_sub_crqs(struct ibmvnic_adapter *, bool);
static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
static int ibmvnic_reenable_crq_queue(struct ibmvnic_adapter *);
Expand Down Expand Up @@ -740,7 +740,7 @@ static int ibmvnic_login(struct net_device *netdev)
do {
if (adapter->renegotiate) {
adapter->renegotiate = false;
release_sub_crqs(adapter);
release_sub_crqs(adapter, 1);

reinit_completion(&adapter->init_done);
send_cap_queries(adapter);
Expand Down Expand Up @@ -1648,7 +1648,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,
if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM ||
adapter->wait_for_reset) {
release_resources(adapter);
release_sub_crqs(adapter);
release_sub_crqs(adapter, 1);
release_crq_queue(adapter);
}

Expand Down Expand Up @@ -2288,24 +2288,27 @@ static int reset_sub_crq_queues(struct ibmvnic_adapter *adapter)
}

static void release_sub_crq_queue(struct ibmvnic_adapter *adapter,
struct ibmvnic_sub_crq_queue *scrq)
struct ibmvnic_sub_crq_queue *scrq,
bool do_h_free)
{
struct device *dev = &adapter->vdev->dev;
long rc;

netdev_dbg(adapter->netdev, "Releasing sub-CRQ\n");

/* Close the sub-crqs */
do {
rc = plpar_hcall_norets(H_FREE_SUB_CRQ,
adapter->vdev->unit_address,
scrq->crq_num);
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
if (do_h_free) {
/* Close the sub-crqs */
do {
rc = plpar_hcall_norets(H_FREE_SUB_CRQ,
adapter->vdev->unit_address,
scrq->crq_num);
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));

if (rc) {
netdev_err(adapter->netdev,
"Failed to release sub-CRQ %16lx, rc = %ld\n",
scrq->crq_num, rc);
if (rc) {
netdev_err(adapter->netdev,
"Failed to release sub-CRQ %16lx, rc = %ld\n",
scrq->crq_num, rc);
}
}

dma_unmap_single(dev, scrq->msg_token, 4 * PAGE_SIZE,
Expand Down Expand Up @@ -2373,12 +2376,21 @@ static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
return NULL;
}

static void release_sub_crqs(struct ibmvnic_adapter *adapter)
static void release_sub_crqs(struct ibmvnic_adapter *adapter, bool do_h_free)
{
u64 num_tx_scrqs, num_rx_scrqs;
int i;

if (adapter->state == VNIC_PROBED) {
num_tx_scrqs = adapter->req_tx_queues;
num_rx_scrqs = adapter->req_rx_queues;
} else {
num_tx_scrqs = adapter->num_active_tx_scrqs;
num_rx_scrqs = adapter->num_active_rx_scrqs;
}

if (adapter->tx_scrq) {
for (i = 0; i < adapter->req_tx_queues; i++) {
for (i = 0; i < num_tx_scrqs; i++) {
if (!adapter->tx_scrq[i])
continue;

Expand All @@ -2391,15 +2403,16 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
adapter->tx_scrq[i]->irq = 0;
}

release_sub_crq_queue(adapter, adapter->tx_scrq[i]);
release_sub_crq_queue(adapter, adapter->tx_scrq[i],
do_h_free);
}

kfree(adapter->tx_scrq);
adapter->tx_scrq = NULL;
}

if (adapter->rx_scrq) {
for (i = 0; i < adapter->req_rx_queues; i++) {
for (i = 0; i < num_rx_scrqs; i++) {
if (!adapter->rx_scrq[i])
continue;

Expand All @@ -2412,7 +2425,8 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
adapter->rx_scrq[i]->irq = 0;
}

release_sub_crq_queue(adapter, adapter->rx_scrq[i]);
release_sub_crq_queue(adapter, adapter->rx_scrq[i],
do_h_free);
}

kfree(adapter->rx_scrq);
Expand Down Expand Up @@ -2622,7 +2636,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);
irq_dispose_mapping(adapter->rx_scrq[j]->irq);
}
release_sub_crqs(adapter);
release_sub_crqs(adapter, 1);
return rc;
}

Expand Down Expand Up @@ -2704,7 +2718,7 @@ static int init_sub_crqs(struct ibmvnic_adapter *adapter)
adapter->tx_scrq = NULL;
tx_failed:
for (i = 0; i < registered_queues; i++)
release_sub_crq_queue(adapter, allqueues[i]);
release_sub_crq_queue(adapter, allqueues[i], 1);
kfree(allqueues);
return -1;
}
Expand Down Expand Up @@ -4331,6 +4345,7 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
{
struct device *dev = &adapter->vdev->dev;
unsigned long timeout = msecs_to_jiffies(30000);
u64 old_num_rx_queues, old_num_tx_queues;
int rc;

if (adapter->resetting && !adapter->wait_for_reset) {
Expand All @@ -4348,6 +4363,9 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)

adapter->from_passive_init = false;

old_num_rx_queues = adapter->req_rx_queues;
old_num_tx_queues = adapter->req_tx_queues;

init_completion(&adapter->init_done);
adapter->init_done_rc = 0;
ibmvnic_send_crq_init(adapter);
Expand All @@ -4367,10 +4385,18 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
return -1;
}

if (adapter->resetting && !adapter->wait_for_reset)
rc = reset_sub_crq_queues(adapter);
else
if (adapter->resetting && !adapter->wait_for_reset) {
if (adapter->req_rx_queues != old_num_rx_queues ||
adapter->req_tx_queues != old_num_tx_queues) {
release_sub_crqs(adapter, 0);
rc = init_sub_crqs(adapter);
} else {
rc = reset_sub_crq_queues(adapter);
}
} else {
rc = init_sub_crqs(adapter);
}

if (rc) {
dev_err(dev, "Initialization of sub crqs failed\n");
release_crq_queue(adapter);
Expand Down Expand Up @@ -4470,7 +4496,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
device_remove_file(&dev->dev, &dev_attr_failover);

ibmvnic_init_fail:
release_sub_crqs(adapter);
release_sub_crqs(adapter, 1);
release_crq_queue(adapter);
free_netdev(netdev);

Expand All @@ -4487,7 +4513,7 @@ static int ibmvnic_remove(struct vio_dev *dev)
mutex_lock(&adapter->reset_lock);

release_resources(adapter);
release_sub_crqs(adapter);
release_sub_crqs(adapter, 1);
release_crq_queue(adapter);

adapter->state = VNIC_REMOVED;
Expand Down

0 comments on commit d7c0ef3

Please sign in to comment.