From mboxrd@z Thu Jan 1 00:00:00 1970 From: "tip-bot2 for Jiri Slaby" Subject: [tip: x86/asm] xen/pvh: Annotate data appropriately Date: Fri, 18 Oct 2019 16:30:30 -0000 Message-ID: <157141623045.29376.2755641744903920106.tip-bot2@tip-bot2> References: <20191011115108.12392-15-jslaby@suse.cz> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191011115108.12392-15-jslaby@suse.cz> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-tip-commits@vger.kernel.org Cc: Juergen Gross , linux-arch@vger.kernel.org, Stefano Stabellini , xen-devel@lists.xenproject.org, Ingo Molnar , x86-ml , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Darren Hart , Boris Ostrovsky , Borislav Petkov , Jiri Slaby , Thomas Gleixner , Andy Shevchenko List-Id: linux-arch.vger.kernel.org VGhlIGZvbGxvd2luZyBjb21taXQgaGFzIGJlZW4gbWVyZ2VkIGludG8gdGhlIHg4Ni9hc20gYnJh bmNoIG9mIHRpcDoKCkNvbW1pdC1JRDogICAgIDFkZTViZGNlMGMzZjgyOTRkMGFhYmM0OGZiNTQ5 NzgxNDU4OTQyMmYKR2l0d2ViOiAgICAgICAgaHR0cHM6Ly9naXQua2VybmVsLm9yZy90aXAvMWRl NWJkY2UwYzNmODI5NGQwYWFiYzQ4ZmI1NDk3ODE0NTg5NDIyZgpBdXRob3I6ICAgICAgICBKaXJp IFNsYWJ5IDxqc2xhYnlAc3VzZS5jej4KQXV0aG9yRGF0ZTogICAgRnJpLCAxMSBPY3QgMjAxOSAx Mzo1MDo1NCArMDI6MDAKQ29tbWl0dGVyOiAgICAgQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRl PgpDb21taXR0ZXJEYXRlOiBGcmksIDE4IE9jdCAyMDE5IDEwOjQ2OjA2ICswMjowMAoKeGVuL3B2 aDogQW5ub3RhdGUgZGF0YSBhcHByb3ByaWF0ZWx5CgpVc2UgdGhlIG5ldyBTWU1fREFUQV9TVEFS VF9MT0NBTCwgYW5kIFNZTV9EQVRBX0VORCogbWFjcm9zIHRvIGdldDoKCiAgMDAwMCAgICAgOCBP QkpFQ1QgIExPQ0FMICBERUZBVUxUICAgIDYgZ2R0CiAgMDAwOCAgICAzMiBPQkpFQ1QgIExPQ0FM ICBERUZBVUxUICAgIDYgZ2R0X3N0YXJ0CiAgMDAyOCAgICAgMCBPQkpFQ1QgIExPQ0FMICBERUZB VUxUICAgIDYgZ2R0X2VuZAogIDAwMjggICAyNTYgT0JKRUNUICBMT0NBTCAgREVGQVVMVCAgICA2 IGVhcmx5X3N0YWNrCiAgMDEyOCAgICAgMCBPQkpFQ1QgIExPQ0FMICBERUZBVUxUICAgIDYgZWFy bHlfc3RhY2sKClNpZ25lZC1vZmYtYnk6IEppcmkgU2xhYnkgPGpzbGFieUBzdXNlLmN6PgpTaWdu ZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+ClJldmlld2VkLWJ5OiBCb3Jp cyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpDYzogQW5keSBTaGV2Y2hl bmtvIDxhbmR5QGluZnJhZGVhZC5vcmc+CkNjOiBEYXJyZW4gSGFydCA8ZHZoYXJ0QGluZnJhZGVh ZC5vcmc+CkNjOiAiSC4gUGV0ZXIgQW52aW4iIDxocGFAenl0b3IuY29tPgpDYzogSW5nbyBNb2xu YXIgPG1pbmdvQHJlZGhhdC5jb20+CkNjOiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ CkNjOiBsaW51eC1hcmNoQHZnZXIua2VybmVsLm9yZwpDYzogcGxhdGZvcm0tZHJpdmVyLXg4NkB2 Z2VyLmtlcm5lbC5vcmcKQ2M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVs Lm9yZz4KQ2M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpDYzogeDg2LW1s IDx4ODZAa2VybmVsLm9yZz4KQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpMaW5r OiBodHRwczovL2xrbWwua2VybmVsLm9yZy9yLzIwMTkxMDExMTE1MTA4LjEyMzkyLTE1LWpzbGFi eUBzdXNlLmN6Ci0tLQogYXJjaC94ODYvcGxhdGZvcm0vcHZoL2hlYWQuUyB8IDE0ICsrKysrKyst LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2FyY2gveDg2L3BsYXRmb3JtL3B2aC9oZWFkLlMgYi9hcmNoL3g4Ni9wbGF0 Zm9ybS9wdmgvaGVhZC5TCmluZGV4IDFmODgyNWIuLjRlNjM0ODAgMTAwNjQ0Ci0tLSBhL2FyY2gv eDg2L3BsYXRmb3JtL3B2aC9oZWFkLlMKKysrIGIvYXJjaC94ODYvcGxhdGZvcm0vcHZoL2hlYWQu UwpAQCAtMTUwLDExICsxNTAsMTIgQEAgRU5EKHB2aF9zdGFydF94ZW4pCiAKIAkuc2VjdGlvbiAi LmluaXQuZGF0YSIsImF3IgogCS5iYWxpZ24gOAotZ2R0OgorU1lNX0RBVEFfU1RBUlRfTE9DQUwo Z2R0KQogCS53b3JkIGdkdF9lbmQgLSBnZHRfc3RhcnQKIAkubG9uZyBfcGEoZ2R0X3N0YXJ0KQog CS53b3JkIDAKLWdkdF9zdGFydDoKK1NZTV9EQVRBX0VORChnZHQpCitTWU1fREFUQV9TVEFSVF9M T0NBTChnZHRfc3RhcnQpCiAJLnF1YWQgMHgwMDAwMDAwMDAwMDAwMDAwICAgICAgICAgICAgLyog TlVMTCBkZXNjcmlwdG9yICovCiAjaWZkZWYgQ09ORklHX1g4Nl82NAogCS5xdWFkIEdEVF9FTlRS WSgweGEwOWEsIDAsIDB4ZmZmZmYpIC8qIFBWSF9DU19TRUwgKi8KQEAgLTE2MywxNSArMTY0LDE0 IEBAIGdkdF9zdGFydDoKICNlbmRpZgogCS5xdWFkIEdEVF9FTlRSWSgweGMwOTIsIDAsIDB4ZmZm ZmYpIC8qIFBWSF9EU19TRUwgKi8KIAkucXVhZCBHRFRfRU5UUlkoMHg0MDkwLCAwLCAweDE4KSAg ICAvKiBQVkhfQ0FOQVJZX1NFTCAqLwotZ2R0X2VuZDoKK1NZTV9EQVRBX0VORF9MQUJFTChnZHRf c3RhcnQsIFNZTV9MX0xPQ0FMLCBnZHRfZW5kKQogCiAJLmJhbGlnbiAxNgotY2FuYXJ5OgotCS5m aWxsIDQ4LCAxLCAwCitTWU1fREFUQV9MT0NBTChjYW5hcnksIC5maWxsIDQ4LCAxLCAwKQogCi1l YXJseV9zdGFjazoKK1NZTV9EQVRBX1NUQVJUX0xPQ0FMKGVhcmx5X3N0YWNrKQogCS5maWxsIEJP T1RfU1RBQ0tfU0laRSwgMSwgMAotZWFybHlfc3RhY2tfZW5kOgorU1lNX0RBVEFfRU5EX0xBQkVM KGVhcmx5X3N0YWNrLCBTWU1fTF9MT0NBTCwgZWFybHlfc3RhY2tfZW5kKQogCiAJRUxGTk9URShY ZW4sIFhFTl9FTEZOT1RFX1BIWVMzMl9FTlRSWSwKIAkgICAgICAgICAgICAgX0FTTV9QVFIgKHB2 aF9zdGFydF94ZW4gLSBfX1NUQVJUX0tFUk5FTF9tYXApKQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from Galois.linutronix.de ([193.142.43.55]:57685 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439805AbfJRQar (ORCPT ); Fri, 18 Oct 2019 12:30:47 -0400 Date: Fri, 18 Oct 2019 16:30:30 -0000 From: "tip-bot2 for Jiri Slaby" Reply-to: linux-kernel@vger.kernel.org Subject: [tip: x86/asm] xen/pvh: Annotate data appropriately In-Reply-To: <20191011115108.12392-15-jslaby@suse.cz> References: <20191011115108.12392-15-jslaby@suse.cz> MIME-Version: 1.0 Message-ID: <157141623045.29376.2755641744903920106.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-tip-commits@vger.kernel.org Cc: Jiri Slaby , Borislav Petkov , Boris Ostrovsky , Andy Shevchenko , Darren Hart , "H. Peter Anvin" , Ingo Molnar , Juergen Gross , linux-arch@vger.kernel.org, platform-driver-x86@vger.kernel.org, Stefano Stabellini , Thomas Gleixner , x86-ml , xen-devel@lists.xenproject.org, Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org Message-ID: <20191018163030.mbZVbkxgp2VU48NFXXxpMJUyOPtXQrtRCGaxX1qQ0hI@z> The following commit has been merged into the x86/asm branch of tip: Commit-ID: 1de5bdce0c3f8294d0aabc48fb5497814589422f Gitweb: https://git.kernel.org/tip/1de5bdce0c3f8294d0aabc48fb5497814589422f Author: Jiri Slaby AuthorDate: Fri, 11 Oct 2019 13:50:54 +02:00 Committer: Borislav Petkov CommitterDate: Fri, 18 Oct 2019 10:46:06 +02:00 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 Signed-off-by: Borislav Petkov Reviewed-by: Boris Ostrovsky Cc: Andy Shevchenko Cc: Darren Hart Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Juergen Gross Cc: linux-arch@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org Cc: Stefano Stabellini Cc: Thomas Gleixner Cc: x86-ml Cc: xen-devel@lists.xenproject.org Link: https://lkml.kernel.org/r/20191011115108.12392-15-jslaby@suse.cz --- arch/x86/platform/pvh/head.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S index 1f8825b..4e63480 100644 --- a/arch/x86/platform/pvh/head.S +++ b/arch/x86/platform/pvh/head.S @@ -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))