From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, xieyongji@bytedance.com,
stefanha@redhat.com, file@sect.tu-berlin.de,
ashish.kalra@amd.com, martin.radev@aisec.fraunhofer.de,
konrad.wilk@oracle.com, kvm@vger.kernel.org
Subject: [RFC PATCH 2/7] virtio_ring: rename vring_desc_extra_packed
Date: Wed, 21 Apr 2021 11:21:12 +0800 [thread overview]
Message-ID: <20210421032117.5177-3-jasowang@redhat.com> (raw)
In-Reply-To: <20210421032117.5177-1-jasowang@redhat.com>
Rename vring_desc_extra_packed to vring_desc_extra since the structure
are pretty generic which could be reused by split virtqueue as well.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio_ring.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index e1e9ed42e637..c25ea5776687 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -77,7 +77,7 @@ struct vring_desc_state_packed {
u16 last; /* The last desc state in a list. */
};
-struct vring_desc_extra_packed {
+struct vring_desc_extra {
dma_addr_t addr; /* Buffer DMA addr. */
u32 len; /* Buffer length. */
u16 flags; /* Descriptor flags. */
@@ -166,7 +166,7 @@ struct vring_virtqueue {
/* Per-descriptor state. */
struct vring_desc_state_packed *desc_state;
- struct vring_desc_extra_packed *desc_extra;
+ struct vring_desc_extra *desc_extra;
/* DMA address and size information */
dma_addr_t ring_dma_addr;
@@ -912,7 +912,7 @@ static struct virtqueue *vring_create_virtqueue_split(
*/
static void vring_unmap_state_packed(const struct vring_virtqueue *vq,
- struct vring_desc_extra_packed *state)
+ struct vring_desc_extra *state)
{
u16 flags;
@@ -1651,13 +1651,13 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->free_head = 0;
vq->packed.desc_extra = kmalloc_array(num,
- sizeof(struct vring_desc_extra_packed),
+ sizeof(struct vring_desc_extra),
GFP_KERNEL);
if (!vq->packed.desc_extra)
goto err_desc_extra;
memset(vq->packed.desc_extra, 0,
- num * sizeof(struct vring_desc_extra_packed));
+ num * sizeof(struct vring_desc_extra));
for (i = 0; i < num - 1; i++)
vq->packed.desc_extra[i].next = i + 1;
--
2.25.1
next prev parent reply other threads:[~2021-04-21 3:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 3:21 [RFC PATCH 0/7] Untrusted device support for virtio Jason Wang
2021-04-21 3:21 ` [RFC PATCH 1/7] virtio-ring: maintain next in extra state for packed virtqueue Jason Wang
2021-04-21 3:21 ` Jason Wang [this message]
2021-04-21 3:21 ` [RFC PATCH 3/7] virtio-ring: factor out desc_extra allocation Jason Wang
2021-04-21 3:21 ` [RFC PATCH 4/7] virtio_ring: secure handling of mapping errors Jason Wang
2021-04-21 3:21 ` [RFC PATCH 5/7] virtio_ring: introduce virtqueue_desc_add_split() Jason Wang
2021-04-21 3:21 ` [RFC PATCH 6/7] virtio: use err label in __vring_new_virtqueue() Jason Wang
2021-04-21 3:21 ` [RFC PATCH 7/7] virtio-ring: store DMA metadata in desc_extra for split virtqueue Jason Wang
2021-04-22 6:31 ` [RFC PATCH 0/7] Untrusted device support for virtio Christoph Hellwig
2021-04-22 8:19 ` Jason Wang
2021-04-23 20:14 ` Michael S. Tsirkin
2021-04-25 1:43 ` Jason Wang
2021-04-28 21:06 ` Konrad Rzeszutek Wilk
2021-04-29 4:16 ` Jason Wang
2021-06-04 15:17 ` Konrad Rzeszutek Wilk
2021-06-07 2:46 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210421032117.5177-3-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=ashish.kalra@amd.com \
--cc=file@sect.tu-berlin.de \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.radev@aisec.fraunhofer.de \
--cc=mst@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xieyongji@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).