Misc xen fixes for tboot since last merge with oss.

diff --git a/master/series b/master/series
index 1bb39e5957aba5794ab54e9fdf2c3d9146e00648..5a34e123c3402ff889e2917f817f327ef36c514a 100644 (file)
--- a/master/series
+++ b/master/series
@@ -33,3 +33,4 @@ hp-host-resume-workaround
 cope-with-dead-serial
 reset-atapi-after-failed-cd-boot
 vga-edid
+tboot-xen-fixes-01082010.patch

diff --git a/master/tboot-xen-fixes-01082010.patch b/master/tboot-xen-fixes-01082010.patch
new file mode 100644 (file)
index 0000000..117ca77
--- /dev/null
+++ b/master/tboot-xen-fixes-01082010.patch
@@ -0,0 +1,157 @@
+diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
+index 9709553..fa8aabf 100644
+--- a/xen/arch/x86/tboot.c
++++ b/xen/arch/x86/tboot.c
+@@ -70,12 +70,29 @@ typedef struct __packed {
+     uint32_t     vtd_dmars_off;
+ } sinit_mle_data_t;
+ 
++static void tboot_copy_memory(unsigned char *va, uint32_t size,
++                              unsigned long pa)
++{
++    unsigned long map_base = 0;
++    unsigned char *map_addr = NULL;
++    unsigned int i;
++
++    for ( i = 0; i < size; i++ )
++    {
++        if ( map_base != PFN_DOWN(pa + i) )
++        {
++            map_base = PFN_DOWN(pa + i);
++            set_fixmap(FIX_TBOOT_MAP_ADDRESS, map_base << PAGE_SHIFT);
++            map_addr = (unsigned char *)fix_to_virt(FIX_TBOOT_MAP_ADDRESS);
++        }
++        va[i] = map_addr[pa + i - (map_base << PAGE_SHIFT)];
++    }
++}
++
+ void __init tboot_probe(void)
+ {
+     tboot_shared_t *tboot_shared;
+     unsigned long p_tboot_shared;
+-    uint32_t map_base, map_size;
+-    unsigned long map_addr;
+ 
+     /* Look for valid page-aligned address for shared page. */
+     p_tboot_shared = simple_strtoul(opt_tboot, NULL, 0);
+@@ -108,26 +125,17 @@ void __init tboot_probe(void)
+     /* these will be needed by tboot_protect_mem_regions() and/or
+        tboot_parse_dmar_table(), so get them now */
+ 
+-    map_base = PFN_DOWN(TXT_PUB_CONFIG_REGS_BASE);
+-    map_size = PFN_UP(NR_TXT_CONFIG_PAGES * PAGE_SIZE);
+-    map_addr = (unsigned long)__va(map_base << PAGE_SHIFT);
+-    if ( map_pages_to_xen(map_addr, map_base, map_size, __PAGE_HYPERVISOR) )
+-        return;
+-
++    txt_heap_base = txt_heap_size = sinit_base = sinit_size = 0;
+     /* TXT Heap */
+-    txt_heap_base =
+-        *(uint64_t *)__va(TXT_PUB_CONFIG_REGS_BASE + TXTCR_HEAP_BASE);
+-    txt_heap_size =
+-        *(uint64_t *)__va(TXT_PUB_CONFIG_REGS_BASE + TXTCR_HEAP_SIZE);
+-
++    tboot_copy_memory((unsigned char *)&txt_heap_base, sizeof(txt_heap_base),
++                      TXT_PUB_CONFIG_REGS_BASE + TXTCR_HEAP_BASE);
++    tboot_copy_memory((unsigned char *)&txt_heap_size, sizeof(txt_heap_size),
++                      TXT_PUB_CONFIG_REGS_BASE + TXTCR_HEAP_SIZE);
+     /* SINIT */
+-    sinit_base =
+-        *(uint64_t *)__va(TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE);
+-    sinit_size =
+-        *(uint64_t *)__va(TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE);
+-
+-    destroy_xen_mappings((unsigned long)__va(map_base << PAGE_SHIFT),
+-                         (unsigned long)__va((map_base + map_size) << PAGE_SHIFT));
++    tboot_copy_memory((unsigned char *)&sinit_base, sizeof(sinit_base),
++                      TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_BASE);
++    tboot_copy_memory((unsigned char *)&sinit_size, sizeof(sinit_size),
++                      TXT_PUB_CONFIG_REGS_BASE + TXTCR_SINIT_SIZE);
+ }
+ 
+ /* definitions from xen/drivers/passthrough/vtd/iommu.h
+@@ -380,11 +388,14 @@ int __init tboot_protect_mem_regions(void)
+ 
+ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler)
+ {
+-    uint32_t map_base, map_size;
+-    unsigned long map_vaddr;
+-    void *heap_ptr;
+     struct acpi_table_header *dmar_table;
+     int rc;
++    uint64_t size;
++    uint32_t dmar_table_length;
++    unsigned long pa;
++    sinit_mle_data_t sinit_mle_data;
++    unsigned char *dmar_table_raw;
++
+ 
+     if ( !tboot_in_measured_env() )
+         return acpi_table_parse(ACPI_SIG_DMAR, dmar_handler);
+@@ -396,31 +407,32 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler)
+         return 1;
+ 
+     /* map TXT heap into Xen addr space */
+-    map_base = PFN_DOWN(txt_heap_base);
+-    map_size = PFN_UP(txt_heap_size);
+-    map_vaddr = (unsigned long)__va(map_base << PAGE_SHIFT);
+-    if ( map_pages_to_xen(map_vaddr, map_base, map_size, __PAGE_HYPERVISOR) )
+-        return 1;
+ 
+-    /* walk heap to SinitMleData */
+-    heap_ptr = __va(txt_heap_base);
+-    /* skip BiosData */
+-    heap_ptr += *(uint64_t *)heap_ptr;
+-    /* skip OsMleData */
+-    heap_ptr += *(uint64_t *)heap_ptr;
+-    /* skip OsSinitData */
+-    heap_ptr += *(uint64_t *)heap_ptr;
+-    /* now points to SinitMleDataSize; set to SinitMleData */
+-    heap_ptr += sizeof(uint64_t);
++    /* walk heap to SinitMleData */  
++    pa = txt_heap_base;
++    /* skip BiosData */    
++    tboot_copy_memory((unsigned char *)&size, sizeof(size), pa);
++    pa += size;
++    /* skip OsMleData */    
++    tboot_copy_memory((unsigned char *)&size, sizeof(size), pa);
++    pa += size;
++    /* skip OsSinitData */    
++    tboot_copy_memory((unsigned char *)&size, sizeof(size), pa);
++    pa += size;
++    /* now points to SinitMleDataSize; set to SinitMleData */   
++    pa += sizeof(uint64_t);
++    tboot_copy_memory((unsigned char *)&sinit_mle_data, sizeof(sinit_mle_data),
++                      pa);
+     /* get addr of DMAR table */
+-    dmar_table = (struct acpi_table_header *)(heap_ptr +
+-            ((sinit_mle_data_t *)heap_ptr)->vtd_dmars_off - sizeof(uint64_t));
+-
++    pa += sinit_mle_data.vtd_dmars_off - sizeof(uint64_t);
++    tboot_copy_memory((unsigned char *)&dmar_table_length,
++                      sizeof(dmar_table_length),
++                      pa + sizeof(char) * ACPI_NAME_SIZE);
++    dmar_table_raw = xmalloc_array(unsigned char, dmar_table_length);
++    tboot_copy_memory(dmar_table_raw, dmar_table_length, pa);
++    dmar_table = (struct acpi_table_header *)dmar_table_raw;
+     rc = dmar_handler(dmar_table);
+-
+-    destroy_xen_mappings(
+-        (unsigned long)__va(map_base << PAGE_SHIFT),
+-        (unsigned long)__va((map_base + map_size) << PAGE_SHIFT));
++    xfree(dmar_table_raw);
+   
+     /* acpi_parse_dmar() zaps APCI DMAR signature in TXT heap table */
+     /* but dom0 will read real table, so must zap it there too */
+diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h
+index 1ef9a69..a5d9b9a 100644
+--- a/xen/include/asm-x86/fixmap.h
++++ b/xen/include/asm-x86/fixmap.h
+@@ -51,6 +51,7 @@ enum fixed_addresses {
+     FIX_TBOOT_SHARED_BASE,
+     FIX_MSIX_IO_RESERV_BASE,
+     FIX_MSIX_IO_RESERV_END = FIX_MSIX_IO_RESERV_BASE + FIX_MSIX_MAX_PAGES -1,
++    FIX_TBOOT_MAP_ADDRESS,
+     __end_of_fixed_addresses
+ };
+