* [PATCH v3 1/2] arch/riscv: initial RISC-V support to build/run minimal Xen
2023-01-05 8:40 [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing Oleksii Kurochko
@ 2023-01-05 8:40 ` Oleksii Kurochko
2023-01-05 8:40 ` [PATCH v3 2/2] automation: add RISC-V 64 cross-build tests for Xen Oleksii Kurochko
2023-01-05 12:04 ` [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing Oleksii
2 siblings, 0 replies; 4+ messages in thread
From: Oleksii Kurochko @ 2023-01-05 8:40 UTC (permalink / raw)
To: xen-devel
Cc: Oleksii Kurochko, Bob Eshleman, Alistair Francis, Connor Davis,
Julien Grall, Anthony PERARD, Andrew Cooper, Stefano Stabellini,
Gianluca Guida
The patch provides a minimal amount of changes to start
build and run minimal Xen binary at GitLab CI&CD that will
allow continuous checking of the build status of RISC-V Xen.
Except introduction of new files the following changes were done:
* Redefinition of ALIGN define from '.algin 2' to '.align 4' as
RISC-V implementations (except for with C extension) enforce 32-bit
instruction address alignment. With C extension, 16-bit and 32-bit
are both allowed.
* ALL_OBJ-y and ALL_LIBS-y were temporary overwritted to produce
a minimal hypervisor image otherwise it will be required to push
huge amount of headers and stubs for common, drivers, libs etc which
aren't necessary for now.
* Section changed from .text to .text.header for start function
to make it the first one executed.
* Rework riscv64/Makefile logic to rebase over changes since the first
RISC-V commit.
RISC-V Xen can be built by the following instructions:
$ CONTAINER=riscv64 ./automation/scripts/containerize \
make XEN_TARGET_ARCH=riscv64 tiny64_defconfig
$ CONTAINER=riscv64 ./automation/scripts/containerize \
make XEN_TARGET_ARCH=riscv64 -C xen build
RISC-V Xen can be run as:
$ qemu-system-riscv64 -M virt -smp 1 -nographic -m 2g \
-kernel xen/xen
To run in debug mode should be done the following instructions:
$ qemu-system-riscv64 -M virt -smp 1 -nographic -m 2g \
-kernel xen/xen -s -S
# In separate terminal:
$ riscv64-buildroot-linux-gnu-gdb
$ target remote :1234
$ add-symbol-file <xen_src>/xen/xen-syms 0x80200000
$ hb *0x80200000
$ c # it should stop at instruction j 0x80200000 <start>
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
Changes in V3:
- Remove include of <asm/config.h> from head.S
---
Changes in V2:
- Update commit message:
- Add explanation why ALIGN define was changed.
- Add explanation why section of 'start' function was changed.
- Rework xen.lds.S linker script. It is mostly based on ARM except
ARM-specific sections which have been removed.
- Rework in riscv64/Makefile rule $(TARGET)-syms
- Remove asm/types.h header as after reworking of riscv64/Makefile
it is not needed now.
- Remove unneeded define SYMBOLS_DUMMY_OBJ.
---
xen/arch/riscv/Makefile | 16 +++
xen/arch/riscv/arch.mk | 4 +
xen/arch/riscv/include/asm/config.h | 9 +-
xen/arch/riscv/riscv64/Makefile | 2 +-
xen/arch/riscv/riscv64/head.S | 4 +-
xen/arch/riscv/xen.lds.S | 158 ++++++++++++++++++++++++++++
6 files changed, 188 insertions(+), 5 deletions(-)
create mode 100644 xen/arch/riscv/xen.lds.S
diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile
index 942e4ffbc1..74386beb85 100644
--- a/xen/arch/riscv/Makefile
+++ b/xen/arch/riscv/Makefile
@@ -1,2 +1,18 @@
+obj-$(CONFIG_RISCV_64) += riscv64/
+
+$(TARGET): $(TARGET)-syms
+ $(OBJCOPY) -O binary -S $< $@
+
+$(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
+ $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@
+ $(NM) -pa --format=sysv $(@D)/$(@F) \
+ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
+ >$(@D)/$(@F).map
+
+$(obj)/xen.lds: $(src)/xen.lds.S FORCE
+ $(call if_changed_dep,cpp_lds_S)
+
+clean-files := $(objtree)/.xen-syms.[0-9]*
+
.PHONY: include
include:
diff --git a/xen/arch/riscv/arch.mk b/xen/arch/riscv/arch.mk
index ae8fe9dec7..012dc677c3 100644
--- a/xen/arch/riscv/arch.mk
+++ b/xen/arch/riscv/arch.mk
@@ -11,3 +11,7 @@ riscv-march-$(CONFIG_RISCV_ISA_C) := $(riscv-march-y)c
# -mcmodel=medlow would force Xen into the lower half.
CFLAGS += -march=$(riscv-march-y) -mstrict-align -mcmodel=medany
+
+# TODO: Drop override when more of the build is working
+override ALL_OBJS-y = arch/$(TARGET_ARCH)/built_in.o
+override ALL_LIBS-y =
diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h
index e2ae21de61..e10e13ba53 100644
--- a/xen/arch/riscv/include/asm/config.h
+++ b/xen/arch/riscv/include/asm/config.h
@@ -1,6 +1,9 @@
#ifndef __RISCV_CONFIG_H__
#define __RISCV_CONFIG_H__
+#include <xen/const.h>
+#include <xen/page-size.h>
+
#if defined(CONFIG_RISCV_64)
# define LONG_BYTEORDER 3
# define ELFSIZE 64
@@ -28,7 +31,7 @@
/* Linkage for RISCV */
#ifdef __ASSEMBLY__
-#define ALIGN .align 2
+#define ALIGN .align 4
#define ENTRY(name) \
.globl name; \
@@ -36,6 +39,10 @@
name:
#endif
+#define XEN_VIRT_START _AT(UL,0x00200000)
+
+#define SMP_CACHE_BYTES (1 << 6)
+
#endif /* __RISCV_CONFIG_H__ */
/*
* Local variables:
diff --git a/xen/arch/riscv/riscv64/Makefile b/xen/arch/riscv/riscv64/Makefile
index 15a4a65f66..3340058c08 100644
--- a/xen/arch/riscv/riscv64/Makefile
+++ b/xen/arch/riscv/riscv64/Makefile
@@ -1 +1 @@
-extra-y += head.o
+obj-y += head.o
diff --git a/xen/arch/riscv/riscv64/head.S b/xen/arch/riscv/riscv64/head.S
index 0dbc27ba75..990edb70a0 100644
--- a/xen/arch/riscv/riscv64/head.S
+++ b/xen/arch/riscv/riscv64/head.S
@@ -1,6 +1,4 @@
-#include <asm/config.h>
-
- .text
+ .section .text.header, "ax", %progbits
ENTRY(start)
j start
diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S
new file mode 100644
index 0000000000..ca57cce75c
--- /dev/null
+++ b/xen/arch/riscv/xen.lds.S
@@ -0,0 +1,158 @@
+#include <xen/xen.lds.h>
+
+#undef ENTRY
+#undef ALIGN
+
+OUTPUT_ARCH(riscv)
+ENTRY(start)
+
+PHDRS
+{
+ text PT_LOAD ;
+#if defined(BUILD_ID)
+ note PT_NOTE ;
+#endif
+}
+
+SECTIONS
+{
+ . = XEN_VIRT_START;
+ _start = .;
+ .text : {
+ _stext = .; /* Text section */
+ *(.text.header)
+
+ *(.text.cold)
+ *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+
+ *(.text)
+#ifdef CONFIG_CC_SPLIT_SECTIONS
+ *(.text.*)
+#endif
+
+ *(.fixup)
+ *(.gnu.warning)
+ . = ALIGN(POINTER_ALIGN);
+ _etext = .; /* End of text section */
+ } :text
+
+ . = ALIGN(PAGE_SIZE);
+ .rodata : {
+ _srodata = .; /* Read-only data */
+ *(.rodata)
+ *(.rodata.*)
+ *(.data.rel.ro)
+ *(.data.rel.ro.*)
+
+ VPCI_ARRAY
+
+ . = ALIGN(POINTER_ALIGN);
+ _erodata = .; /* End of read-only data */
+ } :text
+
+ #if defined(BUILD_ID)
+ . = ALIGN(4);
+ .note.gnu.build-id : {
+ __note_gnu_build_id_start = .;
+ *(.note.gnu.build-id)
+ __note_gnu_build_id_end = .;
+ } :note :text
+ #endif
+ _erodata = .; /* End of read-only data */
+
+ . = ALIGN(PAGE_SIZE);
+ .data.ro_after_init : {
+ __ro_after_init_start = .;
+ *(.data.ro_after_init)
+ . = ALIGN(PAGE_SIZE);
+ __ro_after_init_end = .;
+ } : text
+
+ .data.read_mostly : {
+ *(.data.read_mostly)
+ } :text
+
+ . = ALIGN(PAGE_SIZE);
+ .data : { /* Data */
+ *(.data.page_aligned)
+ . = ALIGN(8);
+ __start_schedulers_array = .;
+ *(.data.schedulers)
+ __end_schedulers_array = .;
+
+ HYPFS_PARAM
+
+ *(.data .data.*)
+ CONSTRUCTORS
+ } :text
+
+ . = ALIGN(PAGE_SIZE); /* Init code and data */
+ __init_begin = .;
+ .init.text : {
+ _sinittext = .;
+ *(.init.text)
+ _einittext = .;
+ . = ALIGN(PAGE_SIZE); /* Avoid mapping alt insns executable */
+ } :text
+ . = ALIGN(PAGE_SIZE);
+ .init.data : {
+ *(.init.rodata)
+ *(.init.rodata.*)
+
+ . = ALIGN(POINTER_ALIGN);
+ __setup_start = .;
+ *(.init.setup)
+ __setup_end = .;
+
+ __initcall_start = .;
+ *(.initcallpresmp.init)
+ __presmp_initcall_end = .;
+ *(.initcall1.init)
+ __initcall_end = .;
+
+ LOCK_PROFILE_DATA
+
+ *(.init.data)
+ *(.init.data.rel)
+ *(.init.data.rel.*)
+
+ . = ALIGN(8);
+ __ctors_start = .;
+ *(.ctors)
+ *(.init_array)
+ *(SORT(.init_array.*))
+ __ctors_end = .;
+ } :text
+ . = ALIGN(POINTER_ALIGN);
+ __init_end = .;
+
+ .bss : { /* BSS */
+ __bss_start = .;
+ *(.bss.stack_aligned)
+ . = ALIGN(PAGE_SIZE);
+ *(.bss.page_aligned)
+ . = ALIGN(PAGE_SIZE);
+ __per_cpu_start = .;
+ *(.bss.percpu.page_aligned)
+ *(.bss.percpu)
+ . = ALIGN(SMP_CACHE_BYTES);
+ *(.bss.percpu.read_mostly)
+ . = ALIGN(SMP_CACHE_BYTES);
+ __per_cpu_data_end = .;
+ *(.bss .bss.*)
+ . = ALIGN(POINTER_ALIGN);
+ __bss_end = .;
+ } :text
+ _end = . ;
+
+ /* Section for the device tree blob (if any). */
+ .dtb : { *(.dtb) } :text
+
+ DWARF2_DEBUG_SECTIONS
+
+ DISCARD_SECTIONS
+
+ STABS_DEBUG_SECTIONS
+
+ ELF_DETAILS_SECTIONS
+}
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 2/2] automation: add RISC-V 64 cross-build tests for Xen
2023-01-05 8:40 [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing Oleksii Kurochko
2023-01-05 8:40 ` [PATCH v3 1/2] arch/riscv: initial RISC-V support to build/run minimal Xen Oleksii Kurochko
@ 2023-01-05 8:40 ` Oleksii Kurochko
2023-01-05 12:04 ` [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing Oleksii
2 siblings, 0 replies; 4+ messages in thread
From: Oleksii Kurochko @ 2023-01-05 8:40 UTC (permalink / raw)
To: xen-devel
Cc: Oleksii Kurochko, Doug Goldstein, Stefano Stabellini,
Andrew Cooper, Gianluca Guida, Alistair Francis
Add build jobs to cross-compile Xen-only for RISC-V 64.
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
---
Changes in V2:
- Add HYPERVISOR_ONLY to RISCV jobs because after rebase on
top of the patch series "CI: Fixes/cleanup in preparation for RISCV"
it is required to set HYPERVISOR_ONLY in build.yaml
---
automation/gitlab-ci/build.yaml | 45 +++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index e6a9357de3..11eb1c6b82 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -172,6 +172,33 @@
variables:
<<: *gcc
+.riscv64-cross-build-tmpl:
+ <<: *build
+ variables:
+ XEN_TARGET_ARCH: riscv64
+ tags:
+ - x86_64
+
+.riscv64-cross-build:
+ extends: .riscv64-cross-build-tmpl
+ variables:
+ debug: n
+
+.riscv64-cross-build-debug:
+ extends: .riscv64-cross-build-tmpl
+ variables:
+ debug: y
+
+.gcc-riscv64-cross-build:
+ extends: .riscv64-cross-build
+ variables:
+ <<: *gcc
+
+.gcc-riscv64-cross-build-debug:
+ extends: .riscv64-cross-build-debug
+ variables:
+ <<: *gcc
+
# Jobs below this line
archlinux-gcc:
@@ -617,6 +644,21 @@ alpine-3.12-gcc-debug-arm64-boot-cpupools:
EXTRA_XEN_CONFIG: |
CONFIG_BOOT_TIME_CPUPOOLS=y
+# RISC-V 64 cross-build
+riscv64-cross-gcc:
+ extends: .gcc-riscv64-cross-build
+ variables:
+ CONTAINER: archlinux:riscv64
+ KBUILD_DEFCONFIG: tiny64_defconfig
+ HYPERVISOR_ONLY: y
+
+riscv64-cross-gcc-debug:
+ extends: .gcc-riscv64-cross-build-debug
+ variables:
+ CONTAINER: archlinux:riscv64
+ KBUILD_DEFCONFIG: tiny64_defconfig
+ HYPERVISOR_ONLY: y
+
## Test artifacts common
.test-jobs-artifact-common:
@@ -692,3 +734,6 @@ kernel-5.10.74-export:
- binaries/bzImage
tags:
- x86_64
+
+# # RISC-V 64 test artificats
+# # TODO: add RISC-V 64 test artitifacts
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing
2023-01-05 8:40 [PATCH v3 0/2] Add minimal RISC-V Xen build and build testing Oleksii Kurochko
2023-01-05 8:40 ` [PATCH v3 1/2] arch/riscv: initial RISC-V support to build/run minimal Xen Oleksii Kurochko
2023-01-05 8:40 ` [PATCH v3 2/2] automation: add RISC-V 64 cross-build tests for Xen Oleksii Kurochko
@ 2023-01-05 12:04 ` Oleksii
2 siblings, 0 replies; 4+ messages in thread
From: Oleksii @ 2023-01-05 12:04 UTC (permalink / raw)
To: xen-devel
Cc: Bob Eshleman, Alistair Francis, Connor Davis, Doug Goldstein,
Stefano Stabellini, Julien Grall, Anthony PERARD, Andrew Cooper,
Gianluca Guida
Sorry for flooding but please skip review of patch series v3 as
I missed comments of Andrew so only v4 should be reviewed.
On Thu, 2023-01-05 at 10:40 +0200, Oleksii Kurochko wrote:
> The patch series introduces the following:
> - provide a minimal amount of changes to add initial RISC-V support
> to make Xen binary buildable and runnable for RISC-V architecture
> which can be used for future development and testing.
> - add RISC-V 64 cross-compile build jobs to check if any new changes
> break RISC-V build.
>
> Changes in V3:
> - Remove include of <asm/config.h> from head.S.
>
> Changes in V2:
> - Remove the patch "automation: add cross-compiler support
> for the build script" because it was reworked as a part of the
> patch
> series "CI: Fixes/cleanup in preparation for RISCV".
> - Remove the patch "automation: add python3 package for
> riscv64.dockerfile"
> because it is not necessary for RISCV Xen binary build now.
> - Rework the patch "arch/riscv: initial RISC-V support to build/run
> minimal Xen" according to the comments about v1 of the patch
> series.
> - Add HYPERVISOR_ONLY to RISCV jobs in build.yaml after rebasing on
> "CI: Fixes/cleanup in preparation for RISCV" patch series.
>
> Oleksii Kurochko (2):
> arch/riscv: initial RISC-V support to build/run minimal Xen
> automation: add RISC-V 64 cross-build tests for Xen
>
> automation/gitlab-ci/build.yaml | 45 ++++++++
> xen/arch/riscv/Makefile | 16 +++
> xen/arch/riscv/arch.mk | 4 +
> xen/arch/riscv/include/asm/config.h | 9 +-
> xen/arch/riscv/riscv64/Makefile | 2 +-
> xen/arch/riscv/riscv64/head.S | 4 +-
> xen/arch/riscv/xen.lds.S | 158
> ++++++++++++++++++++++++++++
> 7 files changed, 233 insertions(+), 5 deletions(-)
> create mode 100644 xen/arch/riscv/xen.lds.S
>
^ permalink raw reply [flat|nested] 4+ messages in thread