| Message ID | 1612963214-30397-5-git-send-email-pmorel@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CSS Mesurement Block | expand |
On Wed, 10 Feb 2021 14:20:13 +0100 Pierre Morel <pmorel@linux.ibm.com> wrote: > We tests the update of the mesurement block format 0, the s/tests/test/ s/mesurement/measurement/ > mesurement block origin is calculated from the mbo argument > used by the SCHM instruction and the offset calculated using > the measurement block index of the SCHIB. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > lib/s390x/css.h | 14 +++++++++++++ > s390x/css.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 69 insertions(+) > (...) > +static void test_schm_fmt0(void) > +{ > + struct measurement_block_format0 *mb0; > + > + report_prefix_push("Format 0"); > + > + mb0 = alloc_io_mem(sizeof(struct measurement_block_format0), 0); > + if (!mb0) { > + report_abort("measurement_block_format0 allocation failed"); > + goto end; > + } > + > + schm(NULL, 0); /* Clear previous MB address */ I think it would be better to clean out the mb after a particular test has run, so that the following tests can start with a clean slate. > + schm(mb0, SCHM_MBU); > > + /* Expect error for non aligned MB */ > + report_prefix_push("Unaligned MB index"); > + report_xfail(start_measure(0, 0x01, false), mb0->ssch_rsch_count != 0, > + "SSCH measured %d", mb0->ssch_rsch_count); > + report_prefix_pop(); > + > + memset(mb0, 0, sizeof(*mb0)); > + > + /* Expect success */ > + report_prefix_push("Valid MB address and index"); > + report(start_measure(0, 0, false) && > + mb0->ssch_rsch_count == SCHM_UPDATE_CNT, > + "SSCH measured %d", mb0->ssch_rsch_count); > + report_prefix_pop(); > + > + free_io_mem(mb0, sizeof(struct measurement_block_format0)); Before you free the memory, you really need to stop measurements again... even though nothing happens right now, because you're not doing I/O after this point. > +end: > + report_prefix_pop(); > } > > static struct { > @@ -202,6 +256,7 @@ static struct { > { "enable (msch)", test_enable }, > { "sense (ssch/tsch)", test_sense }, > { "measurement block (schm)", test_schm }, > + { "measurement block format0", test_schm_fmt0 }, > { NULL, NULL } > }; >
On 2/12/21 12:12 PM, Cornelia Huck wrote: > On Wed, 10 Feb 2021 14:20:13 +0100 > Pierre Morel <pmorel@linux.ibm.com> wrote: > >> We tests the update of the mesurement block format 0, the > > s/tests/test/ > s/mesurement/measurement/ hum, yes :( > >> mesurement block origin is calculated from the mbo argument >> used by the SCHM instruction and the offset calculated using >> the measurement block index of the SCHIB. >> >> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> >> --- >> lib/s390x/css.h | 14 +++++++++++++ >> s390x/css.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 69 insertions(+) >> > > (...) > >> +static void test_schm_fmt0(void) >> +{ >> + struct measurement_block_format0 *mb0; >> + >> + report_prefix_push("Format 0"); >> + >> + mb0 = alloc_io_mem(sizeof(struct measurement_block_format0), 0); >> + if (!mb0) { >> + report_abort("measurement_block_format0 allocation failed"); >> + goto end; >> + } >> + >> + schm(NULL, 0); /* Clear previous MB address */ > > I think it would be better to clean out the mb after a particular test > has run, so that the following tests can start with a clean slate. The allocation includes zeroing the memory. and I do a memset(mb, 0...) after the failed test. Is there something else to clear? > >> + schm(mb0, SCHM_MBU); >> >> + /* Expect error for non aligned MB */ >> + report_prefix_push("Unaligned MB index"); >> + report_xfail(start_measure(0, 0x01, false), mb0->ssch_rsch_count != 0, >> + "SSCH measured %d", mb0->ssch_rsch_count); >> + report_prefix_pop(); >> + >> + memset(mb0, 0, sizeof(*mb0)); >> + >> + /* Expect success */ >> + report_prefix_push("Valid MB address and index"); >> + report(start_measure(0, 0, false) && >> + mb0->ssch_rsch_count == SCHM_UPDATE_CNT, >> + "SSCH measured %d", mb0->ssch_rsch_count); >> + report_prefix_pop(); >> + >> + free_io_mem(mb0, sizeof(struct measurement_block_format0)); > > Before you free the memory, you really need to stop measurements > again... even though nothing happens right now, because you're not doing > I/O after this point. Yes, it is cleaner. Thanks, pierre
diff --git a/lib/s390x/css.h b/lib/s390x/css.h index 0e3254a..5478f45 100644 --- a/lib/s390x/css.h +++ b/lib/s390x/css.h @@ -374,5 +374,19 @@ static inline void schm(void *mbo, unsigned int flags) } bool css_enable_mb(int sid, uint64_t mb, uint16_t mbi, uint16_t flg, bool fmt1); +#define SCHM_DCTM 1 /* activate Device Connection TiMe */ +#define SCHM_MBU 2 /* activate Measurement Block Update */ + +struct measurement_block_format0 { + uint16_t ssch_rsch_count; + uint16_t sample_count; + uint32_t device_connect_time; + uint32_t function_pending_time; + uint32_t device_disconnect_time; + uint32_t cu_queuing_time; + uint32_t device_active_only_time; + uint32_t device_busy_time; + uint32_t initial_cmd_resp_time; +}; #endif diff --git a/s390x/css.c b/s390x/css.c index a382235..f3fdc0c 100644 --- a/s390x/css.c +++ b/s390x/css.c @@ -189,7 +189,61 @@ static void test_schm(void) schm(NULL, SCHM_MBU); report(1,"SCHM call without address"); report_prefix_pop(); +} + +#define SCHM_UPDATE_CNT 10 +static bool start_measure(uint64_t mbo, uint16_t mbi, bool fmt1) +{ + int i; + + if (!css_enable_mb(test_device_sid, mbo, mbi, PMCW_MBUE, fmt1)) { + report(0, "Enabling measurement_block_format"); + return false; + } + + for (i = 0; i < SCHM_UPDATE_CNT; i++) { + if (!do_test_sense()) { + report(0, "Error during sense"); + return false; + } + } + + return true; +} + +static void test_schm_fmt0(void) +{ + struct measurement_block_format0 *mb0; + + report_prefix_push("Format 0"); + + mb0 = alloc_io_mem(sizeof(struct measurement_block_format0), 0); + if (!mb0) { + report_abort("measurement_block_format0 allocation failed"); + goto end; + } + + schm(NULL, 0); /* Clear previous MB address */ + schm(mb0, SCHM_MBU); + /* Expect error for non aligned MB */ + report_prefix_push("Unaligned MB index"); + report_xfail(start_measure(0, 0x01, false), mb0->ssch_rsch_count != 0, + "SSCH measured %d", mb0->ssch_rsch_count); + report_prefix_pop(); + + memset(mb0, 0, sizeof(*mb0)); + + /* Expect success */ + report_prefix_push("Valid MB address and index"); + report(start_measure(0, 0, false) && + mb0->ssch_rsch_count == SCHM_UPDATE_CNT, + "SSCH measured %d", mb0->ssch_rsch_count); + report_prefix_pop(); + + free_io_mem(mb0, sizeof(struct measurement_block_format0)); +end: + report_prefix_pop(); } static struct { @@ -202,6 +256,7 @@ static struct { { "enable (msch)", test_enable }, { "sense (ssch/tsch)", test_sense }, { "measurement block (schm)", test_schm }, + { "measurement block format0", test_schm_fmt0 }, { NULL, NULL } };
We tests the update of the mesurement block format 0, the mesurement block origin is calculated from the mbo argument used by the SCHM instruction and the offset calculated using the measurement block index of the SCHIB. Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- lib/s390x/css.h | 14 +++++++++++++ s390x/css.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+)