Changeset 331d024 in mainline

Timestamp:

2018-06-28T18:57:36Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1e472ee

Parents:

96c30c8

Message:

Move desc free list functions to libvirtio

Location:

uspace

Files:

• drv/nic/virtio-net/virtio-net.c (modified) (4 diffs)
• lib/virtio/virtio-pci.h (modified) (1 diff)
• lib/virtio/virtio.c (modified) (1 diff)

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

@@ -122 +122 @@
                 buf[0] = NULL;
         }
-}
-
-/** Create free descriptor list from the unused VIRTIO descriptors
- *
- * @param vdev[in]   VIRTIO device for which the free list will be created.
- * @param num[in]    Index of the virtqueue for which the free list will be
- *                   created.
- * @param size[in]   Number of descriptors on the free list. The free list will
- *                   contain descriptors starting from 0 to \a size - 1.
- * @param head[out]  Variable that will hold the VIRTIO descriptor at the head
- *                   of the free list.
- */
-static void virtio_net_create_desc_free_list(virtio_dev_t *vdev, uint16_t num,
-    uint16_t size, uint16_t *head)
-{
-        for (unsigned i = 0; i < size; i++) {
-                virtio_virtq_desc_set(vdev, num, i, 0, 0,
-                    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? -1U : i + 1);
-        }
-        *head = 0;
-}
-
-/** Allocate a descriptor from the free list
- *
- * @param vdev[in]      VIRTIO device with the free list.
- * @param num[in]       Index of the virtqueue with free list.
- * @param head[in,out]  Head of the free list.
- *
- * @return  Allocated descriptor or 0xFFFF if the list is empty.
- */
-static uint16_t virtio_net_alloc_desc(virtio_dev_t *vdev, uint16_t num,
-    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;
-}
-
-/** Free a descriptor into the free list
- *
- * @param vdev[in]      VIRTIO device with the free list.
- * @param num[in]       Index of the virtqueue with free list.
- * @param head[in,out]  Head of the free list.
- * @param descno[in]    The freed descriptor.
- */
-static void virtio_net_free_desc(virtio_dev_t *vdev, uint16_t num,
-    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);
 }
 
@@ -214 +156 @@
 
         while (virtio_virtq_consume_used(vdev, TX_QUEUE_1, &descno, &len)) {
-                virtio_net_free_desc(vdev, TX_QUEUE_1,
-                    &virtio_net->tx_free_head, descno);
+                virtio_free_desc(vdev, TX_QUEUE_1, &virtio_net->tx_free_head,
+                    descno);
         }
         while (virtio_virtq_consume_used(vdev, CT_QUEUE_1, &descno, &len)) {
-                virtio_net_free_desc(vdev, CT_QUEUE_1,
-                    &virtio_net->ct_free_head, descno);
+                virtio_free_desc(vdev, CT_QUEUE_1, &virtio_net->ct_free_head,
+                    descno);
         }
 }
@@ -379 +321 @@
          * Put all TX and CT buffers on a free list
          */
-        virtio_net_create_desc_free_list(vdev, TX_QUEUE_1, TX_BUFFERS,
+        virtio_create_desc_free_list(vdev, TX_QUEUE_1, TX_BUFFERS,
             &virtio_net->tx_free_head);
-        virtio_net_create_desc_free_list(vdev, CT_QUEUE_1, CT_BUFFERS,
+        virtio_create_desc_free_list(vdev, CT_QUEUE_1, CT_BUFFERS,
             &virtio_net->ct_free_head);
 
@@ -446 +388 @@
         }
 
-        uint16_t descno = virtio_net_alloc_desc(vdev, TX_QUEUE_1,
+        uint16_t descno = virtio_alloc_desc(vdev, TX_QUEUE_1,
             &virtio_net->tx_free_head);
         if (descno == (uint16_t) -1U) {

uspace/lib/virtio/virtio-pci.h

@@ -186 +186 @@
     uint16_t);
 
+extern void virtio_create_desc_free_list(virtio_dev_t *, uint16_t, uint16_t,
+    uint16_t *);
+extern uint16_t virtio_alloc_desc(virtio_dev_t *, uint16_t, uint16_t *);
+extern void virtio_free_desc(virtio_dev_t *, uint16_t, uint16_t *, uint16_t);
+
 extern void virtio_virtq_produce_available(virtio_dev_t *, uint16_t, uint16_t);
 extern bool virtio_virtq_consume_used(virtio_dev_t *, uint16_t, uint16_t *,

uspace/lib/virtio/virtio.c

@@ -57 +57 @@
         return pio_read_le16(&d->next);
 }
+
+/** Create free descriptor list from the unused VIRTIO descriptors
+ *
+ * @param vdev[in]   VIRTIO device for which the free list will be created.
+ * @param num[in]    Index of the virtqueue for which the free list will be
+ *                   created.
+ * @param size[in]   Number of descriptors on the free list. The free list will
+ *                   contain descriptors starting from 0 to \a size - 1.
+ * @param head[out]  Variable that will hold the VIRTIO descriptor at the head
+ *                   of the free list.
+ */
+void virtio_create_desc_free_list(virtio_dev_t *vdev, uint16_t num,
+    uint16_t size, uint16_t *head)
+{
+        for (unsigned i = 0; i < size; i++) {
+                virtio_virtq_desc_set(vdev, num, i, 0, 0,
+                    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? -1U : i + 1);
+        }
+        *head = 0;
+}
+
+/** Allocate a descriptor from the free list
+ *
+ * @param vdev[in]      VIRTIO device with the free list.
+ * @param num[in]       Index of the virtqueue with free list.
+ * @param head[in,out]  Head of the free list.
+ *
+ * @return  Allocated descriptor or 0xFFFF if the list is empty.
+ */
+uint16_t virtio_alloc_desc(virtio_dev_t *vdev, uint16_t num, 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;
+}
+
+/** Free a descriptor into the free list
+ *
+ * @param vdev[in]      VIRTIO device with the free list.
+ * @param num[in]       Index of the virtqueue with free list.
+ * @param head[in,out]  Head of the free list.
+ * @param descno[in]    The freed descriptor.
+ */
+void virtio_free_desc(virtio_dev_t *vdev, uint16_t num, 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);
+}
+
 
 void virtio_virtq_produce_available(virtio_dev_t *vdev, uint16_t num,