diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2018-03-22 21:52:03 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2018-03-23 00:16:39 +0000 |
| commit | 929399046cc464d1c38a4d4facf93476166a5662 (patch) | |
| tree | 593e3f55018f29a6aefaf54cf017fafca2c73b2d | |
| parent | 2136ccc7721a074a369d80492678baaa7cf47a67 (diff) | |
| download | illumos-joyent-929399046cc464d1c38a4d4facf93476166a5662.tar.gz | |
OS-6807 viona rx ring can deadlock on shutdown
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Ryan Zezeski <rpz@joyent.com>
Approved by: Ryan Zezeski <rpz@joyent.com>
| -rw-r--r-- | usr/src/uts/i86pc/io/viona/viona.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/uts/i86pc/io/viona/viona.c b/usr/src/uts/i86pc/io/viona/viona.c index ee1380ae7d..359f814265 100644 --- a/usr/src/uts/i86pc/io/viona/viona.c +++ b/usr/src/uts/i86pc/io/viona/viona.c @@ -1094,7 +1094,16 @@ viona_worker_rx(viona_vring_t *ring, viona_link_t *link) (void) cv_wait_sig(&ring->vr_cv, &ring->vr_lock); } while (!VRING_NEED_BAIL(ring, p)); + mutex_exit(&ring->vr_lock); + /* + * Clearing the RX function involves MAC quiescing any flows on that + * client. If MAC happens to be delivering packets to this ring via + * viona_rx() at the time of worker clean-up, that thread may need to + * acquire vr_lock for tasks such as delivering an interrupt. In order + * to avoid such deadlocks, vr_lock must temporarily be dropped here. + */ mac_rx_clear(link->l_mch); + mutex_enter(&ring->vr_lock); } static void |