From patchwork Fri Apr 1 11:16:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 12798165 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 C37ADC433FE for ; Fri, 1 Apr 2022 11:16:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345396AbiDALSm (ORCPT ); Fri, 1 Apr 2022 07:18:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239869AbiDALSZ (ORCPT ); Fri, 1 Apr 2022 07:18:25 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69120184608 for ; Fri, 1 Apr 2022 04:16:36 -0700 (PDT) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 231Ag4n2011753 for ; Fri, 1 Apr 2022 11:16:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=32/y951/ywGbPycWn/v0dvl70JvxYh0PFLP0C5aGyKg=; b=Ygw0320XAOvuL6XWRgeGKdFYBXqB+XG55nOJlBk8zxSoMYcWTr3gy+vlXJto1ol0kO4K WXN7XfmlPE6UGqQTuel4ZEi32FMuqlIegTJjcdxe4snmFd4/CbBGlU7Sd1oRccEYaduQ EEsy/V/TSD6XDDQUEirJCcxT0S52xDJ+XJQUtXXvilgi6+tP3+KZkC6p/m3ePkYVAThQ PIMEW9SuzevXHu1wwIOiS7OOVp/32A6Oy0dfH6mPK8WegguUQsJDoyhxfFQBhXUq9vDD CE2vF6NWPddsNKfDmyc4g3gTX/HXWM/e9wAK5kxA8uSwOYGP8AXbiyStW9NEcIv8ws4W VQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f5yv50mr0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 01 Apr 2022 11:16:35 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 231B7QT8005746 for ; Fri, 1 Apr 2022 11:16:35 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f5yv50mq6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Apr 2022 11:16:35 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 231B87Cf013029; Fri, 1 Apr 2022 11:16:33 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03ams.nl.ibm.com with ESMTP id 3f1tf9mv0g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Apr 2022 11:16:33 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 231BGUkh33096190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Apr 2022 11:16:30 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F395B4C06E; Fri, 1 Apr 2022 11:16:29 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 95DEF4C063; Fri, 1 Apr 2022 11:16:29 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.3.73]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 1 Apr 2022 11:16:29 +0000 (GMT) From: Claudio Imbrenda To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, thuth@redhat.com, Nico Boehr , Pierre Morel Subject: [kvm-unit-tests GIT PULL 10/27] s390x: Add tests for STCRW Date: Fri, 1 Apr 2022 13:16:03 +0200 Message-Id: <20220401111620.366435-11-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401111620.366435-1-imbrenda@linux.ibm.com> References: <20220401111620.366435-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Nmh9wG4WtLlXq0cTuXlmyVCoQAxbwxV_ X-Proofpoint-GUID: PDwyfu2V0ZehCn-p3H87LOzAZjZwv3vn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-04-01_03,2022-03-31_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 phishscore=0 mlxlogscore=983 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204010050 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Nico Boehr The test consists of two parts: First a simple check to ensure we enforce an aligned address. We test misalignment by 1 and 2 bytes. The second part tests the handling of pending Channel Reports (CR). We first assume no CR is initally pending and check STCRW returns accordingly. Then, we generate a CR by resetting a Channel Path using RCHP and make sure this results in exactly one CRW being generated which has a Reporting-Source Code (RSC) corresponding to the Channel Path facility. Signed-off-by: Nico Boehr Reviewed-by: Claudio Imbrenda Reviewed-by: Pierre Morel Signed-off-by: Claudio Imbrenda --- lib/s390x/css.h | 17 ++++++++++ lib/s390x/css_lib.c | 60 +++++++++++++++++++++++++++++++++ s390x/css.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) diff --git a/lib/s390x/css.h b/lib/s390x/css.h index 0db8a281..a6a68577 100644 --- a/lib/s390x/css.h +++ b/lib/s390x/css.h @@ -266,6 +266,20 @@ static inline int rchp(unsigned long chpid) return cc; } +static inline int stcrw(uint32_t *crw) +{ + int cc; + + asm volatile( + " stcrw %[crw]\n" + " ipm %[cc]\n" + " srl %[cc],28" + : [cc] "=d" (cc) + : [crw] "Q" (*crw) + : "cc", "memory"); + return cc; +} + /* Debug functions */ char *dump_pmcw_flags(uint16_t f); char *dump_scsw_flags(uint32_t f); @@ -294,6 +308,9 @@ int css_residual_count(unsigned int schid); void enable_io_isc(uint8_t isc); int wait_and_check_io_completion(int schid); +int css_find_installed_chpid(int sid, uint8_t *chpid_out); +int css_generate_crw(int sid); + /* * CHSC definitions */ diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c index 80e9e078..a9f5097f 100644 --- a/lib/s390x/css_lib.c +++ b/lib/s390x/css_lib.c @@ -504,3 +504,63 @@ void enable_io_isc(uint8_t isc) value = (uint64_t)isc << 24; lctlg(6, value); } + +static int is_path_installed(struct schib *schib, int chp_idx) +{ + return schib->pmcw.pim & BIT(7 - chp_idx); +} + +/* + * css_find_installed_chpid: find any installed CHPID + * @sid: subsystem-identification word + * @chpid_out: store the found chpid here, left alone if none found + * + * returns 0 on success, -1 if no chpid found any other value + * indicates the condition code of a failing STSCH instruction + */ +int css_find_installed_chpid(int sid, uint8_t *chpid_out) +{ + int cc; + + cc = stsch(sid, &schib); + if (cc) { + report_fail("%s: sch %08x failed with cc=%d", __func__, sid, cc); + return cc; + } + + for (int i = 0; i < ARRAY_SIZE(schib.pmcw.chpid); i++) { + if (is_path_installed(&schib, i)) { + *chpid_out = schib.pmcw.chpid[i]; + return 0; + } + } + + return -1; +} + +/* + * css_generate_crw: Generate a CRW by issuing RCHP on any channel path + * @sid: subsystem-identification word + * + * returns 0 when a CRW was generated, -1 if no chpid found. + */ +int css_generate_crw(int sid) +{ + int ret, cc; + uint8_t chpid; + + report_prefix_push("Generate CRW"); + + ret = css_find_installed_chpid(sid, &chpid); + if (ret) { + report_fail("No CHPID found: ret=%d", ret); + return -1; + } + + cc = rchp(chpid); + report(!cc, "rhcp cc != 0"); + + report_prefix_pop(); + + return 0; +} diff --git a/s390x/css.c b/s390x/css.c index 396007ed..fcc264ee 100644 --- a/s390x/css.c +++ b/s390x/css.c @@ -388,6 +388,87 @@ static void test_msch(void) schib.pmcw.flags = old_pmcw_flags; } +static void check_stcrw_no_crw_available(void) +{ + uint32_t crw = 0xfeedc0fe; + int cc; + + report_prefix_push("No CRW available"); + cc = stcrw(&crw); + report(cc == 1, "cc == 1"); + report(!crw, "stored zeroes in crw"); + report_prefix_pop(); +} + +static int check_stcrw_crw_available(void) +{ + const uint32_t magic = 0xfeedc0fe; + uint32_t crw = magic; + int cc; + + report_prefix_push("CRW available"); + cc = stcrw(&crw); + report(!cc, "cc is zero"); + report(crw != magic, "stored crw"); + report_prefix_pop(); + + return crw; +} + +static uint32_t crw_get_rsc(uint32_t crw) +{ + const int rsc_begin = 4; + const int rsc_end = 8; + + return (crw & GENMASK(31 - rsc_begin, 31 - rsc_end)) >> 24; +} + +#define CRW_RSC_CHP 4 +static void test_stcrw(void) +{ + const int align_to = 4; + int res; + uint32_t crw; + + 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(); + stcrw((uint32_t *)(alignment_test_page + i)); + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); + + report_prefix_pop(); + } + report_prefix_pop(); + + report_prefix_push("No CRW available initally"); + check_stcrw_no_crw_available(); + report_prefix_pop(); + + res = css_generate_crw(test_device_sid); + if (res) { + report_skip("Couldn't generate CRW"); + report_prefix_pop(); + return; + } + + crw = check_stcrw_crw_available(); + + report_prefix_push("CRW available"); + report(crw_get_rsc(crw) == CRW_RSC_CHP, "CRW has Channel Path RSC"); + report_prefix_pop(); + + report_prefix_push("No more CRWs pending"); + check_stcrw_no_crw_available(); + report_prefix_pop(); +} + static struct { const char *name; void (*func)(void); @@ -401,6 +482,7 @@ static struct { { "measurement block format0", test_schm_fmt0 }, { "measurement block format1", test_schm_fmt1 }, { "msch", test_msch }, + { "stcrw", test_stcrw }, { NULL, NULL } };