Changeset 417aaafb in mainline

Timestamp:

2018-06-25T21:37:48Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3107e2

Parents:

ea6840d

Message:

Protect the virtqueue with a mutex

Location:

uspace

Files:

• drv/nic/virtio-net/virtio-net.c (modified) (2 diffs)
• lib/virtio/virtio-pci.h (modified) (2 diffs)
• lib/virtio/virtio.c (modified) (5 diffs)

uspace/drv/nic/virtio-net/virtio-net.c

@@ -155 +155 @@
     uint16_t *head)
 {
+        virtq_t *q = &vdev->queues[num];
+        fibril_mutex_lock(&q->lock);
         uint16_t descno = *head;
         if (descno != (uint16_t) -1U)
                 *head = virtio_virtq_desc_get_next(vdev, num, descno);
+        fibril_mutex_unlock(&q->lock);
         return descno;
 }
@@ -171 +174 @@
     uint16_t *head, uint16_t descno)
 {
+        virtq_t *q = &vdev->queues[num];
+        fibril_mutex_lock(&q->lock);
         virtio_virtq_desc_set(vdev, num, descno, 0, 0, VIRTQ_DESC_F_NEXT,
             *head);
         *head = descno;
+        fibril_mutex_unlock(&q->lock);
 }
 

uspace/lib/virtio/virtio-pci.h

@@ -36 +36 @@
 #include <pci_dev_iface.h>
 #include <ddi.h>
+#include <fibril_synch.h>
 
 #define VIRTIO_PCI_CAP_CAP_LEN(c)       ((c) + 2)
@@ -131 +132 @@
         size_t size;
 
+        /** Mutex protecting access to this virtqueue */
+        fibril_mutex_t lock;
+
         /**
          * Size of the queue which determines the number of descriptors and

uspace/lib/virtio/virtio.c

@@ -63 +63 @@
         virtq_t *q = &vdev->queues[num];
 
+        fibril_mutex_lock(&q->lock);
         uint16_t idx = pio_read_le16(&q->avail->idx);
         pio_write_le16(&q->avail->ring[idx % q->queue_size], descno);
@@ -69 +70 @@
         write_barrier();
         pio_write_le16(q->notify, num);
+        fibril_mutex_unlock(&q->lock);
 }
 
@@ -76 +78 @@
         virtq_t *q = &vdev->queues[num];
 
+        fibril_mutex_lock(&q->lock);
         uint16_t last_idx = q->used_last_idx % q->queue_size;
-        if (last_idx == (pio_read_le16(&q->used->idx) % q->queue_size))
+        if (last_idx == (pio_read_le16(&q->used->idx) % q->queue_size)) {
+                fibril_mutex_unlock(&q->lock);
                 return false;
+        }
 
         *descno = (uint16_t) pio_read_le32(&q->used->ring[last_idx].id);
@@ -84 +89 @@
 
         q->used_last_idx++;
+        fibril_mutex_unlock(&q->lock);
 
         return true;
@@ -132 +138 @@
         }
 
+        fibril_mutex_initialize(&q->lock);
+
         q->size = mem_size;
         q->queue_size = size;