From patchwork Mon Jul 24 09:44:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 124760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1700121vqg; Mon, 24 Jul 2023 03:19:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhA8sTlOVie2uOarqp+CXHCm6N8eHGWQJa2SdFp4kBj100ngrHqjSH85GqfEVam+g8/0SZ X-Received: by 2002:a05:6358:6f8c:b0:134:d467:b751 with SMTP id s12-20020a0563586f8c00b00134d467b751mr4920698rwn.21.1690193983516; Mon, 24 Jul 2023 03:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690193983; cv=none; d=google.com; s=arc-20160816; b=cIwrbo9HOwn3ggY1KJMA0CejrEaooBY6/c74darMNyFZW4UzMPbgA/TVYKh8dqbzKk 7aBvOT1W6fTf+uD2aFQYj58E4ErKzDiyTOq5WEFm55zZCCl19ffVXrfi4r/qm9DdGClv oESw0ZqpMcOl282TnPgGcdj/VzLxe84WQmJOC0Xsix6Qcw2VTZtkvc3zm9qSWCemotYh zW/plUZ20m/9uhuubkhWPjRdjZdgnmpHAbsuAKhe1feRkxQuyPwmxqL1OI/kciEIFV6L +xQMZuQxmDaZQN7Y0nAyb5D/0TsVMciXvRiGYZGLNT/6lmyHOQuKWjuSY8qDqfBKM1tL nJfg== 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=YQJy/BXNNYvw+mu2oPv4Yu2e4F5FrpGUg51TjYpurHY=; fh=gnw7XswWrGFmwFr+TRhiPvsko5dDTK5jEGn/N8bqD/Q=; b=MFSoml31Vl2CXyBXJ3KcNICCDTcTe94tgYvZraFrtv/3QlMp3Wz4xJPSuk4NIivcW4 BPgTDcWGMPIVivjhfHNS+ANJDfCkDRS9aH4eCfOJvdrdFmtfHDk4Pc+J8MQ0J2zR9wye s3qpc8gyXrnbRpvC7FFqJVC+FJD0TJEYjbfitxYDv/Zr39QMMfMuZMc12yeiZ/y/siUh gJCkvOvD0z5v+Ap2ef+mBA6rJwu1jJm+iAO0eK9hxK0RangJcE1H/scNAUsnMlz3sxga ww/NtfFDCz7FSub8sUGkJGeM5iqH5KFQ7fZQ79BdJnppgmIPivrLFKRTgEvYxhF/eNmk i3zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=b9SpIqp0; 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 r9-20020a63ec49000000b0053f3d04e66csi9088090pgj.699.2023.07.24.03.19.30; Mon, 24 Jul 2023 03:19:43 -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=b9SpIqp0; 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 S232533AbjGXJuw (ORCPT + 99 others); Mon, 24 Jul 2023 05:50:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232211AbjGXJt6 (ORCPT ); Mon, 24 Jul 2023 05:49:58 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19EBF30EC; Mon, 24 Jul 2023 02:47:55 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36O9dcKu029347; Mon, 24 Jul 2023 09:47:38 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=YQJy/BXNNYvw+mu2oPv4Yu2e4F5FrpGUg51TjYpurHY=; b=b9SpIqp0n+Ae5o+WWKwy30sBRk7tbTh9ue5tckNBcU2p3c6TKPn9LSNdsReBjcciYeUb KLycwlWvfINgvVhQGojhi+DUslLkhvSmX05akvZG6VrPFG9I5619g80xEKucy2eTrAdd H2lnuKn1pmqV/7rGLBS3U5qNeH7mXxe4QwkU8AQ0QfrAjfJAx6SxV8ELlksJDj0bF46G ZRsYSGjpLGArx+105O05CvhtwxK5sc4XOn00mhz4fK5R4i5o2VWTpzDhefQRpcliWcM6 ZQHbU6PV1e1t4ojreyhzLkFhO/aTuCYmSljIQw9bGSHc8qtcze2B7hQCH12izLZ7452f gA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s0hw2gn2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:37 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36O9enYX002905; Mon, 24 Jul 2023 09:47:37 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s0hw2gn2c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:37 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36O7mBLu001851; Mon, 24 Jul 2023 09:47:36 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3s0unj1k1g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 09:47:36 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36O9lXme46072452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Jul 2023 09:47:33 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8AC4E20040; Mon, 24 Jul 2023 09:47:33 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B68C420049; Mon, 24 Jul 2023 09:47:32 +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:32 +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 5/6] KVM: s390: interrupt: Fix single-stepping keyless mode exits Date: Mon, 24 Jul 2023 11:44:11 +0200 Message-ID: <20230724094716.91510-6-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: gyKDY0v399DNHjOnaUkPyhaSOmsiNhUx X-Proofpoint-GUID: RuNCpFDJXaayn6G42oNpOZMGDgymm_4N 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 suspectscore=0 bulkscore=0 phishscore=0 priorityscore=1501 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 mlxscore=0 mlxlogscore=918 lowpriorityscore=0 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: 1772296846276933123 X-GMAIL-MSGID: 1772296846276933123 kvm_s390_skey_check_enable() does not emulate any instructions, rather, it clears CPUSTAT_KSS and arranges the instruction that caused the exit (e.g., ISKE, SSKE, RRBE or LPSWE with a keyed PSW) to run again. Therefore, skip the PER check and let the instruction execution happen. Otherwise, a debugger will see two single-step events on the same instruction. Reviewed-by: Christian Borntraeger Reviewed-by: David Hildenbrand Signed-off-by: Ilya Leoshkevich --- arch/s390/kvm/intercept.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index d2f7940c5d03..62b3b956c843 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -630,8 +630,8 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) rc = handle_partial_execution(vcpu); break; case ICPT_KSS: - rc = kvm_s390_skey_check_enable(vcpu); - break; + /* Instruction will be redriven, skip the PER check. */ + return kvm_s390_skey_check_enable(vcpu); case ICPT_MCHKREQ: case ICPT_INT_ENABLE: /*