search for: __s390x__

.../archsetjmp.h b/usr/include/arch/s390/klibc/archsetjmp.h new file mode 100644 index 0000000..728780a --- /dev/null +++ b/usr/include/arch/s390/klibc/archsetjmp.h @@ -0,0 +1,26 @@ +/* + * arch/s390/include/klibc/archsetjmp.h + */ + +#ifndef _KLIBC_ARCHSETJMP_H +#define _KLIBC_ARCHSETJMP_H + +#ifndef __s390x__ + +struct __jmp_buf { + uint32_t __gregs[10]; /* general registers r6-r15 */ + uint64_t __fpregs[2]; /* fp registers f4 and f6 */ +}; + +#else /* __s390x__ */ + +struct __jmp_buf { + uint64_t __gregs[10]; /* general registers r6-r15 */ + uint64_t __fpregs[4]; /* fp registers f1, f3, f5, f7 */ +};...

...print OUT ".if __NR_${sname} < 256\n"; - print OUT "\tsvc __NR_${sname}\n"; - print OUT ".else\n"; - print OUT "\tla %r1,__NR_${sname}\n"; - print OUT "\tsvc 0\n"; - print OUT ".endif\n"; - - print OUT "#ifndef __s390x__\n"; - - print OUT "\tbras %r3,1f\n"; - print OUT "\t.long __syscall_common\n"; - print OUT "1:\tl %r3,0(%r3)\n"; - print OUT "\tbr %r3\n"; + foreach $t (@args) { + $r += ($typesize{$t} == 8) ? $llregs : 1; + } - print OUT &quot...

...jmp.h b/usr/include/arch/s390/klibc/archsetjmp.h --- a/usr/include/arch/s390/klibc/archsetjmp.h 2006-05-11 08:09:08.000000000 +0200 +++ b/usr/include/arch/s390/klibc/archsetjmp.h 2006-05-11 08:10:07.000000000 +0200 @@ -5,6 +5,8 @@ #ifndef _KLIBC_ARCHSETJMP_H #define _KLIBC_ARCHSETJMP_H +#ifndef __s390x__ + struct __jmp_buf { uint32_t __gregs[10]; /* general registers r6-r15 */ uint64_t __fpregs[2]; /* fp registers f4 and f6 */ @@ -12,4 +14,14 @@ struct __jmp_buf { typedef struct __jmp_buf jmp_buf[1]; +#else /* __s390x__ */ + +struct __jmp_buf { + uint64_t __gregs[10]; /* general regi...

...00000 +0200 @@ -20,6 +20,7 @@ AFLAGS += -m31 UTS_MACHINE := s390 STACK_SIZE := 8192 CHECKFLAGS += -D__s390__ +KLIBCARCH := s390 else LDFLAGS := -m elf64_s390 MODFLAGS += -fpic -D__PIC__ @@ -28,8 +29,11 @@ AFLAGS += -m64 UTS_MACHINE := s390x STACK_SIZE := 16384 CHECKFLAGS += -D__s390__ -D__s390x__ +KLIBCARCH := s390x endif +KLIBCARCHDIR := s390 + cflags-$(CONFIG_MARCH_G5) += $(call cc-option,-march=g5) cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900) cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990) diff -purN a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc --- a...

...++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c index f66c8e0ef..4adb2cfb3 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -1359,6 +1359,7 @@ construct_libvirt_xml_devices (guestfs_h *g, return -1; } +#ifndef __s390x__ /* Console. */ start_element ("serial") { attribute ("type", "unix"); @@ -1370,6 +1371,22 @@ construct_libvirt_xml_devices (guestfs_h *g, attribute ("port", "0"); } end_element (); } end_element (); +#else +...

