diff options
| author | Zbigniew Bodek <zbb@FreeBSD.org> | 2017-07-04 00:00:42 +0000 |
|---|---|---|
| committer | Zbigniew Bodek <zbb@FreeBSD.org> | 2017-07-04 00:00:42 +0000 |
| commit | b38cf61385b71d8e5a6bdbddae1a73ef0e6dee46 (patch) | |
| tree | a03543dc25dde38de2259dd6dd3cfb29a975ecb4 /sys/dev/ena | |
| parent | 3d3a90f9ab429ffe9bdf621a9769cd96e4c2e113 (diff) | |
| download | src-b38cf61385b71d8e5a6bdbddae1a73ef0e6dee46.tar.gz src-b38cf61385b71d8e5a6bdbddae1a73ef0e6dee46.zip | |
Acquire locks before calling drbr_flush()
It is required to hold lock that is associated with buffer ring before
flushing drbr.
Submitted by: Michal Krawczyk <mk@semihalf.com>
Obtained from: Semihalf
Sponsored by: Amazon.com Inc.
Notes
Notes:
svn path=/head/; revision=320626
Diffstat (limited to 'sys/dev/ena')
| -rw-r--r-- | sys/dev/ena/ena.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 3307f98249de..a48c8937ae5d 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -642,7 +642,9 @@ ena_setup_tx_resources(struct ena_adapter *adapter, int qid) tx_ring->next_to_clean = 0; /* Make sure that drbr is empty */ + ENA_RING_MTX_LOCK(tx_ring); drbr_flush(adapter->ifp, tx_ring->br); + ENA_RING_MTX_UNLOCK(tx_ring); /* ... and create the buffer DMA maps */ for (i = 0; i < tx_ring->ring_size; i++) { @@ -709,11 +711,11 @@ ena_free_tx_resources(struct ena_adapter *adapter, int qid) taskqueue_free(tx_ring->enqueue_tq); + ENA_RING_MTX_LOCK(tx_ring); /* Flush buffer ring, */ drbr_flush(adapter->ifp, tx_ring->br); /* Free buffer DMA maps, */ - ENA_RING_MTX_LOCK(tx_ring); for (int i = 0; i < tx_ring->ring_size; i++) { m_freem(tx_ring->tx_buffer_info[i].mbuf); tx_ring->tx_buffer_info[i].mbuf = NULL; |