From b38cf61385b71d8e5a6bdbddae1a73ef0e6dee46 Mon Sep 17 00:00:00 2001 From: Zbigniew Bodek Date: Tue, 4 Jul 2017 00:00:42 +0000 Subject: [PATCH] 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 Obtained from: Semihalf Sponsored by: Amazon.com Inc. --- sys/dev/ena/ena.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 3307f98249d..a48c8937ae5 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;