system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

xen-netfront: attempt to make cleanup idempotent

Browse source 
Current cleanup code assumes that all the fields are allocated and/or setup by
the time cleanup is called, but this is not always true: a failure in mid-setup
of the device will cause the functions to be called with possibly uninitialized
fields.

Fix the functions to cope with such sate, while also attempting to make the
cleanup idempotent.

Finally fix an error path during setup that would not mark the device as
closed, and hence prevents the kernel from finishing booting.

Fixes: 96375eac94 ("xen-netfront: add multiqueue support")
Sponsored by: Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2023-11-03 10:28:16 +01:00
parent 1a12f0aea8
commit 318bbb6d5a
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/dev/xen/netfront/netfront.c
View file

@ -589,8 +589,10 @@ talk_to_backend(device_t dev, struct netfront_info *info)
num_queues = max_queues;
err = setup_device(dev, info, num_queues);
if (err != 0)
if (err != 0) {
xenbus_dev_fatal(dev, err, "setup device");
goto out;
}
again:
err = xs_transaction_start(&xst);
@ -717,7 +719,10 @@ disconnect_rxq(struct netfront_rxq *rxq)
xn_release_rx_bufs(rxq);
gnttab_free_grant_references(rxq->gref_head);
gnttab_end_foreign_access(rxq->ring_ref, NULL);
if (rxq->ring_ref != GRANT_REF_INVALID) {
gnttab_end_foreign_access(rxq->ring_ref, NULL);
rxq->ring_ref = GRANT_REF_INVALID;
}
/*
* No split event channel support at the moment, handle will
* be unbound in tx. So no need to call xen_intr_unbind here,
@ -732,6 +737,7 @@ destroy_rxq(struct netfront_rxq *rxq)
callout_drain(&rxq->rx_refill);
free(rxq->ring.sring, M_DEVBUF);
rxq->ring.sring = NULL;
}
static void
@ -763,6 +769,8 @@ setup_rxqs(device_t dev, struct netfront_info *info,
rxq->id = q;
rxq->info = info;
rxq->gref_head = GNTTAB_LIST_END;
rxq->ring_ref = GRANT_REF_INVALID;
rxq->ring.sring = NULL;
snprintf(rxq->name, XN_QUEUE_NAME_LEN, "xnrx_%u", q);
@ -819,7 +827,10 @@ disconnect_txq(struct netfront_txq *txq)
xn_release_tx_bufs(txq);
gnttab_free_grant_references(txq->gref_head);
gnttab_end_foreign_access(txq->ring_ref, NULL);
if (txq->ring_ref != GRANT_REF_INVALID) {
gnttab_end_foreign_access(txq->ring_ref, NULL);
txq->ring_ref = GRANT_REF_INVALID;
}
xen_intr_unbind(&txq->xen_intr_handle);
}
@ -829,9 +840,14 @@ destroy_txq(struct netfront_txq *txq)
unsigned int i;
free(txq->ring.sring, M_DEVBUF);
txq->ring.sring = NULL;
buf_ring_free(txq->br, M_DEVBUF);
taskqueue_drain_all(txq->tq);
taskqueue_free(txq->tq);
txq->br = NULL;
if (txq->tq) {
taskqueue_drain_all(txq->tq);
taskqueue_free(txq->tq);
txq->tq = NULL;
}
for (i = 0; i <= NET_TX_RING_SIZE; i++) {
bus_dmamap_destroy(txq->info->dma_tag,
@ -870,6 +886,7 @@ setup_txqs(device_t dev, struct netfront_info *info,
txq->id = q;
txq->info = info;
txq->gref_head = GNTTAB_LIST_END;
txq->ring_ref = GRANT_REF_INVALID;
txq->ring.sring = NULL;