From: Julien Grall <julien.grall@arm.com> To: xen-devel@lists.xenproject.org Cc: Oleksandr_Tyshchenko@epam.com, Julien Grall <julien.grall@arm.com>, Stefano Stabellini <sstabellini@kernel.org>, Andrii Anisov <andrii_anisov@epam.com> Subject: [PATCH MM-PART2 RESEND v2 08/19] xen/arm64: head: Move earlyprintk messages in .rodata.str Date: Tue, 14 May 2019 13:24:45 +0100 [thread overview] Message-ID: <20190514122456.28559-9-julien.grall@arm.com> (raw) In-Reply-To: <20190514122456.28559-1-julien.grall@arm.com> At the moment, the earlyprintk messages are interleaved with the instructions. This makes more difficult to read the objdump output. Introduce a new macro to add a string in .rodata.str and use it for all the earlyprintk messages. Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Andrii Anisov <andrii_anisov@epam.com> --- I haven't done a similar change in arm32 yet because the compiler will throw an error when using 'adr' when load an address from a different section (see A5-200 in ARM DDI 0406C.a for the technical reason). The change is likely to be more elaborate. Changes in v2: - Add Andrii's reviewed-by --- xen/arch/arm/arm64/head.S | 14 +++++--------- xen/include/asm-arm/asm_defns.h | 5 +++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index ad446e7345..b957eb90fb 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -81,13 +81,10 @@ /* Macro to print a string to the UART, if there is one. * Clobbers x0-x3. */ #ifdef CONFIG_EARLY_PRINTK -#define PRINT(_s) \ - adr x0, 98f ; \ - bl puts ; \ - b 99f ; \ -98: .asciz _s ; \ - .align 2 ; \ -99: +#define PRINT(_s) \ + adr x0, 98f ; \ + bl puts ; \ + RODATA_STR(98, _s) #else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) #endif /* !CONFIG_EARLY_PRINTK */ @@ -633,8 +630,7 @@ init_uart: #endif adr x0, 1f b puts -1: .asciz "- UART enabled -\r\n" - .align 4 +RODATA_STR(1, "- UART enabled -\r\n") /* Print early debug messages. * x0: Nul-terminated string to print. diff --git a/xen/include/asm-arm/asm_defns.h b/xen/include/asm-arm/asm_defns.h index 02be83e2b3..3f21def0ab 100644 --- a/xen/include/asm-arm/asm_defns.h +++ b/xen/include/asm-arm/asm_defns.h @@ -16,6 +16,11 @@ # error "unknown ARM variant" #endif +#define RODATA_STR(label, msg) \ +.pushsection .rodata.str, "aMS", %progbits, 1 ; \ +label: .asciz msg; \ +.popsection + #endif /* __ARM_ASM_DEFNS_H__ */ /* * Local variables: -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Julien Grall <julien.grall@arm.com> To: xen-devel@lists.xenproject.org Cc: Oleksandr_Tyshchenko@epam.com, Julien Grall <julien.grall@arm.com>, Stefano Stabellini <sstabellini@kernel.org>, Andrii Anisov <andrii_anisov@epam.com> Subject: [Xen-devel] [PATCH MM-PART2 RESEND v2 08/19] xen/arm64: head: Move earlyprintk messages in .rodata.str Date: Tue, 14 May 2019 13:24:45 +0100 [thread overview] Message-ID: <20190514122456.28559-9-julien.grall@arm.com> (raw) Message-ID: <20190514122445.gFrWzHgpgXXiWVhFo-kLE8E8EyxWcMGheFyGviA3fwc@z> (raw) In-Reply-To: <20190514122456.28559-1-julien.grall@arm.com> At the moment, the earlyprintk messages are interleaved with the instructions. This makes more difficult to read the objdump output. Introduce a new macro to add a string in .rodata.str and use it for all the earlyprintk messages. Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Andrii Anisov <andrii_anisov@epam.com> --- I haven't done a similar change in arm32 yet because the compiler will throw an error when using 'adr' when load an address from a different section (see A5-200 in ARM DDI 0406C.a for the technical reason). The change is likely to be more elaborate. Changes in v2: - Add Andrii's reviewed-by --- xen/arch/arm/arm64/head.S | 14 +++++--------- xen/include/asm-arm/asm_defns.h | 5 +++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index ad446e7345..b957eb90fb 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -81,13 +81,10 @@ /* Macro to print a string to the UART, if there is one. * Clobbers x0-x3. */ #ifdef CONFIG_EARLY_PRINTK -#define PRINT(_s) \ - adr x0, 98f ; \ - bl puts ; \ - b 99f ; \ -98: .asciz _s ; \ - .align 2 ; \ -99: +#define PRINT(_s) \ + adr x0, 98f ; \ + bl puts ; \ + RODATA_STR(98, _s) #else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) #endif /* !CONFIG_EARLY_PRINTK */ @@ -633,8 +630,7 @@ init_uart: #endif adr x0, 1f b puts -1: .asciz "- UART enabled -\r\n" - .align 4 +RODATA_STR(1, "- UART enabled -\r\n") /* Print early debug messages. * x0: Nul-terminated string to print. diff --git a/xen/include/asm-arm/asm_defns.h b/xen/include/asm-arm/asm_defns.h index 02be83e2b3..3f21def0ab 100644 --- a/xen/include/asm-arm/asm_defns.h +++ b/xen/include/asm-arm/asm_defns.h @@ -16,6 +16,11 @@ # error "unknown ARM variant" #endif +#define RODATA_STR(label, msg) \ +.pushsection .rodata.str, "aMS", %progbits, 1 ; \ +label: .asciz msg; \ +.popsection + #endif /* __ARM_ASM_DEFNS_H__ */ /* * Local variables: -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-05-14 12:25 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-14 12:24 [PATCH MM-PART2 RESEND v2 00/19] xen/arm: Clean-up & fixes in boot/mm code Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 01/19] xen/const: Extend the existing macro BIT to take a suffix in parameter Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-14 12:37 ` Jan Beulich 2019-05-14 12:37 ` [Xen-devel] " Jan Beulich 2019-05-20 21:43 ` Stefano Stabellini 2019-05-20 21:43 ` [Xen-devel] " Stefano Stabellini 2019-05-21 10:01 ` Andrii Anisov 2019-05-21 10:01 ` [Xen-devel] " Andrii Anisov 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 02/19] xen/arm: Rename SCTLR_* defines and remove unused one Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 21:46 ` Stefano Stabellini 2019-05-20 21:46 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 03/19] xen/arm: processor: Use BIT(.., UL) instead of _AC(1, U) in SCTLR_ defines Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 21:48 ` Stefano Stabellini 2019-05-20 21:48 ` [Xen-devel] " Stefano Stabellini 2019-05-21 10:01 ` Andrii Anisov 2019-05-21 10:01 ` [Xen-devel] " Andrii Anisov 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 04/19] xen/arm: Rework HSCTLR_BASE Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 22:56 ` Stefano Stabellini 2019-05-20 22:56 ` [Xen-devel] " Stefano Stabellini 2019-05-21 10:09 ` Julien Grall 2019-05-21 10:09 ` [Xen-devel] " Julien Grall 2019-05-29 16:54 ` Julien Grall 2019-05-29 16:54 ` [Xen-devel] " Julien Grall 2019-06-03 23:12 ` Stefano Stabellini 2019-06-03 23:12 ` [Xen-devel] " Stefano Stabellini 2019-06-04 10:27 ` Julien Grall 2019-06-04 17:41 ` Stefano Stabellini 2019-05-30 16:17 ` Andrii Anisov 2019-05-30 16:17 ` [Xen-devel] " Andrii Anisov 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 05/19] xen/arm: Remove parameter cpuid from start_xen Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-21 10:01 ` Andrii Anisov 2019-05-21 10:01 ` [Xen-devel] " Andrii Anisov 2019-06-06 17:15 ` Julien Grall 2019-06-07 22:39 ` Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 06/19] xen/arm: Rework secondary_start prototype Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 22:56 ` Stefano Stabellini 2019-05-20 22:56 ` [Xen-devel] " Stefano Stabellini 2019-05-29 17:06 ` Julien Grall 2019-05-29 17:06 ` [Xen-devel] " Julien Grall 2019-05-30 16:18 ` Andrii Anisov 2019-05-30 16:18 ` [Xen-devel] " Andrii Anisov 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 07/19] xen/arm64: head: Remove unnecessary comment Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 22:56 ` Stefano Stabellini 2019-05-20 22:56 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` Julien Grall [this message] 2019-05-14 12:24 ` [Xen-devel] [PATCH MM-PART2 RESEND v2 08/19] xen/arm64: head: Move earlyprintk messages in .rodata.str Julien Grall 2019-05-20 22:56 ` Stefano Stabellini 2019-05-20 22:56 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 09/19] xen/arm64: head: Correctly report the HW CPU ID Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-20 22:56 ` Stefano Stabellini 2019-05-20 22:56 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 10/19] xen/arm32: " Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-03 22:45 ` Stefano Stabellini 2019-06-03 22:45 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 11/19] xen/arm32: head: Don't set MAIR0 and MAIR1 Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-03 22:47 ` Stefano Stabellini 2019-06-03 22:47 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 12/19] xen/arm32: head: Always zero r3 before update a page-table entry Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-21 10:03 ` Andrii Anisov 2019-05-21 10:03 ` [Xen-devel] " Andrii Anisov 2019-06-03 23:15 ` Stefano Stabellini 2019-06-03 23:15 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 13/19] xen/arm32: mm: Avoid to zero and clean cache for CPU0 domheap Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-03 23:20 ` Stefano Stabellini 2019-06-03 23:20 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 14/19] xen/arm32: mm: Avoid cleaning the cache for secondary CPUs page-tables Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-04 23:11 ` Stefano Stabellini 2019-06-05 10:19 ` Julien Grall 2019-06-10 10:15 ` Julien Grall 2019-06-10 20:28 ` Stefano Stabellini 2019-06-10 20:40 ` Julien Grall 2019-06-10 20:54 ` Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 15/19] xen/arm: mm: Introduce DEFINE_PAGE_TABLE{, S} and use it Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-03 23:29 ` Stefano Stabellini 2019-06-03 23:29 ` [Xen-devel] " Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 16/19] xen/arm: mm: Protect Xen page-table update with a spinlock Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-05-21 10:04 ` Andrii Anisov 2019-05-21 10:04 ` [Xen-devel] " Andrii Anisov 2019-06-04 23:11 ` Stefano Stabellini 2019-06-05 10:36 ` Julien Grall 2019-06-08 0:17 ` Stefano Stabellini 2019-06-13 12:06 ` Julien Grall 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 17/19] xen/arm: mm: Initialize page-tables earlier Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-04 23:12 ` Stefano Stabellini 2019-06-06 17:32 ` Julien Grall 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 18/19] xen/arm: mm: Check start is always before end in {destroy, modify}_xen_mappings Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-04 23:12 ` Stefano Stabellini 2019-05-14 12:24 ` [PATCH MM-PART2 RESEND v2 19/19] xen/arm: Pair call to set_fixmap with call to clear_fixmap in copy_from_paddr Julien Grall 2019-05-14 12:24 ` [Xen-devel] " Julien Grall 2019-06-04 17:59 ` Stefano Stabellini 2019-06-04 20:18 ` Julien Grall 2019-06-04 23:12 ` Stefano Stabellini 2019-06-06 17:38 ` Julien Grall 2019-05-29 17:23 ` [PATCH MM-PART2 RESEND v2 00/19] xen/arm: Clean-up & fixes in boot/mm code Julien Grall 2019-05-29 17:23 ` [Xen-devel] " Julien Grall 2019-06-13 12:09 ` Julien Grall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190514122456.28559-9-julien.grall@arm.com \ --to=julien.grall@arm.com \ --cc=Oleksandr_Tyshchenko@epam.com \ --cc=andrii_anisov@epam.com \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.