Skip to content

Commit

Permalink
vmbus cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierrick Bouvier <[email protected]>
  • Loading branch information
@pbo-linaro
pbo-linaro committed Mar 5, 2025
1 parent 9596c8b commit 9c4b46f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion hw/hyperv/meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'))
specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true: files('hyperv_testdev.c'))
specific_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c'))
system_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c'))
specific_ss.add(when: 'CONFIG_SYNDBG', if_true: files('syndbg.c'))
specific_ss.add(when: 'CONFIG_HV_BALLOON', if_true: files('hv-balloon.c', 'hv-balloon-page_range_tree.c', 'hv-balloon-our_range_memslots.c'))
system_ss.add(when: 'CONFIG_HV_BALLOON', if_false: files('hv-balloon-stub.c'))
50 changes: 25 additions & 25 deletions hw/hyperv/vmbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "hw/hyperv/vmbus.h"
#include "hw/hyperv/vmbus-bridge.h"
#include "hw/sysbus.h"
#include "cpu.h"
#include "exec/target_page.h"
#include "trace.h"

enum {
Expand Down Expand Up @@ -309,7 +309,7 @@ void vmbus_put_gpadl(VMBusGpadl *gpadl)

uint32_t vmbus_gpadl_len(VMBusGpadl *gpadl)
{
return gpadl->num_gfns * TARGET_PAGE_SIZE;
return gpadl->num_gfns * qemu_target_page_size();
}

static void gpadl_iter_init(GpadlIter *iter, VMBusGpadl *gpadl,
Expand All @@ -323,14 +323,14 @@ static void gpadl_iter_init(GpadlIter *iter, VMBusGpadl *gpadl,

static inline void gpadl_iter_cache_unmap(GpadlIter *iter)
{
uint32_t map_start_in_page = (uintptr_t)iter->map & ~TARGET_PAGE_MASK;
uint32_t io_end_in_page = ((iter->last_off - 1) & ~TARGET_PAGE_MASK) + 1;
uint32_t map_start_in_page = (uintptr_t)iter->map & ~qemu_target_page_mask();
uint32_t io_end_in_page = ((iter->last_off - 1) & ~qemu_target_page_mask()) + 1;

/* mapping is only done to do non-zero amount of i/o */
assert(iter->last_off > 0);
assert(map_start_in_page < io_end_in_page);

dma_memory_unmap(iter->as, iter->map, TARGET_PAGE_SIZE - map_start_in_page,
dma_memory_unmap(iter->as, iter->map, qemu_target_page_size() - map_start_in_page,
iter->dir, io_end_in_page - map_start_in_page);
}

Expand All @@ -348,17 +348,17 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len)
assert(iter->active);

while (len) {
uint32_t off_in_page = iter->off & ~TARGET_PAGE_MASK;
uint32_t pgleft = TARGET_PAGE_SIZE - off_in_page;
uint32_t off_in_page = iter->off & ~qemu_target_page_mask();
uint32_t pgleft = qemu_target_page_size() - off_in_page;
uint32_t cplen = MIN(pgleft, len);
void *p;

/* try to reuse the cached mapping */
if (iter->map) {
uint32_t map_start_in_page =
(uintptr_t)iter->map & ~TARGET_PAGE_MASK;
uint32_t off_base = iter->off & ~TARGET_PAGE_MASK;
uint32_t mapped_base = (iter->last_off - 1) & ~TARGET_PAGE_MASK;
(uintptr_t)iter->map & ~qemu_target_page_mask();
uint32_t off_base = iter->off & ~qemu_target_page_mask();
uint32_t mapped_base = (iter->last_off - 1) & ~qemu_target_page_mask();
if (off_base != mapped_base || off_in_page < map_start_in_page) {
gpadl_iter_cache_unmap(iter);
iter->map = NULL;
Expand All @@ -368,10 +368,10 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len)
if (!iter->map) {
dma_addr_t maddr;
dma_addr_t mlen = pgleft;
uint32_t idx = iter->off >> TARGET_PAGE_BITS;
uint32_t idx = iter->off >> qemu_target_page_bits();
assert(idx < iter->gpadl->num_gfns);

maddr = (iter->gpadl->gfns[idx] << TARGET_PAGE_BITS) | off_in_page;
maddr = (iter->gpadl->gfns[idx] << qemu_target_page_bits()) | off_in_page;

iter->map = dma_memory_map(iter->as, maddr, &mlen, iter->dir,
MEMTXATTRS_UNSPECIFIED);
Expand All @@ -382,7 +382,7 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len)
}
}

p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) |
p = (void *)(uintptr_t)(((uintptr_t)iter->map & qemu_target_page_mask()) |
off_in_page);
if (iter->dir == DMA_DIRECTION_FROM_DEVICE) {
memcpy(p, buf, cplen);
Expand Down Expand Up @@ -591,9 +591,9 @@ static void ringbuf_init_common(VMBusRingBufCommon *ringbuf, VMBusGpadl *gpadl,
uint32_t begin, uint32_t end)
{
ringbuf->as = as;
ringbuf->rb_addr = gpadl->gfns[begin] << TARGET_PAGE_BITS;
ringbuf->base = (begin + 1) << TARGET_PAGE_BITS;
ringbuf->len = (end - begin - 1) << TARGET_PAGE_BITS;
ringbuf->rb_addr = gpadl->gfns[begin] << qemu_target_page_bits();
ringbuf->base = (begin + 1) << qemu_target_page_bits();
ringbuf->len = (end - begin - 1) << qemu_target_page_bits();
gpadl_iter_init(&ringbuf->iter, gpadl, as, dir);
}

Expand Down Expand Up @@ -734,7 +734,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *chan)
unsigned long *int_map, mask;
unsigned idx;
hwaddr addr = chan->vmbus->int_page_gpa;
hwaddr len = TARGET_PAGE_SIZE / 2, dirty = 0;
hwaddr len = qemu_target_page_size() / 2, dirty = 0;

trace_vmbus_channel_notify_guest(chan->id);

Expand All @@ -743,7 +743,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *chan)
}

