From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5F61192B71 for ; Wed, 29 Jan 2025 14:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738162537; cv=none; b=H/25sM+khgn84xLLPMdJqmvCYaTXesHHr0WMHSgu6E85Zd5rTDG7PI9tIE8Ud3Ml0CVonQMM8Lh3Y29v9S/MPS/fkDUwqRB2JU+0N81mnEjECKRVYsFD/PsRwVlkK0VnF2KgNIPg4fltcaRizgf1RpbzNKc3Cs2QBvcIZ0238oU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738162537; c=relaxed/simple; bh=OpvV2FRBoOXqoYVkx9trWaePyZ9bhhy3z7ClzhbzshA=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rTdeVTOvUOuz2XxhTG61r9nxJz/dYZOusgdAOeygb8UF7dSJrvcfujhQ7OXEPWrPkEGaxzO2/nxZ0CnLmoWTdWa4vLGEKV00DUNaQlQate9nf7W4Hf5HMTLffasIJHxBmWlmc2Hy58XjjF6+u3q07BQH7Xl8orDwkJCJo9LwXmU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=O0xsJd4l; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="O0xsJd4l" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738162534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gmrRKA0ChyO0vLu9JTiC5ZPpN5pGEUANDOxIesc4B2Q=; b=O0xsJd4lt5H2Gy23b53vPImfXomm/B4tyBd+XMVnOIUP1FW+mTfG7hvr6mx3YOXmic2oSU EuZ5TJGEHw6OSZAgRCZOsWQe/58Bpk1Xy9IlZQNmwOxp5NV1AqwXJ+Ud16ynuB0v77RY4H 6yRz/wD7RTjCv2da3xzfbAdvtA3De7A= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-217-Ae7uoTAiNlGqFlE90aEIhQ-1; Wed, 29 Jan 2025 09:55:33 -0500 X-MC-Unique: Ae7uoTAiNlGqFlE90aEIhQ-1 X-Mimecast-MFC-AGG-ID: Ae7uoTAiNlGqFlE90aEIhQ Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-385e2579507so2948830f8f.1 for ; Wed, 29 Jan 2025 06:55:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738162532; x=1738767332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gmrRKA0ChyO0vLu9JTiC5ZPpN5pGEUANDOxIesc4B2Q=; b=d4RtFX0w6u7D/3f2azVuwlyEs07BoY06hwVpRtTfxDBnXxPi2l9zrq8KTT5QqG7O6l IFsV/pjZ9qmPrSa+j2pX9Wh0Z2aut8DR5mLb2Y+miKvKpEvIzdqHujQD4XDStkyja3ko S1XW8FNf99V/odYHUpr1ll4m1tj3ReEOsZlZdUt1P36uOptkfSzNpz5TDnju4uciqpDO fP0OcR64hCUbg0h70qvphowO4g0lSryfdjBngUzOFcijLn3UeCwNl6Ce8IdiHhTT6hOU usFN6x+o/Y6oLqe1aCz3Da5p+zOjj3+cQYxYqKM/3ZkwFsjPxsVI6RpELyXeAiXcT7bW 56Zw== X-Forwarded-Encrypted: i=1; AJvYcCULqDrXw4L2TPLUyQq8AEI1l88DGoIhXbu8dRonwgng3wAwizmZSTxO54XJzkXLMy6g1C1QmP0Z//IeucY=@vger.kernel.org X-Gm-Message-State: AOJu0YxGxEVqFav3gH0vFLZXdy2aTfkgUvNJY8LODBhel4pN7j/y/u3A C2tpEHhPsmaly/Q5hJ0wiaCkT/eD4u3XTR6QsdglMnwsqRjRruMCMEwN99x5oLUQ2ANGWP5Ur1w HaXP8KjGlX+kVkOXVZvHk481/uNEYqKeji9GwiPxBEjYrNtGEKHS09n8IinMr1g== X-Gm-Gg: ASbGncvK+EmCkWJI4GAhKTlXzZhyEJ+3bZgngeWlpW+T6TiGCsLL8VPL0QWAstJCLjY HgSOM2OAYCgr8zn+4vQkN/+Q5JVo6378j7bUHKlysPFfku4y6Ibhj4cdUzbu4+b+Mwggj9zS8/X 73tdkoonL1OqIDK8E+Qn9uyrbtn3eJeuAXoAH57mE0nJud2kSS0moeW8s3gW+mSfKTO31CmKsBi H1pGLeDieI7t/i5hK47NVyxoeUaoASFO4MTtUxddZdokhdj12Waq21w+F6MMV3QIRjwlxMTMLvi /dA4iY2DjlW3+DCeusTGmSRzMA5sLYeHCQINkyPjgvlOVJi/oe0F X-Received: by 2002:a05:6000:1788:b0:38b:e32a:10aa with SMTP id ffacd0b85a97d-38c51949fbamr3141510f8f.5.1738162532011; Wed, 29 Jan 2025 06:55:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYY802k1TNGiUZEBvWD3euMsSo6t1SQYXX3//x/iaE/8GbMeWVCUlbIuRNN6C4/ug0ihsZow== X-Received: by 2002:a05:6000:1788:b0:38b:e32a:10aa with SMTP id ffacd0b85a97d-38c51949fbamr3141484f8f.5.1738162531533; Wed, 29 Jan 2025 06:55:31 -0800 (PST) Received: from imammedo.users.ipa.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a1bad16sm17727837f8f.68.2025.01.29.06.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 06:55:31 -0800 (PST) Date: Wed, 29 Jan 2025 15:55:30 +0100 From: Igor Mammedov To: Mauro Carvalho Chehab Cc: "Michael S . Tsirkin" , Jonathan Cameron , Shiju Jose , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Ani Sinha , Dongjiu Geng , Paolo Bonzini , Peter Maydell , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 08/13] acpi/ghes: Cleanup the code which gets ghes ged state Message-ID: <20250129155530.29455d45@imammedo.users.ipa.redhat.com> In-Reply-To: References: X-Mailer: Claws Mail 4.3.0 (GTK 3.24.43; x86_64-redhat-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 29 Jan 2025 09:04:14 +0100 Mauro Carvalho Chehab wrote: > Move the check logic into a common function and simplify the > code which checks if GHES is enabled and was properly setup. > > Signed-off-by: Mauro Carvalho Chehab > Reviewed-by: Jonathan Cameron with nits fixed: Reviewed-by: Igor Mammedov > --- > hw/acpi/ghes-stub.c | 7 ++++--- > hw/acpi/ghes.c | 43 ++++++++++++------------------------------ > include/hw/acpi/ghes.h | 15 ++++++++------- > target/arm/kvm.c | 8 ++++++-- > 4 files changed, 30 insertions(+), 43 deletions(-) > > diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c > index 7cec1812dad9..40f660c246fe 100644 > --- a/hw/acpi/ghes-stub.c > +++ b/hw/acpi/ghes-stub.c > @@ -11,12 +11,13 @@ > #include "qemu/osdep.h" > #include "hw/acpi/ghes.h" > > -int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address) > +int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, > + uint64_t physical_address) > { > return -1; > } > > -bool acpi_ghes_present(void) > +AcpiGhesState *acpi_ghes_get_state(void) > { > - return false; > + return NULL; > } > diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c > index 38ff95273706..849abfa12187 100644 > --- a/hw/acpi/ghes.c > +++ b/hw/acpi/ghes.c > @@ -407,18 +407,12 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s, > fw_cfg_add_file_callback(s, ACPI_HEST_ADDR_FW_CFG_FILE, NULL, NULL, > NULL, &(ags->hest_addr_le), sizeof(ags->hest_addr_le), false); > } > - > - ags->present = true; > } > > static void get_hw_error_offsets(uint64_t ghes_addr, > uint64_t *cper_addr, > uint64_t *read_ack_register_addr) > { > - if (!ghes_addr) { > - return; > - } > - > /* > * non-HEST version supports only one source, so no need to change > * the start offset based on the source ID. Also, we can't validate > @@ -447,9 +441,6 @@ static void get_ghes_source_offsets(uint16_t source_id, > uint64_t err_source_entry, error_block_addr; > uint32_t num_sources, i; > > - if (!hest_entry_addr) { > - return; > - } > > cpu_physical_memory_read(hest_entry_addr, &num_sources, > sizeof(num_sources)); > @@ -515,27 +506,17 @@ static void get_ghes_source_offsets(uint16_t source_id, > NotifierList acpi_generic_error_notifiers = > NOTIFIER_LIST_INITIALIZER(error_device_notifiers); > > -void ghes_record_cper_errors(const void *cper, size_t len, > +void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len, > uint16_t source_id, Error **errp) > { > uint64_t cper_addr = 0, read_ack_register_addr = 0, read_ack_register; > - AcpiGedState *acpi_ged_state; > - AcpiGhesState *ags; > > if (len > ACPI_GHES_MAX_RAW_DATA_LENGTH) { > error_setg(errp, "GHES CPER record is too big: %zd", len); > return; > } > > - acpi_ged_state = ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED, > - NULL)); > - if (!acpi_ged_state) { > - error_setg(errp, "Can't find ACPI_GED object"); > - return; > - } > - ags = &acpi_ged_state->ghes_state; > - > - if (!ags->hest_addr_le) { > + if (!ags->use_hest_addr) { > get_hw_error_offsets(le64_to_cpu(ags->hw_error_le), > &cper_addr, &read_ack_register_addr); > } else { > @@ -543,11 +524,6 @@ void ghes_record_cper_errors(const void *cper, size_t len, > &cper_addr, &read_ack_register_addr, errp); > } > > - if (!cper_addr) { > - error_setg(errp, "can not find Generic Error Status Block"); > - return; > - } > - > cpu_physical_memory_read(read_ack_register_addr, > &read_ack_register, sizeof(read_ack_register)); > > @@ -573,7 +549,8 @@ void ghes_record_cper_errors(const void *cper, size_t len, > notifier_list_notify(&acpi_generic_error_notifiers, NULL); > } > > -int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address) > +int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, > + uint64_t physical_address) > { > /* Memory Error Section Type */ > const uint8_t guid[] = > @@ -599,7 +576,7 @@ int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address) > acpi_ghes_build_append_mem_cper(block, physical_address); > > /* Report the error */ > - ghes_record_cper_errors(block->data, block->len, source_id, &errp); > + ghes_record_cper_errors(ags, block->data, block->len, source_id, &errp); > > g_array_free(block, true); > > @@ -611,7 +588,7 @@ int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address) > return 0; > } > > -bool acpi_ghes_present(void) > +AcpiGhesState *acpi_ghes_get_state(void) > { > AcpiGedState *acpi_ged_state; > AcpiGhesState *ags; > @@ -620,8 +597,12 @@ bool acpi_ghes_present(void) > NULL)); > > if (!acpi_ged_state) { > - return false; > + return NULL; > } > ags = &acpi_ged_state->ghes_state; > - return ags->present; > + > + if (!ags->hw_error_le && !ags->hest_addr_le) { should we add a warning here? (consider case where firmware hasn't managed to update pointers for some reason) > + return NULL; > + } > + return ags; > } > diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h > index 80a0c3fcfaca..e1b66141d01c 100644 > --- a/include/hw/acpi/ghes.h > +++ b/include/hw/acpi/ghes.h > @@ -63,7 +63,6 @@ enum AcpiGhesNotifyType { > typedef struct AcpiGhesState { > uint64_t hest_addr_le; > uint64_t hw_error_le; > - bool present; /* True if GHES is present at all on this board */ > bool use_hest_addr; /* True if HEST address is present */ > } AcpiGhesState; > > @@ -87,15 +86,17 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_data, > const char *oem_id, const char *oem_table_id); > void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, > GArray *hardware_errors); > -int acpi_ghes_memory_errors(uint16_t source_id, uint64_t error_physical_addr); > -void ghes_record_cper_errors(const void *cper, size_t len, > +int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, > + uint64_t error_physical_addr); > +void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t len, > uint16_t source_id, Error **errp); > > /** > - * acpi_ghes_present: Report whether ACPI GHES table is present > + * acpi_ghes_get_state: Get a pointer for ACPI ghes state > * > - * Returns: true if the system has an ACPI GHES table and it is > - * safe to call acpi_ghes_memory_errors() to record a memory error. > + * Returns: a pointer to ghes state if the system has an ACPI GHES table, > + * it is enabled and it is safe to call acpi_ghes_memory_errors() to record > + * a memory error. Returns false, otherwise. > */ > -bool acpi_ghes_present(void); > +AcpiGhesState *acpi_ghes_get_state(void); > #endif > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index da30bdbb2349..544ff174784d 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -2366,10 +2366,13 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) > { > ram_addr_t ram_addr; > hwaddr paddr; > + AcpiGhesState *ags; > > assert(code == BUS_MCEERR_AR || code == BUS_MCEERR_AO); > > - if (acpi_ghes_present() && addr) { > + ags = acpi_ghes_get_state(); > + I'd drop this newline > + if (ags && addr) { > ram_addr = qemu_ram_addr_from_host(addr); > if (ram_addr != RAM_ADDR_INVALID && > kvm_physical_memory_addr_from_host(c->kvm_state, addr, &paddr)) { > @@ -2387,7 +2390,8 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr) > */ > if (code == BUS_MCEERR_AR) { > kvm_cpu_synchronize_state(c); > - if (!acpi_ghes_memory_errors(ACPI_HEST_SRC_ID_SEA, paddr)) { > + if (!acpi_ghes_memory_errors(ags, ACPI_HEST_SRC_ID_SEA, > + paddr)) { > kvm_inject_arm_sea(c); > } else { > error_report("failed to record the error");