From patchwork Fri Oct 6 11:39:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 9989023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C11A60247 for ; Fri, 6 Oct 2017 11:39:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F2E128B29 for ; Fri, 6 Oct 2017 11:39:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23A6228D6E; Fri, 6 Oct 2017 11:39:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7567228B29 for ; Fri, 6 Oct 2017 11:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0GLFbWztITL4qtBjJJfc3GeX/H8GxLTObw0SdqXhqLI=; b=lzVtMTciaNVO7Q QidN2r0dDCazKrbH819xLlOS29hcyBqlBlO02nnIct3LTzBeJFBVSafHWXvBGfoAY+pt0IKWuuMLg t1ejR2GLhkAoMuxHJjcO4Y6t+6r+TqTqdFXJ+qbnzeJ53sNHmqjsFe50I1aIlM2Capn4/XuNYiw7T jxO+qI51CPP6lU4YGi9Xg6RKgs+VFvI4SNQOBv3bQJbe3IgU2566LHAsjE8MdPEun3aoqT9tKHWkK nIVshvj6yFnARnrUxgxNalN6Ep2lMhoNYlihtCko/g+3Q4pJgTzVBhCgAgb0mf/j0vdO0jhz0So6K 9uzFS3RuQxmKMdAQuARQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e0Qys-0002WI-T1; Fri, 06 Oct 2017 11:39:50 +0000 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e0Qyo-0002Sc-Gk for linux-arm-kernel@lists.infradead.org; Fri, 06 Oct 2017 11:39:48 +0000 Received: by mail-wr0-x229.google.com with SMTP id z1so4040987wre.3 for ; Fri, 06 Oct 2017 04:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UwKuQC/yk7g/K15Qz0LbymMDwJ+ks4gf80Kx2AJkLyY=; b=hWX6ybeAx+1+lTdHpEDsW9uC4IF4YdzA7Ek45g4r+kJqJwgpc5FELEf2AHMN4bnzY/ IBOegnAwojwP9UDP/jV+2M00w5ow1IIqtmuKRorFDTp9QkFIUl2pV3PvZ8wOrnGNybfn /Psv3iebyz18sX5SXSyYjRbcjEX3aGXM5kE4s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UwKuQC/yk7g/K15Qz0LbymMDwJ+ks4gf80Kx2AJkLyY=; b=fDPtUqmb7e2/hAJ+gJXl6K5Pa5aNg05/m8WBE5ztPdxqPDZQ1jCJ4iuPUV1OzFQYzm T7k5ouMKkvviWs1l32gbhBnCWTswxDgnWpubGm4WzAj//IuLDnyaL55o1ZvR9QldQ5BD OHskfmVeEyIdmdd+eCLfWaitR5qb2EVNy8qBebMRhPgX5d5t5Fx+UgY/ykJv1Z4USxLx SvOAGEiD0cGd3YgRupu1ZAA+Ta3ondP1idck2DddG/5GdlyuJCoqLp0OYOb4PPa8qfir e92GFUevODafmegeaxAcTGzjCToCY37OfM2pkYkD8SlcIZcIMDBIPsZwyfoHmhOvkpX7 Tvjg== X-Gm-Message-State: AMCzsaVEJvjA0bWvGKSSHMdrJT8sO1C5BUxToc7bYRFw8auRaur3rZlo EYcgrT4EZm5r5F9sxH4ydtbg/Q== X-Google-Smtp-Source: AOwi7QBMKIAxc7e36w2r7R+yvbPS9T4ZY8zvC7yOeiJsK6JER/ZnFNd9zdqXkfNB9/ZW2oHxhkoDjw== X-Received: by 10.223.131.4 with SMTP id 4mr1898341wrd.106.1507289963681; Fri, 06 Oct 2017 04:39:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k141sm1503463wmg.15.2017.10.06.04.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2017 04:39:21 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 86E8B3E04DE; Fri, 6 Oct 2017 12:39:21 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: julien.thierry@arm.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Subject: [PATCH v1 1/2] KVM: arm64: handle single-stepping trapped instructions Date: Fri, 6 Oct 2017 12:39:20 +0100 Message-Id: <20171006113921.24880-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171006113921.24880-1-alex.bennee@linaro.org> References: <20171006113921.24880-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171006_043946_723708_9FF0F3AD X-CRM114-Status: GOOD ( 16.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , open list , Will Deacon Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP If we are using guest debug to single-step the guest we need to ensure we exit after emulating the instruction. This only affects instructions completely emulated by the kernel. For userspace emulated instructions we need to exit and return to complete the emulation. We fake debug.arch.hsr to contain ESR_ELx_EC_SOFTSTP_LOW so QEMU knows it was a single-step event (and without altering the userspace ABI). Signed-off-by: Alex Bennée Reviewed-by: Julien Thierry --- arch/arm64/kvm/handle_exit.c | 48 +++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 7debb74843a0..c918d291cb58 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -178,6 +178,39 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) return arm_exit_handlers[hsr_ec]; } +/* + * When handling traps we need to ensure exit the guest if we + * completely emulated the instruction while single-stepping. Stuff to + * be emulated in userspace needs to complete that first. + */ + +static int handle_trap_exceptions(struct kvm_vcpu *vcpu, struct kvm_run *run) +{ + int handled; + + /* + * See ARM ARM B1.14.1: "Hyp traps on instructions + * that fail their condition code check" + */ + if (!kvm_condition_valid(vcpu)) { + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); + handled = 1; + } else { + exit_handle_fn exit_handler; + + exit_handler = kvm_get_exit_handler(vcpu); + handled = exit_handler(vcpu, run); + } + + if (handled && (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)) { + handled = 0; + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.hsr = ESR_ELx_EC_SOFTSTP_LOW << ESR_ELx_EC_SHIFT; + } + + return handled; +} + /* * Return > 0 to return to guest, < 0 on error, 0 (and set exit_reason) on * proper exit to userspace. @@ -185,8 +218,6 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, int exception_index) { - exit_handle_fn exit_handler; - if (ARM_SERROR_PENDING(exception_index)) { u8 hsr_ec = ESR_ELx_EC(kvm_vcpu_get_hsr(vcpu)); @@ -214,18 +245,7 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, kvm_inject_vabt(vcpu); return 1; case ARM_EXCEPTION_TRAP: - /* - * See ARM ARM B1.14.1: "Hyp traps on instructions - * that fail their condition code check" - */ - if (!kvm_condition_valid(vcpu)) { - kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); - return 1; - } - - exit_handler = kvm_get_exit_handler(vcpu); - - return exit_handler(vcpu, run); + return handle_trap_exceptions(vcpu, run); case ARM_EXCEPTION_HYP_GONE: /* * EL2 has been reset to the hyp-stub. This happens when a guest