From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CE36CCD18E for ; Wed, 15 Oct 2025 12:08:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v90Hv-0008Vm-R6; Wed, 15 Oct 2025 08:07:27 -0400 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 1v90Hc-0008Pl-Kf for qemu-devel@nongnu.org; Wed, 15 Oct 2025 08:07:12 -0400 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 1v90HS-0000qW-0H for qemu-devel@nongnu.org; Wed, 15 Oct 2025 08:07:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760530012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2HHM7+e+yehdymAxRxWY5fIyhPqFkkqeOoqXWdZWUG0=; b=eDDdCJhe6FmuAZO4bZXEkS3Be9o7k6jX3XT9g3OSQUZyKNHz2ueVvdfxg+4NXk15hgjIpS gADqVjuWBg9ncB3NloNSs8CtXC2BHQB/S3xx3xFARmCPI7lSFEXnxnMo2ZVT5PVQBbo8BU gyC3w8zkmM77vUnbZlKZ4l4/9ElL5Vk= 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-54-12BtnGCXPEyLKcvXDnh3IQ-1; Wed, 15 Oct 2025 08:06:49 -0400 X-MC-Unique: 12BtnGCXPEyLKcvXDnh3IQ-1 X-Mimecast-MFC-AGG-ID: 12BtnGCXPEyLKcvXDnh3IQ_1760530007 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 3ADBE1808427; Wed, 15 Oct 2025 12:06:47 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.27]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A6D9030001B9; Wed, 15 Oct 2025 12:06:46 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E534C180099B; Wed, 15 Oct 2025 14:06:37 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Yanan Wang , Marcel Apfelbaum , "Dr. David Alan Gilbert" , Eric Blake , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Laurent Vivier , Fabiano Rosas , Paolo Bonzini , Gerd Hoffmann , Eduardo Habkost Subject: [PATCH v5 3/3] hw/uefi/ovmf-log: add maxsize parameter Date: Wed, 15 Oct 2025 14:06:37 +0200 Message-ID: <20251015120637.1736402-4-kraxel@redhat.com> In-Reply-To: <20251015120637.1736402-1-kraxel@redhat.com> References: <20251015120637.1736402-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow limiting the amount of log output sent. Allow up to 1 MiB. In case the guest log buffer is larger than 1 MiB limit the output instead of throwing an error. Signed-off-by: Gerd Hoffmann --- hw/uefi/ovmf-log.c | 42 ++++++++++++++++++++++++++++++++++-------- hmp-commands-info.hx | 4 ++-- qapi/machine.json | 5 +++++ 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c index e281a980a101..28788620e3f6 100644 --- a/hw/uefi/ovmf-log.c +++ b/hw/uefi/ovmf-log.c @@ -18,6 +18,7 @@ #include "qapi/error.h" #include "qapi/type-helpers.h" #include "qapi/qapi-commands-machine.h" +#include "qobject/qdict.h" /* ----------------------------------------------------------------------- */ @@ -164,7 +165,8 @@ static void handle_ovmf_log_range(GString *out, } } -FirmwareLog *qmp_query_firmware_log(Error **errp) +FirmwareLog *qmp_query_firmware_log(bool have_max_size, uint64_t max_size, + Error **errp) { MEM_DEBUG_LOG_HDR header; dma_addr_t offset, base; @@ -184,18 +186,40 @@ FirmwareLog *qmp_query_firmware_log(Error **errp) return NULL; } - if (header.DebugLogSize > MiB) { - /* default size is 128k (32 pages), allow up to 1M */ - error_setg(errp, "firmware log: log buffer is too big"); - return NULL; - } - if (header.DebugLogHeadOffset > header.DebugLogSize || header.DebugLogTailOffset > header.DebugLogSize) { error_setg(errp, "firmware log: invalid header"); return NULL; } + if (have_max_size) { + if (max_size > MiB) { + error_setg(errp, "firmware log: max-size larger than 1 MiB"); + return NULL; + } + } else { + max_size = MiB; + } + + /* adjust header.DebugLogHeadOffset so we return at most maxsize bytes */ + if (header.DebugLogHeadOffset > header.DebugLogTailOffset) { + /* wrap around */ + if (header.DebugLogTailOffset > max_size) { + header.DebugLogHeadOffset = header.DebugLogTailOffset - max_size; + } else { + uint64_t max_chunk = max_size - header.DebugLogTailOffset; + if (header.DebugLogSize > max_chunk && + header.DebugLogHeadOffset < header.DebugLogSize - max_chunk) { + header.DebugLogHeadOffset = header.DebugLogSize - max_chunk; + } + } + } else { + if (header.DebugLogTailOffset > max_size && + header.DebugLogHeadOffset < header.DebugLogTailOffset - max_size) { + header.DebugLogHeadOffset = header.DebugLogTailOffset - max_size; + } + } + base = offset + header.HeaderSize; if (header.DebugLogHeadOffset > header.DebugLogTailOffset) { /* wrap around */ @@ -239,8 +263,10 @@ void hmp_info_firmware_log(Monitor *mon, const QDict *qdict) Error *err = NULL; FirmwareLog *log; gsize log_len; + int64_t maxsize; - log = qmp_query_firmware_log(&err); + maxsize = qdict_get_try_int(qdict, "maxsize", -1); + log = qmp_query_firmware_log(maxsize != -1, (uint64_t)maxsize, &err); if (err) { hmp_handle_error(mon, err); return; diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index f0aef419923c..f00d7081b40c 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -993,8 +993,8 @@ ERST { .name = "firmware-log", - .args_type = "", - .params = "", + .args_type = "maxsize:o?", + .params = "[maxsize]", .help = "show the firmware (ovmf) debug log", .cmd = hmp_info_firmware_log, }, diff --git a/qapi/machine.json b/qapi/machine.json index 96133e5c71cf..e4b15680c172 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1858,9 +1858,14 @@ # # Find firmware memory log buffer in guest memory, return content. # +# @max-size: limit the amount of log data returned. Up to 1 MiB if +# log data is allowed. In case the amout of log data is +# larger than max-size the tail of the log is returned. +# # Since: 10.2 ## { 'command': 'query-firmware-log', + 'data': { '*max-size': 'size' }, 'returns': 'FirmwareLog' } ## -- 2.51.0