Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

virtqueue: add more virtqueue apis for the virtio device side #631

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions lib/include/openamp/virtqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,37 @@ void *virtqueue_get_buffer(struct virtqueue *vq, uint32_t *len, uint16_t *idx);
void *virtqueue_get_available_buffer(struct virtqueue *vq, uint16_t *avail_idx,
uint32_t *len);

/**
* @internal
*
* @brief Returns next available buffer in the VirtIO queue
*
* @param vq Pointer to VirtIO queue control block
* @param idx Index of the buffer in vring desc table
* @param next_idx Pointer to index of next buffer in vring desc table
* @param next_len Pointer to length of next buffer in vring desc table
*
* @return Pointer to next available buffer
*/
void *virtqueue_get_next_avail_buffer(struct virtqueue *vq, uint16_t idx,
uint16_t *next_idx, uint32_t *next_len);

/**
* @internal
*
* @brief Get all the available buffers in the VirtIO queue
*
* @param vq Pointer to VirtIO queue control block
* @param vb Pointer to list of buffers
* @param vbsize Size of buffer list
* @param vbcnt Number of buffers returned
*
* @return 0 on success, otherwise error code.
*/
int virtqueue_get_available_buffers(struct virtqueue *vq,
struct virtqueue_buf *vb, int vbsize,
int *vbcnt);

/**
* @internal
*
Expand Down
57 changes: 57 additions & 0 deletions lib/virtio/virtqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,63 @@ void *virtqueue_get_available_buffer(struct virtqueue *vq, uint16_t *avail_idx,
return buffer;
}

void *virtqueue_get_next_avail_buffer(struct virtqueue *vq, uint16_t idx,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you still need this one? virtqueue_get_available_buffers should replace this function

uint16_t *next_idx, uint32_t *next_len)
{
void *buffer;
uint16_t next;

VRING_INVALIDATE(vq->vq_ring.desc[idx], sizeof(struct vring_desc));
if (!(vq->vq_ring.desc[idx].flags & VRING_DESC_F_NEXT))
return NULL;

next = vq->vq_ring.desc[idx].next;
if (next_idx)
*next_idx = next;

VRING_INVALIDATE(vq->vq_ring.desc[next], sizeof(struct vring_desc));
buffer = virtqueue_phys_to_virt(vq, vq->vq_ring.desc[next].addr);
if (next_len)
*next_len = vq->vq_ring.desc[next].len;

return buffer;
}

int virtqueue_get_available_buffers(struct virtqueue *vq,
struct virtqueue_buf *vb, int vbsize,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as mentioned in my previous comment you should return a struct vq_buf that contain the address, the size and the index of the needed buffers instead of just returning the buffer

int *vbcnt)
{
uint16_t head;
uint16_t idx;
uint32_t len;
void *buf;
int i;

buf = virtqueue_get_available_buffer(vq, &head, &len);
if (!buf)
return ERROR_VRING_NO_BUFF;

vb[0].buf = buf;
vb[0].len = len;

for (i = 1, idx = head; ; i++) {
buf = virtqueue_get_next_avail_buffer(vq, idx, &idx, &len);
if (!buf)
break;
else if (i >= vbsize) {
metal_log(METAL_LOG_ERROR, "vbsize %d is not enough\n",
vbsize);
return ERROR_VQUEUE_INVLD_PARAM;
}

vb[i].buf = buf;
vb[i].len = len;
}

*vbcnt = i;
return head;
}

int virtqueue_add_consumed_buffer(struct virtqueue *vq, uint16_t head_idx,
uint32_t len)
{
Expand Down