diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-04 12:44:33 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-04 12:44:33 -0400 |
commit | a3307eb5dbdba6b657a0d9b19eb9bc0c05d04add (patch) | |
tree | dbb6b24ca3676ac0ee7b0a5ea022ae44988a2417 | |
parent | 7e7d93578f02bba2e484ba49a08fa6b2ebbdc4a8 (diff) | |
parent | f7df29115f736b9ffe8e529ba9c2b418d2f5e736 (diff) | |
download | kvm-unit-tests-a3307eb5dbdba6b657a0d9b19eb9bc0c05d04add.tar.gz |
Merge tag 's390x-2020-04-30' of https://github.com/davidhildenbrand/kvm-unit-tests
New maintainer, reviewer, and cc list. New STSI test. Lots of minor fixes
and cleanups
-rw-r--r-- | MAINTAINERS | 4 | ||||
-rw-r--r-- | lib/s390x/asm/arch_def.h | 8 | ||||
-rw-r--r-- | lib/s390x/asm/facility.h | 14 | ||||
-rw-r--r-- | lib/s390x/io.c | 2 | ||||
-rw-r--r-- | lib/s390x/smp.c | 6 | ||||
-rw-r--r-- | lib/s390x/smp.h | 2 | ||||
-rw-r--r-- | s390x/cstart64.S | 5 | ||||
-rw-r--r-- | s390x/smp.c | 105 | ||||
-rw-r--r-- | s390x/stsi.c | 73 | ||||
-rw-r--r-- | s390x/unittests.cfg | 3 |
10 files changed, 196 insertions, 26 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 48da1db..52a3eb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -80,8 +80,10 @@ F: lib/ppc64/* S390X M: Thomas Huth <thuth@redhat.com> M: David Hildenbrand <david@redhat.com> -R: Janosch Frank <frankja@linux.ibm.com> +M: Janosch Frank <frankja@linux.ibm.com> +R: Cornelia Huck <cohuck@redhat.com> L: kvm@vger.kernel.org +L: linux-s390@vger.kernel.org F: s390x/* F: lib/s390x/* diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 15a4d49..1b3bb0c 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -19,10 +19,10 @@ struct psw { #define PSW_MASK_DAT 0x0400000000000000UL #define PSW_MASK_PSTATE 0x0001000000000000UL -#define CR0_EXTM_SCLP 0X0000000000000200UL -#define CR0_EXTM_EXTC 0X0000000000002000UL -#define CR0_EXTM_EMGC 0X0000000000004000UL -#define CR0_EXTM_MASK 0X0000000000006200UL +#define CR0_EXTM_SCLP 0x0000000000000200UL +#define CR0_EXTM_EXTC 0x0000000000002000UL +#define CR0_EXTM_EMGC 0x0000000000004000UL +#define CR0_EXTM_MASK 0x0000000000006200UL struct lowcore { uint8_t pad_0x0000[0x0080 - 0x0000]; /* 0x0000 */ diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h index e34dc2c..def2705 100644 --- a/lib/s390x/asm/facility.h +++ b/lib/s390x/asm/facility.h @@ -14,12 +14,12 @@ #include <asm/facility.h> #include <asm/arch_def.h> -#define NR_STFL_BYTES 256 -extern uint8_t stfl_bytes[]; +#define NB_STFL_DOUBLEWORDS 32 +extern uint64_t stfl_doublewords[]; static inline bool test_facility(int nr) { - return stfl_bytes[nr / 8] & (0x80U >> (nr % 8)); + return stfl_doublewords[nr / 64] & (0x8000000000000000UL >> (nr % 64)); } static inline void stfl(void) @@ -27,9 +27,9 @@ static inline void stfl(void) asm volatile(" stfl 0(0)\n" : : : "memory"); } -static inline void stfle(uint8_t *fac, unsigned int len) +static inline void stfle(uint64_t *fac, unsigned int nb_doublewords) { - register unsigned long r0 asm("0") = len - 1; + register unsigned long r0 asm("0") = nb_doublewords - 1; asm volatile(" .insn s,0xb2b00000,0(%1)\n" : "+d" (r0) : "a" (fac) : "memory", "cc"); @@ -40,9 +40,9 @@ static inline void setup_facilities(void) struct lowcore *lc = NULL; stfl(); - memcpy(stfl_bytes, &lc->stfl, sizeof(lc->stfl)); + memcpy(stfl_doublewords, &lc->stfl, sizeof(lc->stfl)); if (test_facility(7)) - stfle(stfl_bytes, NR_STFL_BYTES); + stfle(stfl_doublewords, NB_STFL_DOUBLEWORDS); } #endif diff --git a/lib/s390x/io.c b/lib/s390x/io.c index e091c37..c0f0bf7 100644 --- a/lib/s390x/io.c +++ b/lib/s390x/io.c @@ -19,7 +19,7 @@ #include "smp.h" extern char ipl_args[]; -uint8_t stfl_bytes[NR_STFL_BYTES] __attribute__((aligned(8))); +uint64_t stfl_doublewords[NB_STFL_DOUBLEWORDS]; static struct spinlock lock; diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c index 3f86243..2860e9c 100644 --- a/lib/s390x/smp.c +++ b/lib/s390x/smp.c @@ -58,7 +58,7 @@ bool smp_cpu_stopped(uint16_t addr) return !!(status & (SIGP_STATUS_CHECK_STOP|SIGP_STATUS_STOPPED)); } -bool smp_cpu_running(uint16_t addr) +bool smp_sense_running_status(uint16_t addr) { if (sigp(addr, SIGP_SENSE_RUNNING, 0, NULL) != SIGP_CC_STATUS_STORED) return true; @@ -128,7 +128,7 @@ static int smp_cpu_restart_nolock(uint16_t addr, struct psw *psw) * The order has been accepted, but the actual restart may not * have been performed yet, so wait until the cpu is running. */ - while (!smp_cpu_running(addr)) + while (smp_cpu_stopped(addr)) mb(); cpu->active = true; return 0; @@ -202,6 +202,8 @@ int smp_cpu_setup(uint16_t addr, struct psw psw) cpu->stack = (uint64_t *)alloc_pages(2); /* Start without DAT and any other mask bits. */ + cpu->lowcore->sw_int_psw.mask = psw.mask; + cpu->lowcore->sw_int_psw.addr = psw.addr; cpu->lowcore->sw_int_grs[14] = psw.addr; cpu->lowcore->sw_int_grs[15] = (uint64_t)cpu->stack + (PAGE_SIZE * 4); lc->restart_new_psw.mask = 0x0000000180000000UL; diff --git a/lib/s390x/smp.h b/lib/s390x/smp.h index ce63a89..d66e39a 100644 --- a/lib/s390x/smp.h +++ b/lib/s390x/smp.h @@ -40,7 +40,7 @@ struct cpu_status { int smp_query_num_cpus(void); struct cpu *smp_cpu_from_addr(uint16_t addr); bool smp_cpu_stopped(uint16_t addr); -bool smp_cpu_running(uint16_t addr); +bool smp_sense_running_status(uint16_t addr); int smp_cpu_restart(uint16_t addr); int smp_cpu_start(uint16_t addr, struct psw psw); int smp_cpu_stop(uint16_t addr); diff --git a/s390x/cstart64.S b/s390x/cstart64.S index 9af6bb3..e084f13 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -161,7 +161,10 @@ smp_cpu_setup_state: lctlg %c0, %c0, GEN_LC_SW_INT_CRS /* We should only go once through cpu setup and not for every restart */ stg %r14, GEN_LC_RESTART_NEW_PSW + 8 - br %r14 + larl %r14, 0f + lpswe GEN_LC_SW_INT_PSW + /* If the function returns, just loop here */ +0: j 0 pgm_int: SAVE_REGS diff --git a/s390x/smp.c b/s390x/smp.c index fa40753..ad30e3c 100644 --- a/s390x/smp.c +++ b/s390x/smp.c @@ -35,15 +35,9 @@ static void set_flag(int val) mb(); } -static void cpu_loop(void) -{ - for (;;) {} -} - static void test_func(void) { set_flag(1); - cpu_loop(); } static void test_start(void) @@ -58,6 +52,34 @@ static void test_start(void) report(1, "start"); } +/* + * Does only test restart when the target is running. + * The other tests do restarts when stopped multiple times already. + */ +static void test_restart(void) +{ + struct cpu *cpu = smp_cpu_from_addr(1); + struct lowcore *lc = cpu->lowcore; + + lc->restart_new_psw.mask = extract_psw_mask(); + lc->restart_new_psw.addr = (unsigned long)test_func; + + /* Make sure cpu is running */ + smp_cpu_stop(0); + set_flag(0); + smp_cpu_restart(1); + wait_for_flag(); + + /* + * Wait until cpu 1 has set the flag because it executed the + * restart function. + */ + set_flag(0); + smp_cpu_restart(1); + wait_for_flag(); + report(1, "restart while running"); +} + static void test_stop(void) { smp_cpu_stop(1); @@ -76,6 +98,18 @@ static void test_stop_store_status(void) struct lowcore *lc = (void *)0x0; report_prefix_push("stop store status"); + report_prefix_push("running"); + smp_cpu_restart(1); + lc->prefix_sa = 0; + lc->grs_sa[15] = 0; + smp_cpu_stop_store_status(1); + mb(); + report(lc->prefix_sa == (uint32_t)(uintptr_t)cpu->lowcore, "prefix"); + report(lc->grs_sa[15], "stack"); + report(smp_cpu_stopped(1), "cpu stopped"); + report_prefix_pop(); + + report_prefix_push("stopped"); lc->prefix_sa = 0; lc->grs_sa[15] = 0; smp_cpu_stop_store_status(1); @@ -83,6 +117,8 @@ static void test_stop_store_status(void) report(lc->prefix_sa == (uint32_t)(uintptr_t)cpu->lowcore, "prefix"); report(lc->grs_sa[15], "stack"); report_prefix_pop(); + + report_prefix_pop(); } static void test_store_status(void) @@ -182,16 +218,42 @@ static void test_emcall(void) report_prefix_pop(); } +static void test_sense_running(void) +{ + report_prefix_push("sense_running"); + /* we (CPU0) are running */ + report(smp_sense_running_status(0), "CPU0 sense claims running"); + /* stop the target CPU (CPU1) to speed up the not running case */ + smp_cpu_stop(1); + /* Make sure to have at least one time with a not running indication */ + while(smp_sense_running_status(1)); + report(true, "CPU1 sense claims not running"); + report_prefix_pop(); +} + +/* Used to dirty registers of cpu #1 before it is reset */ +static void test_func_initial(void) +{ + asm volatile("sfpc %0" :: "d" (0x11)); + lctlg(1, 0x42000UL); + lctlg(7, 0x43000UL); + lctlg(13, 0x44000UL); + set_flag(1); +} + static void test_reset_initial(void) { struct cpu_status *status = alloc_pages(0); struct psw psw; + int i; psw.mask = extract_psw_mask(); - psw.addr = (unsigned long)test_func; + psw.addr = (unsigned long)test_func_initial; report_prefix_push("reset initial"); + set_flag(0); smp_cpu_start(1, psw); + wait_for_flag(); sigp_retry(1, SIGP_INITIAL_CPU_RESET, 0, NULL); sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, NULL); @@ -202,6 +264,10 @@ static void test_reset_initial(void) report(!status->fpc, "fpc"); report(!status->cputm, "cpu timer"); report(!status->todpr, "todpr"); + for (i = 1; i <= 13; i++) { + report(status->crs[i] == 0, "cr%d == 0", i); + } + report(status->crs[15] == 0, "cr15 == 0"); report_prefix_pop(); report_prefix_push("initialized"); @@ -214,6 +280,19 @@ static void test_reset_initial(void) report_prefix_pop(); } +static void test_local_ints(void) +{ + unsigned long mask; + + /* Open masks for ecall and emcall */ + ctl_set_bit(0, 13); + ctl_set_bit(0, 14); + mask = extract_psw_mask(); + mask |= PSW_MASK_EXT; + load_psw_mask(mask); + set_flag(1); +} + static void test_reset(void) { struct psw psw; @@ -222,10 +301,18 @@ static void test_reset(void) psw.addr = (unsigned long)test_func; report_prefix_push("cpu reset"); + sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL); + sigp(1, SIGP_EXTERNAL_CALL, 0, NULL); smp_cpu_start(1, psw); sigp_retry(1, SIGP_CPU_RESET, 0, NULL); report(smp_cpu_stopped(1), "cpu stopped"); + + set_flag(0); + psw.addr = (unsigned long)test_local_ints; + smp_cpu_start(1, psw); + wait_for_flag(); + report(true, "local interrupts cleared"); report_prefix_pop(); } @@ -241,16 +328,18 @@ int main(void) /* Setting up the cpu to give it a stack and lowcore */ psw.mask = extract_psw_mask(); - psw.addr = (unsigned long)cpu_loop; + psw.addr = (unsigned long)test_func; smp_cpu_setup(1, psw); smp_cpu_stop(1); test_start(); + test_restart(); test_stop(); test_stop_store_status(); test_store_status(); test_ecall(); test_emcall(); + test_sense_running(); test_reset(); test_reset_initial(); smp_cpu_destroy(1); diff --git a/s390x/stsi.c b/s390x/stsi.c index e9206bc..66b4257 100644 --- a/s390x/stsi.c +++ b/s390x/stsi.c @@ -14,7 +14,28 @@ #include <asm/page.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <smp.h> +struct stsi_322 { + uint8_t reserved[31]; + uint8_t count; + struct { + uint8_t reserved2[4]; + uint16_t total_cpus; + uint16_t conf_cpus; + uint16_t standby_cpus; + uint16_t reserved_cpus; + uint8_t name[8]; + uint32_t caf; + uint8_t cpi[16]; + uint8_t reserved5[3]; + uint8_t ext_name_encoding; + uint32_t reserved3; + uint8_t uuid[16]; + } vm[8]; + uint8_t reserved4[1504]; + uint8_t ext_names[8][256]; +}; static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); static void test_specs(void) @@ -76,11 +97,63 @@ static void test_fc(void) report(stsi_get_fc(pagebuf) >= 2, "query fc >= 2"); } +static void test_3_2_2(void) +{ + int rc; + /* EBCDIC for "kvm-unit" */ + const uint8_t vm_name[] = { 0x92, 0xa5, 0x94, 0x60, 0xa4, 0x95, 0x89, + 0xa3 }; + const uint8_t uuid[] = { 0x0f, 0xb8, 0x4a, 0x86, 0x72, 0x7c, + 0x11, 0xea, 0xbc, 0x55, 0x02, 0x42, 0xac, 0x13, + 0x00, 0x03 }; + /* EBCDIC for "KVM/" */ + const uint8_t cpi_kvm[] = { 0xd2, 0xe5, 0xd4, 0x61 }; + const char *vm_name_ext = "kvm-unit-test"; + struct stsi_322 *data = (void *)pagebuf; + + report_prefix_push("3.2.2"); + + /* Is the function code available at all? */ + if (stsi_get_fc(pagebuf) < 3) { + report_skip("Running under lpar, no level 3 to test."); + goto out; + } + + rc = stsi(pagebuf, 3, 2, 2); + report(!rc, "call"); + + /* For now we concentrate on KVM/QEMU */ + if (memcmp(&data->vm[0].cpi, cpi_kvm, sizeof(cpi_kvm))) { + report_skip("Not running under KVM/QEMU."); + goto out; + } + + report(!memcmp(data->vm[0].uuid, uuid, sizeof(uuid)), "uuid"); + report(data->vm[0].conf_cpus == smp_query_num_cpus(), "cpu # configured"); + report(data->vm[0].total_cpus == + data->vm[0].reserved_cpus + data->vm[0].conf_cpus, + "cpu # total == conf + reserved"); + report(data->vm[0].standby_cpus == 0, "cpu # standby"); + report(!memcmp(data->vm[0].name, vm_name, sizeof(data->vm[0].name)), + "VM name == kvm-unit-test"); + + if (data->vm[0].ext_name_encoding != 2) { + report_skip("Extended VM names are not UTF-8."); + goto out; + } + report(!memcmp(data->ext_names[0], vm_name_ext, sizeof(vm_name_ext)), + "ext VM name == kvm-unit-test"); + +out: + report_prefix_pop(); +} + int main(void) { report_prefix_push("stsi"); test_priv(); test_specs(); test_fc(); + test_3_2_2(); return report_summary(); } diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index 07013b2..b307329 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -71,10 +71,11 @@ extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi [stsi] file = stsi.elf +extra_params=-name kvm-unit-test --uuid 0fb84a86-727c-11ea-bc55-0242ac130003 -smp 1,maxcpus=8 [smp] file = smp.elf -extra_params =-smp 2 +smp = 2 [sclp-1g] file = sclp.elf |