Add symbols for memory listener priority
PATCH 3/3 exec/memory: Add symbol for the min value of memory listener priority
In reply to Isaku YamahataAdd MEMORY_LISTNER_PRIORITY_MIN for the symbolic value for the min value of the memory listener instead of the hard-coded magic value 0. Add explicit initialization.
No functional change intended.
--- accel/kvm/kvm-all.c | 1 + include/exec/memory.h | 1 + target/arm/kvm.c | 1 + 3 files changed, 3 insertions(+)
accel/kvm/kvm-all.c +1 -0
@@ -1103,6 +1103,7 @@ static MemoryListener kvm_coalesced_pio_listener = { .name = "kvm-coalesced-pio", .coalesced_io_add = kvm_coalesce_pio_add, .coalesced_io_del = kvm_coalesce_pio_del, + .priority = MEMORY_LISTENER_PRIORITY_MIN, };int kvm_check_extension (KVMState *s,unsigned int extension)
include/exec/memory.h +1 -0
@@ -811,6 +811,7 @@ struct IOMMUMemoryRegion {#define IOMMU_NOTIFIER_FOREACH (n, mr) \ QLIST_FOREACH((n), &(mr)->iommu_notify, node) +#define MEMORY_LISTENER_PRIORITY_MIN 0#define MEMORY_LISTENER_PRIORITY_ACCEL 10#define MEMORY_LISTENER_PRIORITY_DEV_BAKCNED 10
target/arm/kvm.c +1 -0
@@ -341,6 +341,7 @@ static MemoryListener devlistener = { .name = "kvm-arm", .region_add = kvm_arm_devlistener_add, .region_del = kvm_arm_devlistener_del, + .priority =MEMORY_LISTENER_PRIORITY_MIN, };static void kvm_arm_set_device_addr (KVMDevice *kd)
Signature · 1 line
2.25.1
cover Add symbols for memory listener priority
The hard-coded value, 10, is used for memory_listener_register(). Add symbolic values for priority of struct MemoryLister. Replace those hard-coded values with symbols.
The background is KVM guest memory[1] or TDX support. I'd like to add one more memory listener whose priority is higher than the KVM memory listener. And I don't want to hard-code 10 + 1.
[1] KVM gmem patches
https://github.com/sean-jc/linux/tree/x86/kvm_gmem_solo
Isaku Yamahata (3):
exec/memory: Add symbolic value for memory listener priority for accel exec/memory: Add symbol for memory listener priority for dev backend exec/memory: Add symbol for the min value of memory listener priority
accel/hvf/hvf-accel-ops.c | 2 +- accel/kvm/kvm-all.c | 5 +++-- hw/arm/xen_arm.c | 2 +- hw/i386/xen/xen-hvm.c | 2 +- hw/remote/proxy-memory-listener.c | 2 +- hw/virtio/vhost.c | 2 +- hw/xen/xen-hvm-common.c | 2 +- hw/xen/xen_pt.c | 4 ++-- include/exec/memory.h | 4 ++++ target/arm/kvm.c | 1 + target/i386/hax/hax-mem.c | 2 +- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- 13 files changed, 19 insertions(+), 13 deletions(-)
base-commit: cab35c73be9d579db105ef73fa8a60728a890098
Signature · 1 line
2.25.1
PATCH 1/3 exec/memory: Add symbolic value for memory listener priority for accel
Add MEMORY_LISTNER_PRIORITY_ACCEL for the symbolic value for the memory listener to replace the hard-coded value 10 for accel.
No functional change intended.
--- accel/hvf/hvf-accel-ops.c | 2 +- accel/kvm/kvm-all.c | 2 +- hw/arm/xen_arm.c | 2 +- hw/i386/xen/xen-hvm.c | 2 +- hw/xen/xen-hvm-common.c | 2 +- hw/xen/xen_pt.c | 4 ++-- include/exec/memory.h | 2 ++ target/i386/hax/hax-mem.c | 2 +- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-)
accel/hvf/hvf-accel-ops.c +1 -1
@@ -304,7 +304,7 @@ static void hvf_region_del(MemoryListener *listener,static MemoryListener hvf_memory_listener = { .name ="hvf" , - .priority =10 , + .priority =MEMORY_LISTENER_PRIORITY_ACCEL , .region_add = hvf_region_add, .region_del = hvf_region_del, .log_start = hvf_log_start,
accel/kvm/kvm-all.c +1 -1
@@ -1775,7 +1775,7 @@ void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, kml->listener.commit = kvm_region_commit; kml->listener.log_start = kvm_log_start; kml->listener.log_stop = kvm_log_stop; - kml->listener.priority =10 ; + kml->listener.priority =MEMORY_LISTENER_PRIORITY_ACCEL ; kml->listener.name = name;if (s->kvm_dirty_ring_size) {
hw/arm/xen_arm.c +1 -1
@@ -45,7 +45,7 @@ static MemoryListener xen_memory_listener = { .log_sync = NULL, .log_global_start = NULL, .log_global_stop = NULL, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, };struct XenArmState {
hw/i386/xen/xen-hvm.c +1 -1
@@ -467,7 +467,7 @@ static MemoryListener xen_memory_listener = { .log_sync = xen_log_sync, .log_global_start = xen_log_global_start, .log_global_stop = xen_log_global_stop, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, };static void regs_to_cpu (vmware_regs_t *vmport_regs,ioreq_t *req)
hw/xen/xen-hvm-common.c +1 -1
@@ -155,7 +155,7 @@ MemoryListener xen_io_listener = { .name = "xen-io", .region_add = xen_io_add, .region_del = xen_io_del, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, };DeviceListener xen_device_listener = {
hw/xen/xen_pt.c +2 -2
@@ -691,14 +691,14 @@ static const MemoryListener xen_pt_memory_listener = { .name = "xen-pt-mem", .region_add = xen_pt_region_add, .region_del = xen_pt_region_del, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, };static const MemoryListener xen_pt_io_listener = { .name ="xen-pt-io" , .region_add = xen_pt_io_region_add, .region_del = xen_pt_io_region_del, - .priority =10 , + .priority =MEMORY_LISTENER_PRIORITY_ACCEL , };/* destroy. */
include/exec/memory.h +2 -0
@@ -811,6 +811,8 @@ struct IOMMUMemoryRegion {#define IOMMU_NOTIFIER_FOREACH (n, mr) \ QLIST_FOREACH((n), &(mr)->iommu_notify, node) +#define MEMORY_LISTENER_PRIORITY_ACCEL 10 +/** * struct MemoryListener: callbacks structure for updates to the physical memory map *
target/i386/hax/hax-mem.c +1 -1
@@ -291,7 +291,7 @@ static MemoryListener hax_memory_listener = { .region_add = hax_region_add, .region_del = hax_region_del, .log_sync = hax_log_sync, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, }; static void hax_ram_block_added(RAMBlockNotifier *n, void *host, size_t size,
target/i386/nvmm/nvmm-all.c +1 -1
@@ -1138,7 +1138,7 @@ static MemoryListener nvmm_memory_listener = { .region_add = nvmm_region_add, .region_del = nvmm_region_del, .log_sync = nvmm_log_sync, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, }; static void
target/i386/whpx/whpx-all.c +1 -1
@@ -2427,7 +2427,7 @@ static MemoryListener whpx_memory_listener = { .region_add = whpx_region_add, .region_del = whpx_region_del, .log_sync = whpx_log_sync, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, };static void whpx_memory_init (void )
Signature · 1 line
2.25.1
PATCH 2/3 exec/memory: Add symbol for memory listener priority for dev backend
In reply to Isaku YamahataAdd MEMORY_LISTNER_PRIORITY_DEV_BAKCNED for the symbolic value for memory listener to replace the hard-coded value 10 for the device backend.
No functional change intended.
--- accel/kvm/kvm-all.c | 2 +- hw/remote/proxy-memory-listener.c | 2 +- hw/virtio/vhost.c | 2 +- include/exec/memory.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)
accel/kvm/kvm-all.c +1 -1
@@ -1800,7 +1800,7 @@ static MemoryListener kvm_io_listener = { .name = "kvm-io", .eventfd_add = kvm_io_ioeventfd_add, .eventfd_del = kvm_io_ioeventfd_del, - .priority = 10, + .priority = MEMORY_LISTENER_PRIORITY_DEV_BAKCNED, };int kvm_set_irq (KVMState *s,int irq,int level)
hw/remote/proxy-memory-listener.c +1 -1
@@ -217,7 +217,7 @@ void proxy_memory_listener_configure(ProxyMemoryListener *proxy_listener, proxy_listener->listener.commit = proxy_memory_listener_commit; proxy_listener->listener.region_add = proxy_memory_listener_region_addnop; proxy_listener->listener.region_nop = proxy_memory_listener_region_addnop; - proxy_listener->listener.priority =10 ; + proxy_listener->listener.priority =MEMORY_LISTENER_PRIORITY_DEV_BAKCNED ; proxy_listener->listener.name ="proxy" ; memory_listener_register(&proxy_listener->listener,
hw/virtio/vhost.c +1 -1
@@ -1445,7 +1445,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque, .log_sync = vhost_log_sync, .log_global_start = vhost_log_global_start, .log_global_stop = vhost_log_global_stop, - .priority = 10 + .priority = MEMORY_LISTENER_PRIORITY_DEV_BAKCNED }; hdev->iommu_listener = (MemoryListener ) {
include/exec/memory.h +1 -0
@@ -812,6 +812,7 @@ struct IOMMUMemoryRegion { QLIST_FOREACH((n), &(mr)->iommu_notify, node)#define MEMORY_LISTENER_PRIORITY_ACCEL 10 +#define MEMORY_LISTENER_PRIORITY_DEV_BAKCNED 10/** * struct MemoryListener: callbacks structure for updates to the physical memory map
Signature · 1 line
2.25.1
Quoted 8 lines · Isaku Yamahata
The hard-coded value, 10, is used for
memory_listener_register(). Add symbolic values for priority of struct MemoryLister. Replace those hard-coded values with symbols.The background is KVM guest memory[1] or TDX support. I'd like to add one more memory listener whose priority is higher than the KVM memory listener. And I don't want to hard-code 10 + 1.
Quoted 7 lines
[1] KVM gmem patches
https://github.com/sean-jc/linux/tree/x86/kvm_gmem_soloIsaku Yamahata (3):
exec/memory: Add symbolic value for memory listener priority for accel exec/memory: Add symbol for memory listener priority for dev backend exec/memory: Add symbol for the min value of memory listener priority
Series:
and queued fixing the typos, thanks.