From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F30D5C433EF for ; Thu, 24 Feb 2022 18:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232575AbiBXSfZ (ORCPT ); Thu, 24 Feb 2022 13:35:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbiBXSfW (ORCPT ); Thu, 24 Feb 2022 13:35:22 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B92F1D8A8F; Thu, 24 Feb 2022 10:34:52 -0800 (PST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21OHkgX0015206; Thu, 24 Feb 2022 18:34:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=K1EAjOc8FBDsEW4Z+j0vCmn2BW1iwdYfzJMUOkMyUWs=; b=BXSgq5AbM5VQ5l664OvZpU8YM2wDA+TPecQn5rswYHPOPbmuP126Fbgj+OFi/PME0Jn5 H9a3npxIj9f1tKN3KS1iuD99Ysdymq2q/0WGO3gTPbZo5ji8a70YaLZpwgMcUacgs0gh ROFlQaTgkA1xMoNaa0kslApUzShsNW1WJvSqxFMq8/LI5UZoxfSYmb3PuPiYNPMYj0I7 jjptRr8/efUaYt2butIiIOVgHYH54762RbUkVmeBa/mtn+W38oJTDfkSHr7WlrD2gsxX P+OYms1IjV+5uyVdYkyB28+hsyP04V8N3Whu/Uv1kuj000ZEv8BMzqHM4m7E3yXm1u51 6A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3edw51q7he-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 24 Feb 2022 18:34:51 +0000 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21OIWu9k006747; Thu, 24 Feb 2022 18:34:50 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 3edw51q7gy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 24 Feb 2022 18:34:50 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21OIJPVh005524; Thu, 24 Feb 2022 18:34:48 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03fra.de.ibm.com with ESMTP id 3ear69hpha-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 24 Feb 2022 18:34:48 +0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21OIYj2q51118432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Feb 2022 18:34:45 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 59567AE04D; Thu, 24 Feb 2022 18:34:45 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 01816AE056; Thu, 24 Feb 2022 18:34:45 +0000 (GMT) Received: from [9.171.25.98] (unknown [9.171.25.98]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 24 Feb 2022 18:34:44 +0000 (GMT) Message-ID: Date: Thu, 24 Feb 2022 19:37:05 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [kvm-unit-tests PATCH v4 6/8] s390x: Add more tests for STSCH Content-Language: en-US To: Nico Boehr , kvm@vger.kernel.org, linux-s390@vger.kernel.org Cc: frankja@linux.ibm.com, imbrenda@linux.ibm.com, thuth@redhat.com, david@redhat.com References: <20220224154336.3459839-1-nrb@linux.ibm.com> <20220224154336.3459839-7-nrb@linux.ibm.com> From: Pierre Morel In-Reply-To: <20220224154336.3459839-7-nrb@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: iPj1EtCvNMu5sTuSK9ne4W8CimwQ2nDl X-Proofpoint-ORIG-GUID: cWYpvwrramPdpnjuPB94_1ufVPHs9eqr Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-02-24_04,2022-02-24_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 suspectscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 malwarescore=0 phishscore=0 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202240102 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 2/24/22 16:43, Nico Boehr wrote: > css_lib extensively uses STSCH, but two more cases deserve their own > tests: > > - unaligned address for SCHIB. We check for misalignment by 1 and 2 > bytes. > - channel not operational > - bit 47 in SID not set > - bit 5 of PMCW flags. > As per the principles of operation, bit 5 of the PMCW flags shall be > ignored by msch and always stored as zero by stsch. > > Older QEMU versions require this bit to always be zero on msch, > which is why this test may fail. A fix is available in QEMU master > commit 2df59b73e086 ("s390x/css: fix PMCW invalid mask"). > > Here's the QEMU PMCW invalid mask fix: https://lists.nongnu.org/archive/html/qemu-s390x/2021-12/msg00100.html > > Signed-off-by: Nico Boehr > Reviewed-by: Claudio Imbrenda I thought I already gave my R-B for some time. You can do the checks for the MSS and so on in a future patch. Reviewed-by: Pierre Morel > --- > s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 82 insertions(+) > > diff --git a/s390x/css.c b/s390x/css.c > index 7fe5283c41d0..dd84e670ce99 100644 > --- a/s390x/css.c > +++ b/s390x/css.c > @@ -501,6 +501,86 @@ static void test_ssch(void) > report_prefix_pop(); > } > > +static void test_stsch(void) > +{ > + const int align_to = 4; > + struct schib schib; > + int cc; > + > + if (!test_device_sid) { > + report_skip("No device"); > + return; > + } > + > + report_prefix_push("Unaligned"); > + for (int i = 1; i < align_to; i *= 2) { > + report_prefix_pushf("%d", i); > + > + expect_pgm_int(); > + stsch(test_device_sid, (struct schib *)(alignment_test_page + i)); > + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); > + > + report_prefix_pop(); > + } > + report_prefix_pop(); > + > + report_prefix_push("Invalid subchannel number"); > + cc = stsch(0x0001ffff, &schib); > + report(cc == 3, "Channel not operational"); > + report_prefix_pop(); > + > + /* > + * No matter if multiple-subchannel-set facility is installed, bit 47 > + * always needs to be 1. > + */ > + report_prefix_push("Bit 47 in SID is zero"); > + expect_pgm_int(); > + stsch(0x0000ffff, &schib); > + check_pgm_int_code(PGM_INT_CODE_OPERAND); > + report_prefix_pop(); > +} > + > +/* > + * According to architecture MSCH does ignore bit 5 of the second word > + * but STSCH will store bit 5 as zero. > + */ > +static void test_pmcw_bit5(void) > +{ > + int cc; > + uint16_t old_pmcw_flags; > + > + cc = stsch(test_device_sid, &schib); > + if (cc) { > + report_fail("stsch: sch %08x failed with cc=%d", test_device_sid, cc); > + return; > + } > + old_pmcw_flags = schib.pmcw.flags; > + > + report_prefix_push("Bit 5 set"); > + > + schib.pmcw.flags = old_pmcw_flags | BIT(15 - 5); > + cc = msch(test_device_sid, &schib); > + report(!cc, "MSCH cc == 0"); > + > + cc = stsch(test_device_sid, &schib); > + report(!cc, "STSCH cc == 0"); > + report(!(schib.pmcw.flags & BIT(15 - 5)), "STSCH PMCW Bit 5 is clear"); > + > + report_prefix_pop(); > + > + report_prefix_push("Bit 5 clear"); > + > + schib.pmcw.flags = old_pmcw_flags & ~BIT(15 - 5); > + cc = msch(test_device_sid, &schib); > + report(!cc, "MSCH cc == 0"); > + > + cc = stsch(test_device_sid, &schib); > + report(!cc, "STSCH cc == 0"); > + report(!(schib.pmcw.flags & BIT(15 - 5)), "STSCH PMCW Bit 5 is clear"); > + > + report_prefix_pop(); > +} > + > static struct { > const char *name; > void (*func)(void); > @@ -516,6 +596,8 @@ static struct { > { "msch", test_msch }, > { "stcrw", test_stcrw }, > { "ssch", test_ssch }, > + { "stsch", test_stsch }, > + { "pmcw bit 5 ignored", test_pmcw_bit5 }, > { NULL, NULL } > }; > > -- Pierre Morel IBM Lab Boeblingen