...st/main.h b/tools/virtio/ringtest/main.h index 34e63cc4c572..14142faf040b 100644 --- a/tools/virtio/ringtest/main.h +++ b/tools/virtio/ringtest/main.h @@ -26,6 +26,16 @@ static inline void wait_cycles(unsigned long long cycles) #define VMEXIT_CYCLES 500 #define VMENTRY_CYCLES 500 +#elif defined(__s390x__) +static inline void wait_cycles(unsigned long long cycles) +{ + asm volatile("0: brctg %0,0b" : : "d" (cycles)); +} + +/* tweak me */ +#define VMEXIT_CYCLES 200 +#define VMENTRY_CYCLES 200 + #else static inline void wait_cycles(unsigned long long cycles) { @@ -81,6 +91,8 @@...

...guestfs-internal.h @@ -136,6 +136,17 @@ #define MACHINE_TYPE "pseries" #endif +/* Differences in qemu device names on ARMv7 (virtio-mmio), s/390x + * (CCW) vs normal hardware with PCI. + */ +#if defined(__arm__) +#define VIRTIO_DEVICE_NAME(type) type "-device" +#elif defined(__s390x__) +#define VIRTIO_DEVICE_NAME(type) type "-ccw" +#else +#define VIRTIO_DEVICE_NAME(type) type "-pci" +#endif + /* Guestfs handle and associated structures. */ /* State. */ diff --git a/lib/guestfs.pod b/lib/guestfs.pod index 3a9805c95..e1998c7eb 100644 --- a/lib/guestfs.pod +...

Let's actually compile and test the patch this time, rather than trusting the RHEL 7.6 patch to apply directly to head ... Rich.

...virtio/ringtest/main.h b/tools/virtio/ringtest/main.h index 5706e07..593a328 100644 --- a/tools/virtio/ringtest/main.h +++ b/tools/virtio/ringtest/main.h @@ -134,4 +134,61 @@ static inline void busy_wait(void) barrier(); \ } while (0) +#if defined(__i386__) || defined(__x86_64__) || defined(__s390x__) +#define smp_wmb() barrier() +#else +#define smp_wmb() smp_release() +#endif + +#ifdef __alpha__ +#define smp_read_barrier_depends() smp_acquire() +#else +#define smp_read_barrier_depends() do {} while(0) +#endif + +static __always_inline +void __read_once_size(const volatile void *p, void *res, i...

...t;) -#if defined(__powerpc64__) +#ifdef __powerpc64__ #define SERIAL_CONSOLE "console=hvc0 console=ttyS0" -#elif defined(__arm__) || defined(__aarch64__) +#endif + +#if defined(__arm__) || defined(__aarch64__) #define SERIAL_CONSOLE "console=ttyAMA0" -#else +#endif + +#ifdef __s390x__ +#define SERIAL_CONSOLE "console=ttysclp0" +#endif + +#ifndef SERIAL_CONSOLE #define SERIAL_CONSOLE "console=ttyS0" #endif -- 2.13.0

...m__ #define VIRTIO_BLK "virtio-blk-device" #define VIRTIO_SCSI "virtio-scsi-device" #define VIRTIO_SERIAL "virtio-serial-device" #define VIRTIO_NET "virtio-net-device" -#endif /* ARMv7 */ +#define VIRTIO_RNG "virtio-rng-device" +#endif + +#ifdef __s390x__ +#define VIRTIO_BLK "virtio-blk-ccw" +#define VIRTIO_SCSI "virtio-scsi-ccw" +#define VIRTIO_SERIAL "virtio-serial-ccw" +#define VIRTIO_NET "virtio-net-ccw" +#define VIRTIO_RNG "virtio-rng-ccw" +#endif + +#ifndef VIRTIO_BLK +#define VIRTIO_BLK "...

...har *arch) binary = strdup ("qemu-system-aarch64"); #elif defined(__arm__) binary = strdup ("qemu-system-arm"); -#elif defined(__powerpc64__) || defined(__powerpc64le__) +#elif defined(__powerpc64__) binary = strdup ("qemu-system-ppc64"); #elif defined(__s390x__) binary = strdup ("qemu-system-s390x"); -- 2.18.0

