From patchwork Thu Nov 9 17:00:19 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: 118469 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1154228edl; Thu, 9 Nov 2017 09:01:17 -0800 (PST) X-Google-Smtp-Source: ABhQp+Q3mqDXdnN028at13jLEab7bL8yzyfZQWwN7pDgxud1KNLDDmqXII2kFoOvIeb1io4Cncpm X-Received: by 10.99.138.194 with SMTP id y185mr1063774pgd.290.1510246877361; Thu, 09 Nov 2017 09:01:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510246877; cv=none; d=google.com; s=arc-20160816; b=TaB5eWQjox+6ZykHqW9HsW2XLOV75IvVjUszn/c5nGtoLSuJQKdv6yPRPZOOQIGLKI 2vSfK9sK/84UHZOMEarNqAeS2HYbtQ7CXKM/gmaBCeTA+T9fFvDFr99MtqWvi7BrD+yL +sYxu799+D1Rb9q19jHKVmai3kyJDFsZ8KWS7RwwK1T+WWCT6puozU8+lqkNU5R0keri bpMbpYLMs0UH/BORm1ApNHAXSAUod7hJRaEZeBwr+way8F2jAfpFCHhfG1P5PGy7Qo2O 3TJTlDA5DLKUGQWexIWfsbcTu9DAo2foGWCr3jnqle4lkykXoGHeFGLbMiM5vn0nlGPP lezA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=XIx5BIGLo7HnFAZHupTGZAVVsZz1nNYmnmudk/N+eFA=; b=mQqTLSf36SU59jVLGBDNWBSByGlLjH8u25AmAJxgMGUp65pbAT6OWs4nURvlEz50wK 4JDt6qBSNnxyDjRQ19+5tI6SuwrSO8BHsNO2ULYNDUgkicPeL0iC2cYrq8U0pYnWI5OY lATep3H1nm6jTmk9jwoRZK8t8L1cF4VZBskSjKVndrxjVkFLKqrVdckfwTnNrfVDOOX7 fU1HGz+jzerfWNyxfAbEnqzS+czlEl3Prw/3nPOBicaNfS9HDhFM1dcrkRYov16hWtym M7CCuQXBChgyuUpOM+hCTOZVyArF2ig5IJD7ruz435Qil+LR6Xn3Xk0sFRv1YQzavpkM 6LDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dA4VEx/I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 68si7210774pfq.46.2017.11.09.09.01.17; Thu, 09 Nov 2017 09:01:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dA4VEx/I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752655AbdKIRBP (ORCPT + 23 others); Thu, 9 Nov 2017 12:01:15 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:45298 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753538AbdKIRAZ (ORCPT ); Thu, 9 Nov 2017 12:00:25 -0500 Received: by mail-wm0-f66.google.com with SMTP id y80so18505300wmd.0 for ; Thu, 09 Nov 2017 09:00:25 -0800 (PST) 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=XIx5BIGLo7HnFAZHupTGZAVVsZz1nNYmnmudk/N+eFA=; b=dA4VEx/Ig/1mcZXysTAE0mMDeVcDb8B4x3uwlRTu1gJx8pyZHkidpNzJo6jEj/6Q1F 0eH9mD2Qdn+A3Y5HCNHJKkwIa4vYa2ODTcaZtvTrgX3/YgW+B/fLUzi5ptQgZkHYtIDP lcSPVyajiqlG+qM6TyKzF25xIWf0h9bmKvMwI= 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=XIx5BIGLo7HnFAZHupTGZAVVsZz1nNYmnmudk/N+eFA=; b=OqtB+sgQZug67VDM/LevmpORYBMjhUZbY+tEp7aEvbrQCC4/w1vIBJ+lYlHByJ7BG+ OKeBryqV4aIW0wRCFsGJEf78uucV6ZZxQ5qxH3jatjY5ykDpV3w5a+9Miv/GkrfyOeGV YpllYpJ22FdmkPiF/VxCj+J6Td6g94GI14AunwG94MlSRMbbqWMhNvJWbBQo1vFrtJpi EHJx1gfNjzjlgkS1KmzyE56IdeYCrWIngPo4J1I1kmrIN99DYkxxgRrIkdEx7LsHK9Cs qtLQuL4JYP5X8Sj58J3yOS/4IiM6dX/CTwCfDrNVj7nm5KKxqA3pXVk/6PBZApI2B6ZU dYqw== X-Gm-Message-State: AJaThX6DF67RrxhXQ6gKDRTtD5FHKyBHdIilib9YL8/qbeA5iDVincb5 dLJxXljE2AxV0Y699mFfTjL6MQ== X-Received: by 10.28.90.85 with SMTP id o82mr380057wmb.69.1510246824318; Thu, 09 Nov 2017 09:00:24 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 128sm8964755wmi.28.2017.11.09.09.00.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Nov 2017 09:00:22 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 35A053E01F7; Thu, 9 Nov 2017 17:00:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=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 Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Russell King , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/3] kvm: arm debug: introduce helper for single-step Date: Thu, 9 Nov 2017 17:00:19 +0000 Message-Id: <20171109170021.2984-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171109170021.2984-1-alex.bennee@linaro.org> References: <20171109170021.2984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After emulating instructions we may want return to user-space to handle a single-step. If single-step is enabled the helper set the run structure for return and returns true. Signed-off-by: Alex Bennée --- v2 - kvm_arm_maybe_return_debug -> kvm_arm_handle_step_debug - return bool, true if return to userspace is required --- arch/arm/include/asm/kvm_host.h | 2 ++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/debug.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+) -- 2.14.2 Reviewed-by: Julien Thierry diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 4a879f6ff13b..a2e881d6108e 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -285,6 +285,8 @@ static inline void kvm_arm_init_debug(void) {} static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) {} +static inline bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu, + struct kvm_run *run) {} int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index e923b58606e2..bbfd6a2adb2b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -369,6 +369,7 @@ void kvm_arm_init_debug(void); void kvm_arm_setup_debug(struct kvm_vcpu *vcpu); void kvm_arm_clear_debug(struct kvm_vcpu *vcpu); void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu); +bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu, diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index dbadfaf850a7..95afd22a4634 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -221,3 +221,25 @@ void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) } } } + + +/* + * When KVM has successfully emulated the instruction we might want to + * return to user space with a KVM_EXIT_DEBUG. We can only do this + * once the emulation is complete though so for userspace emulations + * we have to wait until we have re-entered KVM before calling this + * helper. + * + * Return true (and set exit_reason) to return to userspace or false + * if no further action required. + */ + +bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu, struct kvm_run *run) +{ + if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) { + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.hsr = ESR_ELx_EC_SOFTSTP_LOW << ESR_ELx_EC_SHIFT; + return true; + } + return false; +}