Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp4502406rwo; Tue, 25 Jul 2023 07:05:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhCcv+oHvkNIo/7nW8JXWGZnffaylupKDB3hO/hXOGnj0MqpiLTm5aco2YZ+3u5XGUkUIP X-Received: by 2002:a05:6a00:9a1:b0:668:9bf9:fa70 with SMTP id u33-20020a056a0009a100b006689bf9fa70mr10297043pfg.34.1690293924329; Tue, 25 Jul 2023 07:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690293924; cv=none; d=google.com; s=arc-20160816; b=lWoO4ogqhl3bVYR4sXyhRBnLPaeFBA+JTyhN1BQymnSFAwPpXCiJpbQxyBHkjHyPe+ 47C7NVxse5i2oXEIqnyCmqE/Bby/Jf5pW5LzCiqPzpFaGkLnUpzwi7V3Rviln3NTnPAt G4sTgbUO7SLzVEGgTxFPkOgGv2kROzD3xkVERc2PXz12bFsLNREYkaJqnPtgnmfCsBgP 6jxfZruK+TiG2/9P8iGMRviMyd8sgsdF+uVNdxknEX7DNriNJZnCBLDLAn0ckC40aP8w tyG5VKeDc2rHoiRVEAmiQugVvwUSRs3JroaJrnFVJWZSgKQw3ilaRKO4Tf5LYFDE77cH RYlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date:dkim-signature; bh=78rMFBFyiuc9LBSHU36B7CLJjjtRu8K9aWsYFWMdRfg=; fh=GFqkZo5+Mo/rIt9Y7PRUjp7CCLtLdQavfsNVirE1OYI=; b=ksSUn3cYelQsNyRYsOaCBH2M3TEkB6oBTAEwI0+QYKh+b4L4mlnPV4fUzTLmfQ8JtA OrSgAWIAikFr2zeHskwgmAonYNKHhvZIgD8BEU26UzbmAyHU0kiup4VcnxT3BmMZTfbd sEQXngNbe+fuPvkxiJw48YGyKc5aTrJqgL90OO/pC40qdOsxf6sFIwU/W3fSUXz0dvx1 UQ0RRcNjhPgg9mkA2z4Oui/1B2/ip0wZQ1/TgIw3ufyYroUxz6FMfP21NmktEfaFOGne SpjOvNkR1UEddGQnUEkGrDOnrb/p2tKLvEqCIRDcgMRXBrSZrlBqi3DHyC8ACKajPTWr NQVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=lNnxsdr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020a639853000000b005533647f7c5si11544567pgo.420.2023.07.25.07.05.09; Tue, 25 Jul 2023 07:05:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=lNnxsdr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231864AbjGYNxu (ORCPT + 99 others); Tue, 25 Jul 2023 09:53:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231768AbjGYNxo (ORCPT ); Tue, 25 Jul 2023 09:53:44 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68E7A1FCB; Tue, 25 Jul 2023 06:53:42 -0700 (PDT) Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36PDjmeY026957; Tue, 25 Jul 2023 13:53:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=78rMFBFyiuc9LBSHU36B7CLJjjtRu8K9aWsYFWMdRfg=; b=lNnxsdr6oDMuO3yScGlcxdCuIjUEZnBhe1CAOXy54FnjkGxEpW0cTm9+6coLlWajM7S9 /XKA8Hhur0NJrn8ZkxBmHiegiUkeMxnI4WzscKcYXXWi5mN4eUlgLB4KMHI6L4ocTJ8o EPVs8r1B4l21ZGSZJaquBVsdcDsj+rkp8jujpjvko5LdhseStnfa6kb2RyHhpRP2cC7x X7AMnX7xJGaUDcBG1p81aWP783ebW8g7G9epiun3ogsdO4IpYTdSCZEUl7hFKT4GTHx6 cjTYQnxmMYD92IVpajqFcwJTltIqFcvI/NJ24rwe872G9mlM9CDOIyHPsD2BJE5LkaJc 9A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s2cgxwhxt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jul 2023 13:53:41 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36PDmqil010451; Tue, 25 Jul 2023 13:53:41 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s2cgxwhxf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jul 2023 13:53:41 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36PBWEFU002375; Tue, 25 Jul 2023 13:53:40 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3s0txjv8ef-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jul 2023 13:53:39 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36PDrae824838694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Jul 2023 13:53:36 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B581C20043; Tue, 25 Jul 2023 13:53:36 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6925520049; Tue, 25 Jul 2023 13:53:36 +0000 (GMT) Received: from p-imbrenda (unknown [9.152.224.66]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 25 Jul 2023 13:53:36 +0000 (GMT) Date: Tue, 25 Jul 2023 15:53:25 +0200 From: Claudio Imbrenda To: Ilya Leoshkevich Cc: Christian Borntraeger , Janosch Frank , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , David Hildenbrand , Sven Schnelle , kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Freimann Subject: Re: [PATCH v3 6/6] KVM: s390: selftests: Add selftest for single-stepping Message-ID: <20230725155325.513ee076@p-imbrenda> In-Reply-To: <20230724094716.91510-7-iii@linux.ibm.com> References: <20230724094716.91510-1-iii@linux.ibm.com> <20230724094716.91510-7-iii@linux.ibm.com> Organization: IBM X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: aFFbTVgWxVqwkJrH4TD0hfV8YyRmFNDz X-Proofpoint-ORIG-GUID: TCaJJjIXbbN5zi9BcLZhqr3f7V3PWWWh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-25_08,2023-07-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 phishscore=0 bulkscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307250119 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 24 Jul 2023 11:44:12 +0200 Ilya Leoshkevich wrote: > Test different variations of single-stepping into interrupts: > > - SVC and PGM interrupts; > - Interrupts generated by ISKE; > - Interrupts generated by instructions emulated by KVM; > - Interrupts generated by instructions emulated by userspace. thank you for writing this selftest! > > Signed-off-by: Ilya Leoshkevich Reviewed-by: Claudio Imbrenda > --- > tools/testing/selftests/kvm/Makefile | 1 + > .../testing/selftests/kvm/s390x/debug_test.c | 160 ++++++++++++++++++ > 2 files changed, 161 insertions(+) > create mode 100644 tools/testing/selftests/kvm/s390x/debug_test.c > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > index c692cc86e7da..f3306eaa7031 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -166,6 +166,7 @@ TEST_GEN_PROGS_s390x += s390x/resets > TEST_GEN_PROGS_s390x += s390x/sync_regs_test > TEST_GEN_PROGS_s390x += s390x/tprot > TEST_GEN_PROGS_s390x += s390x/cmma_test > +TEST_GEN_PROGS_s390x += s390x/debug_test > TEST_GEN_PROGS_s390x += demand_paging_test > TEST_GEN_PROGS_s390x += dirty_log_test > TEST_GEN_PROGS_s390x += kvm_create_max_vcpus > diff --git a/tools/testing/selftests/kvm/s390x/debug_test.c b/tools/testing/selftests/kvm/s390x/debug_test.c > new file mode 100644 > index 000000000000..a8fa9fe93b3c > --- /dev/null > +++ b/tools/testing/selftests/kvm/s390x/debug_test.c > @@ -0,0 +1,160 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* Test KVM debugging features. */ > +#include "kvm_util.h" > +#include "test_util.h" > + > +#include > + > +#define __LC_SVC_NEW_PSW 0x1c0 > +#define __LC_PGM_NEW_PSW 0x1d0 > +#define ICPT_INSTRUCTION 0x04 > +#define IPA0_DIAG 0x8300 > +#define PGM_SPECIFICATION 0x06 > + > +/* Common code for testing single-stepping interruptions. */ > +extern char int_handler[]; > +asm("int_handler:\n" > + "j .\n"); > + > +static struct kvm_vm *test_step_int_1(struct kvm_vcpu **vcpu, void *guest_code, > + size_t new_psw_off, uint64_t *new_psw) > +{ > + struct kvm_guest_debug debug = {}; > + struct kvm_regs regs; > + struct kvm_vm *vm; > + char *lowcore; > + > + vm = vm_create_with_one_vcpu(vcpu, guest_code); > + lowcore = addr_gpa2hva(vm, 0); > + new_psw[0] = (*vcpu)->run->psw_mask; > + new_psw[1] = (uint64_t)int_handler; > + memcpy(lowcore + new_psw_off, new_psw, 16); > + vcpu_regs_get(*vcpu, ®s); > + regs.gprs[2] = -1; > + vcpu_regs_set(*vcpu, ®s); > + debug.control = KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP; > + vcpu_guest_debug_set(*vcpu, &debug); > + vcpu_run(*vcpu); > + > + return vm; > +} > + > +static void test_step_int(void *guest_code, size_t new_psw_off) > +{ > + struct kvm_vcpu *vcpu; > + uint64_t new_psw[2]; > + struct kvm_vm *vm; > + > + vm = test_step_int_1(&vcpu, guest_code, new_psw_off, new_psw); > + TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_DEBUG); > + ASSERT_EQ(vcpu->run->psw_mask, new_psw[0]); > + ASSERT_EQ(vcpu->run->psw_addr, new_psw[1]); > + kvm_vm_free(vm); > +} > + > +/* Test single-stepping "boring" program interruptions. */ > +extern char test_step_pgm_guest_code[]; > +asm("test_step_pgm_guest_code:\n" > + ".insn rr,0x1d00,%r1,%r0 /* dr %r1,%r0 */\n" > + "j .\n"); > + > +static void test_step_pgm(void) > +{ > + test_step_int(test_step_pgm_guest_code, __LC_PGM_NEW_PSW); > +} > + > +/* > + * Test single-stepping program interruptions caused by DIAG. > + * Userspace emulation must not interfere with single-stepping. > + */ > +extern char test_step_pgm_diag_guest_code[]; > +asm("test_step_pgm_diag_guest_code:\n" > + "diag %r0,%r0,0\n" > + "j .\n"); > + > +static void test_step_pgm_diag(void) > +{ > + struct kvm_s390_irq irq = { > + .type = KVM_S390_PROGRAM_INT, > + .u.pgm.code = PGM_SPECIFICATION, > + }; > + struct kvm_vcpu *vcpu; > + uint64_t new_psw[2]; > + struct kvm_vm *vm; > + > + vm = test_step_int_1(&vcpu, test_step_pgm_diag_guest_code, > + __LC_PGM_NEW_PSW, new_psw); > + TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC); > + ASSERT_EQ(vcpu->run->s390_sieic.icptcode, ICPT_INSTRUCTION); > + ASSERT_EQ(vcpu->run->s390_sieic.ipa & 0xff00, IPA0_DIAG); > + vcpu_ioctl(vcpu, KVM_S390_IRQ, &irq); > + vcpu_run(vcpu); > + TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_DEBUG); > + ASSERT_EQ(vcpu->run->psw_mask, new_psw[0]); > + ASSERT_EQ(vcpu->run->psw_addr, new_psw[1]); > + kvm_vm_free(vm); > +} > + > +/* > + * Test single-stepping program interruptions caused by ISKE. > + * CPUSTAT_KSS handling must not interfere with single-stepping. > + */ > +extern char test_step_pgm_iske_guest_code[]; > +asm("test_step_pgm_iske_guest_code:\n" > + "iske %r2,%r2\n" > + "j .\n"); > + > +static void test_step_pgm_iske(void) > +{ > + test_step_int(test_step_pgm_iske_guest_code, __LC_PGM_NEW_PSW); > +} > + > +/* > + * Test single-stepping program interruptions caused by LCTL. > + * KVM emulation must not interfere with single-stepping. > + */ > +extern char test_step_pgm_lctl_guest_code[]; > +asm("test_step_pgm_lctl_guest_code:\n" > + "lctl %c0,%c0,1\n" > + "j .\n"); > + > +static void test_step_pgm_lctl(void) > +{ > + test_step_int(test_step_pgm_lctl_guest_code, __LC_PGM_NEW_PSW); > +} > + > +/* Test single-stepping supervisor-call interruptions. */ > +extern char test_step_svc_guest_code[]; > +asm("test_step_svc_guest_code:\n" > + "svc 0\n" > + "j .\n"); > + > +static void test_step_svc(void) > +{ > + test_step_int(test_step_svc_guest_code, __LC_SVC_NEW_PSW); > +} > + > +/* Run all tests above. */ > +static struct testdef { > + const char *name; > + void (*test)(void); > +} testlist[] = { > + { "single-step pgm", test_step_pgm }, > + { "single-step pgm caused by diag", test_step_pgm_diag }, > + { "single-step pgm caused by iske", test_step_pgm_iske }, > + { "single-step pgm caused by lctl", test_step_pgm_lctl }, > + { "single-step svc", test_step_svc }, > +}; > + > +int main(int argc, char *argv[]) > +{ > + int idx; > + > + ksft_print_header(); > + ksft_set_plan(ARRAY_SIZE(testlist)); > + for (idx = 0; idx < ARRAY_SIZE(testlist); idx++) { > + testlist[idx].test(); > + ksft_test_result_pass("%s\n", testlist[idx].name); > + } > + ksft_finished(); > +}