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 C5DD7C43334 for ; Fri, 22 Jul 2022 07:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234592AbiGVHU1 (ORCPT ); Fri, 22 Jul 2022 03:20:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234403AbiGVHUS (ORCPT ); Fri, 22 Jul 2022 03:20:18 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C61DF5F78 for ; Fri, 22 Jul 2022 00:20:12 -0700 (PDT) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26M6na9d009561 for ; Fri, 22 Jul 2022 07:20:12 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=+GyD/D+k+vGAMO4AUbEBx9bJAmH08TSt0jTaYdbUgNg=; b=WrEBPgHgEQz0jaMtjINrq4lWWtWynivA8mLxgGv7Ty95aTbdwnG4bvXrMa7G1uvn/+4i PalbqGgQQ3f7apJAoycLBRLjenSHJVBErKQnXNOVLMjnayH31rqTtDuAkRrgsh6GILrw SnPwCKFRaCYQF74QirehCxnBJpuy/OwrZs5CkljBTdYvMBAlfg0Yrj71OxWVCNxlw2My SJsg9mFntnGhggQzMEcIjlBdB/qdymsFJtbjMQXCjQmnZ7UcQ+37WIp6rAK/ehSTLqBW nRE3YTMm0oRxMTWS0/Wd2RpXnBDLe4ok63Tn3FzR4l+YO9UbhYchN2cCEF40aazHsiPf UQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3hfpyf8k76-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 22 Jul 2022 07:20:12 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 26M75htQ010792 for ; Fri, 22 Jul 2022 07:20:11 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3hfpyf8k62-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jul 2022 07:20:11 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 26M76tfM018993; Fri, 22 Jul 2022 07:20:08 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma04ams.nl.ibm.com with ESMTP id 3hbmy8ywqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jul 2022 07:20:08 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26M7K5qW13435302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Jul 2022 07:20:05 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C47094C050; Fri, 22 Jul 2022 07:20:05 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8DFAF4C044; Fri, 22 Jul 2022 07:20:05 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 22 Jul 2022 07:20:05 +0000 (GMT) From: Nico Boehr To: kvm@vger.kernel.org Cc: frankja@linux.ibm.com, imbrenda@linux.ibm.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH v2 2/3] s390x: smp: use an array for sigp calls Date: Fri, 22 Jul 2022 09:20:03 +0200 Message-Id: <20220722072004.800792-3-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220722072004.800792-1-nrb@linux.ibm.com> References: <20220722072004.800792-1-nrb@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: uHCJPRYPc_LB9wfz6K6CX1Ra8CDASP9d X-Proofpoint-GUID: JO9UVoliole2xxMhuSwB9JfihbJ0MaRo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_28,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 suspectscore=0 mlxscore=0 malwarescore=0 phishscore=0 spamscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 mlxlogscore=861 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207220029 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Tests for the SIGP calls are quite similar, so we have a lot of code duplication right now. Since upcoming changes will add more cases, refactor the code to iterate over an array, similarily as we already do for test_invalid(). The receiving CPU is disabled for IO interrupts. This makes sure the conditional emergency signal is accepted and doesn't hurt the other orders. Signed-off-by: Nico Boehr --- s390x/smp.c | 127 +++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 82 deletions(-) diff --git a/s390x/smp.c b/s390x/smp.c index 34ae91c3fe12..683b0e618a48 100644 --- a/s390x/smp.c +++ b/s390x/smp.c @@ -43,6 +43,20 @@ static const struct sigp_invalid_cases cases_valid_cpu_addr[] = { static uint32_t cpu1_prefix; +struct sigp_call_cases { + char name[20]; + int call; + uint16_t ext_int_expected_type; + uint32_t cr0_bit; + bool supports_pv; +}; +static const struct sigp_call_cases cases_sigp_call[] = { + { "emcall", SIGP_EMERGENCY_SIGNAL, 0x1201, CTL0_EMERGENCY_SIGNAL, true }, + { "cond emcall", SIGP_COND_EMERGENCY_SIGNAL, 0x1201, CTL0_EMERGENCY_SIGNAL, false }, + { "ecall", SIGP_EXTERNAL_CALL, 0x1202, CTL0_EXTERNAL_CALL, true }, +}; +static const struct sigp_call_cases *current_sigp_call_case; + static void test_invalid(void) { const struct sigp_invalid_cases *c; @@ -289,97 +303,48 @@ static void test_set_prefix(void) } -static void ecall(void) +static void call_received(void) { expect_ext_int(); - ctl_set_bit(0, CTL0_EXTERNAL_CALL); - psw_mask_set_bits(PSW_MASK_EXT); - set_flag(1); - while (lowcore.ext_int_code != 0x1202) { mb(); } - report_pass("received"); - set_flag(1); -} - -static void test_ecall(void) -{ - struct psw psw; - psw.mask = extract_psw_mask(); - psw.addr = (unsigned long)ecall; - - report_prefix_push("ecall"); - set_flag(0); - - smp_cpu_start(1, psw); - wait_for_flag(); - set_flag(0); - smp_sigp(1, SIGP_EXTERNAL_CALL, 0, NULL); - wait_for_flag(); - smp_cpu_stop(1); - report_prefix_pop(); -} + ctl_set_bit(0, current_sigp_call_case->cr0_bit); + /* make sure conditional emergency is accepted by disabling IO interrupts */ + psw_mask_clear_and_set_bits(PSW_MASK_IO, PSW_MASK_EXT); -static void emcall(void) -{ - expect_ext_int(); - ctl_set_bit(0, CTL0_EMERGENCY_SIGNAL); - psw_mask_set_bits(PSW_MASK_EXT); set_flag(1); - while (lowcore.ext_int_code != 0x1201) { mb(); } + while (lowcore.ext_int_code != current_sigp_call_case->ext_int_expected_type) + mb(); report_pass("received"); + ctl_clear_bit(0, current_sigp_call_case->cr0_bit); set_flag(1); } -static void test_emcall(void) +static void test_calls(void) { + int i; struct psw psw; - psw.mask = extract_psw_mask(); - psw.addr = (unsigned long)emcall; - - report_prefix_push("emcall"); - set_flag(0); - - smp_cpu_start(1, psw); - wait_for_flag(); - set_flag(0); - smp_sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL); - wait_for_flag(); - smp_cpu_stop(1); - - report_prefix_pop(); -} - -static void test_cond_emcall(void) -{ - uint32_t status = 0; - struct psw psw; - int cc; - psw.mask = extract_psw_mask() & ~PSW_MASK_IO; - psw.addr = (unsigned long)emcall; - report_prefix_push("conditional emergency call"); - - if (uv_os_is_guest()) { - report_skip("unsupported under PV"); - goto out; + for (i = 0; i < ARRAY_SIZE(cases_sigp_call); i++) { + current_sigp_call_case = &cases_sigp_call[i]; + + report_prefix_push(current_sigp_call_case->name); + if (!current_sigp_call_case->supports_pv && uv_os_is_guest()) { + report_skip("Not supported under PV"); + report_prefix_pop(); + continue; + } + + set_flag(0); + psw.mask = extract_psw_mask(); + psw.addr = (unsigned long)call_received; + + smp_cpu_start(1, psw); + wait_for_flag(); + set_flag(0); + smp_sigp(1, current_sigp_call_case->call, 0, NULL); + wait_for_flag(); + smp_cpu_stop(1); + report_prefix_pop(); } - - report_prefix_push("success"); - set_flag(0); - - smp_cpu_start(1, psw); - wait_for_flag(); - set_flag(0); - cc = smp_sigp(1, SIGP_COND_EMERGENCY_SIGNAL, 0, &status); - report(!cc, "CC = 0"); - - wait_for_flag(); - smp_cpu_stop(1); - - report_prefix_pop(); - -out: - report_prefix_pop(); - } static void test_sense_running(void) @@ -499,9 +464,7 @@ int main(void) test_stop_store_status(); test_store_status(); test_set_prefix(); - test_ecall(); - test_emcall(); - test_cond_emcall(); + test_calls(); test_sense_running(); test_reset(); test_reset_initial(); -- 2.36.1