From nobody Sat Nov 29 10:17:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204377; cv=none; d=zohomail.com; s=zohoarc; b=mNG/V07eENRyFuG7jYh8It2RVsS7GEAVSBgLkCFRPLbtrTYu2D2OkYjU6clA9M6QGmwJtaVtiGYHrzxrnacKFZ2uR/9LJiKmp1pmgXHqT0AV91YoobElf7vKybz9aRubdoRnwVxIj0z3KSugsUSc0QvrX8cwWkDqy/O5A6IUzfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204377; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hJZHJutSaG2EsXCQPDcefCSnCjIQj+WaU8sibpmufkY=; b=hpSNFo2EG/zER52Jye1gQJutt+gu/bPZNLcQEdCj+Jxz+m3vnGbZx6/M99d+NN7EA49pG6nlVDaAyptiSJxiYXTxpYR7U0p2kFhIUlx8x/MOQ7vmXaOLJ7BHaD5KNGPZhpFrMOoQ1Lc0G/+A5LlZBS3pTFq2wkPCCTSn0e/LYm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204377039132.9875621140451; Wed, 26 Nov 2025 16:46:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8P-0000T0-41; Wed, 26 Nov 2025 19:45:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8J-0000P7-UF for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8G-0006fO-TY for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:15 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-eqiJ43aEPEGIH0bVagvkdA-1; Wed, 26 Nov 2025 19:45:08 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 219F0180035F; Thu, 27 Nov 2025 00:45:07 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A6D318004A3; Thu, 27 Nov 2025 00:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204312; 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=hJZHJutSaG2EsXCQPDcefCSnCjIQj+WaU8sibpmufkY=; b=bWLyiCSnff2xZh81OfqFtoxzVKHlIae0/7MimfjdRJtlIUdm+X8A/6i8uRBfKPBXx4AbZW JQ96es1GEWGZ3MrH86qLusoFpS52TCj48ac9GHYuyksYmpBeqof2H+ZCHCmAWeFushCYgd rh3Uz2e1Tdkvr0CJ4uJWRN1lXOHay1M= X-MC-Unique: eqiJ43aEPEGIH0bVagvkdA-1 X-Mimecast-MFC-AGG-ID: eqiJ43aEPEGIH0bVagvkdA_1764204307 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 1/5] acpi/ghes: Automate data block cleanup in acpi_ghes_memory_errors() Date: Thu, 27 Nov 2025 10:44:31 +1000 Message-ID: <20251127004435.2098335-2-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204379241019200 Content-Type: text/plain; charset="utf-8" Use g_auto_ptr() to automate data block cleanup in the function so that it won't be a burden to us. Suggested-by: Markus Armbruster Signed-off-by: Gavin Shan Reviewed-by: Markus Armbruster --- hw/acpi/ghes.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 06555905ce..6366c74248 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -565,9 +565,7 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_= t source_id, 0xED, 0x7C, 0x83, 0xB1); Error *errp =3D NULL; int data_length; - GArray *block; - - block =3D g_array_new(false, true /* clear */, 1); + g_autoptr(GArray) block =3D g_array_new(false, true /* clear */, 1); =20 data_length =3D ACPI_GHES_DATA_LENGTH + ACPI_GHES_MEM_CPER_LENGTH; /* @@ -585,8 +583,6 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_= t source_id, /* Report the error */ ghes_record_cper_errors(ags, block->data, block->len, source_id, &errp= ); =20 - g_array_free(block, true); - if (errp) { error_report_err(errp); return -1; --=20 2.51.1 From nobody Sat Nov 29 10:17:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204387; cv=none; d=zohomail.com; s=zohoarc; b=F4oo0R/eI3whKQEghKYy1SFGbVtCt0AH6ZvdvhP+DX0x0J0aYySqE2bPJoES8mERsJ5H3IkWhKb9BL7txaIOJCxeiftkmhVMn9HLEYYIlqNPKA9x7+KnPz5vQ8AxNb4wyglWZDbJcSIUUQrSKktsVXzGIc9N+5yf1Jr/UXIyBFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204387; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=t+tqqQvUFqNTVlh00Ywwj0fhJw5oQDzYQ+hgwc4k11g=; b=JG/IGYxfv7JWCHBQr3ZTB+wUdb1k1i8FwY2sI06SRZtbnqLnCkd/xiMLr3VFgKM4bYQ6Z9aTY8IXp3reCwDJ0RVro7iSV32yRepS/zd1YNy9pwaWY29F8zibLkUXRp6RHQuz6StezBw4q49Rh85y3BXPYXZKKVsqUmJzwqetDHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204387234800.4520323184095; Wed, 26 Nov 2025 16:46:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8P-0000WK-Va; Wed, 26 Nov 2025 19:45:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8O-0000SM-1A for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8M-0006g2-FU for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:19 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-478-DEpx_QFZNwa0ZU7yJMfw7w-1; Wed, 26 Nov 2025 19:45:15 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B994C1956068; Thu, 27 Nov 2025 00:45:13 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D58A31800346; Thu, 27 Nov 2025 00:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204317; 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=t+tqqQvUFqNTVlh00Ywwj0fhJw5oQDzYQ+hgwc4k11g=; b=ZaayqSch5CiWhckA0rBwsVV8u/NZF2c81HPstn7+WgcaLXeBh58XPvh5RHFgsGzJohOHGn hbcJRghJUbGg+ABzQtYhU+PM6KtMzA65fPjrx8vlYKYgloMALL+voZpviUL06aYe/lf4eR Ep+yetJ7n6yB4iN27K0lnFm6ha07e1M= X-MC-Unique: DEpx_QFZNwa0ZU7yJMfw7w-1 X-Mimecast-MFC-AGG-ID: DEpx_QFZNwa0ZU7yJMfw7w_1764204314 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 2/5] acpi/ghes: Abort in acpi_ghes_memory_errors() if necessary Date: Thu, 27 Nov 2025 10:44:32 +1000 Message-ID: <20251127004435.2098335-3-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204389142019200 Content-Type: text/plain; charset="utf-8" The function hw/acpi/ghes-stub.c::acpi_ghes_memory_errors() shouldn't be called by any one. Take g_assert_not_reached() as a clearer indication. Suggested-by: Markus Armbruster Signed-off-by: Gavin Shan --- hw/acpi/ghes-stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c index 40f660c246..b54f1b093c 100644 --- a/hw/acpi/ghes-stub.c +++ b/hw/acpi/ghes-stub.c @@ -14,7 +14,7 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, uint64_t physical_address) { - return -1; + g_assert_not_reached(); } =20 AcpiGhesState *acpi_ghes_get_state(void) --=20 2.51.1 From nobody Sat Nov 29 10:17:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204362; cv=none; d=zohomail.com; s=zohoarc; b=czOcsLdOxg/qWtenl70H2+7J5entgY7/9Oi7EauxzV/KxX2t7j8PjLHoAH8kXFt/SXmsQvQ+44SwTOQQoxHLjiFxt4tiLixKnPOSA+iMDXEcUa2M5ZkW/JIjEZ1AUwIyAtxIlI+3F44bVt5tReR5Uu0WRKasDNiKYkh1+9QqvF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204362; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yA/wejVZNzYL0KXn472axjGJ86cUSpnHL3wVM9aWxLk=; b=ijY6Al9xkijUxVKzlyKfjyL1fBR7+neMlGxcIxOZ0Ketr6wAI1Vu/s3Sx3jePJg4p5BwBiGL5TqVENjrw2maR3U6RedQtkkFdCzVy6dWhDRgWgCWF8IlffEWFF6/XXxjsuQ8KcD2OQBr3s95j/Et5CSAqW5VP45TLLLEWV5Ukfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204362116814.624597447395; Wed, 26 Nov 2025 16:46:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8W-0000fR-8d; Wed, 26 Nov 2025 19:45:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8U-0000dU-Oz for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8T-0006gr-Fu for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:26 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-QVCtzi6iNtOw-Te1vzhGpA-1; Wed, 26 Nov 2025 19:45:21 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9063180049F; Thu, 27 Nov 2025 00:45:19 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7CB5918004A3; Thu, 27 Nov 2025 00:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204324; 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=yA/wejVZNzYL0KXn472axjGJ86cUSpnHL3wVM9aWxLk=; b=LTeKFYdrxL7/bdXJs0LRzeyKUiTYeF56pN76sMzH16LpTqomeqRaS7JMbSUghZlwz8InL7 Bgcq62PgzEOass9P/ScSBqbpeZzoxydURwEhgXt0aM6sHGlN+DVx07f+emWSYGFrjJwha4 EJ/MbeHPo53PWOC54jdh0d6ZZTjdRbo= X-MC-Unique: QVCtzi6iNtOw-Te1vzhGpA-1 X-Mimecast-MFC-AGG-ID: QVCtzi6iNtOw-Te1vzhGpA_1764204320 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 3/5] target/arm/kvm: Exit on error from acpi_ghes_memory_errors() Date: Thu, 27 Nov 2025 10:44:33 +1000 Message-ID: <20251127004435.2098335-4-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204363137019200 Content-Type: text/plain; charset="utf-8" A core dump is no sense as there isn't programming bugs related to errors from acpi_ghes_memory_errors(). Exit instead of abort when the function returns errors, and the excessive error message is also dropped. Suggested-by: Igor Mammedov Suggested-by: Markus Armbruster Signed-off-by: Gavin Shan --- target/arm/kvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0d57081e69..acda0b3fb4 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2460,8 +2460,7 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, v= oid *addr) paddr)) { kvm_inject_arm_sea(c); } else { - error_report("failed to record the error"); - abort(); + exit(1); } } return; --=20 2.51.1 From nobody Sat Nov 29 10:17:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204377; cv=none; d=zohomail.com; s=zohoarc; b=b7f+e5OgMOseYHmXnK7lY41I9Y98dazo5DPFVr1QzN397OZfBZ2B/T8r0GhiMmrjzLva8vYNc5EUwPeiAED1uESwT9RQEG/SXAS+T2jM1tzlLgSXhajEoRbDyHalavJ04h4ABJDdkCM6r4SZYQa59cGHbcKB+gtL+WX5jgpY5A0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204377; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dTekhLTcHwbGmgTlG6sTMWagdp+bTk7K42A4+/BFuI8=; b=ZL8Jvl825wC6f9RKPgApfONSVXsmbpX2ekiiqr3A4coSi4JWFszyCVXr5HolG9Su1oz7xXODtCrNzuA0JsdBL8HDnmhGCr7yimEssCjmCt83LxwHjaHu/SYs7qWz7OHO6paC30Sl6DDW7iaaN6oWLrgBoerasUndAVudCPMGP1I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204377083840.3551075560231; Wed, 26 Nov 2025 16:46:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8f-0000jx-MN; Wed, 26 Nov 2025 19:45:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8e-0000j9-MQ for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8d-0006hd-7O for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:36 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-shSviguEOXyAfnEqIxCqEA-1; Wed, 26 Nov 2025 19:45:27 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E34E21956080; Thu, 27 Nov 2025 00:45:25 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A25DC18004A3; Thu, 27 Nov 2025 00:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204334; 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=dTekhLTcHwbGmgTlG6sTMWagdp+bTk7K42A4+/BFuI8=; b=agj+VbagtfEkGu4aLNrFscgJkwE3xBGW/mVlRDHVQXitAN2UQpWJnupkvHN6LPdY6Al2n9 Mhn4zwMH9DXd+oBo/x+CDEt3mkKHsvD6Ze/RrMjJTDqNJfXWLtVKN1iYGdC4Vkq//i1Xvl BLWtYTP1bfF3dftEUGUwiveiwOSdg6Y= X-MC-Unique: shSviguEOXyAfnEqIxCqEA-1 X-Mimecast-MFC-AGG-ID: shSviguEOXyAfnEqIxCqEA_1764204326 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 4/5] acpi/ghes: Bail early on error from get_ghes_source_offsets() Date: Thu, 27 Nov 2025 10:44:34 +1000 Message-ID: <20251127004435.2098335-5-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204379277019200 Content-Type: text/plain; charset="utf-8" For one particular error (Error), we can't call error_setg() for twice. Otherwise, the assert(*errp =3D=3D NULL) will be triggered unexpectedly in error_setv(). In ghes_record_cper_errors(), get_ghes_source_offsets() can return a error initialized by error_setg(). Without bailing on this error, it can call into the second error_setg() due to the unexpected value from the read acknowledgement register. Bail early in ghes_record_cper_errors() when error is received from get_ghes_source_offsets() to avoid the exception. Signed-off-by: Gavin Shan Reviewed-by: Jonathan Cameron Reviewed-by: Markus Armbruster --- hw/acpi/ghes.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 6366c74248..c35883dfa9 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -443,7 +443,7 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr =3D ghes_addr + sizeof(uint64_t); } =20 -static void get_ghes_source_offsets(uint16_t source_id, +static bool get_ghes_source_offsets(uint16_t source_id, uint64_t hest_addr, uint64_t *cper_addr, uint64_t *read_ack_start_addr, @@ -474,7 +474,7 @@ static void get_ghes_source_offsets(uint16_t source_id, /* For now, we only know the size of GHESv2 table */ if (type !=3D ACPI_GHES_SOURCE_GENERIC_ERROR_V2) { error_setg(errp, "HEST: type %d not supported.", type); - return; + return false; } =20 /* Compare CPER source ID at the GHESv2 structure */ @@ -488,7 +488,7 @@ static void get_ghes_source_offsets(uint16_t source_id, } if (i =3D=3D num_sources) { error_setg(errp, "HEST: Source %d not found.", source_id); - return; + return false; } =20 /* Navigate through table address pointers */ @@ -508,6 +508,8 @@ static void get_ghes_source_offsets(uint16_t source_id, cpu_physical_memory_read(hest_read_ack_addr, read_ack_start_addr, sizeof(*read_ack_start_addr)); *read_ack_start_addr =3D le64_to_cpu(*read_ack_start_addr); + + return true; } =20 NotifierList acpi_generic_error_notifiers =3D @@ -526,9 +528,10 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const= void *cper, size_t len, if (!ags->use_hest_addr) { get_hw_error_offsets(le64_to_cpu(ags->hw_error_le), &cper_addr, &read_ack_register_addr); - } else { - get_ghes_source_offsets(source_id, le64_to_cpu(ags->hest_addr_le), - &cper_addr, &read_ack_register_addr, errp); + } else if (!get_ghes_source_offsets(source_id, + le64_to_cpu(ags->hest_addr_le), + &cper_addr, &read_ack_register_addr, errp)) { + return; } =20 cpu_physical_memory_read(read_ack_register_addr, --=20 2.51.1 From nobody Sat Nov 29 10:17:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204385; cv=none; d=zohomail.com; s=zohoarc; b=dMnVTY4Zq22L0eZ2HOsOnfu6ShH2lPbygSrS2LRP3wwRajzMm5FMJFprHFl4nvj8+8c82SN8nwxeAydCDHK9Aeyv3FFH/kho1pwNDpCWYG0OO88qFzLoeNcRJBmxSsvMaTWHR7z+uPlicWMzqnQcadclpXmP8z0yUeNgr/lIDdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204385; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=D+eMsQpYXZU6IcoKdWWccAyk7/9QIRvSgLUxlij3+fQ=; b=dL0VJPLDSZIXdsPi0MOs0T7zeqxLu7MOGSF0YOsMmbd1qzxY2eVcoPTciYQCh8/0ZMRP65GQntP4VdfW+INBrhXc0qeDDSb82NXUj5Cvu+03bB8VPlR+IZSftVna6tp1m25TYgL194WQtFCIdUHJptWUeRpnT2kfQornxNVyJVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204385044270.3092201009947; Wed, 26 Nov 2025 16:46:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8p-0000tJ-Cy; Wed, 26 Nov 2025 19:45:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8g-0000kF-2M for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8e-0006jR-6E for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:37 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-f9HhfwJwN5ycEU-P_hc8Tw-1; Wed, 26 Nov 2025 19:45:33 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D38761956054; Thu, 27 Nov 2025 00:45:31 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 98F191800872; Thu, 27 Nov 2025 00:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204335; 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=D+eMsQpYXZU6IcoKdWWccAyk7/9QIRvSgLUxlij3+fQ=; b=TDBI7PfPQAGYsUntcRoR/FGpNvL9Iv7ufKUUW7TRLS9hM1jInGfIXCRQPQh4Q7ZjRGkmbG EmgBKGYmVzR1jlvVjUAcV1eU7SdZ91a4yI+NeLIKMPWLmeen+edC9gcu5ydQHWWtzRTiBD OFlBFfaFvNlMw5k611De4hHoYHKQ6uU= X-MC-Unique: f9HhfwJwN5ycEU-P_hc8Tw-1 X-Mimecast-MFC-AGG-ID: f9HhfwJwN5ycEU-P_hc8Tw_1764204332 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 5/5] acpi/ghes: Use error_fatal in acpi_ghes_memory_errors() Date: Thu, 27 Nov 2025 10:44:35 +1000 Message-ID: <20251127004435.2098335-6-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204387230019200 Content-Type: text/plain; charset="utf-8" Use error_fatal in acpi_ghes_memory_errors() so that the caller needn't explicitly call exit(). The return value of acpi_ghes_memory_errors() and ghes_record_cper_errors() is changed to 'bool' indicating an error has been raised, to be compatible with what's documented in error.h. Suggested-by: Igor Mammedov Suggested-by: Markus Armbruster Signed-off-by: Gavin Shan Reviewed-by: Jonathan Cameron Reviewed-by: Markus Armbruster --- hw/acpi/ghes-stub.c | 4 ++-- hw/acpi/ghes.c | 26 ++++++++++---------------- include/hw/acpi/ghes.h | 6 +++--- target/arm/kvm.c | 9 +++------ 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c index b54f1b093c..5f9313cce9 100644 --- a/hw/acpi/ghes-stub.c +++ b/hw/acpi/ghes-stub.c @@ -11,8 +11,8 @@ #include "qemu/osdep.h" #include "hw/acpi/ghes.h" =20 -int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, - uint64_t physical_address) +bool acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, + uint64_t physical_address, Error **errp) { g_assert_not_reached(); } diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index c35883dfa9..3033e93d65 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -515,14 +515,14 @@ static bool get_ghes_source_offsets(uint16_t source_i= d, NotifierList acpi_generic_error_notifiers =3D NOTIFIER_LIST_INITIALIZER(acpi_generic_error_notifiers); =20 -void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t = len, +bool ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t = len, uint16_t source_id, Error **errp) { uint64_t cper_addr =3D 0, read_ack_register_addr =3D 0, read_ack_regis= ter; =20 if (len > ACPI_GHES_MAX_RAW_DATA_LENGTH) { error_setg(errp, "GHES CPER record is too big: %zd", len); - return; + return false; } =20 if (!ags->use_hest_addr) { @@ -531,7 +531,7 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const = void *cper, size_t len, } else if (!get_ghes_source_offsets(source_id, le64_to_cpu(ags->hest_addr_le), &cper_addr, &read_ack_register_addr, errp)) { - return; + return false; } =20 cpu_physical_memory_read(read_ack_register_addr, @@ -542,7 +542,7 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const = void *cper, size_t len, error_setg(errp, "OSPM does not acknowledge previous error," " so can not record CPER for current error anymore"); - return; + return false; } =20 read_ack_register =3D cpu_to_le64(0); @@ -557,16 +557,17 @@ void ghes_record_cper_errors(AcpiGhesState *ags, cons= t void *cper, size_t len, cpu_physical_memory_write(cper_addr, cper, len); =20 notifier_list_notify(&acpi_generic_error_notifiers, &source_id); + + return true; } =20 -int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, - uint64_t physical_address) +bool acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, + uint64_t physical_address, Error **errp) { /* Memory Error Section Type */ const uint8_t guid[] =3D UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \ 0xED, 0x7C, 0x83, 0xB1); - Error *errp =3D NULL; int data_length; g_autoptr(GArray) block =3D g_array_new(false, true /* clear */, 1); =20 @@ -583,15 +584,8 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16= _t source_id, /* Build the memory section CPER for above new generic error data entr= y */ acpi_ghes_build_append_mem_cper(block, physical_address); =20 - /* Report the error */ - ghes_record_cper_errors(ags, block->data, block->len, source_id, &errp= ); - - if (errp) { - error_report_err(errp); - return -1; - } - - return 0; + return ghes_record_cper_errors(ags, block->data, block->len, + source_id, errp); } =20 AcpiGhesState *acpi_ghes_get_state(void) diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index df2ecbf6e4..5b29aae4dd 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -98,9 +98,9 @@ void acpi_build_hest(AcpiGhesState *ags, GArray *table_da= ta, 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(AcpiGhesState *ags, uint16_t source_id, - uint64_t error_physical_addr); -void ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t = len, +bool acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id, + uint64_t error_physical_addr, Error **errp); +bool ghes_record_cper_errors(AcpiGhesState *ags, const void *cper, size_t = len, uint16_t source_id, Error **errp); =20 /** diff --git a/target/arm/kvm.c b/target/arm/kvm.c index acda0b3fb4..76aa09810f 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2456,12 +2456,9 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, = void *addr) */ if (code =3D=3D BUS_MCEERR_AR) { kvm_cpu_synchronize_state(c); - if (!acpi_ghes_memory_errors(ags, ACPI_HEST_SRC_ID_SYNC, - paddr)) { - kvm_inject_arm_sea(c); - } else { - exit(1); - } + acpi_ghes_memory_errors(ags, ACPI_HEST_SRC_ID_SYNC, + paddr, &error_fatal); + kvm_inject_arm_sea(c); } return; } --=20 2.51.1