From patchwork Mon Jul 24 09:44:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 124774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1702597vqg; Mon, 24 Jul 2023 03:25:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHOfJvIWj7fqnzN2TVmi3goxHkLvQLQ24cZHDSpQvZIBQEoY4SM0pb4diI2ds+LFq4q1Vg9 X-Received: by 2002:a17:902:a986:b0:1b8:64e9:e4b3 with SMTP id bh6-20020a170902a98600b001b864e9e4b3mr6623798plb.39.1690194328752; Mon, 24 Jul 2023 03:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690194328; cv=none; d=google.com; s=arc-20160816; b=NB9oTmVGrguXXj7yFE+Lu9C+Jr+sKqiiLYOp9o4eFE0Bf6Bthej7YJA3kxOzOGjj0C xEMW8HuJf3HacjAgCfK6W+um/eYqM87QuNf8ancXv73bSYmnWSfY2bQyfRAYyWcpqpKz TFL4iN3SEcZYFaEjEqvUlIytV4rbEtJgNl5N5SlY4FE6qJq89iY9IyXw8iO3LGHGga03 J2+z0zz2lgEqIb8SoMfo58lENdhvdBdod5FkbQCFntiwnE3x5+FgA8tyJJI8JuhNBz/l joRvx6I6GtyWcQ7yFBbfPB6ZUdXRWnXfRjmRpeWkP88QDH9/XthgTghDBisS2uY6hJsU WVGQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=deG51zCzcUT5GfDMqafHjpZjegCMRnUztn3S9uVudTo=; fh=gnw7XswWrGFmwFr+TRhiPvsko5dDTK5jEGn/N8bqD/Q=; b=lSEpSfBGJkEV8dqToG3UyqUeUy3gF1hkGJ97gyG86rH9KhjDKd6rWtmmVcvij8pMSI B2OmeQtrgNu6C14YSlD41XGEhLGaV/FC9lJxA+ihV2akkVEM004TSW04J02xIjihqswD OJpzZUEdSTKN4EWaq4JQX8L/PWqmgEkH5gBRAe/BQiKI2kcfcTNOLxF6CeL4GXo2mnp8 NhWn6Yln4ZKmXQ1eVxLOrZBS5e7QuLvnxP2IXgewZmeu2T8881Yj/SldGgKdYm8MBXIe 6Ubv9VM8zkIs2Re7RBf9qhLdvLzogRZQffEefdkhYiPyprJrqIN91lBuU0CkbKTSdQsU Uktg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=qr14BjVs; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j3-20020a170903028300b001baff05d890si9195069plr.313.2023.07.24.03.25.15; Mon, 24 Jul 2023 03:25:28 -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=qr14BjVs; 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 S229577AbjGXJuh (ORCPT + 99 others); Mon, 24 Jul 2023 05:50:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232026AbjGXJtp (ORCPT ); Mon, 24 Jul 2023 05:49:45 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FCFE30D0; Mon, 24 Jul 2023 02:47:52 -0700 (PDT) Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36O9gp1B016386; Mon, 24 Jul 2023 09:47:35 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=deG51zCzcUT5GfDMqafHjpZjegCMRnUztn3S9uVudTo=; b=qr14BjVsDTfvf2oAOG8kst/BFqj8fQCE0LLycElcXConYkp4RBsBeiqigALsYyB6x8KP 2mUETEi5ViqDG0+5S3b+Xrrbm3SElSLB5Yfp6wZQdtrI+yJl6fweYujh9gGC4zSRJIEz brnyca+v8ZySgB+Af108nv0JssZwvU+S9hjW4xAgze08Aa+e5Yk08tdsN3Zi1h88JgZf gKjx2PhwRs82LEqKdI0OL3TikqNvrHS6Z4VQcVmS24Zv3qf0GsU6CUo+VAVcC0LBwzzw jSkA7/iUn/XFLgv6cfiX8jF0QCL9TSMOjrJm0JJu6OTNK078Ccq2UbSIRmPfn22DAojb +A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1pwg83ub-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:35 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36O9hqug020132; Mon, 24 Jul 2023 09:47:35 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1pwg83ty-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:34 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36O8eCou002068; Mon, 24 Jul 2023 09:47:33 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3s0temj1f7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:33 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36O9lUZc44695868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Jul 2023 09:47:30 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 855E320043; Mon, 24 Jul 2023 09:47:30 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC2C120049; Mon, 24 Jul 2023 09:47:29 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.11.212]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 24 Jul 2023 09:47:29 +0000 (GMT) From: Ilya Leoshkevich To: Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Alexander Gordeev Cc: David Hildenbrand , Sven Schnelle , kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Freimann , Ilya Leoshkevich Subject: [PATCH v3 3/6] KVM: s390: interrupt: Fix single-stepping kernel-emulated instructions Date: Mon, 24 Jul 2023 11:44:09 +0200 Message-ID: <20230724094716.91510-4-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724094716.91510-1-iii@linux.ibm.com> References: <20230724094716.91510-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: xHUbj1-NCKZ2Yf-Luh7L78MJGP8GYT9I X-Proofpoint-GUID: Mj87OfbTJ3OT6uoUXN3pBytyuTqTHq-d 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-24_07,2023-07-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=946 adultscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 phishscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307240084 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772297208736274393 X-GMAIL-MSGID: 1772297208736274393 Single-stepping a kernel-emulated instruction that generates an interrupt causes GDB to land on the instruction following it instead of the respective interrupt handler. The reason is that kvm_handle_sie_intercept(), after injecting the interrupt, also processes the PER event and arranges a KVM_SINGLESTEP exit. The interrupt is not yet delivered, however, so the userspace sees the next instruction. Fix by avoiding the KVM_SINGLESTEP exit when there is a pending interrupt. The next __vcpu_run() loop iteration will arrange a KVM_SINGLESTEP exit after delivering the interrupt. Reviewed-by: David Hildenbrand Signed-off-by: Ilya Leoshkevich Reviewed-by: Claudio Imbrenda --- arch/s390/kvm/intercept.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index 7cdd927541b0..d2f7940c5d03 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -583,6 +583,19 @@ static int handle_pv_notification(struct kvm_vcpu *vcpu) return handle_instruction(vcpu); } +static bool should_handle_per_ifetch(const struct kvm_vcpu *vcpu, int rc) +{ + /* Process PER, also if the instruction is processed in user space. */ + if (!(vcpu->arch.sie_block->icptstatus & 0x02)) + return false; + if (rc != 0 && rc != -EOPNOTSUPP) + return false; + if (guestdbg_sstep_enabled(vcpu) && vcpu->arch.local_int.pending_irqs) + /* __vcpu_run() will exit after delivering the interrupt. */ + return false; + return true; +} + int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) { int rc, per_rc = 0; @@ -645,9 +658,7 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) return -EOPNOTSUPP; } - /* process PER, also if the instruction is processed in user space */ - if (vcpu->arch.sie_block->icptstatus & 0x02 && - (!rc || rc == -EOPNOTSUPP)) + if (should_handle_per_ifetch(vcpu, rc)) per_rc = kvm_s390_handle_per_ifetch_icpt(vcpu); return per_rc ? per_rc : rc; }