Re: [kvm-unit-tests PATCH v1 3/5] s390x: css: implementing Set CHannel Monitor

Cornelia Huck
2021-02-02T11:50:10Z

On Fri, 29 Jan 2021 15:34:27 +0100
Pierre Morel <pmorel@linux.ibm.com> wrote:

> We implement the call of the Set CHannel Monitor instruction,
> starting the monitoring of the all Channel Sub System, and

"initializing channel subsystem monitoring" ?

> the initialization of the monitoring on a Sub Channel.

"enabling monitoring for a subchannel" ?

>
> An initial test reports the presence of the extended measurement
> block feature.
>
> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> ---
> lib/s390x/css.h | 17 +++++++++-
> lib/s390x/css_lib.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
> s390x/css.c | 7 +++++
> 3 files changed, 100 insertions(+), 1 deletion(-)
>

(...)

> diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c
> index f300969..9e0f568 100644
> --- a/lib/s390x/css_lib.c
> +++ b/lib/s390x/css_lib.c
> @@ -205,6 +205,83 @@ retry:
> return -1;
> }
>
> +/*
> + * css_enable_mb: enable the subchannel Mesurement Block
> + * @schid: Subchannel Identifier
> + * @mb : 64bit address of the measurement block
> + * @format1: set if format 1 is to be used
> + * @mbi : the measurement block offset
> + * @flags : PMCW_MBUE to enable measurement block update
> + * PMCW_DCTME to enable device connect time
> + * Return value:
> + * On success: 0
> + * On error the CC of the faulty instruction
> + * or -1 if the retry count is exceeded.
> + */
> +int css_enable_mb(int schid, uint64_t mb, int format1, uint16_t mbi,
> + uint16_t flags)
> +{
> + struct pmcw *pmcw = &schib.pmcw;
> + int retry_count = 0;
> + int cc;
> +
> + /* Read the SCHIB for this subchannel */
> + cc = stsch(schid, &schib);
> + if (cc) {
> + report_info("stsch: sch %08x failed with cc=%d", schid, cc);
> + return cc;
> + }
> +
> +retry:
> + /* Update the SCHIB to enable the measurement block */
> + pmcw->flags |= flags;
> +
> + if (format1)
> + pmcw->flags2 |= PMCW_MBF1;
> + else
> + pmcw->flags2 &= ~PMCW_MBF1;
> +
> + pmcw->mbi = mbi;
> + schib.mbo = mb;
> +
> + /* Tell the CSS we want to modify the subchannel */
> + cc = msch(schid, &schib);

Setting some invalid flags for measurements in the schib could lead to
an operand exception. Do we want to rely on the caller always getting
it right, or should we add handling for those invalid flags? (Might
also make a nice test case.)

> + if (cc) {
> + /*
> + * If the subchannel is status pending or
> + * if a function is in progress,
> + * we consider both cases as errors.
> + */
> + report_info("msch: sch %08x failed with cc=%d", schid, cc);
> + return cc;
> + }
> +
> + /*
> + * Read the SCHIB again to verify the measurement block origin
> + */
> + cc = stsch(schid, &schib);
> + if (cc) {
> + report_info("stsch: updating sch %08x failed with cc=%d",
> + schid, cc);
> + return cc;
> + }
> +
> + if (schib.mbo == mb) {
> + report_info("stsch: sch %08x successfully modified after %d retries",
> + schid, retry_count);
> + return 0;
> + }
> +
> + if (retry_count++ < MAX_ENABLE_RETRIES) {
> + mdelay(10); /* the hardware was not ready, give it some time */
> + goto retry;
> + }
> +
> + report_info("msch: modifying sch %08x failed after %d retries. pmcw flags: %04x",
> + schid, retry_count, pmcw->flags);
> + return -1;
> +}
> +
> static struct irb irb;
>
> void css_irq_io(void)

(...)