[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RESEND v12 09/12] Move related hwpoison page functio
From: |
Dongjiu Geng |
Subject: |
[Qemu-devel] [PATCH RESEND v12 09/12] Move related hwpoison page function to accel/kvm/ folder |
Date: |
Wed, 22 Nov 2017 02:37:11 +0800 |
kvm_hwpoison_page_add() and kvm_unpoison_all() will be used
by both X86 and ARM platforms, so move them to a common accel/kvm/
folder to avoid duplicate code.
Signed-off-by: Dongjiu Geng <address@hidden>
---
Address Peter's comments to move related hwpoison page function to accel/kvm
folder in [1]
Address Paolo's comments to move HWPoisonPage definition back to
accel/kvm/kvm-all.c
[1]:
https://lists.gnu.org/archive/html/qemu-arm/2017-09/msg00077.html
https://lists.gnu.org/archive/html/qemu-arm/2017-09/msg00152.html
---
accel/kvm/kvm-all.c | 34 ++++++++++++++++++++++++++++++++++
include/exec/ram_addr.h | 5 +++++
target/i386/kvm.c | 33 ---------------------------------
3 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 46ce479..98ac06c 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -564,6 +564,39 @@ int kvm_vm_check_extension(KVMState *s, unsigned int
extension)
return ret;
}
+typedef struct HWPoisonPage {
+ ram_addr_t ram_addr;
+ QLIST_ENTRY(HWPoisonPage) list;
+} HWPoisonPage;
+
+static QLIST_HEAD(, HWPoisonPage) hwpoison_page_list =
+ QLIST_HEAD_INITIALIZER(hwpoison_page_list);
+
+void kvm_unpoison_all(void *param)
+{
+ HWPoisonPage *page, *next_page;
+
+ QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) {
+ QLIST_REMOVE(page, list);
+ qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE);
+ g_free(page);
+ }
+}
+
+void kvm_hwpoison_page_add(ram_addr_t ram_addr)
+{
+ HWPoisonPage *page;
+
+ QLIST_FOREACH(page, &hwpoison_page_list, list) {
+ if (page->ram_addr == ram_addr) {
+ return;
+ }
+ }
+ page = g_new(HWPoisonPage, 1);
+ page->ram_addr = ram_addr;
+ QLIST_INSERT_HEAD(&hwpoison_page_list, page, list);
+}
+
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{
#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
@@ -2279,6 +2312,7 @@ bool kvm_arm_supports_user_irq(void)
return kvm_check_extension(kvm_state, KVM_CAP_ARM_USER_IRQ);
}
+
#ifdef KVM_CAP_SET_GUEST_DEBUG
struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu,
target_ulong pc)
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index d017639..2a25315 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -80,6 +80,11 @@ void qemu_ram_free(RAMBlock *block);
int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+/* Free and remove all the poisoned pages in the list */
+void kvm_unpoison_all(void *param);
+/* Add a poisoned page to the list */
+void kvm_hwpoison_page_add(ram_addr_t ram_addr);
+
#define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1)
#define DIRTY_CLIENTS_NOCODE (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 6db7783..3e1afb6 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -390,39 +390,6 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
return ret;
}
-typedef struct HWPoisonPage {
- ram_addr_t ram_addr;
- QLIST_ENTRY(HWPoisonPage) list;
-} HWPoisonPage;
-
-static QLIST_HEAD(, HWPoisonPage) hwpoison_page_list =
- QLIST_HEAD_INITIALIZER(hwpoison_page_list);
-
-static void kvm_unpoison_all(void *param)
-{
- HWPoisonPage *page, *next_page;
-
- QLIST_FOREACH_SAFE(page, &hwpoison_page_list, list, next_page) {
- QLIST_REMOVE(page, list);
- qemu_ram_remap(page->ram_addr, TARGET_PAGE_SIZE);
- g_free(page);
- }
-}
-
-static void kvm_hwpoison_page_add(ram_addr_t ram_addr)
-{
- HWPoisonPage *page;
-
- QLIST_FOREACH(page, &hwpoison_page_list, list) {
- if (page->ram_addr == ram_addr) {
- return;
- }
- }
- page = g_new(HWPoisonPage, 1);
- page->ram_addr = ram_addr;
- QLIST_INSERT_HEAD(&hwpoison_page_list, page, list);
-}
-
static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap,
int *max_banks)
{
--
1.8.3.1
- [Qemu-devel] [PATCH RESEND v12 00/12] Add RAS virtualization support in QEMU, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 03/12] docs: APEI GHES generation description, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 04/12] ACPI: enable APEI GHES in the configure file and build it, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 09/12] Move related hwpoison page function to accel/kvm/ folder,
Dongjiu Geng <=
- [Qemu-devel] [PATCH RESEND v12 08/12] target-arm: kvm64: inject synchronous External Abort, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 05/12] linux-headers: sync against Linux v4.14-rc8, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 01/12] ACPI: add related GHES structures and macros definition, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 07/12] target-arm: handle SError interrupt exception from the guest OS, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 12/12] target-arm: kvm64: handle SIGBUS signal from kernel or KVM, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 02/12] ACPI: Add APEI GHES table generation and CPER record support, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 11/12] hw/arm/virt: Add RAS platform version for migration, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 06/12] target-arm: kvm64: detect whether can set vsesr_el2, Dongjiu Geng, 2017/11/21
- [Qemu-devel] [PATCH RESEND v12 10/12] ARM: ACPI: Add _E04 for hardware error device, Dongjiu Geng, 2017/11/21