int_map = cpu_physical_memory_map(addr, &len, 1);
if (len != TARGET_PAGE_SIZE / 2) {
if (len != qemu_target_page_size() / 2) {
res = -ENXIO;
goto unmap;
}
Expand Down Expand Up @@ -1038,14 +1038,14 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMBusDevice *dev,
}
len -= sizeof(range);

if (range.byte_offset & TARGET_PAGE_MASK) {
if (range.byte_offset & qemu_target_page_mask()) {
goto eio;
}

for (; range.byte_count; range.byte_offset = 0) {
uint64_t paddr;
uint32_t plen = MIN(range.byte_count,
TARGET_PAGE_SIZE - range.byte_offset);
qemu_target_page_size() - range.byte_offset);

if (len < sizeof(uint64_t)) {
goto eio;
Expand All @@ -1055,7 +1055,7 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMBusDevice *dev,
goto err;
}
len -= sizeof(uint64_t);
paddr <<= TARGET_PAGE_BITS;
paddr <<= qemu_target_page_bits();
paddr |= range.byte_offset;
range.byte_count -= plen;

Expand Down Expand Up @@ -1804,7 +1804,7 @@ static void handle_gpadl_header(VMBus *vmbus, vmbus_message_gpadl_header *msg,
* anything else and simplify things greatly.
*/
if (msg->rangecount != 1 || msg->range[0].byte_offset ||
(msg->range[0].byte_count != (num_gfns << TARGET_PAGE_BITS))) {
(msg->range[0].byte_count != (num_gfns << qemu_target_page_bits()))) {
return;
}

Expand Down Expand Up @@ -2240,10 +2240,10 @@ static void vmbus_signal_event(EventNotifier *e)
return;
}

addr = vmbus->int_page_gpa + TARGET_PAGE_SIZE / 2;
len = TARGET_PAGE_SIZE / 2;
addr = vmbus->int_page_gpa + qemu_target_page_size() / 2;
len = qemu_target_page_size() / 2;
int_map = cpu_physical_memory_map(addr, &len, 1);
if (len != TARGET_PAGE_SIZE / 2) {
if (len != qemu_target_page_size() / 2) {
goto unmap;
}

Expand Down

0 comments on commit 9c4b46f

Please sign in to comment.