motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vdpa: add shadow_data to vhost_vdpa

Browse source 
The memory listener that thells the device how to convert GPA to qemu's
va is registered against CVQ vhost_vdpa. memory listener translations
are always ASID 0, CVQ ones are ASID 1 if supported.

Let's tell the listener if it needs to register them on iova tree or
not.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20221215113144.322011-12-eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-12-15 12:31:43 +01:00 • committed by Michael S. Tsirkin
parent 7f211a28fd
commit 6188d78a19
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/virtio/vhost-vdpa.c
View file

@ -224,7 +224,7 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
vaddr, section->readonly); vaddr, section->readonly);
llsize = int128_sub(llend, int128_make64(iova)); llsize = int128_sub(llend, int128_make64(iova));
if (v->shadow_vqs_enabled) { if (v->shadow_data) {
int r; int r;
mem_region.translated_addr = (hwaddr)(uintptr_t)vaddr, mem_region.translated_addr = (hwaddr)(uintptr_t)vaddr,
@ -251,7 +251,7 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
return; return;
fail_map: fail_map:
if (v->shadow_vqs_enabled) { if (v->shadow_data) {
vhost_iova_tree_remove(v->iova_tree, mem_region); vhost_iova_tree_remove(v->iova_tree, mem_region);
} }
@ -296,7 +296,7 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
llsize = int128_sub(llend, int128_make64(iova)); llsize = int128_sub(llend, int128_make64(iova));
if (v->shadow_vqs_enabled) { if (v->shadow_data) {
const DMAMap *result; const DMAMap *result;
const void *vaddr = memory_region_get_ram_ptr(section->mr) + const void *vaddr = memory_region_get_ram_ptr(section->mr) +
section->offset_within_region + section->offset_within_region +

2
include/hw/virtio/vhost-vdpa.h
View file

@ -40,6 +40,8 @@ typedef struct vhost_vdpa {
struct vhost_vdpa_iova_range iova_range; struct vhost_vdpa_iova_range iova_range;
uint64_t acked_features; uint64_t acked_features;
bool shadow_vqs_enabled; bool shadow_vqs_enabled;
/* Vdpa must send shadow addresses as IOTLB key for data queues, not GPA */
bool shadow_data;
/* IOVA mapping used by the Shadow Virtqueue */ /* IOVA mapping used by the Shadow Virtqueue */
VhostIOVATree *iova_tree; VhostIOVATree *iova_tree;
GPtrArray *shadow_vqs; GPtrArray *shadow_vqs;

1
net/vhost-vdpa.c
View file

@ -573,6 +573,7 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
s->always_svq = svq; s->always_svq = svq;
s->vhost_vdpa.shadow_vqs_enabled = svq; s->vhost_vdpa.shadow_vqs_enabled = svq;
s->vhost_vdpa.iova_range = iova_range; s->vhost_vdpa.iova_range = iova_range;
s->vhost_vdpa.shadow_data = svq;
s->vhost_vdpa.iova_tree = iova_tree; s->vhost_vdpa.iova_tree = iova_tree;
if (!is_datapath) { if (!is_datapath) {
s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(), s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(),