memory: notify hypervisor of all eventfds during listener (de)registration
When a new listener for an address space is registered, the hypervisor must be informed of all existing eventfds for that address space by calling eventfd_add() for that listener. Similarly, when a listener is de-registered from an address space, the hypervisor must be informed of all existing eventfds for that address space with a call to eventfd_del(). Same is also true for coalesced io. Send coalesced io add/del listener notifications if any flatrage for the address space registered with the listener intersects with any coalesced io range. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Ani Sinha <anisinha@redhat.com> Link: https://lore.kernel.org/r/20240918064853.30678-1-anisinha@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
parent
2af37e7919
commit
8d3031fa1b
@ -941,6 +941,38 @@ static void flat_range_coalesced_io_add(FlatRange *fr, AddressSpace *as)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
flat_range_coalesced_io_notify_listener_add_del(FlatRange *fr,
|
||||||
|
MemoryRegionSection *mrs,
|
||||||
|
MemoryListener *listener,
|
||||||
|
AddressSpace *as, bool add)
|
||||||
|
{
|
||||||
|
CoalescedMemoryRange *cmr;
|
||||||
|
MemoryRegion *mr = fr->mr;
|
||||||
|
AddrRange tmp;
|
||||||
|
|
||||||
|
QTAILQ_FOREACH(cmr, &mr->coalesced, link) {
|
||||||
|
tmp = addrrange_shift(cmr->addr,
|
||||||
|
int128_sub(fr->addr.start,
|
||||||
|
int128_make64(fr->offset_in_region)));
|
||||||
|
|
||||||
|
if (!addrrange_intersects(tmp, fr->addr)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
tmp = addrrange_intersection(tmp, fr->addr);
|
||||||
|
|
||||||
|
if (add && listener->coalesced_io_add) {
|
||||||
|
listener->coalesced_io_add(listener, mrs,
|
||||||
|
int128_get64(tmp.start),
|
||||||
|
int128_get64(tmp.size));
|
||||||
|
} else if (!add && listener->coalesced_io_del) {
|
||||||
|
listener->coalesced_io_del(listener, mrs,
|
||||||
|
int128_get64(tmp.start),
|
||||||
|
int128_get64(tmp.size));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void address_space_update_topology_pass(AddressSpace *as,
|
static void address_space_update_topology_pass(AddressSpace *as,
|
||||||
const FlatView *old_view,
|
const FlatView *old_view,
|
||||||
const FlatView *new_view,
|
const FlatView *new_view,
|
||||||
@ -3015,8 +3047,10 @@ void memory_global_dirty_log_stop(unsigned int flags)
|
|||||||
static void listener_add_address_space(MemoryListener *listener,
|
static void listener_add_address_space(MemoryListener *listener,
|
||||||
AddressSpace *as)
|
AddressSpace *as)
|
||||||
{
|
{
|
||||||
|
unsigned i;
|
||||||
FlatView *view;
|
FlatView *view;
|
||||||
FlatRange *fr;
|
FlatRange *fr;
|
||||||
|
MemoryRegionIoeventfd *fd;
|
||||||
|
|
||||||
if (listener->begin) {
|
if (listener->begin) {
|
||||||
listener->begin(listener);
|
listener->begin(listener);
|
||||||
@ -3041,10 +3075,34 @@ static void listener_add_address_space(MemoryListener *listener,
|
|||||||
if (listener->region_add) {
|
if (listener->region_add) {
|
||||||
listener->region_add(listener, §ion);
|
listener->region_add(listener, §ion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* send coalesced io add notifications */
|
||||||
|
flat_range_coalesced_io_notify_listener_add_del(fr, §ion,
|
||||||
|
listener, as, true);
|
||||||
|
|
||||||
if (fr->dirty_log_mask && listener->log_start) {
|
if (fr->dirty_log_mask && listener->log_start) {
|
||||||
listener->log_start(listener, §ion, 0, fr->dirty_log_mask);
|
listener->log_start(listener, §ion, 0, fr->dirty_log_mask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* register all eventfds for this address space for the newly registered
|
||||||
|
* listener.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < as->ioeventfd_nb; i++) {
|
||||||
|
fd = &as->ioeventfds[i];
|
||||||
|
MemoryRegionSection section = (MemoryRegionSection) {
|
||||||
|
.fv = view,
|
||||||
|
.offset_within_address_space = int128_get64(fd->addr.start),
|
||||||
|
.size = fd->addr.size,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (listener->eventfd_add) {
|
||||||
|
listener->eventfd_add(listener, §ion,
|
||||||
|
fd->match_data, fd->data, fd->e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (listener->commit) {
|
if (listener->commit) {
|
||||||
listener->commit(listener);
|
listener->commit(listener);
|
||||||
}
|
}
|
||||||
@ -3054,8 +3112,10 @@ static void listener_add_address_space(MemoryListener *listener,
|
|||||||
static void listener_del_address_space(MemoryListener *listener,
|
static void listener_del_address_space(MemoryListener *listener,
|
||||||
AddressSpace *as)
|
AddressSpace *as)
|
||||||
{
|
{
|
||||||
|
unsigned i;
|
||||||
FlatView *view;
|
FlatView *view;
|
||||||
FlatRange *fr;
|
FlatRange *fr;
|
||||||
|
MemoryRegionIoeventfd *fd;
|
||||||
|
|
||||||
if (listener->begin) {
|
if (listener->begin) {
|
||||||
listener->begin(listener);
|
listener->begin(listener);
|
||||||
@ -3067,10 +3127,33 @@ static void listener_del_address_space(MemoryListener *listener,
|
|||||||
if (fr->dirty_log_mask && listener->log_stop) {
|
if (fr->dirty_log_mask && listener->log_stop) {
|
||||||
listener->log_stop(listener, §ion, fr->dirty_log_mask, 0);
|
listener->log_stop(listener, §ion, fr->dirty_log_mask, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* send coalesced io del notifications */
|
||||||
|
flat_range_coalesced_io_notify_listener_add_del(fr, §ion,
|
||||||
|
listener, as, false);
|
||||||
if (listener->region_del) {
|
if (listener->region_del) {
|
||||||
listener->region_del(listener, §ion);
|
listener->region_del(listener, §ion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* de-register all eventfds for this address space for the current
|
||||||
|
* listener.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < as->ioeventfd_nb; i++) {
|
||||||
|
fd = &as->ioeventfds[i];
|
||||||
|
MemoryRegionSection section = (MemoryRegionSection) {
|
||||||
|
.fv = view,
|
||||||
|
.offset_within_address_space = int128_get64(fd->addr.start),
|
||||||
|
.size = fd->addr.size,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (listener->eventfd_del) {
|
||||||
|
listener->eventfd_del(listener, §ion,
|
||||||
|
fd->match_data, fd->data, fd->e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (listener->commit) {
|
if (listener->commit) {
|
||||||
listener->commit(listener);
|
listener->commit(listener);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user