| Message ID | 1520942503-6163-7-git-send-email-frankja@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13.03.2018 13:01, Janosch Frank wrote: > Collaborative Memory Management is the extended vm memory usage > hinting for the hypervisor and handling the ESSA instruction is quite > complicated. Let's add at least a bare-bones test, maybe someone will > extend it later. > > Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com> > --- > lib/s390x/asm/interrupt.h | 1 + > lib/s390x/interrupt.c | 8 ++++++ > s390x/Makefile | 1 + > s390x/cmm.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 3 +++ > 5 files changed, 81 insertions(+) > create mode 100644 s390x/cmm.c > > diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h > index 3ccc8e3..3f8f2f7 100644 > --- a/lib/s390x/asm/interrupt.h > +++ b/lib/s390x/asm/interrupt.h > @@ -15,6 +15,7 @@ void handle_pgm_int(void); > void expect_pgm_int(void); > uint16_t clear_pgm_int(void); > void check_pgm_int_code(uint16_t code); > +uint16_t get_pgm_int_code(void); > > /* Activate low-address protection */ > static inline void low_prot_enable(void) > diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c > index 56c7603..bfa21e8 100644 > --- a/lib/s390x/interrupt.c > +++ b/lib/s390x/interrupt.c > @@ -41,6 +41,14 @@ void check_pgm_int_code(uint16_t code) > code == lc->pgm_int_code, code, lc->pgm_int_code); > } > > +uint16_t get_pgm_int_code(void) > +{ > + mb(); > + if (!lc->pgm_int_code) > + pgm_int_expected = false; > + return lc->pgm_int_code; > +} > + > static void fixup_pgm_int(void) > { > switch (lc->pgm_int_code) { > diff --git a/s390x/Makefile b/s390x/Makefile > index 438c6b2..e04cad0 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -6,6 +6,7 @@ tests += $(TEST_DIR)/sthyi.elf > tests += $(TEST_DIR)/skey.elf > tests += $(TEST_DIR)/diag10.elf > tests += $(TEST_DIR)/pfmf.elf > +tests += $(TEST_DIR)/cmm.elf > > all: directories test_cases > > diff --git a/s390x/cmm.c b/s390x/cmm.c > new file mode 100644 > index 0000000..5f68465 > --- /dev/null > +++ b/s390x/cmm.c > @@ -0,0 +1,68 @@ > +/* > + * CMM tests (ESSA) > + * > + * Copyright (c) 2017 IBM Corp > + * > + * Authors: > + * Janosch Frank <frankja@linux.vnet.ibm.com> > + * > + * This code is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Library General Public License version 2. > + */ > + > +#include <libcflat.h> > +#include <asm/asm-offsets.h> > +#include <asm/interrupt.h> > +#include <asm/page.h> > + > +static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); > +const unsigned long page0 = (unsigned long)pagebuf; > + > +static unsigned long essa(uint8_t state, unsigned long paddr) > +{ > + register uint64_t addr asm("0") = paddr; > + register uint64_t extr_state asm("1"); > + > + asm volatile(".insn rrf,0xb9ab0000,%[extr_state],%[addr],%[new_state],0" > + : [extr_state] "=&d" (extr_state) > + : [addr] "a" (addr), [new_state] "i" (state)); > + return (unsigned long)extr_state; > +} > + > +static void test_params(void) > +{ > + expect_pgm_int(); > + essa(8, page0); > + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); > +} > + > +static void test_priv(void) > +{ > + expect_pgm_int(); > + enter_pstate(); > + essa(0, page0); > + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); > +} > + > +/* Unfortunately the availability is not indicated by stfl bits, but > + * we have to try to execute it and test for an operation exception. > + */ > +static bool test_availability(void) > +{ > + expect_pgm_int(); > + essa(0, page0); > + return get_pgm_int_code() == 0; > +} No clue how to review this since the instruction is not documented in the PoP .... so all I can say is: Acked-by: Thomas Huth <thuth@redhat.com>
On 03/14/2018 06:17 AM, Thomas Huth wrote: > On 13.03.2018 13:01, Janosch Frank wrote: >> Collaborative Memory Management is the extended vm memory usage >> hinting for the hypervisor and handling the ESSA instruction is quite >> complicated. Let's add at least a bare-bones test, maybe someone will >> extend it later. > > No clue how to review this since the instruction is not documented in > the PoP .... so all I can say is: the ESSA is documented in z/VM documentation e.g. the CP Programming Services. > > Acked-by: Thomas Huth <thuth@redhat.com>
On 14.03.2018 09:20, Christian Borntraeger wrote: > > > On 03/14/2018 06:17 AM, Thomas Huth wrote: >> On 13.03.2018 13:01, Janosch Frank wrote: >>> Collaborative Memory Management is the extended vm memory usage >>> hinting for the hypervisor and handling the ESSA instruction is quite >>> complicated. Let's add at least a bare-bones test, maybe someone will >>> extend it later. >> >> No clue how to review this since the instruction is not documented in >> the PoP .... so all I can say is: > > the ESSA is documented in z/VM documentation e.g. the CP Programming Services. I did not spot it in my version of the CP Programming Services (version 6 release 2) ... is there a newer version of this document available publicly? Thomas
On 03/14/2018 09:45 AM, Thomas Huth wrote: > On 14.03.2018 09:20, Christian Borntraeger wrote: >> >> >> On 03/14/2018 06:17 AM, Thomas Huth wrote: >>> On 13.03.2018 13:01, Janosch Frank wrote: >>>> Collaborative Memory Management is the extended vm memory usage >>>> hinting for the hypervisor and handling the ESSA instruction is quite >>>> complicated. Let's add at least a bare-bones test, maybe someone will >>>> extend it later. >>> >>> No clue how to review this since the instruction is not documented in >>> the PoP .... so all I can say is: >> >> the ESSA is documented in z/VM documentation e.g. the CP Programming Services. > > I did not spot it in my version of the CP Programming Services (version > 6 release 2) ... is there a newer version of this document available > publicly? In the version for 5.3 I have a chapter about collaborative memory management.
On 14.03.2018 09:46, Christian Borntraeger wrote: > > > On 03/14/2018 09:45 AM, Thomas Huth wrote: >> On 14.03.2018 09:20, Christian Borntraeger wrote: >>> >>> >>> On 03/14/2018 06:17 AM, Thomas Huth wrote: >>>> On 13.03.2018 13:01, Janosch Frank wrote: >>>>> Collaborative Memory Management is the extended vm memory usage >>>>> hinting for the hypervisor and handling the ESSA instruction is quite >>>>> complicated. Let's add at least a bare-bones test, maybe someone will >>>>> extend it later. >>>> >>>> No clue how to review this since the instruction is not documented in >>>> the PoP .... so all I can say is: >>> >>> the ESSA is documented in z/VM documentation e.g. the CP Programming Services. >> >> I did not spot it in my version of the CP Programming Services (version >> 6 release 2) ... is there a newer version of this document available >> publicly? > > In the version for 5.3 I have a chapter about collaborative memory management. > In 6.3 http://www.vm.ibm.com/library/zvmpdf.html it's in chapter 26, page 963. But the latest ESSA additions might not yet be public and at some point in time I'll have to find a way to activate migration mode, to actually activate emulation instead of interpretation for essa.
On 14.03.2018 09:50, Janosch Frank wrote: > On 14.03.2018 09:46, Christian Borntraeger wrote: >> >> >> On 03/14/2018 09:45 AM, Thomas Huth wrote: >>> On 14.03.2018 09:20, Christian Borntraeger wrote: >>>> >>>> >>>> On 03/14/2018 06:17 AM, Thomas Huth wrote: >>>>> On 13.03.2018 13:01, Janosch Frank wrote: >>>>>> Collaborative Memory Management is the extended vm memory usage >>>>>> hinting for the hypervisor and handling the ESSA instruction is quite >>>>>> complicated. Let's add at least a bare-bones test, maybe someone will >>>>>> extend it later. >>>>> >>>>> No clue how to review this since the instruction is not documented in >>>>> the PoP .... so all I can say is: >>>> >>>> the ESSA is documented in z/VM documentation e.g. the CP Programming Services. >>> >>> I did not spot it in my version of the CP Programming Services (version >>> 6 release 2) ... is there a newer version of this document available >>> publicly? >> >> In the version for 5.3 I have a chapter about collaborative memory management. >> > > In 6.3 http://www.vm.ibm.com/library/zvmpdf.html it's in chapter 26, OK, thanks, now I've got it. Not sure why searching the PDF initially failed ... maybe some kind of PEBKAC ;-) Thomas
diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h index 3ccc8e3..3f8f2f7 100644 --- a/lib/s390x/asm/interrupt.h +++ b/lib/s390x/asm/interrupt.h @@ -15,6 +15,7 @@ void handle_pgm_int(void); void expect_pgm_int(void); uint16_t clear_pgm_int(void); void check_pgm_int_code(uint16_t code); +uint16_t get_pgm_int_code(void); /* Activate low-address protection */ static inline void low_prot_enable(void) diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 56c7603..bfa21e8 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -41,6 +41,14 @@ void check_pgm_int_code(uint16_t code) code == lc->pgm_int_code, code, lc->pgm_int_code); } +uint16_t get_pgm_int_code(void) +{ + mb(); + if (!lc->pgm_int_code) + pgm_int_expected = false; + return lc->pgm_int_code; +} + static void fixup_pgm_int(void) { switch (lc->pgm_int_code) { diff --git a/s390x/Makefile b/s390x/Makefile index 438c6b2..e04cad0 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -6,6 +6,7 @@ tests += $(TEST_DIR)/sthyi.elf tests += $(TEST_DIR)/skey.elf tests += $(TEST_DIR)/diag10.elf tests += $(TEST_DIR)/pfmf.elf +tests += $(TEST_DIR)/cmm.elf all: directories test_cases diff --git a/s390x/cmm.c b/s390x/cmm.c new file mode 100644 index 0000000..5f68465 --- /dev/null +++ b/s390x/cmm.c @@ -0,0 +1,68 @@ +/* + * CMM tests (ESSA) + * + * Copyright (c) 2017 IBM Corp + * + * Authors: + * Janosch Frank <frankja@linux.vnet.ibm.com> + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU Library General Public License version 2. + */ + +#include <libcflat.h> +#include <asm/asm-offsets.h> +#include <asm/interrupt.h> +#include <asm/page.h> + +static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); +const unsigned long page0 = (unsigned long)pagebuf; + +static unsigned long essa(uint8_t state, unsigned long paddr) +{ + register uint64_t addr asm("0") = paddr; + register uint64_t extr_state asm("1"); + + asm volatile(".insn rrf,0xb9ab0000,%[extr_state],%[addr],%[new_state],0" + : [extr_state] "=&d" (extr_state) + : [addr] "a" (addr), [new_state] "i" (state)); + return (unsigned long)extr_state; +} + +static void test_params(void) +{ + expect_pgm_int(); + essa(8, page0); + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); +} + +static void test_priv(void) +{ + expect_pgm_int(); + enter_pstate(); + essa(0, page0); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); +} + +/* Unfortunately the availability is not indicated by stfl bits, but + * we have to try to execute it and test for an operation exception. + */ +static bool test_availability(void) +{ + expect_pgm_int(); + essa(0, page0); + return get_pgm_int_code() == 0; +} + +int main(void) +{ + if (!test_availability()) { + printf("ESSA is not available."); + return 0; + } + + report_prefix_push("cmm"); + test_priv(); + test_params(); + return report_summary(); +} diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index 3b975ca..367e970 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -47,3 +47,6 @@ file = diag10.elf [pfmf] file = pfmf.elf + +[cmm] +file = cmm.elf
Collaborative Memory Management is the extended vm memory usage hinting for the hypervisor and handling the ESSA instruction is quite complicated. Let's add at least a bare-bones test, maybe someone will extend it later. Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com> --- lib/s390x/asm/interrupt.h | 1 + lib/s390x/interrupt.c | 8 ++++++ s390x/Makefile | 1 + s390x/cmm.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 +++ 5 files changed, 81 insertions(+) create mode 100644 s390x/cmm.c