Skip to content

Commit ad95f5b

Browse files
authored
Doc and changelog the cpuid fix (#7749)
1 parent e84dc59 commit ad95f5b

3 files changed

Lines changed: 30 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [7.0.0-dev13]
9+
10+
[7.0.0-dev13]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev13
11+
12+
### Fixed
13+
14+
- Fixed the Turin SEV-SNP CPUID mapping used for product detection. (#7748)
15+
816
## [7.0.0-dev12]
917

1018
[7.0.0-dev12]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev12

doc/operations/platforms/snp.rst

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,30 @@ To set the minimum TCB version for a specific CPU model, you can use the followi
187187
"name": "set_snp_minimum_tcb_version_hex",
188188
"args": {
189189
"cpuid": "00a00f11",
190-
"tcb_version": "d315000000000004"
190+
"tcb_version": "db18000000000004"
191191
}
192192
}
193193
]
194194
}
195195
196196
The parsed TCB version mapped to that cpuid in the :ref:`audit/builtin_maps:``nodes.snp.tcb_versions``` table, which is used to validate the TCB version of joining nodes.
197197

198+
.. note::
199+
`Milan <https://learn.microsoft.com/en-us/azure/virtual-machines/sizes/general-purpose/dcasv5-series>`__
200+
and `Genoa <https://learn.microsoft.com/en-us/azure/virtual-machines/sizes/general-purpose/dcasv6-series>`__
201+
are currently deployed in Azure Container Instances.
202+
As of March 2026, reasonable minimum values are:
203+
204+
+-------+----------+---------------------+
205+
| Model | CPUID | Minimum TCB Version |
206+
+=======+==========+=====================+
207+
| Milan | 00a00f11 | db18000000000004 |
208+
+-------+----------+---------------------+
209+
| Genoa | 00a10f11 | 541700000000000a |
210+
+-------+----------+---------------------+
211+
| Turin | 00b00f21 | 5100000004010101 |
212+
+-------+----------+---------------------+
213+
198214
.. note::
199215
The CPUID and TCB version must be input as lower-case hex-strings. The values in the above example are for Milan CPUs, and can be expanded as follows:
200216

@@ -220,17 +236,17 @@ The parsed TCB version mapped to that cpuid in the :ref:`audit/builtin_maps:``no
220236

221237
SNP attestation structures contain the combined Family (``Extended Family + Base Family``) and Model (``Extended Model : Base Model``) values, so 25 (0x19) and 1 (0x01) respectively for the above Milan example.
222238

223-
The above TCB version ``d315000000000004`` is for a Milan CPU.
239+
The TCB version ``db18000000000004`` is for a Milan CPU.
224240
It, and also TCB versions for Genoa CPUs, can be expanded as follows:
225241

226242
+-------------------+------------------+
227243
| | Value |
228244
| TCB Version Field +-----+------------+
229245
| | dec | hex |
230246
+===================+=====+============+
231-
| Microcode | 211 | 0xd3 |
247+
| Microcode | 219 | 0xdb |
232248
+-------------------+-----+------------+
233-
| SNP | 21 | 0x15 |
249+
| SNP | 24 | 0x18 |
234250
+-------------------+-----+------------+
235251
| Reserved | 0 | 0x00000000 |
236252
+-------------------+-----+------------+
@@ -259,6 +275,7 @@ The parsed TCB version mapped to that cpuid in the :ref:`audit/builtin_maps:``no
259275
| FMC | 85 | 0x55 |
260276
+-------------------+-----+------------+
261277

278+
262279
Testing CCF's attestation validation
263280
-----------------------------------------------------
264281

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "ccf"
7-
version = "7.0.0.dev12"
7+
version = "7.0.0.dev13"
88
authors = [
99
{ name="CCF Team", email="CCF-Sec@microsoft.com" },
1010
]

0 commit comments

Comments
 (0)