| Message ID | 1575649588-6127-7-git-send-email-pmorel@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: Testing the Channel Subsystem I/O | expand |
On 06/12/2019 17.26, Pierre Morel wrote: > First step for testing the channel subsystem is to enumerate the css and > retrieve the css devices. > > This tests the success of STSCH I/O instruction. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > lib/s390x/css.h | 1 + > s390x/Makefile | 2 ++ > s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 4 +++ > 4 files changed, 89 insertions(+) > create mode 100644 s390x/css.c > > diff --git a/lib/s390x/css.h b/lib/s390x/css.h > index 6f19bb5..d37227b 100644 > --- a/lib/s390x/css.h > +++ b/lib/s390x/css.h > @@ -82,6 +82,7 @@ struct pmcw { > uint8_t chpid[8]; > uint16_t flags2; > }; > +#define PMCW_CHANNEL_TYPE(pmcw) (pmcw->flags >> 21) > > struct schib { > struct pmcw pmcw; > diff --git a/s390x/Makefile b/s390x/Makefile > index 3744372..9ebbb84 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -16,6 +16,7 @@ tests += $(TEST_DIR)/diag288.elf > tests += $(TEST_DIR)/stsi.elf > tests += $(TEST_DIR)/skrf.elf > tests += $(TEST_DIR)/smp.elf > +tests += $(TEST_DIR)/css.elf > tests_binary = $(patsubst %.elf,%.bin,$(tests)) > > all: directories test_cases test_cases_binary > @@ -50,6 +51,7 @@ cflatobjs += lib/s390x/sclp-console.o > cflatobjs += lib/s390x/interrupt.o > cflatobjs += lib/s390x/mmu.o > cflatobjs += lib/s390x/smp.o > +cflatobjs += lib/s390x/css_dump.o > > OBJDIRS += lib/s390x > > diff --git a/s390x/css.c b/s390x/css.c > new file mode 100644 > index 0000000..3d4a986 > --- /dev/null > +++ b/s390x/css.c > @@ -0,0 +1,82 @@ > +/* > + * Channel Subsystem tests > + * > + * Copyright (c) 2019 IBM Corp > + * > + * Authors: > + * Pierre Morel <pmorel@linux.ibm.com> > + * > + * This code is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2. > + */ > + > +#include <libcflat.h> > + > +#include <css.h> > + > +#define SID_ONE 0x00010000 > + > +static struct schib schib; > + > +static const char *Channel_type[4] = { > + "I/O", "CHSC", "MSG", "EADM" > +}; > + > +static int test_device_sid; > + > +static void test_enumerate(void) > +{ > + struct pmcw *pmcw = &schib.pmcw; > + int scn; > + int cc, i; > + int found = 0; > + > + for (scn = 0; scn < 0xffff; scn++) { > + cc = stsch(scn|SID_ONE, &schib); > + if (!cc && (pmcw->flags & PMCW_DNV)) { > + report_info("SID %04x Type %s PIM %x", scn, > + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], > + pmcw->pim); > + for (i = 0; i < 8; i++) { > + if ((pmcw->pim << i) & 0x80) { > + report_info("CHPID[%d]: %02x", i, > + pmcw->chpid[i]); > + break; > + } > + } > + found++; > + } > + if (cc == 3) /* cc = 3 means no more channel in CSS */ > + break; > + if (found && !test_device_sid) > + test_device_sid = scn|SID_ONE; > + } > + if (!found) { > + report("Tested %d devices, none found", 0, scn); > + return; > + } > + report("Tested %d devices, %d found", 1, scn, found); I'm sorry, but since last Friday, you now have to swap the first two parameters of the report() function. (that was unfortunately necessary to fix an issue with Clang) Thomas
On 2019-12-09 12:52, Thomas Huth wrote: > On 06/12/2019 17.26, Pierre Morel wrote: >> First step for testing the channel subsystem is to enumerate the css and >> retrieve the css devices. >> >> This tests the success of STSCH I/O instruction. >> >> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> >> --- >> lib/s390x/css.h | 1 + >> s390x/Makefile | 2 ++ >> s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ >> s390x/unittests.cfg | 4 +++ >> 4 files changed, 89 insertions(+) >> create mode 100644 s390x/css.c >> >> diff --git a/lib/s390x/css.h b/lib/s390x/css.h >> index 6f19bb5..d37227b 100644 >> --- a/lib/s390x/css.h >> +++ b/lib/s390x/css.h >> @@ -82,6 +82,7 @@ struct pmcw { >> uint8_t chpid[8]; >> uint16_t flags2; >> }; >> +#define PMCW_CHANNEL_TYPE(pmcw) (pmcw->flags >> 21) >> >> struct schib { >> struct pmcw pmcw; >> diff --git a/s390x/Makefile b/s390x/Makefile >> index 3744372..9ebbb84 100644 >> --- a/s390x/Makefile >> +++ b/s390x/Makefile >> @@ -16,6 +16,7 @@ tests += $(TEST_DIR)/diag288.elf >> tests += $(TEST_DIR)/stsi.elf >> tests += $(TEST_DIR)/skrf.elf >> tests += $(TEST_DIR)/smp.elf >> +tests += $(TEST_DIR)/css.elf >> tests_binary = $(patsubst %.elf,%.bin,$(tests)) >> >> all: directories test_cases test_cases_binary >> @@ -50,6 +51,7 @@ cflatobjs += lib/s390x/sclp-console.o >> cflatobjs += lib/s390x/interrupt.o >> cflatobjs += lib/s390x/mmu.o >> cflatobjs += lib/s390x/smp.o >> +cflatobjs += lib/s390x/css_dump.o >> >> OBJDIRS += lib/s390x >> >> diff --git a/s390x/css.c b/s390x/css.c >> new file mode 100644 >> index 0000000..3d4a986 >> --- /dev/null >> +++ b/s390x/css.c >> @@ -0,0 +1,82 @@ >> +/* >> + * Channel Subsystem tests >> + * >> + * Copyright (c) 2019 IBM Corp >> + * >> + * Authors: >> + * Pierre Morel <pmorel@linux.ibm.com> >> + * >> + * This code is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License version 2. >> + */ >> + >> +#include <libcflat.h> >> + >> +#include <css.h> >> + >> +#define SID_ONE 0x00010000 >> + >> +static struct schib schib; >> + >> +static const char *Channel_type[4] = { >> + "I/O", "CHSC", "MSG", "EADM" >> +}; >> + >> +static int test_device_sid; >> + >> +static void test_enumerate(void) >> +{ >> + struct pmcw *pmcw = &schib.pmcw; >> + int scn; >> + int cc, i; >> + int found = 0; >> + >> + for (scn = 0; scn < 0xffff; scn++) { >> + cc = stsch(scn|SID_ONE, &schib); >> + if (!cc && (pmcw->flags & PMCW_DNV)) { >> + report_info("SID %04x Type %s PIM %x", scn, >> + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], >> + pmcw->pim); >> + for (i = 0; i < 8; i++) { >> + if ((pmcw->pim << i) & 0x80) { >> + report_info("CHPID[%d]: %02x", i, >> + pmcw->chpid[i]); >> + break; >> + } >> + } >> + found++; >> + } >> + if (cc == 3) /* cc = 3 means no more channel in CSS */ >> + break; >> + if (found && !test_device_sid) >> + test_device_sid = scn|SID_ONE; >> + } >> + if (!found) { >> + report("Tested %d devices, none found", 0, scn); >> + return; >> + } >> + report("Tested %d devices, %d found", 1, scn, found); > > I'm sorry, but since last Friday, you now have to swap the first two > parameters of the report() function. (that was unfortunately necessary > to fix an issue with Clang) > > Thomas > grrr. :) OK, will do. Thanks, Pierre
On Fri, 6 Dec 2019 17:26:25 +0100 Pierre Morel <pmorel@linux.ibm.com> wrote: > First step for testing the channel subsystem is to enumerate the css and > retrieve the css devices. > > This tests the success of STSCH I/O instruction. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > lib/s390x/css.h | 1 + > s390x/Makefile | 2 ++ > s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 4 +++ > 4 files changed, 89 insertions(+) > create mode 100644 s390x/css.c > > +static void test_enumerate(void) > +{ > + struct pmcw *pmcw = &schib.pmcw; > + int scn; > + int cc, i; > + int found = 0; > + > + for (scn = 0; scn < 0xffff; scn++) { > + cc = stsch(scn|SID_ONE, &schib); > + if (!cc && (pmcw->flags & PMCW_DNV)) { Not sure when dnv is actually applicable... it is used for I/O subchannels; chsc subchannels don't have a device; message subchannels use a different bit IIRC; not sure about EADM subchannels. [Not very relevant as long as we run under KVM, but should be considered if you plan to run this test under z/VM or LPAR as well.] > + report_info("SID %04x Type %s PIM %x", scn, > + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], > + pmcw->pim); > + for (i = 0; i < 8; i++) { > + if ((pmcw->pim << i) & 0x80) { > + report_info("CHPID[%d]: %02x", i, > + pmcw->chpid[i]); > + break; That 'break;' seems odd -- won't you end up printing the first chpid in the pim only? Maybe modify this loop to print the chpid if the path is in the pim, and 'n/a' or so if not? > + } > + } > + found++; > + } > + if (cc == 3) /* cc = 3 means no more channel in CSS */ s/channel/subchannels/ > + break; > + if (found && !test_device_sid) > + test_device_sid = scn|SID_ONE; > + } > + if (!found) { > + report("Tested %d devices, none found", 0, scn); > + return; > + } > + report("Tested %d devices, %d found", 1, scn, found); > +}
On 2019-12-09 17:49, Cornelia Huck wrote: > On Fri, 6 Dec 2019 17:26:25 +0100 > Pierre Morel <pmorel@linux.ibm.com> wrote: > >> First step for testing the channel subsystem is to enumerate the css and >> retrieve the css devices. >> >> This tests the success of STSCH I/O instruction. >> >> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> >> --- >> lib/s390x/css.h | 1 + >> s390x/Makefile | 2 ++ >> s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ >> s390x/unittests.cfg | 4 +++ >> 4 files changed, 89 insertions(+) >> create mode 100644 s390x/css.c >> > >> +static void test_enumerate(void) >> +{ >> + struct pmcw *pmcw = &schib.pmcw; >> + int scn; >> + int cc, i; >> + int found = 0; >> + >> + for (scn = 0; scn < 0xffff; scn++) { >> + cc = stsch(scn|SID_ONE, &schib); >> + if (!cc && (pmcw->flags & PMCW_DNV)) { > > Not sure when dnv is actually applicable... it is used for I/O > subchannels; chsc subchannels don't have a device; message subchannels > use a different bit IIRC; not sure about EADM subchannels. > > [Not very relevant as long as we run under KVM, but should be > considered if you plan to run this test under z/VM or LPAR as well.] Hum, interresting, I will check and modify accordingly. > >> + report_info("SID %04x Type %s PIM %x", scn, >> + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], >> + pmcw->pim); >> + for (i = 0; i < 8; i++) { >> + if ((pmcw->pim << i) & 0x80) { >> + report_info("CHPID[%d]: %02x", i, >> + pmcw->chpid[i]); >> + break; > > That 'break;' seems odd -- won't you end up printing the first chpid in > the pim only? yes > > Maybe modify this loop to print the chpid if the path is in the pim, > and 'n/a' or so if not? OK > >> + } >> + } >> + found++; >> + } >> + if (cc == 3) /* cc = 3 means no more channel in CSS */ > > s/channel/subchannels/ thanks > >> + break; >> + if (found && !test_device_sid) >> + test_device_sid = scn|SID_ONE; >> + } >> + if (!found) { >> + report("Tested %d devices, none found", 0, scn); >> + return; >> + } >> + report("Tested %d devices, %d found", 1, scn, found); >> +} > Thanks for the reviewing, Regards, Pierre
On 2019-12-06 17:26, Pierre Morel wrote: > First step for testing the channel subsystem is to enumerate the css and > retrieve the css devices. > > This tests the success of STSCH I/O instruction. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > lib/s390x/css.h | 1 + > s390x/Makefile | 2 ++ > s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 4 +++ > 4 files changed, 89 insertions(+) > create mode 100644 s390x/css.c > > diff --git a/lib/s390x/css.h b/lib/s390x/css.h > index 6f19bb5..d37227b 100644 > --- a/lib/s390x/css.h > +++ b/lib/s390x/css.h > @@ -82,6 +82,7 @@ struct pmcw { > uint8_t chpid[8]; > uint16_t flags2; > }; > +#define PMCW_CHANNEL_TYPE(pmcw) (pmcw->flags >> 21) This is wrong. In between I redefined flag2 as 32bits and type as (flags2>>21) > > struct schib { > struct pmcw pmcw; > diff --git a/s390x/Makefile b/s390x/Makefile > index 3744372..9ebbb84 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -16,6 +16,7 @@ tests += $(TEST_DIR)/diag288.elf > tests += $(TEST_DIR)/stsi.elf > tests += $(TEST_DIR)/skrf.elf > tests += $(TEST_DIR)/smp.elf > +tests += $(TEST_DIR)/css.elf > tests_binary = $(patsubst %.elf,%.bin,$(tests)) > > all: directories test_cases test_cases_binary > @@ -50,6 +51,7 @@ cflatobjs += lib/s390x/sclp-console.o > cflatobjs += lib/s390x/interrupt.o > cflatobjs += lib/s390x/mmu.o > cflatobjs += lib/s390x/smp.o > +cflatobjs += lib/s390x/css_dump.o > > OBJDIRS += lib/s390x > > diff --git a/s390x/css.c b/s390x/css.c > new file mode 100644 > index 0000000..3d4a986 > --- /dev/null > +++ b/s390x/css.c > @@ -0,0 +1,82 @@ > +/* > + * Channel Subsystem tests > + * > + * Copyright (c) 2019 IBM Corp > + * > + * Authors: > + * Pierre Morel <pmorel@linux.ibm.com> > + * > + * This code is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2. > + */ > + > +#include <libcflat.h> > + > +#include <css.h> > + > +#define SID_ONE 0x00010000 > + > +static struct schib schib; > + > +static const char *Channel_type[4] = { > + "I/O", "CHSC", "MSG", "EADM" > +}; > + > +static int test_device_sid; > + > +static void test_enumerate(void) > +{ > + struct pmcw *pmcw = &schib.pmcw; > + int scn; > + int cc, i; > + int found = 0; > + > + for (scn = 0; scn < 0xffff; scn++) { > + cc = stsch(scn|SID_ONE, &schib); > + if (!cc && (pmcw->flags & PMCW_DNV)) { > + report_info("SID %04x Type %s PIM %x", scn, > + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], > + pmcw->pim); > + for (i = 0; i < 8; i++) { > + if ((pmcw->pim << i) & 0x80) { > + report_info("CHPID[%d]: %02x", i, > + pmcw->chpid[i]); > + break; > + } > + } > + found++; > + } > + if (cc == 3) /* cc = 3 means no more channel in CSS */ > + break; > + if (found && !test_device_sid) > + test_device_sid = scn|SID_ONE; > + } > + if (!found) { > + report("Tested %d devices, none found", 0, scn); > + return; > + } > + report("Tested %d devices, %d found", 1, scn, found); > +} > + > +static struct { > + const char *name; > + void (*func)(void); > +} tests[] = { > + { "enumerate (stsch)", test_enumerate }, > + { NULL, NULL } > +}; > + > +int main(int argc, char *argv[]) > +{ > + int i; > + > + report_prefix_push("Channel Sub-System"); > + for (i = 0; tests[i].name; i++) { > + report_prefix_push(tests[i].name); > + tests[i].func(); > + report_prefix_pop(); > + } > + report_prefix_pop(); > + > + return report_summary(); > +} > diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg > index f1b07cd..1755d9e 100644 > --- a/s390x/unittests.cfg > +++ b/s390x/unittests.cfg > @@ -75,3 +75,7 @@ file = stsi.elf > [smp] > file = smp.elf > extra_params =-smp 2 > + > +[css] > +file = css.elf > +extra_params =-device ccw-pong >
diff --git a/lib/s390x/css.h b/lib/s390x/css.h index 6f19bb5..d37227b 100644 --- a/lib/s390x/css.h +++ b/lib/s390x/css.h @@ -82,6 +82,7 @@ struct pmcw { uint8_t chpid[8]; uint16_t flags2; }; +#define PMCW_CHANNEL_TYPE(pmcw) (pmcw->flags >> 21) struct schib { struct pmcw pmcw; diff --git a/s390x/Makefile b/s390x/Makefile index 3744372..9ebbb84 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -16,6 +16,7 @@ tests += $(TEST_DIR)/diag288.elf tests += $(TEST_DIR)/stsi.elf tests += $(TEST_DIR)/skrf.elf tests += $(TEST_DIR)/smp.elf +tests += $(TEST_DIR)/css.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary @@ -50,6 +51,7 @@ cflatobjs += lib/s390x/sclp-console.o cflatobjs += lib/s390x/interrupt.o cflatobjs += lib/s390x/mmu.o cflatobjs += lib/s390x/smp.o +cflatobjs += lib/s390x/css_dump.o OBJDIRS += lib/s390x diff --git a/s390x/css.c b/s390x/css.c new file mode 100644 index 0000000..3d4a986 --- /dev/null +++ b/s390x/css.c @@ -0,0 +1,82 @@ +/* + * Channel Subsystem tests + * + * Copyright (c) 2019 IBM Corp + * + * Authors: + * Pierre Morel <pmorel@linux.ibm.com> + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2. + */ + +#include <libcflat.h> + +#include <css.h> + +#define SID_ONE 0x00010000 + +static struct schib schib; + +static const char *Channel_type[4] = { + "I/O", "CHSC", "MSG", "EADM" +}; + +static int test_device_sid; + +static void test_enumerate(void) +{ + struct pmcw *pmcw = &schib.pmcw; + int scn; + int cc, i; + int found = 0; + + for (scn = 0; scn < 0xffff; scn++) { + cc = stsch(scn|SID_ONE, &schib); + if (!cc && (pmcw->flags & PMCW_DNV)) { + report_info("SID %04x Type %s PIM %x", scn, + Channel_type[PMCW_CHANNEL_TYPE(pmcw)], + pmcw->pim); + for (i = 0; i < 8; i++) { + if ((pmcw->pim << i) & 0x80) { + report_info("CHPID[%d]: %02x", i, + pmcw->chpid[i]); + break; + } + } + found++; + } + if (cc == 3) /* cc = 3 means no more channel in CSS */ + break; + if (found && !test_device_sid) + test_device_sid = scn|SID_ONE; + } + if (!found) { + report("Tested %d devices, none found", 0, scn); + return; + } + report("Tested %d devices, %d found", 1, scn, found); +} + +static struct { + const char *name; + void (*func)(void); +} tests[] = { + { "enumerate (stsch)", test_enumerate }, + { NULL, NULL } +}; + +int main(int argc, char *argv[]) +{ + int i; + + report_prefix_push("Channel Sub-System"); + for (i = 0; tests[i].name; i++) { + report_prefix_push(tests[i].name); + tests[i].func(); + report_prefix_pop(); + } + report_prefix_pop(); + + return report_summary(); +} diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index f1b07cd..1755d9e 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -75,3 +75,7 @@ file = stsi.elf [smp] file = smp.elf extra_params =-smp 2 + +[css] +file = css.elf +extra_params =-device ccw-pong
First step for testing the channel subsystem is to enumerate the css and retrieve the css devices. This tests the success of STSCH I/O instruction. Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- lib/s390x/css.h | 1 + s390x/Makefile | 2 ++ s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 +++ 4 files changed, 89 insertions(+) create mode 100644 s390x/css.c