Update gh-pages from f85610f

thmsbinder · Jan 12, 2024 · 7ba9f27 · 7ba9f27
1 parent b1b4817
commit 7ba9f27
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/doc/src/oak_stage0/sev.rs.html b/doc/src/oak_stage0/sev.rs.html
@@ -548,18 +548,6 @@
 <a href="#548" id="548">548</a>
 <a href="#549" id="549">549</a>
 <a href="#550" id="550">550</a>
-<a href="#551" id="551">551</a>
-<a href="#552" id="552">552</a>
-<a href="#553" id="553">553</a>
-<a href="#554" id="554">554</a>
-<a href="#555" id="555">555</a>
-<a href="#556" id="556">556</a>
-<a href="#557" id="557">557</a>
-<a href="#558" id="558">558</a>
-<a href="#559" id="559">559</a>
-<a href="#560" id="560">560</a>
-<a href="#561" id="561">561</a>
-<a href="#562" id="562">562</a>
 </pre></div><pre class="rust"><code><span class="comment">//
 // Copyright 2022 The Project Oak Authors
 //
@@ -1059,18 +1047,6 @@
         .expect(<span class="string">&quot;failed to validate memory&quot;</span>);
     }
 
-    <span class="comment">// Also pvalidate the range from 0xF0000 to 0xFFFFF since the Linux Kernel will scan this range
-    // for the SMBIOS entry point table if CONFIG_DMI is enabled, even if the range is marked as
-    // reserved.
-    // See &lt;https://github.com/torvalds/linux/blob/master/drivers/firmware/dmi_scan.c&gt;
-    </span><span class="kw">let </span>range = PhysFrame::&lt;Size4KiB&gt;::range(
-        PhysFrame::from_start_address(PhysAddr::new(<span class="number">0xF0000</span>)).unwrap(),
-        PhysFrame::from_start_address(PhysAddr::new(<span class="number">0x100000</span>)).unwrap(),
-    );
-    range
-        .pvalidate(<span class="kw-2">&amp;mut </span>validation_pt, encrypted)
-        .expect(<span class="string">&quot;failed to validate SMBIOS memory&quot;</span>);
-
     page_tables.pd_0[<span class="number">1</span>].set_unused();
     page_tables.pdpt[<span class="number">1</span>].set_unused();
     tlb::flush_all();

diff --git a/doc/src/oak_stage0/zero_page.rs.html b/doc/src/oak_stage0/zero_page.rs.html
@@ -448,6 +448,18 @@
 <a href="#448" id="448">448</a>
 <a href="#449" id="449">449</a>
 <a href="#450" id="450">450</a>
+<a href="#451" id="451">451</a>
+<a href="#452" id="452">452</a>
+<a href="#453" id="453">453</a>
+<a href="#454" id="454">454</a>
+<a href="#455" id="455">455</a>
+<a href="#456" id="456">456</a>
+<a href="#457" id="457">457</a>
+<a href="#458" id="458">458</a>
+<a href="#459" id="459">459</a>
+<a href="#460" id="460">460</a>
+<a href="#461" id="461">461</a>
+<a href="#462" id="462">462</a>
 </pre></div><pre class="rust"><code><span class="comment">//
 // Copyright 2022 The Project Oak Authors
 //
@@ -583,12 +595,24 @@
         <span class="self">self</span>.validate_e820_table();
 
         <span class="comment">// Carve out a chunk of memory out for the ACPI area and reserved memory just below 1 MiB.
+        // The ACPI area is from 0x80000-0x9FFFF. We also reserve the region from 0xA0000-0xEFFFF
+        // since historically this contained hardware-related regions such as the VGA bios rom.
         </span><span class="self">self</span>.insert_e820_entry(BootE820Entry::new(<span class="number">0x8_0000</span>, <span class="number">0x2_0000</span>, E820EntryType::ACPI));
         <span class="self">self</span>.insert_e820_entry(BootE820Entry::new(
             <span class="number">0xA_0000</span>,
-            <span class="number">0x6_0000</span>,
+            <span class="number">0x5_0000</span>,
             E820EntryType::RESERVED,
         ));
+        <span class="comment">// Mark the memory range for the SMBIOS entry point table as disabled since we don&#39;t support
+        // DMI or SMBIOS tables. If this memory range is enabled (even it if is reserved) and the
+        // Linux kernel has CONFIG_DMI enabled it will try to scan this memory range to find the
+        // SMBIOS entry point table. On AMD SEV-SNP scanning of this memory range causes #VC
+        // exceptions, so we don&#39;t want the kernel to try to scan it.
+        </span><span class="self">self</span>.insert_e820_entry(BootE820Entry::new(
+            <span class="number">0xF_0000</span>,
+            <span class="number">0x1_0000</span>,
+            E820EntryType::DISABLED,
+        ));
 
         <span class="kw">for </span>entry <span class="kw">in </span><span class="self">self</span>.inner.e820_table() {
             <span class="macro">log::debug!</span>(