From: Antonio Caggiano <antonio.caggiano@collabora.com>
To: qemu-devel@nongnu.org
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH v2 3/8] virtio: Add shared memory capability
Date: Wed, 28 Jul 2021 15:46:29 +0200 [thread overview]
Message-ID: <20210728134634.2142156-4-antonio.caggiano@collabora.com> (raw)
In-Reply-To: <20210728134634.2142156-1-antonio.caggiano@collabora.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Define a new capability type 'VIRTIO_PCI_CAP_SHARED_MEMORY_CFG'
and the data structure 'virtio_pci_shm_cap' to go with it.
They allow defining shared memory regions with sizes and offsets
of 2^32 and more.
Multiple instances of the capability are allowed and distinguished
by a device-specific 'id'.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
(cherry picked from commit a5d628a3a3c5e60b98b15ffff197c36a77056115)
---
hw/virtio/virtio-pci.c | 19 +++++++++++++++++++
hw/virtio/virtio-pci.h | 4 ++++
include/standard-headers/linux/virtio_pci.h | 7 +++++++
3 files changed, 30 insertions(+)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 433060ac02..3589386412 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1149,6 +1149,25 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
return offset;
}
+int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
+ uint8_t bar, uint64_t offset, uint64_t length,
+ uint8_t id)
+{
+ struct virtio_pci_shm_cap cap = {
+ .cap.cap_len = sizeof cap,
+ .cap.cfg_type = VIRTIO_PCI_CAP_SHARED_MEMORY_CFG,
+ };
+ uint32_t mask32 = ~0;
+
+ cap.cap.bar = bar;
+ cap.cap.length = cpu_to_le32(length & mask32);
+ cap.length_hi = cpu_to_le32((length >> 32) & mask32);
+ cap.cap.offset = cpu_to_le32(offset & mask32);
+ cap.offset_hi = cpu_to_le32((offset >> 32) & mask32);
+ cap.id = id;
+ return virtio_pci_add_mem_cap(proxy, &cap.cap);
+}
+
static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
unsigned size)
{
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 2446dcd9ae..5e5c4a4c6d 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -252,4 +252,8 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t);
*/
unsigned virtio_pci_optimal_num_queues(unsigned fixed_queues);
+int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
+ uint8_t bar, uint64_t offset, uint64_t length,
+ uint8_t id);
+
#endif
diff --git a/include/standard-headers/linux/virtio_pci.h b/include/standard-headers/linux/virtio_pci.h
index db7a8e2fcb..85d1420d29 100644
--- a/include/standard-headers/linux/virtio_pci.h
+++ b/include/standard-headers/linux/virtio_pci.h
@@ -172,6 +172,13 @@ struct virtio_pci_cfg_cap {
uint8_t pci_cfg_data[4]; /* Data for BAR access. */
};
+struct virtio_pci_shm_cap {
+ struct virtio_pci_cap cap;
+ uint32_t offset_hi; /* Most sig 32 bits of offset */
+ uint32_t length_hi; /* Most sig 32 bits of length */
+ uint8_t id; /* To distinguish shm chunks */
+};
+
/* Macro versions of offsets for the Old Timers! */
#define VIRTIO_PCI_CAP_VNDR 0
#define VIRTIO_PCI_CAP_NEXT 1
--
2.30.2
next prev parent reply other threads:[~2021-07-28 13:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 13:46 [PATCH v2 0/8] virtio-gpu: Support Venus Vulkan driver Antonio Caggiano
2021-07-28 13:46 ` [PATCH v2 1/8] virtio-gpu: CONTEXT_INIT feature Antonio Caggiano
2021-07-30 9:45 ` Gerd Hoffmann
2021-07-28 13:46 ` [PATCH v2 2/8] virtio-gpu: hostmem [wip] Antonio Caggiano
2021-07-28 18:46 ` Philippe Mathieu-Daudé
2021-07-30 9:49 ` Gerd Hoffmann
2021-07-28 13:46 ` Antonio Caggiano [this message]
2021-07-28 13:46 ` [PATCH v2 4/8] virtio-gpu: Shared memory capability Antonio Caggiano
2021-07-30 9:52 ` Gerd Hoffmann
2021-07-28 13:46 ` [PATCH v2 5/8] virtio-gpu: Resource UUID Antonio Caggiano
2021-07-30 9:57 ` Gerd Hoffmann
2021-07-28 13:46 ` [PATCH v2 6/8] virtio-gpu: Support Venus capset Antonio Caggiano
2021-07-30 9:59 ` Gerd Hoffmann
2021-07-28 13:46 ` [PATCH v2 7/8] virtio-gpu: Initialize Venus Antonio Caggiano
2021-07-28 18:44 ` Philippe Mathieu-Daudé
2021-07-30 10:00 ` Gerd Hoffmann
2021-07-28 13:46 ` [PATCH v2 8/8] virtio-gpu: Handle resource blob commands Antonio Caggiano
2021-07-30 10:04 ` Gerd Hoffmann
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=20210728134634.2142156-4-antonio.caggiano@collabora.com \
--to=antonio.caggiano@collabora.com \
--cc=dgilbert@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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).