gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From d47ad4c29f1cd34aff896a88b3dfc4a861a15a6a Mon Sep 17 00:00:00 2001
   2 From: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
   3 Date: Thu, 10 Oct 2019 12:21:01 +0200
   4 Subject: [PATCH 01/32] x86/jailhouse: Improve setup data version comparison
   5
   6 Soon, setup_data will contain information on passed-through platform
   7 UARTs. This requires some preparational work for the sanity check of the
   8 header and the check of the version.
   9
  10 Use the following strategy:
  11
  12   1. Ensure that the header declares at least enough space for the
  13      version and the compatible_version as it must hold that fields for
  14      any version. The location and semantics of header+version fields
  15      will never change.
  16
  17   2. Copy over data -- as much as as possible. The length is either
  18      limited by the header length or the length of setup_data.
  19
  20   3. Things are now in place -- sanity check if the header length
  21      complies the actual version.
  22
  23 For future versions of the setup_data, only step 3 requires alignment.
  24
  25 Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
  26 Signed-off-by: Borislav Petkov <bp@suse.de>
  27 Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
  28 Cc: Baoquan He <bhe@redhat.com>
  29 Cc: "H. Peter Anvin" <hpa@zytor.com>
  30 Cc: Ingo Molnar <mingo@redhat.com>
  31 Cc: jailhouse-dev@googlegroups.com
  32 Cc: Juergen Gross <jgross@suse.com>
  33 Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
  34 Cc: Thomas Gleixner <tglx@linutronix.de>
  35 Cc: x86-ml <x86@kernel.org>
  36 Link: https://lkml.kernel.org/r/20191010102102.421035-2-ralf.ramsauer@oth-regensburg.de
  37 ---
  38  arch/x86/include/uapi/asm/bootparam.h | 22 ++++++++-------
  39  arch/x86/kernel/jailhouse.c           | 51 ++++++++++++++++++++++-------------
  40  2 files changed, 45 insertions(+), 28 deletions(-)
  41
  42 diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
  43 index c895df5482c5..43be437c9c71 100644
  44 --- a/arch/x86/include/uapi/asm/bootparam.h
  45 +++ b/arch/x86/include/uapi/asm/bootparam.h
  46 @@ -139,15 +139,19 @@ struct boot_e820_entry {
  47   * setup data structure.
  48   */
  49  struct jailhouse_setup_data {
  50 -       __u16   version;
  51 -       __u16   compatible_version;
  52 -       __u16   pm_timer_address;
  53 -       __u16   num_cpus;
  54 -       __u64   pci_mmconfig_base;
  55 -       __u32   tsc_khz;
  56 -       __u32   apic_khz;
  57 -       __u8    standard_ioapic;
  58 -       __u8    cpu_ids[255];
  59 +       struct {
  60 +               __u16   version;
  61 +               __u16   compatible_version;
  62 +       } __attribute__((packed)) hdr;
  63 +       struct {
  64 +               __u16   pm_timer_address;
  65 +               __u16   num_cpus;
  66 +               __u64   pci_mmconfig_base;
  67 +               __u32   tsc_khz;
  68 +               __u32   apic_khz;
  69 +               __u8    standard_ioapic;
  70 +               __u8    cpu_ids[255];
  71 +       } __attribute__((packed)) v1;
  72  } __attribute__((packed));
  73
  74  /* The so-called "zeropage" */
  75 diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
  76 index 3ad34f01de2a..cf4eb37ad97b 100644
  77 --- a/arch/x86/kernel/jailhouse.c
  78 +++ b/arch/x86/kernel/jailhouse.c
  79 @@ -22,6 +22,8 @@
  80  #include <asm/jailhouse_para.h>
  81
  82  static __initdata struct jailhouse_setup_data setup_data;
  83 +#define SETUP_DATA_V1_LEN      (sizeof(setup_data.hdr) + sizeof(setup_data.v1))
  84 +
  85  static unsigned int precalibrated_tsc_khz;
  86
  87  static uint32_t jailhouse_cpuid_base(void)
  88 @@ -45,7 +47,7 @@ static void jailhouse_get_wallclock(struct timespec64 *now)
  89
  90  static void __init jailhouse_timer_init(void)
  91  {
  92 -       lapic_timer_period = setup_data.apic_khz * (1000 / HZ);
  93 +       lapic_timer_period = setup_data.v1.apic_khz * (1000 / HZ);
  94  }
  95
  96  static unsigned long jailhouse_get_tsc(void)
  97 @@ -88,14 +90,14 @@ static void __init jailhouse_get_smp_config(unsigned int early)
  98
  99         register_lapic_address(0xfee00000);
 100
 101 -       for (cpu = 0; cpu < setup_data.num_cpus; cpu++) {
 102 -               generic_processor_info(setup_data.cpu_ids[cpu],
 103 +       for (cpu = 0; cpu < setup_data.v1.num_cpus; cpu++) {
 104 +               generic_processor_info(setup_data.v1.cpu_ids[cpu],
 105                                        boot_cpu_apic_version);
 106         }
 107
 108         smp_found_config = 1;
 109
 110 -       if (setup_data.standard_ioapic) {
 111 +       if (setup_data.v1.standard_ioapic) {
 112                 mp_register_ioapic(0, 0xfec00000, gsi_top, &ioapic_cfg);
 113
 114                 /* Register 1:1 mapping for legacy UART IRQs 3 and 4 */
 115 @@ -126,9 +128,9 @@ static int __init jailhouse_pci_arch_init(void)
 116                 pcibios_last_bus = 0xff;
 117
 118  #ifdef CONFIG_PCI_MMCONFIG
 119 -       if (setup_data.pci_mmconfig_base) {
 120 +       if (setup_data.v1.pci_mmconfig_base) {
 121                 pci_mmconfig_add(0, 0, pcibios_last_bus,
 122 -                                setup_data.pci_mmconfig_base);
 123 +                                setup_data.v1.pci_mmconfig_base);
 124                 pci_mmcfg_arch_init();
 125         }
 126  #endif
 127 @@ -139,6 +141,7 @@ static int __init jailhouse_pci_arch_init(void)
 128  static void __init jailhouse_init_platform(void)
 129  {
 130         u64 pa_data = boot_params.hdr.setup_data;
 131 +       unsigned long setup_data_len;
 132         struct setup_data header;
 133         void *mapping;
 134
 135 @@ -163,16 +166,8 @@ static void __init jailhouse_init_platform(void)
 136                 memcpy(&header, mapping, sizeof(header));
 137                 early_memunmap(mapping, sizeof(header));
 138
 139 -               if (header.type == SETUP_JAILHOUSE &&
 140 -                   header.len >= sizeof(setup_data)) {
 141 -                       pa_data += offsetof(struct setup_data, data);
 142 -
 143 -                       mapping = early_memremap(pa_data, sizeof(setup_data));
 144 -                       memcpy(&setup_data, mapping, sizeof(setup_data));
 145 -                       early_memunmap(mapping, sizeof(setup_data));
 146 -
 147 +               if (header.type == SETUP_JAILHOUSE)
 148                         break;
 149 -               }
 150
 151                 pa_data = header.next;
 152         }
 153 @@ -180,13 +175,27 @@ static void __init jailhouse_init_platform(void)
 154         if (!pa_data)
 155                 panic("Jailhouse: No valid setup data found");
 156
 157 -       if (setup_data.compatible_version > JAILHOUSE_SETUP_REQUIRED_VERSION)
 158 -               panic("Jailhouse: Unsupported setup data structure");
 159 +       /* setup data must at least contain the header */
 160 +       if (header.len < sizeof(setup_data.hdr))
 161 +               goto unsupported;
 162
 163 -       pmtmr_ioport = setup_data.pm_timer_address;
 164 +       pa_data += offsetof(struct setup_data, data);
 165 +       setup_data_len = min_t(unsigned long, sizeof(setup_data),
 166 +                              (unsigned long)header.len);
 167 +       mapping = early_memremap(pa_data, setup_data_len);
 168 +       memcpy(&setup_data, mapping, setup_data_len);
 169 +       early_memunmap(mapping, setup_data_len);
 170 +
 171 +       if (setup_data.hdr.version == 0 ||
 172 +           setup_data.hdr.compatible_version !=
 173 +               JAILHOUSE_SETUP_REQUIRED_VERSION ||
 174 +           (setup_data.hdr.version >= 1 && header.len < SETUP_DATA_V1_LEN))
 175 +               goto unsupported;
 176 +
 177 +       pmtmr_ioport = setup_data.v1.pm_timer_address;
 178         pr_debug("Jailhouse: PM-Timer IO Port: %#x\n", pmtmr_ioport);
 179
 180 -       precalibrated_tsc_khz = setup_data.tsc_khz;
 181 +       precalibrated_tsc_khz = setup_data.v1.tsc_khz;
 182         setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);
 183
 184         pci_probe = 0;
 185 @@ -196,6 +205,10 @@ static void __init jailhouse_init_platform(void)
 186          * are none in a non-root cell.
 187          */
 188         disable_acpi();
 189 +       return;
 190 +
 191 +unsupported:
 192 +       panic("Jailhouse: Unsupported setup data structure");
 193  }
 194
 195  bool jailhouse_paravirt(void)
 196 --
 197 2.11.0
 198