haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

memory: allow MemoryListeners to observe a specific address space

Browse source 
Ignore any regions not belonging to a specified address space.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2012-02-08 21:05:17 +02:00
parent 8df8a8436f
commit 7376e5827a
6 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exec.c
View file

@ -3571,7 +3571,7 @@ static void memory_map_init(void)
memory_region_init(system_io, "io", 65536); memory_region_init(system_io, "io", 65536);
set_system_io_map(system_io); set_system_io_map(system_io);
memory_listener_register(&core_memory_listener); memory_listener_register(&core_memory_listener, NULL);
} }
MemoryRegion *get_system_memory(void) MemoryRegion *get_system_memory(void)

2
hw/vhost.c
View file

@ -774,7 +774,7 @@ int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force)
hdev->log_size = 0; hdev->log_size = 0;
hdev->log_enabled = false; hdev->log_enabled = false;
hdev->started = false; hdev->started = false;
memory_listener_register(&hdev->memory_listener); memory_listener_register(&hdev->memory_listener, NULL);
hdev->force = force; hdev->force = force;
return 0; return 0;
fail: fail:

2
kvm-all.c
View file

@ -1049,7 +1049,7 @@ int kvm_init(void)
} }
kvm_state = s; kvm_state = s;
memory_listener_register(&kvm_memory_listener); memory_listener_register(&kvm_memory_listener, NULL);
s->many_ioeventfds = kvm_check_many_ioeventfds(); s->many_ioeventfds = kvm_check_many_ioeventfds();

45
memory.c
View file

@ -84,7 +84,14 @@ static AddrRange addrrange_intersection(AddrRange r1, AddrRange r2)
enum ListenerDirection { Forward, Reverse }; enum ListenerDirection { Forward, Reverse };
#define MEMORY_LISTENER_CALL(_callback, _direction, _args...) \ static bool memory_listener_match(MemoryListener *listener,
MemoryRegionSection *section)
{
return !listener->address_space_filter
|| listener->address_space_filter == section->address_space;
}
#define MEMORY_LISTENER_CALL_GLOBAL(_callback, _direction, _args...) \
do { \ do { \
MemoryListener *_listener; \ MemoryListener *_listener; \
\ \
@ -105,15 +112,40 @@ enum ListenerDirection { Forward, Reverse };
} \ } \
} while (0) } while (0)
#define MEMORY_LISTENER_CALL(_callback, _direction, _section, _args...) \
do { \
MemoryListener *_listener; \
\
switch (_direction) { \
case Forward: \
QTAILQ_FOREACH(_listener, &memory_listeners, link) { \
if (memory_listener_match(_listener, _section)) { \
_listener->_callback(_listener, _section, ##_args); \
} \
} \
break; \
case Reverse: \
QTAILQ_FOREACH_REVERSE(_listener, &memory_listeners, \
memory_listeners, link) { \
if (memory_listener_match(_listener, _section)) { \
_listener->_callback(_listener, _section, ##_args); \
} \
} \
break; \
default: \
abort(); \
} \
} while (0)
#define MEMORY_LISTENER_UPDATE_REGION(fr, as, dir, callback) \ #define MEMORY_LISTENER_UPDATE_REGION(fr, as, dir, callback) \
MEMORY_LISTENER_CALL(callback, dir, &(MemoryRegionSection) { \ MEMORY_LISTENER_CALL(callback, dir, (&(MemoryRegionSection) { \
.mr = (fr)->mr, \ .mr = (fr)->mr, \
.address_space = (as)->root, \ .address_space = (as)->root, \
.offset_within_region = (fr)->offset_in_region, \ .offset_within_region = (fr)->offset_in_region, \
.size = int128_get64((fr)->addr.size), \ .size = int128_get64((fr)->addr.size), \
.offset_within_address_space = int128_get64((fr)->addr.start), \ .offset_within_address_space = int128_get64((fr)->addr.start), \
.readonly = (fr)->readonly, \ .readonly = (fr)->readonly, \
}) }))
struct CoalescedMemoryRange { struct CoalescedMemoryRange {
AddrRange addr; AddrRange addr;
@ -1382,13 +1414,13 @@ void memory_global_sync_dirty_bitmap(MemoryRegion *address_space)
void memory_global_dirty_log_start(void) void memory_global_dirty_log_start(void)
{ {
global_dirty_log = true; global_dirty_log = true;
MEMORY_LISTENER_CALL(log_global_start, Forward); MEMORY_LISTENER_CALL_GLOBAL(log_global_start, Forward);
} }
void memory_global_dirty_log_stop(void) void memory_global_dirty_log_stop(void)
{ {
global_dirty_log = false; global_dirty_log = false;
MEMORY_LISTENER_CALL(log_global_stop, Reverse); MEMORY_LISTENER_CALL_GLOBAL(log_global_stop, Reverse);
} }
static void listener_add_address_space(MemoryListener *listener, static void listener_add_address_space(MemoryListener *listener,
@ -1412,10 +1444,11 @@ static void listener_add_address_space(MemoryListener *listener,
} }
} }
void memory_listener_register(MemoryListener *listener) void memory_listener_register(MemoryListener *listener, MemoryRegion *filter)
{ {
MemoryListener *other = NULL; MemoryListener *other = NULL;
listener->address_space_filter = filter;
if (QTAILQ_EMPTY(&memory_listeners) if (QTAILQ_EMPTY(&memory_listeners)
|| listener->priority >= QTAILQ_LAST(&memory_listeners, || listener->priority >= QTAILQ_LAST(&memory_listeners,
memory_listeners)->priority) { memory_listeners)->priority) {

4
memory.h
View file

@ -193,6 +193,7 @@ struct MemoryListener {
bool match_data, uint64_t data, int fd); bool match_data, uint64_t data, int fd);
/* Lower = earlier (during add), later (during del) */ /* Lower = earlier (during add), later (during del) */
unsigned priority; unsigned priority;
MemoryRegion *address_space_filter;
QTAILQ_ENTRY(MemoryListener) link; QTAILQ_ENTRY(MemoryListener) link;
}; };
@ -685,8 +686,9 @@ void memory_region_transaction_commit(void);
* space * space
* *
* @listener: an object containing the callbacks to be called * @listener: an object containing the callbacks to be called
* @filter: if non-%NULL, only regions in this address space will be observed
*/ */
void memory_listener_register(MemoryListener *listener); void memory_listener_register(MemoryListener *listener, MemoryRegion *filter);
/** /**
* memory_listener_unregister: undo the effect of memory_listener_register() * memory_listener_unregister: undo the effect of memory_listener_register()

2
xen-all.c
View file

@ -989,7 +989,7 @@ int xen_hvm_init(void)
state->memory_listener = xen_memory_listener; state->memory_listener = xen_memory_listener;
QLIST_INIT(&state->physmap); QLIST_INIT(&state->physmap);
memory_listener_register(&state->memory_listener); memory_listener_register(&state->memory_listener, NULL);
state->log_for_dirtybit = NULL; state->log_for_dirtybit = NULL;
/* Initialize backend core & drivers */ /* Initialize backend core & drivers */