From nobody Thu Oct 30 18:55:08 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=1753869441; cv=none; d=zohomail.com; s=zohoarc; b=cIHRvbCxkaWmSNtCY5vxVdR5fCjuoHOzAdt/4wFCIvT3zWS/KbOygmuufNirIQVqoXPTJts1x4hkvBo+rjusiRwFDS32AaCen/iefZTsHY2lwmp3yA3Rbr4bqhYlzhCVA/o8RjFbPYXk3kJu6IY6zNcVdOwBQQ5vtlhaYB4CUio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753869441; 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=lPlqHXskDbw2/VqWKhqdl7xdZizcs3bRouTx3ma38YA=; b=XRaFbldU4kKzNbk2tAYZ1R+PF2ek94fIfCMF1pYk4q3vieHuohm0dahZPtFqdCAFnICawO3xTo2+F1bmqklJT1rAAvxXOTQIIb7C2okN2LAVpvtMLj112by3Y3QVfCLWneMKqY8JqcqeHUwr3WkKUGySTGa7+c434Ml6mN54imA= 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 1753869441373366.32951902324; Wed, 30 Jul 2025 02:57:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063645.1429373 (Exim 4.92) (envelope-from ) id 1uh3YU-0006Ko-4u; Wed, 30 Jul 2025 09:57:02 +0000 Received: by outflank-mailman (output) from mailman id 1063645.1429373; Wed, 30 Jul 2025 09:57:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uh3YU-0006Kf-1w; Wed, 30 Jul 2025 09:57:02 +0000 Received: by outflank-mailman (input) for mailman id 1063645; Wed, 30 Jul 2025 09:57:00 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uh3YS-00066r-Pu for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 09:57:00 +0000 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [2a00:1450:4864:20::634]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 885af468-6d2b-11f0-a320-13f23c93f187; Wed, 30 Jul 2025 11:56:58 +0200 (CEST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-ae35eb87810so102019566b.1 for ; Wed, 30 Jul 2025 02:56:59 -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-af635a60e68sm722900966b.94.2025.07.30.02.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 02:56:57 -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: 885af468-6d2b-11f0-a320-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753869418; x=1754474218; 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=lPlqHXskDbw2/VqWKhqdl7xdZizcs3bRouTx3ma38YA=; b=CWVNpR6mfKRbuQpHPaV6fOOWavHWqnYrwA5KA0i9//F4iDShIPlFBgnTz5W1q58an8 EhVcR0L9qcQwjbPDNIk3132NxkhUr4ebqyNl1MeMOZaTjWPtuQpsAworUDJ0DK8RPz1X RqYVEYGvWoMGQxPlB6I/alBRN0Bb8kmzWqr5EVWMxhMaYdClf4DmMVBehChv5BOEEoaA rs6zz+hdx5rRaY2mqOXYJrQK+R3gBBxDdWT/LbVonKvDJfi7jqmvt7U6D80xH00U2m7N 4HhyjHgYu7ubOv2y0oKiU0eWWLmXcEGN2PXkig5VpQUh5hqYGDEwOXbuKnow5UUgQpA2 bG4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753869418; x=1754474218; 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=lPlqHXskDbw2/VqWKhqdl7xdZizcs3bRouTx3ma38YA=; b=XyiH6ET6HDeDbBJbE+T9rZes9tYAHRQiPHgI3prM+kCZvZ2demCLvSSsfqAi6jcUqp yDrPRGVypONJ7DGrc9Fc2xgFR3XSct61Zexea46l31CdbUUj4LAfbLKZj/1nj0Pw/hQ0 HG3hJyRJ/jXr+WQctWFZDa23ebFanjlE91/0MRpxX6/ghdvsx38EkCZ0adg0d/dB1vSa ht5+W2c0IDZ2a9mphQ3clmk8o0B1WngwLnC+R0Sewzr1kJII5lpNWy+/qYIyghMEz5On nrN9L7T7MESHYgz/ogb67E2bdiv3zMDM36vTBk4h3oUprsq9QtAGQgbKVQ4oP/G9Ucf0 kiMA== X-Gm-Message-State: AOJu0YyWCrlUkWuIGVXlE1bvVkUY9M1qm3QkBFhrTyjRBsIVXJfGLm8s ujulYRH8hxXT+WhdLkNsCQJbSB0XONSS+Fus89trj9Sn7eBP2zK9sW5oajgyaTK9DIQ= X-Gm-Gg: ASbGncvfZ3JxE+4mK4oWvHj1YDhq4rP2Sm57o6ClKhJ/GPkzlcrIOf3lEnhApin4zrt P5R1bTj0PxnKAnLULeWhHJt/wKNAxhKDlsfsPbGEzCvbQr3ok67ppacnScB7krGLH4eEYDMYXKO MfkoD+PJHnwrPI7XVIHHObW7M/+Ciexg6B8LkJI8nuessRf1WcL9h1heqJkkpCSy9aO1wUwhBJz UCI5hxb97euTnkw15TBMtepEU9kq2h5taOEFHWX/+PgWgxlWy7AetltsGZaklItrXQm4zYc1bF7 KN8ncrq0AF5CyrvkSFTwjup/3o/176gsg1aE6zmuuNuLGCBmt+e+je7lqbbRiN3DZ74Bfh4Fcae JecrzBUelIu8qnzGrLLpwYHAAYs6lcbx8ogXtWFj8UnTvecrLlc2IYFOgf1Lcl/Sp/PVprUuPrs 0/D3D3d5K3iLOylJwyy/zOyA== X-Google-Smtp-Source: AGHT+IG2twmTL90g2cOGaPewf7uIzhzWTIOpSwoEPSQMH/r6oPYWV35Fz7guqXJJv5VTapjHIy4iOw== X-Received: by 2002:a17:907:3e10:b0:af8:fd22:6e28 with SMTP id a640c23a62f3a-af8fd794dc6mr124864066b.7.1753869417878; Wed, 30 Jul 2025 02:56:57 -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?= , Anthony PERARD Subject: [PATCH v4 1/3] tools: add sizeof_field and offsetof_end macros Date: Wed, 30 Jul 2025 09:56:51 +0000 Message-Id: <8cfd773bd5cc9ecac25a4a92104483f07021c991.1753869323.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: 1753869442600116600 From: Petr Bene=C5=A1 * `sizeof_field` returns the size of a specific struct member * `offsetof_end` returns the offset to the end of the member within the str= uct It will be useful in upcoming layout checks of SMBIOS structs. Signed-off-by: Petr Bene=C5=A1 --- tools/include/xen-tools/common-macros.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-to= ols/common-macros.h index 0088208c2e..3899e06753 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -83,6 +83,11 @@ #define __packed __attribute__((__packed__)) #endif =20 +#define sizeof_field(type, member) sizeof(((type *)NULL)->member) + +#define offsetof_end(type, member) \ + (offsetof(type, member) + sizeof_field(type, member)) + #define container_of(ptr, type, member) ({ \ typeof(((type *)0)->member) *mptr__ =3D (ptr); \ (type *)((char *)mptr__ - offsetof(type, member)); \ --=20 2.34.1 From nobody Thu Oct 30 18:55:08 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=1753869440; cv=none; d=zohomail.com; s=zohoarc; b=Os3ZFtruJGJUBsxksSP/yoI0xICLfBmv1KNU1coCajnyo1Z00stU9ys+eDcNO8wojZAYFh4xcJPYFXiamrou2wKoTFFAzGm1aujHLoy7hlX1cNw4ZaKkeiQMNlJIY28RKjUVnp2Q6GBMxb+ladUC8XQL8deHbJfMdG5gKcT5gu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753869440; 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=4+z3CYE1dbeyjgTEBryLMqPtKkk9053KfJf846t/qLw=; b=J4pa+XCoZU/XoQsnAbmIO1FZG3IhmnMStOPYclcwNbA4YkYbyrAqTt0NFBlAe8FAaegUB3bShSnDbs2sB+95DUtJjx0WHomHVThuRXlZIAHX5JAFlzmHHLugeDF0Y01o5DPKbGlw93SW6BF4OZlVBirhSybYyizHBw+TNnwR7ug= 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 1753869440593499.15982491346006; Wed, 30 Jul 2025 02:57:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063647.1429393 (Exim 4.92) (envelope-from ) id 1uh3YW-0006oD-OH; Wed, 30 Jul 2025 09:57:04 +0000 Received: by outflank-mailman (output) from mailman id 1063647.1429393; Wed, 30 Jul 2025 09:57:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uh3YW-0006o6-LJ; Wed, 30 Jul 2025 09:57:04 +0000 Received: by outflank-mailman (input) for mailman id 1063647; Wed, 30 Jul 2025 09:57:02 +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 1uh3YU-0006HC-KA for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 09:57:02 +0000 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [2a00:1450:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 88f3524c-6d2b-11f0-b895-0df219b8e170; Wed, 30 Jul 2025 11:56:59 +0200 (CEST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-af240271376so72875266b.2 for ; Wed, 30 Jul 2025 02:56:59 -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-af635a60e68sm722900966b.94.2025.07.30.02.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 02:56: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: 88f3524c-6d2b-11f0-b895-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753869419; x=1754474219; 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=4+z3CYE1dbeyjgTEBryLMqPtKkk9053KfJf846t/qLw=; b=Z0nLqQrzaJhO5OPk1E07Pz2CLQ2jyhgbrTgmp0HDOMHijFnTiBfz41D/1+FUlwrlyk JkytS4crbYFlOjDLcTYNzqyMB+z9ppoUd9tO7KyN+34UrsT+ipvxirZjNOIBydyw34IP By2ud1dTfjFtPZsuy4/0jI/zNhb6ap7N5PhJqGFhA7iTSGecSTegWf+aqKaRxzpZXWCJ 6QbpgMQtrGW1FlDorxRgQrLa+Hny5j/yTo4n8128yZYyl+P19mJFdsJbWx2Xx2sjI42Q KBmd9n0ALlYpTM8TDnEKRUOae2NEn9iRWYfh93D9sZFYoSiXIbhEAT/T8nYqUylDqEhb j8jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753869419; x=1754474219; 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=4+z3CYE1dbeyjgTEBryLMqPtKkk9053KfJf846t/qLw=; b=eh44JxxTSEQn7CVyIl7RyDhYHd+IQ8bsqI3NFAr8N5DjE2e2CrjsHVqr4tfBDJ1uxQ k8/Y92gZhibTcxy67UzaCJKoaeYVTtRNUh+/SOhlNjWs5Apxk495SW0RsnbaoIPSgsUb lcPe9/Y5cyEepgBl9B6W1WSsF1kK/sej1NAUbtlNjlatvC3y5VeLFFi+hzZc5S+2CGD0 ICr3a56KmV5tbZeoRZt+mIWlyXD3fTaXicBjJhtY2KN6aIUEBAXHHCuNM7HrTNYb864f URnTU/Fm38qbuvWe3Su6qPZZVNJryx5Lr8fEFjx40ZLV2/8djx3sHcShSZoeWgpAiEJP yIjg== X-Gm-Message-State: AOJu0YzQpKD2lD+etMJKlj6mu20+GjTKuWxIzLi2+OW5I4ltGdw3KfvT tlzSZjcpe3RjyzyOSPhkw5CfubEqGG6ZJz8wxac7h6ofnUutlmYtDDZEfJGw3af5Wuo= X-Gm-Gg: ASbGncvaZM+TdEnEeYCkBsO39QyjBHbh04pdBJLPRWjsZyPVq+uXb0cU7Qnm2Jya7ZI 0rXiV/Sh4Mu6xqRsUrEGubOn7g+jg3iuRyC9lTqIfxxVe2ptR0ilJcJv0Z2XW0a7GSTBRORpkvf +ynu7zP9qjBp6j07Mb8umfM06G9cIfkN0Ltjq5tniWTaEtuKqIG1rh2Gjhgi6UgMgBn8mIy9XT5 2FB/E/vkCevBlbY5TBDu1WZE7wNHsozZV24sa1jzaoGUTIZ1MNvMxk1LVmNGym1OYs56diMr/A1 1LjoIYNZ+UcaCfcUdmGKatgBmPpHZS1jp6aBKm0hTzKthERqfjkm3vBC/ZCZydeAruaSRdEEK97 Tm2pwrkLbZL56118rBkv4gKe227I81mZbL3OUhnICwKfxvX6Qz+dk9niD6lQRNIF3WBlJXw2eSl Mf5LjMBjyuhT2AXdJPlDcTOxGk1WYnt6yg X-Google-Smtp-Source: AGHT+IEVKAmB/poFBN03oCthRMQZ54jlAT2IJIKcGbwZDfONSQJzb4bkL823yAWk8bQxcPdZfTq64g== X-Received: by 2002:a17:907:d7c9:b0:ae0:ba0e:ae59 with SMTP id a640c23a62f3a-af8fd7642c0mr152005566b.7.1753869418740; Wed, 30 Jul 2025 02:56:58 -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 v4 2/3] hvmloader: fix SMBIOS table length checks Date: Wed, 30 Jul 2025 09:56:52 +0000 Message-Id: <1f452cde49cd9cfa949affe6061fc628de434e18.1753869323.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: 1753869442840116600 From: Petr Bene=C5=A1 SMBIOS specification dictates that tables should have a minimal length. This commit introduces further validation for user-input SMBIOS tables. As per SMBIOS Reference Specification: * Type 0: For version 2.3 and later implementations, the length is at least= 14h * Type 1: 1Bh for 2.4 and later * Type 2: at least 08h * Type 3: 0Dh for version 2.1 and later * Type 11: 5h (+ strings) * Type 22: 1Ah (+ strings) * Type 39: a minimum of 10h Notably, this also fixes previously incorrect check for chassis handle in smbios_type_2_init. Chassis handle is a WORD, therefore, the condition now correctly checks for >=3D 13 instead of > 13. hvmloader currently implements version 2.4 Furthermore, this commit introduces smbios_pt_copy helper function to subst= itute previously repeating pattern of locating the struct in physical memory (via get_smbios_pt_struct), checking the length and copying it into SMBIOS regio= n. Signed-off-by: Petr Bene=C5=A1 Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 179 ++++++++++++++---------- tools/firmware/hvmloader/smbios_types.h | 32 ++--- 2 files changed, 124 insertions(+), 87 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/s= mbios.c index 6bcdcc233a..3af1b8a7ba 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -47,6 +47,8 @@ static void smbios_pt_init(void); static void* get_smbios_pt_struct(uint8_t type, uint32_t *length_out); +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t table_si= ze); static void get_cpu_manufacturer(char *buf, int len); static int @@ -154,6 +156,24 @@ get_smbios_pt_struct(uint8_t type, uint32_t *length_ou= t) return NULL; } =20 +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t table_si= ze) +{ + struct smbios_structure_header *header =3D start; + void *pts; + uint32_t length; + + pts =3D get_smbios_pt_struct(type, &length); + if ( pts !=3D NULL && length >=3D table_size ) + { + memcpy(start, pts, length); + header->handle =3D handle; + return start + length; + } + + return start; +} + static void get_cpu_manufacturer(char *buf, int len) { @@ -381,16 +401,17 @@ smbios_type_0_init(void *start, const char *xen_versi= on, struct smbios_type_0 *p =3D start; static const char *smbios_release_date =3D __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; =20 - pts =3D get_smbios_pt_struct(0, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE0; - return start + length; - } + /* + * Specification says Type 0 table has length of at least 18h for v2.4= -3.0. + */ + + BUILD_BUG_ON(sizeof(*p) !=3D 24); + + next =3D smbios_pt_copy(start, 0, SMBIOS_HANDLE_TYPE0, sizeof(*p)); + if ( next !=3D start ) + return next; =20 memset(p, 0, sizeof(*p)); =20 @@ -440,16 +461,14 @@ smbios_type_1_init(void *start, const char *xen_versi= on, char uuid_str[37]; struct smbios_type_1 *p =3D start; const char *s; - void *pts; - uint32_t length; + void *next; =20 - pts =3D get_smbios_pt_struct(1, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE1; - return start + length; - } + /* Specification says Type 1 table has length of 1Bh for v2.4 and late= r. */ + BUILD_BUG_ON(sizeof(*p) !=3D 27); + + next =3D smbios_pt_copy(start, 1, SMBIOS_HANDLE_TYPE1, sizeof(*p)); + if ( next !=3D start ) + return next; =20 memset(p, 0, sizeof(*p)); =20 @@ -498,26 +517,30 @@ smbios_type_2_init(void *start) { struct smbios_type_2 *p =3D start; const char *s; - uint8_t *ptr; - void *pts; - uint32_t length; + void *next; unsigned int counter =3D 0; =20 - pts =3D get_smbios_pt_struct(2, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE2; + /* + * Specification says Type 2 table has length of at least 08h, + * which corresponds with the end of the "Serial Number" field. + */ + + BUILD_BUG_ON(offsetof_end(struct smbios_type_2, serial_number_str) != =3D 8); =20 + next =3D smbios_pt_copy(start, 2, SMBIOS_HANDLE_TYPE2, + offsetof_end(struct smbios_type_3, + serial_number_str)); + if ( next !=3D start ) + { /* Set current chassis handle if present */ - if ( p->header.length > 13 ) + if ( p->header.length >=3D offsetof_end(struct smbios_type_2, + chassis_handle) ) { - ptr =3D ((uint8_t*)start) + 11; =20 - if ( *((uint16_t*)ptr) !=3D 0 ) - *((uint16_t*)ptr) =3D SMBIOS_HANDLE_TYPE3; + if ( p->chassis_handle !=3D 0 ) + p->chassis_handle =3D SMBIOS_HANDLE_TYPE3; } =20 - return start + length; + return next; } =20 memset(p, 0, sizeof(*p)); @@ -593,18 +616,21 @@ smbios_type_3_init(void *start) { struct smbios_type_3 *p =3D start; const char *s; - void *pts; - uint32_t length; + void *next; uint32_t counter =3D 0; =20 - pts =3D get_smbios_pt_struct(3, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE3; - return start + length; - } - =20 + /* + * Specification says Type 3 table has length of at least 0Dh (for v2.= 1+), + * which corresponds with the end of the "Security Status" field. + */ + + BUILD_BUG_ON(offsetof_end(struct smbios_type_3, security_status) !=3D = 13); + + next =3D smbios_pt_copy(start, 3, SMBIOS_HANDLE_TYPE3, + offsetof(struct smbios_type_3, security_status)); + if ( next !=3D start ) + return next; + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 3; @@ -656,6 +682,9 @@ smbios_type_4_init( struct smbios_type_4 *p =3D start; uint32_t eax, ebx, ecx, edx; =20 + /* Specification says Type 4 table has length of 23h for v2.3+. */ + BUILD_BUG_ON(sizeof(*p) !=3D 35); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 4; @@ -707,17 +736,15 @@ smbios_type_11_init(void *start) struct smbios_type_11 *p =3D start; char path[20]; const char *s; + void *next; int i; - void *pts; - uint32_t length; =20 - pts =3D get_smbios_pt_struct(11, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE11; - return start + length; - } + /* Specification says Type 11 table has length of 05h. */ + BUILD_BUG_ON(sizeof(*p) !=3D 5); + =20 + next =3D smbios_pt_copy(start, 11, SMBIOS_HANDLE_TYPE11, sizeof(*p)); + if ( next !=3D start ) + return next; =20 p->header.type =3D 11; p->header.length =3D sizeof(*p); @@ -756,6 +783,9 @@ smbios_type_16_init(void *start, uint32_t memsize, int = nr_mem_devs) { struct smbios_type_16 *p =3D start; =20 + /* Specification says Type 16 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) !=3D 15); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 16; @@ -781,6 +811,9 @@ smbios_type_17_init(void *start, uint32_t memory_size_m= b, int instance) char buf[16]; struct smbios_type_17 *p =3D start; =20 + /* Specification says Type 17 table has length of 1Bh for v2.3-2.6. */ + BUILD_BUG_ON(sizeof(*p) !=3D 27); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 17; @@ -816,6 +849,9 @@ smbios_type_19_init(void *start, uint32_t memory_size_m= b, int instance) { struct smbios_type_19 *p =3D start; =20 + /* Specification says Type 19 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) !=3D 15); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 19; @@ -838,6 +874,9 @@ smbios_type_20_init(void *start, uint32_t memory_size_m= b, int instance) { struct smbios_type_20 *p =3D start; =20 + /* Specification says Type 20 table has length of 13h for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) !=3D 19); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 20; @@ -865,16 +904,14 @@ smbios_type_22_init(void *start) struct smbios_type_22 *p =3D start; static const char *smbios_release_date =3D __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; =20 - pts =3D get_smbios_pt_struct(22, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE22; - return start + length; - } + /* Specification says Type 22 table has length of 1Ah. */ + BUILD_BUG_ON(sizeof(*p) !=3D 26); + + next =3D smbios_pt_copy(start, 22, SMBIOS_HANDLE_TYPE22, sizeof(*p)); + if ( next !=3D start ) + return next; =20 s =3D xenstore_read(HVM_XS_SMBIOS_DEFAULT_BATTERY, "0"); if ( strncmp(s, "1", 1) !=3D 0 ) @@ -929,6 +966,9 @@ smbios_type_32_init(void *start) { struct smbios_type_32 *p =3D start; =20 + /* Specification says Type 32 table has length of at least 0Bh. */ + BUILD_BUG_ON(sizeof(*p) !=3D 11); + memset(p, 0, sizeof(*p)); =20 p->header.type =3D 32; @@ -946,20 +986,17 @@ smbios_type_32_init(void *start) static void * smbios_type_39_init(void *start) { - struct smbios_type_39 *p =3D start; - void *pts; - uint32_t length; + /* + * Specification says Type 39 table has length of at least 10h, + * which corresponds with the end of the "Characteristics" field. + * + * Only present when passed in. + */ =20 - pts =3D get_smbios_pt_struct(39, &length); - if ( pts !=3D NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle =3D SMBIOS_HANDLE_TYPE39; - return start + length; - } + BUILD_BUG_ON(offsetof_end(struct smbios_type_39, characteristics) !=3D= 16); =20 - /* Only present when passed in */ - return start; + return smbios_pt_copy(start, 39, SMBIOS_HANDLE_TYPE39, + offsetof_end(struct smbios_type_39, characterist= ics)); } =20 static void * diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmlo= ader/smbios_types.h index 7c648ece71..a04d194975 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -90,13 +90,13 @@ struct smbios_type_2 { uint8_t product_name_str; uint8_t version_str; uint8_t serial_number_str; - uint8_t asset_tag_str; - uint8_t feature_flags; - uint8_t location_in_chassis_str; - uint16_t chassis_handle; - uint8_t board_type; - uint8_t contained_handle_count; - uint16_t contained_handles[]; + uint8_t asset_tag_str; /* Optional */ + uint8_t feature_flags; /* Optional */ + uint8_t location_in_chassis_str; /* Optional */ + uint16_t chassis_handle; /* Optional */ + uint8_t board_type; /* Optional */ + uint8_t contained_handle_count; /* Optional */ + uint16_t contained_handles[]; /* Optional */ } __attribute__ ((packed)); =20 /* System Enclosure - Contained Elements */ @@ -118,12 +118,12 @@ struct smbios_type_3 { uint8_t power_supply_state; uint8_t thermal_state; uint8_t security_status; - uint32_t oem_specific; - uint8_t height; - uint8_t number_of_power_cords; - uint8_t contained_element_count; - uint8_t contained_element_length; - struct smbios_contained_element contained_elements[]; + uint32_t oem_specific; /* Optional */ + uint8_t height; /* Optional */ + uint8_t number_of_power_cords; /* Optional */ + uint8_t contained_element_count; /* Optional */ + uint8_t contained_element_length; /* Optional */ + struct smbios_contained_element contained_elements[]; /* Optional */ } __attribute__ ((packed)); =20 /* SMBIOS type 4 - Processor Information */ @@ -252,9 +252,9 @@ struct smbios_type_39 { uint8_t revision_level_str; uint16_t max_capacity; uint16_t characteristics; - uint16_t input_voltage_probe_handle; - uint16_t cooling_device_handle; - uint16_t input_current_probe_handle; + uint16_t input_voltage_probe_handle; /* Optional */ + uint16_t cooling_device_handle; /* Optional */ + uint16_t input_current_probe_handle; /* Optional */ } __attribute__ ((packed)); =20 /* SMBIOS type 127 -- End-of-table */ --=20 2.34.1 From nobody Thu Oct 30 18:55:08 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=1753869441; cv=none; d=zohomail.com; s=zohoarc; b=ZyDB9OVmZQtWUS9JOpYvbNHpihNCCcUetBDjM1WcHhkX+GMjjh41oY8FdG02kVjV/bQYGYujU1I8MaMxMYr+ANpecOgTOAiP1CRM1FaHqc6ElHRMaNFYR1sKDAPXTeqjgjEIF0z6g+qAs8IEjku5612WjdCcmIYJ3HLt9DdOlvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753869441; 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=HwFHCBdTSHgWjmQGvbODBADiKnjgtW8EbilEqxMqy2M=; b=Ets0XgVx+X5sADcU7CoDM+hyX9a9ySmmAJI8HxTh8bYRVKkYLdWnyqNQt9bvJ1z93lqphG7G1F8cATM6C1RSqScFZ7ItMIbc25qdsncpLJWPf928JvWbfh0OKJpXfYGr7ieM9tOKuB36F941SfHde5rF6rafKGdO3spa27AkEjY= 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 1753869441772303.99156905365464; Wed, 30 Jul 2025 02:57:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063646.1429383 (Exim 4.92) (envelope-from ) id 1uh3YV-0006ZT-Gb; Wed, 30 Jul 2025 09:57:03 +0000 Received: by outflank-mailman (output) from mailman id 1063646.1429383; Wed, 30 Jul 2025 09:57:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uh3YV-0006Z8-Dw; Wed, 30 Jul 2025 09:57:03 +0000 Received: by outflank-mailman (input) for mailman id 1063646; Wed, 30 Jul 2025 09:57:01 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uh3YT-00066r-Pw for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 09:57:01 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8954d559-6d2b-11f0-a320-13f23c93f187; Wed, 30 Jul 2025 11:57:00 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-af8ed6b179eso24318266b.1 for ; Wed, 30 Jul 2025 02:57: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-af635a60e68sm722900966b.94.2025.07.30.02.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 02:56:59 -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: 8954d559-6d2b-11f0-a320-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753869420; x=1754474220; 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=HwFHCBdTSHgWjmQGvbODBADiKnjgtW8EbilEqxMqy2M=; b=SSp2Q4xnqUaonf+wHvdbrirjY3kpWdkAYghoNzXLzbrIC/cnNXQcZXpqGdnZ5zD6d6 +6rMyOI8KQHPPHLGBpavnOVmgWV9Ptk/VOlGK8izHb9wtI63HOWoMh8n4Q+pjgM+V7zU JB6UjtGEeODpBJgINUuF4tID3q6f98gclCFidHYKP5MBI660cdVtn4FKCUMTeZEFfCUN MOm8StgZaA1i4qNX1lPOysV1TxhuLmggc+7Tki/Gw6EJNGA9YyOpk7UtCpLD4XTp/NxS DNUdpQgTiRR+FhqeML+9gPKcmBdCYUimyLI4yBhau4bli3EUlfpNSVffSXkLDAlip+j+ WtOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753869420; x=1754474220; 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=HwFHCBdTSHgWjmQGvbODBADiKnjgtW8EbilEqxMqy2M=; b=PB42Uu++cl4DncjcpARjeT0+3J9oOZ/BDPJIY64xfkvmzdPnZOBrnSfbYUN4bZMCou kH1jHZzQLCvIGLtyS0ySMcul/Hd09Kb4mUFCLtq53sShT9lzgkRCFGBCFIofhq/Tnj51 OOuOtolecajUQLH4VrDyz5+o1RXqZRxgQ2GOv3pr9mFr5TE7aMW6oCcmdBOZ23SpfXXJ JQBXjageBXsruHeCcAgFZxFy9LnTT7rmRcuxugf6ynABG1KLEJQiUXrg7Tr59SwROxfI SR4YYrJF74wL8V5K0bTRCRCoX/VE0dVcVmz20UYD7/+YkX2A9NOt3UUMHqAnOVMFC/Lq ntiA== X-Gm-Message-State: AOJu0Yx3MUKqWUH1L1VZ0YE2oYeYopZq3r/fbYlfaKWpO6hlnB/8oYI9 /ivvjTOY6ftqQMlV+cXF6FDeocWdeLVRbJIHi1lFAcxuFxXvOPJUsXeXFQKCmdX0BoE= X-Gm-Gg: ASbGncvCHRPvmHVGHmXNxFEN77tRQYdBVg2brw3qEulH5mBbTAivG6gYByB3Y8mpvYe KmgLdPh0Wp2D+f8upM+QPhbVFdlvkEsIIkQxMmk74Et3mD9C+1AO9Cb1NVa0p10j2CS5KalPxld 7fjQlwXLzdZiw1YMulwrqBmsdJuTLOx1ipjp2714+1z+MK1tuZCIAXovTabEZSLCQ2VI5uuf0p1 RCrQKoSizhaqFCNPrcMtslzegLpBfRm3+hjviyDTiukhZ/5QUNBqWXC1Hb5LY3fY8IoszmInVt8 mMWQ5K8yEUOOXluSe/+LWK+jtmg4ujLr53expcBKClVCA719NoCgpKz3pCybF6jtSLP9wfk5ITS IAJxJkfRBtqOeQDwzm0Mxp9VNzcpGJtfcWx5ay+utol+VEgUSjR3CZIYiVwct42YmjS1POtn/IS FXS26XMTIWs8nHYJf5g9SVdU4NUfvI3YWf X-Google-Smtp-Source: AGHT+IEdenpSgBmG7wSgqEv5yHYLMym8lzERGyWUOzR4v85q0eAwbTzYyB06+jqOBjFeG0hywVSWHg== X-Received: by 2002:a17:907:6091:b0:add:fc26:bef7 with SMTP id a640c23a62f3a-af8fd98591dmr128574566b.10.1753869419595; Wed, 30 Jul 2025 02:56: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 v4 3/3] hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Date: Wed, 30 Jul 2025 09:56:53 +0000 Message-Id: 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: 1753869442876116600 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: *=C2=A07 - 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 3af1b8a7ba..469138621b 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)); @@ -729,6 +753,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) @@ -960,6 +1020,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(offsetof_end(struct smbios_type_26, oem_defined) !=3D 20); + + return smbios_pt_copy(start, 26, SMBIOS_HANDLE_TYPE26, + offsetof_end(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(offsetof_end(struct smbios_type_27, oem_defined) !=3D 12); +=20 + return smbios_pt_copy(start, 27, SMBIOS_HANDLE_TYPE27, + offsetof_end(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(offsetof_end(struct smbios_type_28, oem_defined) !=3D 20); + + return smbios_pt_copy(start, 28, SMBIOS_HANDLE_TYPE28, + offsetof_end(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