Changeset 0180c67 in mainline

Timestamp:

2018-05-22T19:06:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7bf16b7e

Parents:

eda41a9e

git-author:

Jakub Jermar <jakub@…> (2018-05-19 19:27:18)

git-committer:

Jakub Jermar <jakub@…> (2018-05-22 19:06:50)

Message:

Separate buffers from virtqueues

Location:

uspace

Files:

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

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

@@ -99 +99 @@
         }
 
-        rc = virtio_virtq_setup(vdev, RECVQ1, RECVQ_SIZE, 1500,
-            VIRTQ_DESC_F_WRITE);
+        rc = virtio_virtq_setup(vdev, RECVQ1, RECVQ_SIZE);
         if (rc != EOK)
                 goto fail;
-        rc = virtio_virtq_setup(vdev, TRANSQ1, TRANSQ_SIZE, 1500, 0);
+        rc = virtio_virtq_setup(vdev, TRANSQ1, TRANSQ_SIZE);
         if (rc != EOK)
                 goto fail;
-        rc = virtio_virtq_setup(vdev, CTRLQ1, CTRLQ_SIZE, 512, 0);
+        rc = virtio_virtq_setup(vdev, CTRLQ1, CTRLQ_SIZE);
         if (rc != EOK)
                 goto fail;

uspace/lib/virtio/virtio-pci.h

@@ -144 +144 @@
         virtq_used_t *used;
 
-        /**
-         * Queue-size-sized array of virtual addresses of the atcual DMA
-         * buffers.
-         */
-        void **buffers;
-
         /** Address of the queue's notification register */
         ioport16_t *notify;
@@ -180 +174 @@
 } virtio_dev_t;
 
-extern errno_t virtio_virtq_setup(virtio_dev_t *, uint16_t, uint16_t, size_t,
-    uint16_t);
+extern errno_t virtio_virtq_setup(virtio_dev_t *, uint16_t, uint16_t);
 extern void virtio_virtq_teardown(virtio_dev_t *, uint16_t);
 

uspace/lib/virtio/virtio.c

@@ -38 +38 @@
 #include <ddf/log.h>
 
-errno_t virtio_virtq_setup(virtio_dev_t *vdev, uint16_t num, uint16_t size,
-    size_t buf_size, uint16_t buf_flags)
+errno_t virtio_virtq_setup(virtio_dev_t *vdev, uint16_t num, uint16_t size)
 {
         virtq_t *q = &vdev->queues[num];
@@ -52 +51 @@
         ddf_msg(LVL_NOTE, "Virtq %u: %u buffers", num, (unsigned) size);
 
-        /* Allocate array to hold virtual addresses of DMA buffers */
-        void **buffers = calloc(sizeof(void *), size);
-        if (!buffers)
-                return ENOMEM;
-
         size_t avail_offset = 0;
         size_t used_offset = 0;
-        size_t buffers_offset = 0;
 
         /*
@@ -74 +67 @@
         mem_size += sizeof(virtq_used_t) + sizeof(virtq_used_elem_t[size]) +
             sizeof(ioport16_t);
-        buffers_offset = mem_size;
-        mem_size += size * buf_size;
 
         /*
-         * Allocate DMA memory for the virtqueues and the buffers
+         * Allocate DMA memory for the virtqueues
          */
         q->virt = AS_AREA_ANY;
@@ -84 +75 @@
             AS_AREA_READ | AS_AREA_WRITE, 0, &q->phys, &q->virt);
         if (rc != EOK) {
-                free(buffers);
                 q->virt = NULL;
                 return rc;
@@ -94 +84 @@
         q->avail = q->virt + avail_offset;
         q->used = q->virt + used_offset;
-        q->buffers = buffers;
 
         memset(q->virt, 0, q->size);
 
         /*
-         * Initialize the descriptor table and the buffers array
+         * Initialize the descriptor table
          */
         for (unsigned i = 0; i < size; i++) {
-                q->desc[i].addr = q->phys + buffers_offset + i * buf_size;
-                q->desc[i].len = buf_size;
-                q->desc[i].flags = buf_flags;
-
-                q->buffers[i] = q->virt + buffers_offset + i * buf_size;
+                q->desc[i].addr = 0;
+                q->desc[i].len = 0;
+                q->desc[i].flags = 0;
         }
 
@@ -133 +120 @@
         if (q->size)
                 dmamem_unmap_anonymous(q->virt);
-        if (q->buffers)
-                free(q->buffers);
 }