.../* 0x1338 */ __u32 access_regs_save_area[16]; /* 0x1340 */ __u64 cregs_save_area[16]; /* 0x1380 */ /* align to the top of the prefix area */ - __u8 pad17[0x2000-0x1400]; /* 0x1400 */ + __u8 pad18[0x2000-0x1400]; /* 0x1400 */ #endif /* !__s390x__ */ } __attribute__((packed)); /* End structure*/

...fine SET_CONSOLE_3270 do { console_mode = 3; } while (0) +#ifdef __KERNEL__ + struct ipl_list_header { u32 length; u8 reserved[3]; @@ -114,6 +116,8 @@ IPL_PARMBLOCK_ORIGIN) #define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length) +#endif /* __KERNEL__ */ + #else #ifndef __s390x__

Michael, the following patches have all been posted in the past. I've collected them on top of your vhost branch -- please let me know whether this works for you. The following changes since commit 6bdf1e0efb04a1716373646cb6f35b73addca492: Makefile: drop -D__CHECK_ENDIAN__ from cflags (2016-12-16 00:13:43 +0200) are available in the git repository at:

Michael, the following patches have all been posted in the past. I've collected them on top of your vhost branch -- please let me know whether this works for you. The following changes since commit 6bdf1e0efb04a1716373646cb6f35b73addca492: Makefile: drop -D__CHECK_ENDIAN__ from cflags (2016-12-16 00:13:43 +0200) are available in the git repository at:

...0111 are invalid. */ +/* Page status extended for virtualization */ +#define _PAGE_RCP_PCL 0x0080000000000000UL +#define _PAGE_RCP_HR 0x0040000000000000UL +#define _PAGE_RCP_HC 0x0020000000000000UL +#define _PAGE_RCP_GR 0x0004000000000000UL +#define _PAGE_RCP_GC 0x0002000000000000UL + #ifndef __s390x__ /* Bits in the segment table address-space-control-element */ @@ -513,6 +521,67 @@ static inline int pte_file(pte_t pte) #define __HAVE_ARCH_PTE_SAME #define pte_same(a,b) (pte_val(a) == pte_val(b)) +static inline void rcp_lock(pte_t *ptep) +{ +#ifdef CONFIG_PGSTE + atomic64_t *rcp = (atomi...

...9-01 12:49:36.000000000 +0200 @@ -39,6 +39,7 @@ extern unsigned long machine_flags; #define MACHINE_IS_P390 (machine_flags & 4) #define MACHINE_HAS_MVPG (machine_flags & 16) #define MACHINE_HAS_IDTE (machine_flags & 128) +#define MACHINE_HAS_ESSA (machine_flags & 256) #ifndef __s390x__ #define MACHINE_HAS_IEEE (machine_flags & 2)

...9-01 12:49:36.000000000 +0200 @@ -39,6 +39,7 @@ extern unsigned long machine_flags; #define MACHINE_IS_P390 (machine_flags & 4) #define MACHINE_HAS_MVPG (machine_flags & 16) #define MACHINE_HAS_IDTE (machine_flags & 128) +#define MACHINE_HAS_ESSA (machine_flags & 256) #ifndef __s390x__ #define MACHINE_HAS_IEEE (machine_flags & 2)

.../uapi/asm/stat.h +++ b/arch/s390/include/uapi/asm/stat.h @@ -7,6 +7,14 @@ #ifndef _S390_STAT_H #define _S390_STAT_H +#include <asm/bitsperlong.h> + +#if __KERNEL_TIME_BITS == 32 || __BITS_PER_LONG == 64 +#define __old_kernel_stat2 stat +#else +#define __kernel_stat stat +#endif + #ifndef __s390x__ struct __old_kernel_stat { unsigned short st_dev; @@ -22,7 +30,7 @@ struct __old_kernel_stat { unsigned long st_ctime; }; -struct stat { +struct __old_kernel_stat2 { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; @@ -75,7 +83,7...