Commit 1de5bdce authored Oct 11, 2019 by Jiri Slaby Committed by Borislav Petkov Oct 18, 2019

xen/pvh: Annotate data appropriately



Use the new SYM_DATA_START_LOCAL, and SYM_DATA_END* macros to get:

  0000     8 OBJECT  LOCAL  DEFAULT    6 gdt
  0008    32 OBJECT  LOCAL  DEFAULT    6 gdt_start
  0028     0 OBJECT  LOCAL  DEFAULT    6 gdt_end
  0028   256 OBJECT  LOCAL  DEFAULT    6 early_stack
  0128     0 OBJECT  LOCAL  DEFAULT    6 early_stack

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Darren Hart <dvhart@infradead.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: linux-arch@vger.kernel.org
Cc: platform-driver-x86@vger.kernel.org
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Cc: xen-devel@lists.xenproject.org
Link: https://lkml.kernel.org/r/20191011115108.12392-15-jslaby@suse.cz

parent 773a37b1

arch/x86/platform/pvh/head.S

+7 −7

Original line number	Diff line number	Diff line
		@@ -150,11 +150,12 @@ END(pvh_start_xen)

		.section ".init.data","aw"
		.balign 8
		gdt:
		SYM_DATA_START_LOCAL(gdt)
		.word gdt_end - gdt_start
		.long _pa(gdt_start)
		.word 0
		gdt_start:
		SYM_DATA_END(gdt)
		SYM_DATA_START_LOCAL(gdt_start)
		.quad 0x0000000000000000 /* NULL descriptor */
		#ifdef CONFIG_X86_64
		.quad GDT_ENTRY(0xa09a, 0, 0xfffff) /* PVH_CS_SEL */
		@@ -163,15 +164,14 @@ gdt_start:
		#endif
		.quad GDT_ENTRY(0xc092, 0, 0xfffff) /* PVH_DS_SEL */
		.quad GDT_ENTRY(0x4090, 0, 0x18) /* PVH_CANARY_SEL */
		gdt_end:
		SYM_DATA_END_LABEL(gdt_start, SYM_L_LOCAL, gdt_end)

		.balign 16
		canary:
		.fill 48, 1, 0
		SYM_DATA_LOCAL(canary, .fill 48, 1, 0)

		early_stack:
		SYM_DATA_START_LOCAL(early_stack)
		.fill BOOT_STACK_SIZE, 1, 0
		early_stack_end:
		SYM_DATA_END_LABEL(early_stack, SYM_L_LOCAL, early_stack_end)

		ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY,
		_ASM_PTR (pvh_start_xen - __START_KERNEL_map))

Admin message