All of lore.kernel.org
 help / color / mirror / Atom feed
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, konrad.wilk@oracle.com,
	kvm@vger.kernel.org, hch@infradead.org
Subject: [RFC PATCH V2 2/7] virtio_ring: rename vring_desc_extra_packed
Date: Fri, 23 Apr 2021 16:09:37 +0800	[thread overview]
Message-ID: <20210423080942.2997-3-jasowang@redhat.com> (raw)
In-Reply-To: <20210423080942.2997-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


WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: ashish.kalra@amd.com, file@sect.tu-berlin.de,
	kvm@vger.kernel.org, konrad.wilk@oracle.com,
	linux-kernel@vger.kernel.org,
	virtualization@lists.linux-foundation.org, hch@infradead.org,
	xieyongji@bytedance.com, stefanha@redhat.com
Subject: [RFC PATCH V2 2/7] virtio_ring: rename vring_desc_extra_packed
Date: Fri, 23 Apr 2021 16:09:37 +0800	[thread overview]
Message-ID: <20210423080942.2997-3-jasowang@redhat.com> (raw)
In-Reply-To: <20210423080942.2997-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

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

  parent reply	other threads:[~2021-04-23  8:10 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-23  8:09 [RFC PATCH V2 0/7] Do not read from descripto ring Jason Wang
2021-04-23  8:09 ` Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 1/7] virtio-ring: maintain next in extra state for packed virtqueue Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-04-23  8:09 ` Jason Wang [this message]
2021-04-23  8:09   ` [RFC PATCH V2 2/7] virtio_ring: rename vring_desc_extra_packed Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 3/7] virtio-ring: factor out desc_extra allocation Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 4/7] virtio_ring: secure handling of mapping errors Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 5/7] virtio_ring: introduce virtqueue_desc_add_split() Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 6/7] virtio: use err label in __vring_new_virtqueue() Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-04-23  8:09 ` [RFC PATCH V2 7/7] virtio-ring: store DMA metadata in desc_extra for split virtqueue Jason Wang
2021-04-23  8:09   ` Jason Wang
2021-05-06  3:20 ` [RFC PATCH V2 0/7] Do not read from descripto ring Jason Wang
2021-05-06  3:20   ` Jason Wang
2021-05-06  8:12   ` Michael S. Tsirkin
2021-05-06  8:12     ` Michael S. Tsirkin
2021-05-06 12:38     ` Christoph Hellwig
2021-05-06 12:38       ` Christoph Hellwig
2021-05-14 11:13       ` Michael S. Tsirkin
2021-05-14 11:13         ` Michael S. Tsirkin
2021-06-04  5:38         ` Jason Wang
2021-06-04  5:38           ` Jason Wang
2021-07-11 16:08           ` Michael S. Tsirkin
2021-07-11 16:08             ` Michael S. Tsirkin
2021-07-12  3:07             ` Jason Wang
2021-07-12  3:07               ` Jason Wang
2021-07-12 12:58               ` Michael S. Tsirkin
2021-07-12 12:58                 ` Michael S. Tsirkin
2021-05-13 16:27 ` Stefan Hajnoczi
2021-05-13 16:27   ` Stefan Hajnoczi
2021-05-14  6:06   ` Yongji Xie
2021-05-14  7:30     ` Jason Wang
2021-05-14  7:30       ` Jason Wang
2021-05-14  8:40       ` Yongji Xie
2021-05-14  7:29   ` Jason Wang
2021-05-14  7:29     ` Jason Wang
2021-05-14 11:16     ` Stefan Hajnoczi
2021-05-14 11:16       ` Stefan Hajnoczi
2021-05-14 11:27       ` Yongji Xie
2021-05-14 11:36         ` Michael S. Tsirkin
2021-05-14 11:36           ` Michael S. Tsirkin
2021-05-14 13:58           ` Yongji Xie

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=20210423080942.2997-3-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=ashish.kalra@amd.com \
    --cc=file@sect.tu-berlin.de \
    --cc=hch@infradead.org \
    --cc=konrad.wilk@oracle.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.