Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6267320rwb; Tue, 9 Aug 2022 12:04:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR6QoLL602zZfTKk04+kPGTWSKMTMPvgTDLLSNDq3yagIp8dIWewkSs1NgWZLxWBpNCCKiSR X-Received: by 2002:a65:4608:0:b0:41d:d4ea:4fc4 with SMTP id v8-20020a654608000000b0041dd4ea4fc4mr2111027pgq.186.1660071896841; Tue, 09 Aug 2022 12:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660071896; cv=none; d=google.com; s=arc-20160816; b=nWJt2v5Nz8G/hSvJozp3g96jhnwiXjN52D6wbiY2XluPM09XGzzSbiMr/lYJSZNRJb ix+x0ARozjg2M32hLuqYHMJsbJ9f+R2oRTwrLWUW4cxV2oX66jTZUS+dPdSP2FVr/w59 SUwmefw6S+C0JoeDGNsxoD4qGv7nuzIdxL4Oz2YUbWpKTGWXesv3N+2aaoklmPkFgxXe PbFZ9w5fjrX+41lzMojwXY4xgcjAZhCnO6J2I8CIP+Pt58BACz91CQT959z74UFmeSu1 q+V1jKF51oQydRSWGS+ZgwMrOTv8YcXQGEGc+cbkEAXQP4Hid86R/8uW30e74gaZnLTi tjGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VXbPQ4NxJcGBGd23ANy5/mrch48ZjLL52GuWchCfOns=; b=Zaqi2i1/qcfMmWxsOUCR8mxkhb6HkR1vO1yG3Y2W9GK9a7RtnQh9WHm6pwQL42R0vn bApzNPku1i1bC7VpWa1Nm8kJZTNzUDGIumywHGEMALP8mDDeZvVUH4Di/opiJZJzGB4l ka8HKUmOC2Pvwfttmkk8BamWWemryqNr1iK0eTk0zJGUmb+4SyexbI/Ix5k5ReGhAjQv kZpNJCpvDoNSAYYxWo8oia/2pW+EWisbUJO5901aJOSOzryhzygoru9swvCMAvkSEkrh 9x85YnVkNfsz5rhoFSOHeTacVuVOQskHeWQSRvZHmF7PawbssFBcUjpC8t/eIzOGFlVx JhWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KQ9lv3fU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hk11-20020a17090b224b00b001f028f147efsi877231pjb.82.2022.08.09.12.04.41; Tue, 09 Aug 2022 12:04:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KQ9lv3fU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344681AbiHISUq (ORCPT + 99 others); Tue, 9 Aug 2022 14:20:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347049AbiHISSU (ORCPT ); Tue, 9 Aug 2022 14:18:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7860E2F3A2; Tue, 9 Aug 2022 11:07:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7B20FB818EC; Tue, 9 Aug 2022 18:06:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C282BC433D6; Tue, 9 Aug 2022 18:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660068401; bh=aS6kC7/UR/+s4cEQ6IbqOtahiGkvu5P7CX0AzJ/IWIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQ9lv3fUflTGCqwLRYIHGDPsvsh2/dU3/hNfDvFWFfxVQC/uXYgj8mB8Lue/sjth1 a0rtm3zaqd2IEXnXyLpFoqa3wNISwZpSWbAX7tqZ4VcZbDXe6D+K6RtmukCad/jf2+ GoYm+2nALGdKKZ6E7sQsP5SOdHQdAuNmsLTyXlb4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Luck , "Rafael J. Wysocki" Subject: [PATCH 5.18 06/35] ACPI: APEI: Better fix to avoid spamming the console with old error logs Date: Tue, 9 Aug 2022 20:00:35 +0200 Message-Id: <20220809175515.299942787@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809175515.046484486@linuxfoundation.org> References: <20220809175515.046484486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tony Luck commit c3481b6b75b4797657838f44028fd28226ab48e0 upstream. The fix in commit 3f8dec116210 ("ACPI/APEI: Limit printable size of BERT table data") does not work as intended on systems where the BIOS has a fixed size block of memory for the BERT table, relying on s/w to quit when it finds a record with estatus->block_status == 0. On these systems all errors are suppressed because the check: if (region_len < ACPI_BERT_PRINT_MAX_LEN) always fails. New scheme skips individual CPER records that are too large, and also limits the total number of records that will be printed to 5. Fixes: 3f8dec116210 ("ACPI/APEI: Limit printable size of BERT table data") Cc: All applicable Signed-off-by: Tony Luck Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/apei/bert.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) --- a/drivers/acpi/apei/bert.c +++ b/drivers/acpi/apei/bert.c @@ -29,16 +29,26 @@ #undef pr_fmt #define pr_fmt(fmt) "BERT: " fmt + +#define ACPI_BERT_PRINT_MAX_RECORDS 5 #define ACPI_BERT_PRINT_MAX_LEN 1024 static int bert_disable; +/* + * Print "all" the error records in the BERT table, but avoid huge spam to + * the console if the BIOS included oversize records, or too many records. + * Skipping some records here does not lose anything because the full + * data is available to user tools in: + * /sys/firmware/acpi/tables/data/BERT + */ static void __init bert_print_all(struct acpi_bert_region *region, unsigned int region_len) { struct acpi_hest_generic_status *estatus = (struct acpi_hest_generic_status *)region; int remain = region_len; + int printed = 0, skipped = 0; u32 estatus_len; while (remain >= sizeof(struct acpi_bert_region)) { @@ -46,24 +56,26 @@ static void __init bert_print_all(struct if (remain < estatus_len) { pr_err(FW_BUG "Truncated status block (length: %u).\n", estatus_len); - return; + break; } /* No more error records. */ if (!estatus->block_status) - return; + break; if (cper_estatus_check(estatus)) { pr_err(FW_BUG "Invalid error record.\n"); - return; + break; } - pr_info_once("Error records from previous boot:\n"); - if (region_len < ACPI_BERT_PRINT_MAX_LEN) + if (estatus_len < ACPI_BERT_PRINT_MAX_LEN && + printed < ACPI_BERT_PRINT_MAX_RECORDS) { + pr_info_once("Error records from previous boot:\n"); cper_estatus_print(KERN_INFO HW_ERR, estatus); - else - pr_info_once("Max print length exceeded, table data is available at:\n" - "/sys/firmware/acpi/tables/data/BERT"); + printed++; + } else { + skipped++; + } /* * Because the boot error source is "one-time polled" type, @@ -75,6 +87,9 @@ static void __init bert_print_all(struct estatus = (void *)estatus + estatus_len; remain -= estatus_len; } + + if (skipped) + pr_info(HW_ERR "Skipped %d error records\n", skipped); } static int __init setup_bert_disable(char *str)