On Tue, 25 Jun 2019 20:24:32 +0800
gengdongjiu <gengdongjiu@xxxxxxxxxx> wrote:
> On 2019/6/24 21:08, Igor Mammedov wrote:
> > On Tue, 14 May 2019 04:18:23 -0700
> > Dongjiu Geng <gengdongjiu@xxxxxxxxxx> wrote:
> >
> >> Add SIGBUS signal handler. In this handler, it checks the SIGBUS type,
> >> translates the host VA delivered by host to guest PA, then fill this PA
> >> to guest APEI GHES memory, then notify guest according to the SIGBUS type.
> >>
> >> If guest accesses the poisoned memory, it generates Synchronous External
> >> Abort(SEA). Then host kernel gets an APEI notification and call memory_failure()
> >> to unmapped the affected page for the guest's stage 2, finally return
> >> to guest.
> >>
> >> Guest continues to access PG_hwpoison page, it will trap to KVM as stage2 fault,
> >> then a SIGBUS_MCEERR_AR synchronous signal is delivered to Qemu, Qemu record this
> >> error address into guest APEI GHES memory and notify guest using
> >> Synchronous-External-Abort(SEA).
> >>
> >> Suggested-by: James Morse <james.morse@xxxxxxx>
> >> Signed-off-by: Dongjiu Geng <gengdongjiu@xxxxxxxxxx>
> >> ---
> >> hw/acpi/acpi_ghes.c | 177 ++++++++++++++++++++++++++++++++++++++++++++
> >> include/hw/acpi/acpi_ghes.h | 6 +-
> >> include/sysemu/kvm.h | 2 +-
> >> target/arm/kvm64.c | 39 ++++++++++
> >> 4 files changed, 222 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/hw/acpi/acpi_ghes.c b/hw/acpi/acpi_ghes.c
> >> index d03e797..06b7374 100644
> >> --- a/hw/acpi/acpi_ghes.c
> >> +++ b/hw/acpi/acpi_ghes.c
> >> @@ -26,6 +26,101 @@
> >> #include "sysemu/sysemu.h"
> >> #include "qemu/error-report.h"
> >>
> >> +/* UEFI 2.6: N.2.5 Memory Error Section */
> >> +static void build_append_mem_cper(GArray *table, uint64_t error_physical_addr)
> >> +{
> >> + /*
> >> + * Memory Error Record
> >> + */
> >> + build_append_int_noprefix(table,
> >> + (1UL << 14) | /* Type Valid */
> >> + (1UL << 1) /* Physical Address Valid */,
> >> + 8);
> > bad indent
> I will update it
>
> >
> >> + /* Memory error status information */
> >> + build_append_int_noprefix(table, 0, 8);
> >> + /* The physical address at which the memory error occurred */
> >> + build_append_int_noprefix(table, error_physical_addr, 8);
> >> + build_append_int_noprefix(table, 0, 48);
> >> + build_append_int_noprefix(table, 0 /* Unknown error */, 1);
> >> + build_append_int_noprefix(table, 0, 7);
> >> +}
> >> +
> >> +static int ghes_record_mem_error(uint64_t error_block_address,
> >> + uint64_t error_physical_addr)
> > bad indent
> I will update it
>
> >
> >
> >> +{
> >> + GArray *block;
> >> + uint64_t current_block_length;
> >> + uint32_t data_length;
> >> + /* Memory section */
> >> + char mem_section_id_le[] = {0x14, 0x11, 0xBC, 0xA5, 0x64, 0x6F, 0xDE,
> >> + 0x4E, 0xB8, 0x63, 0x3E, 0x83, 0xED, 0x7C,
> >> + 0x83, 0xB1};
> >> + uint8_t fru_id[16] = {0};
> >> + uint8_t fru_text[20] = {0};
> >> +
> >> + /* Generic Error Status Block
> >> + * | +---------------------+
> >> + * | | block_status |
> >> + * | +---------------------+
> >> + * | | raw_data_offset |
> >> + * | +---------------------+
> >> + * | | raw_data_length |
> >> + * | +---------------------+
> >> + * | | data_length |
> >> + * | +---------------------+
> >> + * | | error_severity |
> >> + * | +---------------------+
> >> + */
> >> + block = g_array_new(false, true /* clear */, 1);
> >> +
> >> + /* Get the length of the Generic Error Data Entries */
> >> + cpu_physical_memory_read(error_block_address +
> >> + offsetof(AcpiGenericErrorStatus, data_length), &data_length, 4);
> >> + /* The current whole length of the generic error status block */
> >> + current_block_length = sizeof(AcpiGenericErrorStatus) + le32_to_cpu(data_length);
> > I might be missing something but why do you read length from guest?
> > Isn't it something provided by QEMU/host?
> The length of the Generic Error Data Entries is not fixed, as the CPER number increases, the length will increase.
> there is already a member to record the length for the CPER in the table, this table is in the guest.
> so it is better directly read the length from the table instead of providing by QEMU/host.
If not careful using guest provided length for reading/writing buffers in QEMU opens road for exploits.
So if CPER is provided and managed by QEMU then it's better to calculate length
without relying on guest state. Or even rewrite whole status block without trying
to calculate delta.
