From nobody Mon Feb 9 08:56:49 2026 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1768934627; cv=none; d=zohomail.com; s=zohoarc; b=R7/cxWenZQ2/ypCkpNnzrin8YLf1qVyLFTYHMOFMXEzmbs9H/rMr9RMZZjCGCezs6xYrmSuoXPladd586OisRAZ2HYjboohGR9kvwlcOGaxLnH43X2pa7NORYJhL0MJ1BLU4mlnQe47V3MGs741Za1J9jIhZmqiZK9Iz2jH5DxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768934627; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=zqrLqq609CQUjCSSvXVi6semWi0zMFDysWxfDqV7aAs=; b=L7m66Q3dTPl1nBQzDaYHKbF9AMUWhPcfAk8LMPZcEU8fq4e7rqKUBzpN7F8/VfwldRi74E2OWMxObmm/xWE9DBZEu1ruN1gCIRWH1H12cXBY2ls0WE/TKZF330rsnvML0+SBFd+DaKN0/rBtwrj2YxLHB7FB1H9i/IvdnsT3AW4= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768934627301467.64303912248306; Tue, 20 Jan 2026 10:43:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1viGh3-0000hK-Bw; Tue, 20 Jan 2026 13:43:09 -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 1viGgB-0007SP-CU for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:42:15 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1viGg8-0006g1-R3 for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:42:14 -0500 Received: by mail-wr1-x443.google.com with SMTP id ffacd0b85a97d-432d28870ddso3193281f8f.3 for ; Tue, 20 Jan 2026 10:42:11 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435996540cesm56559f8f.43.2026.01.20.10.42.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Jan 2026 10:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768934530; x=1769539330; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zqrLqq609CQUjCSSvXVi6semWi0zMFDysWxfDqV7aAs=; b=g19OgJpocvMqwwOMK9MheMYi6iBgXp/UY1+dmW3fy4xlHeNwl51ti4yqZuRbNMzzFB yWQHmem8rtGBTMCRbs3F5f6iadwTctG/l7zydT8rnB2I15xmj3F2ZIzJLrYEpc6smrH0 HyO7y0BnMsX7IXVIYxtLIYqDEyVzSlD0hFHy1ouV9tSP6ooBGW169cVpX6z104pImjFW 6lDV5TJ/81CH+Rb2kP/qCt/IvlACqLaCsZiSI1b/zEKLGbuGL8GIyAM6sBBF8+h22Vl9 cdZl18FaCi+5l0reQg78U12TY/6VprF6GOHXoE8dusfngdGNy//aVhFLsSSCi9b1gN1d sEKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768934530; x=1769539330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zqrLqq609CQUjCSSvXVi6semWi0zMFDysWxfDqV7aAs=; b=cuRQgNzVF/W/fRlP1xw18JtDpaHTevDiE1urUKB6S6qpF5PAJ3s+tQKu1sRcPooO6p om7zC3RnBY897maoGZu4Ma3H8fqfPpsdstQPieom0Num10/hfZq+agZjupJybtWBcPbV AU5+V6Hm+TFL81rRldg2tqDXcW/V8XDSuSGKpmkx0N5k5rk3/EceF4nH7W+EYUEQan3K RSROB6ALl/weANa1wM9rB8d88NWI8JmjdEkZ+nBgCxr96bCarhIBPRpttbThnT70KPlN ijCtol274Xq7x2gdIAVxHk5hA+S9WO+N942ad6sb8EZdnpvR4rkLsHWCHjllmNQacF+Q eCug== X-Gm-Message-State: AOJu0YwHO8jROQJxnzuMpIQTGPFjCFaMbdj1Uryh/vHnKBxiqUjzoGKa F107vrqHW3D7OurZXFocxcnfgygN8LyQCHdcM0ygABYf2tmhOpQwBr7RwSuxlYOj/xSpKDGiv5q avt48hRE= X-Gm-Gg: AZuq6aKQkSuy5F5dFIA9kFzhdgMD/fcaGRH0dlzDlOJPz6o7Suurc0Gd+DtdjHQzgp/ j+Nip0nsnN40f9vP9BNKDpMxI4DrTXzAFuMCy3To+EEpOn8rK/mDFOE/GaMDdt3kWf3Gh7JwF1r hdGSHp7iZcXOaoWXEVVZ9mS4UjIJaYCcqj8vJmBxartKxtuCORhkl8d/ejhdKK/yvKj+VYhwa6n 2QtPGtSl8mGYVdIyH02TvsesAaFvlJA0iue2ClfpqqoGpsdKxlzBbjP87GXe+Xq37rMDI8uUK3H jCBHCjdqz13E+ltMDnAR45xVm+95Jqnz0q/6IELKsPXU/H3K8XQdc8HiHpnAS60xOY5nK6Gid7U pYS9KP1dRbXpyaCUn8jELCMPyLHoZkdZMLZyTzsgK5QggG9ehxrKE9X4n5et4p69Zb4E+O1morL Bxue4tWHMnr7NfxOlyY5wb80ZhAljeJh2kFOeePbA797xpwtEldfHgeHf7WIZhYbw/z5UwhWk= X-Received: by 2002:a05:6000:2505:b0:432:5b81:49c with SMTP id ffacd0b85a97d-43569bd463bmr17900265f8f.55.1768934529487; Tue, 20 Jan 2026 10:42:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 27/29] hw/uefi: add pcap support Date: Tue, 20 Jan 2026 19:39:00 +0100 Message-ID: <20260120183902.73845-28-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120183902.73845-1-philmd@linaro.org> References: <20260120183902.73845-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 (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=2a00:1450:4864:20::443; envelope-from=philmd@linaro.org; helo=mail-wr1-x443.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1768934627775158500 From: Gerd Hoffmann Add pcapfile property to uevi-vars-* devices, allowing to write out a capture of the communication traffic between uefi firmware and qemu. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260114110406.3500357-3-kraxel@redhat.com> [PMD: Wrap long line to avoid checkpatch.pl warning] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/uefi/var-service.h | 10 ++++ hw/uefi/var-service-core.c | 7 +++ hw/uefi/var-service-pcap.c | 95 +++++++++++++++++++++++++++++++++++ hw/uefi/var-service-sysbus.c | 1 + hw/uefi/meson.build | 1 + 5 files changed, 114 insertions(+) create mode 100644 hw/uefi/var-service-pcap.c diff --git a/include/hw/uefi/var-service.h b/include/hw/uefi/var-service.h index 91fb4a20918..7d84025cd58 100644 --- a/include/hw/uefi/var-service.h +++ b/include/hw/uefi/var-service.h @@ -77,6 +77,10 @@ struct uefi_vars_state { bool force_secure_boot; bool disable_custom_mode; bool use_pio; + + /* request + reply capture */ + char *pcapfile; + FILE *pcapfp; }; =20 struct uefi_vars_cert { @@ -189,4 +193,10 @@ uefi_var_policy *uefi_vars_add_policy(uefi_vars_state = *uv, variable_policy_entry *pe); uint32_t uefi_vars_mm_check_policy_proto(uefi_vars_state *uv); =20 +/* vars-service-pcap.c */ +void uefi_vars_pcap_init(uefi_vars_state *uv, Error **errp); +void uefi_vars_pcap_reset(uefi_vars_state *uv); +void uefi_vars_pcap_request(uefi_vars_state *uv, void *buffer, size_t size= ); +void uefi_vars_pcap_reply(uefi_vars_state *uv, void *buffer, size_t size); + #endif /* QEMU_UEFI_VAR_SERVICE_H */ diff --git a/hw/uefi/var-service-core.c b/hw/uefi/var-service-core.c index 6ab8df091aa..ce0628fa524 100644 --- a/hw/uefi/var-service-core.c +++ b/hw/uefi/var-service-core.c @@ -101,6 +101,8 @@ static uint32_t uefi_vars_cmd_mm(uefi_vars_state *uv, b= ool dma_mode) } memset(uv->buffer + size, 0, uv->buf_size - size); =20 + uefi_vars_pcap_request(uv, uv->buffer, size); + /* dispatch */ if (qemu_uuid_is_equal(&mhdr->guid, &EfiSmmVariableProtocolGuid)) { retval =3D uefi_vars_mm_vars_proto(uv); @@ -127,6 +129,8 @@ static uint32_t uefi_vars_cmd_mm(uefi_vars_state *uv, b= ool dma_mode) retval =3D UEFI_VARS_STS_ERR_NOT_SUPPORTED; } =20 + uefi_vars_pcap_reply(uv, uv->buffer, sizeof(*mhdr) + mhdr->length); + /* write buffer */ if (dma_mode) { dma_memory_write(&address_space_memory, dma, @@ -163,6 +167,8 @@ void uefi_vars_hard_reset(uefi_vars_state *uv) uefi_vars_clear_volatile(uv); uefi_vars_policies_clear(uv); uefi_vars_auth_init(uv); + + uefi_vars_pcap_reset(uv); } =20 static uint32_t uefi_vars_cmd(uefi_vars_state *uv, uint32_t cmd) @@ -319,4 +325,5 @@ void uefi_vars_realize(uefi_vars_state *uv, Error **err= p) { uefi_vars_json_init(uv, errp); uefi_vars_json_load(uv, errp); + uefi_vars_pcap_init(uv, errp); } diff --git a/hw/uefi/var-service-pcap.c b/hw/uefi/var-service-pcap.c new file mode 100644 index 00000000000..a09ee1d4c05 --- /dev/null +++ b/hw/uefi/var-service-pcap.c @@ -0,0 +1,95 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qemu/pcap.h" +#include "system/dma.h" + +#include "hw/uefi/var-service.h" + +#define LINKTYPE_EDK2_MM 302 + +#define SNAPLEN (64 * 1024) +#define TYPE_RESET 0x01 +#define TYPE_REQUEST 0x02 +#define TYPE_REPLY 0x03 + +static void uefi_vars_pcap_header(FILE *fp) +{ + static const struct pcap_hdr header =3D { + .magic_number =3D PCAP_MAGIC, + .version_major =3D PCAP_MAJOR, + .version_minor =3D PCAP_MINOR, + .snaplen =3D SNAPLEN, + .network =3D LINKTYPE_EDK2_MM, + }; + + fwrite(&header, sizeof(header), 1, fp); + fflush(fp); +} + +static void uefi_vars_pcap_packet(FILE *fp, uint32_t type, + void *buffer, size_t size) +{ + struct pcaprec_hdr header; + struct timeval tv; + uint32_t orig_len =3D size + sizeof(type); + uint32_t incl_len =3D MIN(orig_len, SNAPLEN); + + gettimeofday(&tv, NULL); + header.ts_sec =3D tv.tv_sec; + header.ts_usec =3D tv.tv_usec; + header.incl_len =3D incl_len; + header.orig_len =3D orig_len; + + fwrite(&header, sizeof(header), 1, fp); + fwrite(&type, sizeof(type), 1, fp); + if (buffer) { + fwrite(buffer, incl_len - sizeof(type), 1, fp); + } + fflush(fp); +} + +void uefi_vars_pcap_init(uefi_vars_state *uv, Error **errp) +{ + int fd; + + if (!uv->pcapfile) { + return; + } + + fd =3D qemu_create(uv->pcapfile, + O_WRONLY | O_TRUNC | O_BINARY, + 0666, errp); + if (fd < 0) { + return; + } + + uv->pcapfp =3D fdopen(fd, "wb"); + uefi_vars_pcap_header(uv->pcapfp); +} + +void uefi_vars_pcap_reset(uefi_vars_state *uv) +{ + if (!uv->pcapfp) { + return; + } + uefi_vars_pcap_packet(uv->pcapfp, TYPE_RESET, NULL, 0); +} + +void uefi_vars_pcap_request(uefi_vars_state *uv, void *buffer, size_t size) +{ + if (!uv->pcapfp) { + return; + } + uefi_vars_pcap_packet(uv->pcapfp, TYPE_REQUEST, buffer, size); +} + +void uefi_vars_pcap_reply(uefi_vars_state *uv, void *buffer, size_t size) +{ + if (!uv->pcapfp) { + return; + } + uefi_vars_pcap_packet(uv->pcapfp, TYPE_REPLY, buffer, size); +} diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c index 75b07905184..97a96cae6a2 100644 --- a/hw/uefi/var-service-sysbus.c +++ b/hw/uefi/var-service-sysbus.c @@ -33,6 +33,7 @@ static const Property uefi_vars_sysbus_properties[] =3D { DEFINE_PROP_SIZE("size", uefi_vars_sysbus_state, state.max_storage, 256 * 1024), DEFINE_PROP_STRING("jsonfile", uefi_vars_sysbus_state, state.jsonfile), + DEFINE_PROP_STRING("pcapfile", uefi_vars_sysbus_state, state.pcapfile), DEFINE_PROP_BOOL("force-secure-boot", uefi_vars_sysbus_state, state.force_secure_boot, false), DEFINE_PROP_BOOL("disable-custom-mode", uefi_vars_sysbus_state, diff --git a/hw/uefi/meson.build b/hw/uefi/meson.build index c8f38dfae24..3eae4755331 100644 --- a/hw/uefi/meson.build +++ b/hw/uefi/meson.build @@ -3,6 +3,7 @@ system_ss.add(files('hardware-info.c', 'ovmf-log.c')) uefi_vars_ss =3D ss.source_set() if (config_all_devices.has_key('CONFIG_UEFI_VARS')) uefi_vars_ss.add(files('var-service-core.c', + 'var-service-pcap.c', 'var-service-json.c', 'var-service-vars.c', 'var-service-auth.c', --=20 2.52.0