From: gengdongjiu <gengdongjiu@huawei.com>
To: Igor Mammedov <imammedo@redhat.com>, <pbonzini@redhat.com>
Cc: peter.maydell@linaro.org, ehabkost@redhat.com,
kvm@vger.kernel.org, mst@redhat.com, mtosatti@redhat.com,
qemu-devel@nongnu.org, linuxarm@huawei.com,
shannon.zhaosl@gmail.com, zhengxiang9@huawei.com,
qemu-arm@nongnu.org, james.morse@arm.com, xuwei5@huawei.com,
jonathan.cameron@huawei.com, lersek@redhat.com, rth@twiddle.net
Subject: Re: [Qemu-devel] [PATCH v17 08/10] KVM: Move related hwpoison page functions to accel/kvm/ folder
Date: Tue, 25 Jun 2019 20:28:36 +0800 [thread overview]
Message-ID: <d7edd19e-340f-98ff-6613-34a5e85c05e2@huawei.com> (raw)
In-Reply-To: <20190624143249.37a5e6d5@redhat.com>
On 2019/6/24 20:32, Igor Mammedov wrote:
> On Tue, 14 May 2019 04:18:21 -0700
> Dongjiu Geng <gengdongjiu@huawei.com> wrote:
>
>> kvm_hwpoison_page_add() and kvm_unpoison_all() will be used both
>> by X86 and ARM platforms, so move these functions to a common
>> accel/kvm/ folder to avoid duplicate code.
>>
>> Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com>
>> ---
>> accel/kvm/kvm-all.c | 33 +++++++++++++++++++++++++++++++++
>> include/exec/ram_addr.h | 24 ++++++++++++++++++++++++
>> target/arm/kvm.c | 3 +++
>> target/i386/kvm.c | 34 +---------------------------------
>> 4 files changed, 61 insertions(+), 33 deletions(-)
>>
>> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
>> index 524c4dd..b9f9f29 100644
>> --- a/accel/kvm/kvm-all.c
>> +++ b/accel/kvm/kvm-all.c
>> @@ -625,6 +625,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)
>> diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
>> index 139ad79..193b0a7 100644
>> --- a/include/exec/ram_addr.h
>> +++ b/include/exec/ram_addr.h
>
> it's not file for KVM specific code,
> maybe Paolo could suggest a bettor place ...
I remember some people suggests me to move the code to KVM before, may be he is Peter.
Paolo, can you give a better place?
>
>
>> @@ -116,6 +116,30 @@ void qemu_ram_free(RAMBlock *block);
>>
>> int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
>>
>> +/**
>> + * kvm_hwpoison_page_add:
>> + *
>> + * Parameters:
>> + * @ram_addr: the address in the RAM for the poisoned page
>> + *
>> + * Add a poisoned page to the list
>> + *
>> + * Return: None.
>> + */
>> +void kvm_hwpoison_page_add(ram_addr_t ram_addr);
>> +
>> +/**
>> + * kvm_unpoison_all:
>> + *
>> + * Parameters:
>> + * @param: some data may be passed to this function
>> + *
>> + * Free and remove all the poisoned pages in the list
>> + *
>> + * Return: None.
>> + */
>> +void kvm_unpoison_all(void *param);
>> +
>> #define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1)
>> #define DIRTY_CLIENTS_NOCODE (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
>>
>> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
>> index 5995634..6d3b25b 100644
>> --- a/target/arm/kvm.c
>> +++ b/target/arm/kvm.c
>> @@ -29,6 +29,7 @@
>> #include "exec/address-spaces.h"
>> #include "hw/boards.h"
>> #include "qemu/log.h"
>> +#include "exec/ram_addr.h"
>>
>> const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
>> KVM_CAP_LAST_INFO
>> @@ -187,6 +188,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
>>
>> cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE);
>>
>> + qemu_register_reset(kvm_unpoison_all, NULL);
>> +
>> return 0;
>> }
>>
>> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
>> index 3b29ce5..9bdb879 100644
>> --- a/target/i386/kvm.c
>> +++ b/target/i386/kvm.c
>> @@ -46,6 +46,7 @@
>> #include "migration/blocker.h"
>> #include "exec/memattrs.h"
>> #include "trace.h"
>> +#include "exec/ram_addr.h"
>>
>> //#define DEBUG_KVM
>>
>> @@ -467,39 +468,6 @@ uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index)
>> }
>>
>>
>> -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)
>> {
>
> .
>
next prev parent reply other threads:[~2019-06-25 12:51 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 11:18 [Qemu-devel] [PATCH v17 00/10] Add ARMv8 RAS virtualization support in QEMU Dongjiu Geng
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 01/10] hw/arm/virt: Add RAS platform version for migration Dongjiu Geng
2019-06-20 12:04 ` Igor Mammedov
2019-06-24 12:19 ` gengdongjiu
2019-06-25 13:16 ` Igor Mammedov
2019-06-25 13:29 ` gengdongjiu
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 02/10] ACPI: add some GHES structures and macros definition Dongjiu Geng
2019-05-29 3:40 ` Michael S. Tsirkin
2019-05-30 14:58 ` gengdongjiu
2019-06-20 12:10 ` Igor Mammedov
2019-06-20 14:04 ` gengdongjiu
2019-06-20 15:09 ` Igor Mammedov
2019-06-20 17:17 ` gengdongjiu
2019-06-24 11:16 ` Igor Mammedov
2019-06-25 9:56 ` gengdongjiu
2019-06-25 13:33 ` Igor Mammedov
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 03/10] acpi: add build_append_ghes_notify() helper for Hardware Error Notification Dongjiu Geng
2019-06-24 11:21 ` Igor Mammedov
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 04/10] acpi: add build_append_ghes_generic_data() helper for Generic Error Data Entry Dongjiu Geng
2019-06-20 12:28 ` Igor Mammedov
2019-06-24 12:37 ` gengdongjiu
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 05/10] acpi: add build_append_ghes_generic_status() helper for Generic Error Status Block Dongjiu Geng
2019-06-20 12:42 ` Igor Mammedov
2019-06-25 12:11 ` gengdongjiu
2019-06-25 13:41 ` Igor Mammedov
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 06/10] docs: APEI GHES generation and CPER record description Dongjiu Geng
2019-06-24 11:39 ` Igor Mammedov
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 07/10] ACPI: Add APEI GHES table generation support Dongjiu Geng
2019-05-29 3:37 ` Michael S. Tsirkin
2019-05-30 14:47 ` gengdongjiu
2019-06-06 13:43 ` Jonathan Cameron
2019-06-24 12:27 ` Igor Mammedov
2019-06-25 13:48 ` gengdongjiu
2019-06-26 14:25 ` Igor Mammedov
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 08/10] KVM: Move related hwpoison page functions to accel/kvm/ folder Dongjiu Geng
2019-06-24 12:32 ` Igor Mammedov
2019-06-25 12:28 ` gengdongjiu [this message]
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 09/10] target-arm: kvm64: inject synchronous External Abort Dongjiu Geng
2019-05-14 11:18 ` [Qemu-devel] [PATCH v17 10/10] target-arm: kvm64: handle SIGBUS signal from kernel or KVM Dongjiu Geng
2019-06-06 13:31 ` Jonathan Cameron
2019-06-24 13:08 ` Igor Mammedov
2019-06-25 12:24 ` gengdongjiu
2019-06-25 13:32 ` Igor Mammedov
2019-05-15 9:40 ` [Qemu-devel] [PATCH v17 00/10] Add ARMv8 RAS virtualization support in QEMU gengdongjiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d7edd19e-340f-98ff-6613-34a5e85c05e2@huawei.com \
--to=gengdongjiu@huawei.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=james.morse@arm.com \
--cc=jonathan.cameron@huawei.com \
--cc=kvm@vger.kernel.org \
--cc=lersek@redhat.com \
--cc=linuxarm@huawei.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=xuwei5@huawei.com \
--cc=zhengxiang9@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).