From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Matej Genci <matej.genci@nutanix.com>,
Jason Wang <jasowang@redhat.com>,
virtualization@lists.linux-foundation.org
Subject: [PATCH v6 04/12] virtio: add VIRTIO_RING_NO_LEGACY
Date: Mon, 6 Apr 2020 18:26:36 -0400 [thread overview]
Message-ID: <20200406222507.281867-5-mst@redhat.com> (raw)
In-Reply-To: <20200406222507.281867-1-mst@redhat.com>
From: Matej Genci <matej.genci@nutanix.com>
Add macro to disable legacy vring functions.
Signed-off-by: Matej Genci <matej.genci@nutanix.com>
Link: https://lore.kernel.org/r/20190911124942.243713-1-matej.genci@nutanix.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/virtio/virtio_pci_modern.c | 1 +
include/uapi/linux/virtio_ring.h | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 7abcc50838b8..db93cedd262f 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#define VIRTIO_PCI_NO_LEGACY
+#define VIRTIO_RING_NO_LEGACY
#include "virtio_pci_common.h"
/*
diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h
index 559f42e73315..9223c3a5c46a 100644
--- a/include/uapi/linux/virtio_ring.h
+++ b/include/uapi/linux/virtio_ring.h
@@ -135,6 +135,8 @@ struct vring {
#define VRING_USED_ALIGN_SIZE 4
#define VRING_DESC_ALIGN_SIZE 16
+#ifndef VIRTIO_RING_NO_LEGACY
+
/* The standard layout for the ring is a continuous chunk of memory which looks
* like this. We assume num is a power of 2.
*
@@ -181,6 +183,8 @@ static inline unsigned vring_size(unsigned int num, unsigned long align)
+ sizeof(__virtio16) * 3 + sizeof(struct vring_used_elem) * num;
}
+#endif /* VIRTIO_RING_NO_LEGACY */
+
/* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */
/* Assuming a given event_idx value from the other side, if
* we have just incremented index from old to new_idx,
--
MST
next prev parent reply other threads:[~2020-04-06 22:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 22:26 [PATCH v6 00/12] virtio: alignment issues Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 01/12] tools/virtio: define aligned attribute Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 02/12] tools/virtio: make asm/barrier.h self contained Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 03/12] tools/virtio: define __KERNEL__ Michael S. Tsirkin
2020-04-06 22:26 ` Michael S. Tsirkin [this message]
2020-04-06 22:26 ` [PATCH v6 05/12] virtio: stop using legacy struct vring in kernel Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 06/12] vhost: force spec specified alignment on types Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 07/12] virtio: add legacy init/size APIs Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 08/12] virtio_ring: switch to virtio_legacy_init/size Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 09/12] tools/virtio: " Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 10/12] vop: " Michael S. Tsirkin
2020-04-06 22:28 ` Dixit, Ashutosh
2020-04-06 22:26 ` [PATCH v6 11/12] remoteproc: " Michael S. Tsirkin
2020-04-06 22:26 ` [PATCH v6 12/12] mellanox: " Michael S. Tsirkin
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=20200406222507.281867-5-mst@redhat.com \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matej.genci@nutanix.com \
--cc=virtualization@lists.linux-foundation.org \
/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).