From nobody Thu Oct 30 23:12:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1755988043; cv=none; d=zohomail.com; s=zohoarc; b=YZBtxdEsIFnhNm55ZCZAHTvFgP7b4a4OYxYMHkToatPbYTyQaZHsQC6ZKatRF5BDy/NZb2i6xpA4W6enxQpH7w52BGZx2ZXDQGhChmSU57qRE9ibO9QbvjfPWeZtDY6WB9kLecfnhf8MVpS1MYX8b0I+aERgsQ8vUWT/P9CjFN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755988043; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qG4paJjVmzt2WmtR78TFt5pLQN6+xUIKpx/Ojl25OE0=; b=NyT4lal6bqLVfrMxJlYx671+pPCWoePf3sEvjpBHXHyXh6Z/5zvUBYep3tbPjx9zsa0ybs8ABanQbj31YRtKicTXXtE9vJFz3FtxXgROXjhfbvqjLwzO6eHJtirMM0iyMG/qRe4Sm9+RisZiwncTq4Au/ZG68T0BCBdw9nCA0c8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1755988043732415.3068853397875; Sat, 23 Aug 2025 15:27:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1091563.1448113 (Exim 4.92) (envelope-from ) id 1upwhX-0002N0-Rb; Sat, 23 Aug 2025 22:27:07 +0000 Received: by outflank-mailman (output) from mailman id 1091563.1448113; Sat, 23 Aug 2025 22:27:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upwhX-0002Mo-OL; Sat, 23 Aug 2025 22:27:07 +0000 Received: by outflank-mailman (input) for mailman id 1091563; Sat, 23 Aug 2025 22:27:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upwhW-0001yi-PO for xen-devel@lists.xenproject.org; Sat, 23 Aug 2025 22:27:06 +0000 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [2a00:1450:4864:20::633]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 4919ed61-8070-11f0-b898-0df219b8e170; Sun, 24 Aug 2025 00:27:00 +0200 (CEST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-afcb7a5cff3so52655666b.3 for ; Sat, 23 Aug 2025 15:27:00 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afe48fd37fbsm252045166b.47.2025.08.23.15.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 15:26:58 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4919ed61-8070-11f0-b898-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755988019; x=1756592819; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qG4paJjVmzt2WmtR78TFt5pLQN6+xUIKpx/Ojl25OE0=; b=YlwuJQFsLDZslDVPiUPLsKE9dY0GWAg1Fjj3sDkfXQxdaV4GTxWqYsXvzJFFXZBQ/j /oUL6uCKEx1y2GnOIcWTexhszMTKWCsW0GuOcVSvXTU1GMrhBZoBFFVVLuBifO2psnf2 1G9JuD8mDe2t+0d3xM62gRpTNcpi6z9nhp/UcVzyL7P2dQayA4ehpIZhPYTSuzSeXC9O 6H3uitaGuDgkt1H0UXaOB3PR2ZnLgaKjNn0OPeRApTS2y3GdRVaZ/IJCbNNN02TC/FVM Ys4olNTgGrt75rf+9ICf7gpAw9IWmIZ5s8kPrQeLEhgPzpE5WSioNe8L2hFb2a1dIeAK Bb1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755988019; x=1756592819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qG4paJjVmzt2WmtR78TFt5pLQN6+xUIKpx/Ojl25OE0=; b=Qx7JyV6IXK6IUGY2WBeIxuJ2kwz1m6aTWyeqeoS2hjUNFZm3Wh4Y2TiJLD8iUJvt8e pqPrSr884LJGLlL2WyR7O4D+RhpHPy7p9ooaLaf492U0dvAZVWJz9gEYisW8XCOt2rNz 7t08sjdEJkQ+rrBYd0M2UiWmNZwF6N+DnIwrAur05NoN6+ovIqc2VxwIdLY6mhYSWM3D DzwYnNzm07IHCcf+7sSPvUuPjd6CYGuB0NAgh7nhliA28/K6FcZ8uI/g+Jps2U7iUfYL dB6Yj9i5wsWZ06nRnCgrR97dMJ1aSrB3XTiUWaXPpgqXNfg18XR64LnznBCOICwPhxLE Kpjg== X-Gm-Message-State: AOJu0YwrsRiisjZrQys3pc64qdWJEBnBi+RxyllMjIfUKZv9zHUA6ir1 uVSmYxBjZzlirDBO9luHGPpvsjKC3DXqbkRfTEFCOVW4PhSDbjVjcLUgUwVsUQ== X-Gm-Gg: ASbGncsLPosoInPUFotwiC2KTiQAwLbIZmA0EwaB6g/wQT9cdQbcu7+PRYVBzdDqW1q ncYGMSlszZUOPJZUMX/Glmem8KH6oGXW3atsHUvyhsCh0I0Jt4T+qaQOTz7AmF7+zxMZrqT1Omb hQSkt+ohSzIK5lWVOfqpMfMppt3hr/FVzBci9qYlWWpD8Wr0d0Ki33Qi0eoc9eLjGvMtgwyw0PC TzK1vLSwMTuYeCwYXvoNaPFq5945jBRfkn5i9Pw9Tmdlt8NFRCCtVjPbL4HfTz804A5tunyuMed JuSXfL+VAlSyGH3qsaQMJmTobn65WTTXo8Gk8RUtx+sOUeTgIe6gDjmHE4nQvLwCLtX86EFaeKm mTcHHqKKnm4mDl+hbTBTC6Nzzgfwi7LTU/8b53NJLzpu9mLEUpr4u4oBOtrVoX/cmXkV4ZWRlSp fGyxVflWDWg+NTo9X2bwVbd0Eew9cz8CGe X-Google-Smtp-Source: AGHT+IFRpio/VEsHjfPDgitsBpViUeoq+NQACVyobSIWuzWw6zfVLpQQeYRT8ev7MjvL/Xz00K6wNw== X-Received: by 2002:a17:907:94c9:b0:ad8:8e05:e5e9 with SMTP id a640c23a62f3a-afe28f0797amr344817666b.2.1755988019128; Sat, 23 Aug 2025 15:26:59 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Anthony PERARD Subject: [PATCH v5 3/4] hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Date: Sat, 23 Aug 2025 22:26:51 +0000 Message-Id: <4ecd33acd8bdf629e9103e97ff271150541e7415.1755987697.git.w1benny@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1755988045586116600 From: Petr Bene=C5=A1 Some SMBIOS tables are used by certain malware families to detect virtualiz= ed environments via WMI queries. To improve stealth for sandboxing purposes, this patch adds support for populating these SMBIOS tables from an external binary specified via the "smbios_firmware" domain config option: * 7 - Cache Info * 8 - Port Connector * 9 - System Slots * 26 - Voltage Probe * 27 - Cooling Device * 28 - Temperature Probe If particular table is absent in binary file, then it will not be mapped to memory. This method works for Windows domains as tables 7,8,9,26,27,28 are = not critical for OS boot and runtime. Also if "smbios_firmware" parameter is not provided, these tables will be skipped in write_smbios_tables function. From: Anton Belousov Signed-off-by: Petr Bene=C5=A1 Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 111 ++++++++++++++++++++++++ tools/firmware/hvmloader/smbios_types.h | 77 ++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/s= mbios.c index de3ba78e87..76c7090d16 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -33,12 +33,18 @@ #define SMBIOS_HANDLE_TYPE2 0x0200 #define SMBIOS_HANDLE_TYPE3 0x0300 #define SMBIOS_HANDLE_TYPE4 0x0400 +#define SMBIOS_HANDLE_TYPE7 0x0700 +#define SMBIOS_HANDLE_TYPE8 0x0800 +#define SMBIOS_HANDLE_TYPE9 0x0900 #define SMBIOS_HANDLE_TYPE11 0x0B00 #define SMBIOS_HANDLE_TYPE16 0x1000 #define SMBIOS_HANDLE_TYPE17 0x1100 #define SMBIOS_HANDLE_TYPE19 0x1300 #define SMBIOS_HANDLE_TYPE20 0x1400 #define SMBIOS_HANDLE_TYPE22 0x1600 +#define SMBIOS_HANDLE_TYPE26 0x1A00 +#define SMBIOS_HANDLE_TYPE27 0x1B00 +#define SMBIOS_HANDLE_TYPE28 0x1C00 #define SMBIOS_HANDLE_TYPE32 0x2000 #define SMBIOS_HANDLE_TYPE39 0x2700 #define SMBIOS_HANDLE_TYPE127 0x7f00 @@ -79,6 +85,12 @@ static void * smbios_type_4_init(void *start, unsigned int cpu_number, char *cpu_manufacturer); static void * +smbios_type_7_init(void *start); +static void * +smbios_type_8_init(void *start); +static void * +smbios_type_9_init(void *start); +static void * smbios_type_11_init(void *start); static void * smbios_type_16_init(void *start, uint32_t memory_size_mb, int nr_mem_devs); @@ -91,6 +103,12 @@ smbios_type_20_init(void *start, uint32_t memory_size_m= b, int instance); static void * smbios_type_22_init(void *start); static void * +smbios_type_26_init(void *start); +static void * +smbios_type_27_init(void *start); +static void * +smbios_type_28_init(void *start); +static void * smbios_type_32_init(void *start); static void * smbios_type_39_init(void *start); @@ -225,6 +243,9 @@ write_smbios_tables(void *ep, void *start, do_struct(smbios_type_3_init(p)); for ( cpu_num =3D 1; cpu_num <=3D vcpus; cpu_num++ ) do_struct(smbios_type_4_init(p, cpu_num, cpu_manufacturer)); + do_struct(smbios_type_7_init(p)); + do_struct(smbios_type_8_init(p)); + do_struct(smbios_type_9_init(p)); do_struct(smbios_type_11_init(p)); =20 /* Each 'memory device' covers up to 16GB of address space. */ @@ -241,6 +262,9 @@ write_smbios_tables(void *ep, void *start, } =20 do_struct(smbios_type_22_init(p)); + do_struct(smbios_type_26_init(p)); + do_struct(smbios_type_27_init(p)); + do_struct(smbios_type_28_init(p)); do_struct(smbios_type_32_init(p)); do_struct(smbios_type_39_init(p)); do_struct(smbios_type_vendor_oem_init(p)); @@ -728,6 +752,42 @@ smbios_type_4_init( return start+1; } =20 +/* Type 7 -- Cache Information */ +static void * +smbios_type_7_init(void *start) +{ + /* Specification says Type 7 table has length of 13h for v2.1+. */ + BUILD_BUG_ON(sizeof(struct smbios_type_7) !=3D 19); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 7, SMBIOS_HANDLE_TYPE7, + sizeof(struct smbios_type_7)); +} + +/* Type 8 -- Port Connector Information */ +static void * +smbios_type_8_init(void *start) +{ + /* Specification says Type 8 table has length of 09h. */ + BUILD_BUG_ON(sizeof(struct smbios_type_8) !=3D 9); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 8, SMBIOS_HANDLE_TYPE8, + sizeof(struct smbios_type_8)); +} + +/* Type 9 -- System Slots */ +static void * +smbios_type_9_init(void *start) +{ + /* Specification says Type 9 table has length of 0Dh for v2.1-2.5. */ + BUILD_BUG_ON(sizeof(struct smbios_type_9) !=3D 13); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 9, SMBIOS_HANDLE_TYPE9, + sizeof(struct smbios_type_9)); +} + /* Type 11 -- OEM Strings */ static void * smbios_type_11_init(void *start) @@ -959,6 +1019,57 @@ smbios_type_22_init(void *start) return start + 1; } =20 +/* Type 26 -- Voltage Probe */ +static void * +smbios_type_26_init(void *start) +{ + /* + * Specification says Type 26 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_26, oem_defined) !=3D 20); + + return smbios_pt_copy(start, 26, SMBIOS_HANDLE_TYPE26, + endof_field(struct smbios_type_26, oem_defined)); +} + +/* Type 27 -- Cooling Device */ +static void * +smbios_type_27_init(void *start) +{ + /* + * Specification says Type 27 table has length of at least 0Ch, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_27, oem_defined) !=3D 12); +=20 + return smbios_pt_copy(start, 27, SMBIOS_HANDLE_TYPE27, + endof_field(struct smbios_type_27, oem_defined)); +} + +/* Type 28 -- Temperature Probe */ +static void * +smbios_type_28_init(void *start) +{ + /* + * Specification says Type 28 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_28, oem_defined) !=3D 20); + + return smbios_pt_copy(start, 28, SMBIOS_HANDLE_TYPE28, + endof_field(struct smbios_type_28, oem_defined)); +} + /* Type 32 -- System Boot Information */ static void * smbios_type_32_init(void *start) diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmlo= ader/smbios_types.h index a04d194975..c04b435d31 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -149,6 +149,44 @@ struct smbios_type_4 { uint8_t part_number_str; } __attribute__ ((packed)); =20 +/* SMBIOS type 7 - Cache Information */ +struct smbios_type_7 { + struct smbios_structure_header header; + uint8_t socket_designation_str; + uint16_t cache_configuration; + uint16_t maximum_cache_size; + uint16_t installed_size; + uint16_t supported_SRAM_type; + uint16_t current_SRAM_type; + uint8_t cache_speed; + uint8_t error_connection_type; + uint8_t system_cache_type; + uint8_t associativity; +} __attribute__ ((packed)); + +/* SMBIOS type 8 - Port Connector Information */ +struct smbios_type_8 { + struct smbios_structure_header header; + uint8_t internal_reference_designator_str; + uint8_t internal_connector_type; + uint8_t external_reference_designator_str; + uint8_t external_connector_type; + uint8_t port_type; +} __attribute__ ((packed)); + +/* SMBIOS type 9 - System Slots */ +struct smbios_type_9 { + struct smbios_structure_header header; + uint8_t slot_designation_str; + uint8_t slot_type; + uint8_t slot_data_bus_width; + uint8_t current_usage; + uint8_t slot_length; + uint16_t slot_id; + uint8_t slot_characteristics_1; + uint8_t slot_characteristics_2; +} __attribute__ ((packed)); + /* SMBIOS type 11 - OEM Strings */ struct smbios_type_11 { struct smbios_structure_header header; @@ -232,6 +270,45 @@ struct smbios_type_22 { uint32_t oem_specific; } __attribute__ ((packed)); =20 +/* SMBIOS type 26 - Voltage Probe */ +struct smbios_type_26 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 27 - Cooling Device */ +struct smbios_type_27 { + struct smbios_structure_header header; + uint16_t temperature_probe_handle; + uint8_t device_type_and_status; + uint8_t cooling_unit_group; + uint32_t oem_defined; + uint16_t nominal_speed; /* Optional */ + uint8_t description_str; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 28 - Temperature Probe */ +struct smbios_type_28 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + /* SMBIOS type 32 - System Boot Information */ struct smbios_type_32 { struct smbios_structure_header header; --=20 2.34.1