Merge pull request #476 from cclerget/master-big-endian

Fix issue on big endian architecture. Increase jmp_buf size. Reduce OUTPUT_FORMAT hardcoding

Author: tavip

arch/lkl/Kconfig

@@ -14,12 +14,6 @@ config LKL
        select ARCH_WANT_FRAME_POINTERS
        select HAS_DMA
        select DMA_DIRECT_OPS
-       select PHYS_ADDR_T_64BIT if 64BIT
-       select 64BIT if "$(OUTPUT_FORMAT)" = "elf64-x86-64"
-       select 64BIT if "$(OUTPUT_FORMAT)" = "pe-x86-64"
-       select HAVE_UNDERSCORE_SYMBOL_PREFIX if "$(OUTPUT_FORMAT)" = "pe-i386"
-       select 64BIT if "$(OUTPUT_FORMAT)" = "elf64-x86-64-freebsd"
-       select 64BIT if "$(OUTPUT_FORMAT)" = "elf64-littleaarch64"
        select NET
        select MULTIUSER
        select INET
@@ -50,14 +44,20 @@ config OUTPUT_FORMAT
 config ARCH_DMA_ADDR_T_64BIT
        def_bool 64BIT
 
+config PHYS_ADDR_T_64BIT
+       def_bool 64BIT
+
 config 64BIT
-       def_bool n
+       def_bool y if "$(EXEC_FORMAT)" = "elf64" || "$(OUTPUT_FORMAT)" = "pe-x86-64"
 
 config COREDUMP
        def_bool n
 
 config BIG_ENDIAN
-       def_bool n
+       def_bool y if "$(OUTPUT_FORMAT)" = "elf64-s390"
+
+config CPU_BIG_ENDIAN
+       def_bool BIG_ENDIAN
 
 config GENERIC_CSUM
        def_bool y
@@ -73,7 +73,7 @@ config RWSEM_GENERIC_SPINLOCK
 	default y
 
 config HAVE_UNDERSCORE_SYMBOL_PREFIX
-       bool
+       def_bool y if "$(OUTPUT_FORMAT)" = "pe-i386"
        help
          Some architectures generate an _ in front of C symbols; things like
          module loading and assembly files need to know about this.

arch/lkl/Makefile

@@ -2,9 +2,11 @@ include arch/lkl/auto.conf
 
 KBUILD_CFLAGS += -fno-builtin
 
-ifneq (,$(filter $(OUTPUT_FORMAT),elf64-x86-64 elf32-i386 elf64-x86-64-freebsd elf32-littlearm elf64-littleaarch64))
+exec_format = $(firstword $(subst -, ,$(OUTPUT_FORMAT)))
+
+ifneq (,$(filter elf64 elf32,$(exec_format)))
 KBUILD_CFLAGS += -fPIC
-else ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386 pe-x86-64 ))
+else ifneq (,$(filter pe,$(exec_format)))
 ifneq ($(OUTPUT_FORMAT),pe-x86-64)
 prefix=_
 endif

arch/lkl/auto.conf

@@ -1 +1,2 @@
 export OUTPUT_FORMAT=$(shell $(LD) -r -print-output-format)
+export EXEC_FORMAT=$(shell echo $(OUTPUT_FORMAT) | cut -d - -f1)

arch/lkl/include/uapi/asm/host_ops.h

@@ -7,7 +7,7 @@ struct lkl_sem;
 struct lkl_tls_key;
 typedef unsigned long lkl_thread_t;
 struct lkl_jmp_buf {
-	unsigned long buf[32];
+	unsigned long buf[128];
 };
 
 /**

tools/lkl/Makefile.autoconf

@@ -1,5 +1,5 @@
-POSIX_HOSTS=elf64-x86-64 elf32-i386 elf64-x86-64-freebsd elf32-littlearm elf64-littleaarch64
-NT_HOSTS=pe-i386 pe-x86-64
+POSIX_HOSTS=elf64 elf32
+NT_HOSTS=pe
 
 define set_autoconf_var
   $(shell echo "#define LKL_HOST_CONFIG_$(1) $(2)" \
@@ -99,8 +99,9 @@ define do_autoconf
   $(eval LD := $(CROSS_COMPILE)ld)
   $(eval CC := $(CROSS_COMPILE)gcc)
   $(eval LD_FMT := $(shell $(LD) -r -print-output-format))
-  $(if $(filter $(LD_FMT),$(POSIX_HOSTS)),$(call posix_host,$(LD_FMT)))
-  $(if $(filter $(LD_FMT),$(NT_HOSTS)),$(call nt_host,$(LD_FMT)))
+  $(eval EXEC_FMT := $(shell echo $(LD_FMT) | cut -d "-" -f1))
+  $(if $(filter $(EXEC_FMT),$(POSIX_HOSTS)),$(call posix_host,$(LD_FMT)))
+  $(if $(filter $(EXEC_FMT),$(NT_HOSTS)),$(call nt_host,$(LD_FMT)))
 endef
 
 export do_autoconf

tools/lkl/lib/endian.h

@@ -11,6 +11,7 @@
 #define le16toh(x) (x)
 #define htole32(x) (x)
 #define htole16(x) (x)
+#define htole64(x) (x)
 #define le64toh(x) (x)
 #define htobe32(x) htonl(x)
 #define htobe16(x) htons(x)

tools/lkl/lib/virtio_blk.c

@@ -51,7 +51,7 @@ static int blk_enqueue(struct virtio_dev *dev, int q, struct virtio_req *req)
 
 	lkl_req.type = le32toh(h->type);
 	lkl_req.prio = le32toh(h->ioprio);
-	lkl_req.sector = le32toh(h->sector);
+	lkl_req.sector = le64toh(h->sector);
 	lkl_req.buf = &req->buf[1];
 	lkl_req.count = req->buf_count - 2;
 
@@ -98,7 +98,7 @@ int lkl_disk_add(struct lkl_disk *disk)
 		ret = -LKL_ENOMEM;
 		goto out_free;
 	}
-	dev->config.capacity = capacity / 512;
+	dev->config.capacity = htole64(capacity / 512);
 
 	ret = virtio_dev_setup(&dev->dev, 1, 32);
 	if (ret)