jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

KVM: Move hwpoison page related functions into kvm-all.c

kvm_hwpoison_page_add() and kvm_unpoison_all() will both
be used by X86 and ARM platforms, so moving them into
"accel/kvm/kvm-all.c" to avoid duplicate code.

For architectures that don't use the poison-list functionality
the reset handler will harmlessly do nothing, so let's register
the kvm_unpoison_all() function in the generic kvm_init() function.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com>
Signed-off-by: Xiang Zheng <zhengxiang9@huawei.com>
Acked-by: Xiang Zheng <zhengxiang9@huawei.com>
Message-id: 20200512030609.19593-8-gengdongjiu@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

authored by

Dongjiu Geng and committed by
Peter Maydell 6b552b9b a08a6462

+48 -36
+36
accel/kvm/kvm-all.c
··· 44 44 #include "qapi/visitor.h" 45 45 #include "qapi/qapi-types-common.h" 46 46 #include "qapi/qapi-visit-common.h" 47 + #include "sysemu/reset.h" 47 48 48 49 #include "hw/boards.h" 49 50 ··· 881 882 } 882 883 883 884 return ret; 885 + } 886 + 887 + typedef struct HWPoisonPage { 888 + ram_addr_t ram_addr; 889 + QLIST_ENTRY(HWPoisonPage) list; 890 + } HWPoisonPage; 891 + 892 + static QLIST_HEAD(, HWPoisonPage) hwpoison_page_list = 893 + QLIST_HEAD_INITIALIZER(hwpoison_page_list); 894 + 895 + static void kvm_unpoison_all(void *param) 896 + { 897 + HWPoisonPage *page, *next_page; 898 + 899 + QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) { 900 + QLIST_REMOVE(page, list); 901 + qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE); 902 + g_free(page); 903 + } 904 + } 905 + 906 + void kvm_hwpoison_page_add(ram_addr_t ram_addr) 907 + { 908 + HWPoisonPage *page; 909 + 910 + QLIST_FOREACH(page, &hwpoison_page_list, list) { 911 + if (page->ram_addr == ram_addr) { 912 + return; 913 + } 914 + } 915 + page = g_new(HWPoisonPage, 1); 916 + page->ram_addr = ram_addr; 917 + QLIST_INSERT_HEAD(&hwpoison_page_list, page, list); 884 918 } 885 919 886 920 static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size) ··· 2084 2118 if (s->kernel_irqchip_split == ON_OFF_AUTO_AUTO) { 2085 2119 s->kernel_irqchip_split = mc->default_kernel_irqchip_split ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; 2086 2120 } 2121 + 2122 + qemu_register_reset(kvm_unpoison_all, NULL); 2087 2123 2088 2124 if (s->kernel_irqchip_allowed) { 2089 2125 kvm_irqchip_create(s);
+12
include/sysemu/kvm_int.h
··· 42 42 AddressSpace *as, int as_id); 43 43 44 44 void kvm_set_max_memslot_size(hwaddr max_slot_size); 45 + 46 + /** 47 + * kvm_hwpoison_page_add: 48 + * 49 + * Parameters: 50 + * @ram_addr: the address in the RAM for the poisoned page 51 + * 52 + * Add a poisoned page to the list 53 + * 54 + * Return: None. 55 + */ 56 + void kvm_hwpoison_page_add(ram_addr_t ram_addr); 45 57 #endif
-36
target/i386/kvm.c
··· 24 24 #include "sysemu/sysemu.h" 25 25 #include "sysemu/hw_accel.h" 26 26 #include "sysemu/kvm_int.h" 27 - #include "sysemu/reset.h" 28 27 #include "sysemu/runstate.h" 29 28 #include "kvm_i386.h" 30 29 #include "hyperv.h" ··· 531 530 default: 532 531 return value; 533 532 } 534 - } 535 - 536 - 537 - typedef struct HWPoisonPage { 538 - ram_addr_t ram_addr; 539 - QLIST_ENTRY(HWPoisonPage) list; 540 - } HWPoisonPage; 541 - 542 - static QLIST_HEAD(, HWPoisonPage) hwpoison_page_list = 543 - QLIST_HEAD_INITIALIZER(hwpoison_page_list); 544 - 545 - static void kvm_unpoison_all(void *param) 546 - { 547 - HWPoisonPage *page, *next_page; 548 - 549 - QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) { 550 - QLIST_REMOVE(page, list); 551 - qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE); 552 - g_free(page); 553 - } 554 - } 555 - 556 - static void kvm_hwpoison_page_add(ram_addr_t ram_addr) 557 - { 558 - HWPoisonPage *page; 559 - 560 - QLIST_FOREACH(page, &hwpoison_page_list, list) { 561 - if (page->ram_addr == ram_addr) { 562 - return; 563 - } 564 - } 565 - page = g_new(HWPoisonPage, 1); 566 - page->ram_addr = ram_addr; 567 - QLIST_INSERT_HEAD(&hwpoison_page_list, page, list); 568 533 } 569 534 570 535 static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, ··· 2180 2145 fprintf(stderr, "e820_add_entry() table is full\n"); 2181 2146 return ret; 2182 2147 } 2183 - qemu_register_reset(kvm_unpoison_all, NULL); 2184 2148 2185 2149 shadow_mem = object_property_get_int(OBJECT(s), "kvm-shadow-mem", &error_abort); 2186 2150 if (shadow_mem != -1) {