Message ID | 20171204140348.21965-11-cdall@kernel.org |
---|---|
State | New |
Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ze4qCj90"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=christofferdall-dk.20150623.gappssmtp.com header.i=@christofferdall-dk.20150623.gappssmtp.com header.b="jI8MkmgK"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yr6CP2Wf4z9t16 for <incoming-imx@patchwork.ozlabs.org>; Tue, 5 Dec 2017 01:07:45 +1100 (AEDT) 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=KOD7FA1XXWWid1ACXu4nEBgOsn6IVwKb1COxfFt2EN4=; b=Ze4qCj90KkrZBa OkVSZhYanvC8cFIEf39hryx+7r67hQTZzPxaDGJe/P/0iO0wxblqKNyWrVFQbDM5Zd0Defa+pUfZz vPz4IEN9RQ4NmNzK8kgF+rNF4WXFqAyZUfTe1R3+cYYMepY1k5BbfCeBmw9tkkxpzY7NKBiWy5hI+ hJx1I4ljDCIw+ULOpOFvdBmAcn0IRro6H6/hNEGMiVuh8OTE/fLA+8fYZxusMkugqRRIbCNT51n08 BW+Ml8busPBG7pPxnG7SwpCuanObop1f4bcVhfxS8ePSb4KWOqgMEPr+Y5u4l5a3c7fjMacMKF026 U7JcOyi7TIxCO+6a/6Tw==; 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 1eLrPK-00071M-Hh; Mon, 04 Dec 2017 14:07:42 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLrM6-0002PM-7C for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2017 14:04:32 +0000 Received: by mail-wr0-x243.google.com with SMTP id v22so17415231wrb.0 for <linux-arm-kernel@lists.infradead.org>; Mon, 04 Dec 2017 06:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=christofferdall-dk.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3CMNdB7iJi3DvINvq0odIh/GBCIHpAw40rBq/VrH2i0=; b=jI8MkmgKsf9y9HPXxkvLzBBBHbrCvbM3c0Yej7BgkyJ/XJwETwA96NPMhF+MnnTqyo UJPfxcBacosk/mrH3q7xgXvbh/62oi0LlwpwqW84esGL6W5IiV9mUmYTfF+9eVRkLaqz cV+vmpyvN+P+pf3+kANrJ1paCnrb69a7+of59QE+TejfY7iUfM7tc5kvtrshST21h1Gq 0TYgVLWGL3slnDnH63yqx4Humxn/uPJpW/lw483sdZPgQSJoe12fgz0V10ZaOfsjYrEa oHnIB2dZVv1IW0siiwyqGSh7uGo3Zoj96O6tYvqKe0ov2vuVIl6/rYyQOxeuSzqfd3Gk OKng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3CMNdB7iJi3DvINvq0odIh/GBCIHpAw40rBq/VrH2i0=; b=njJfw0hk/2ckIh3iP+XjnzcIisecE3q7UEB/Eo6UiueC2gO8/gt/Pd3FuU6urIM4gM sGTWxuTUMb41jOPG7x06ac8L6cqJX3Ih8PcnUjdDtmUEzC2bIGIlqsCewtjaIk2vyan+ UOo25S9JhLj33I7UPu98NwV60aL7Xnix3FmCeS8x3CtGvcI+HW4vDTF/3wpVx7/ajh6z y3pSmXJecJfUlrFdPPPHc5DJVOPlGdIW69pSKVB+qRMb8xeinkONSX14sNxvR3bzz38M /vf7RDoG2aAOknm/nWzfkLQ6HqI1GRsyJXf1GTmfhml5gPgYP5g8UsgENoSvg2vyUqwb PEUg== X-Gm-Message-State: AJaThX5rTAl7RGW17ZSsdEZ1QFNwNGuiO0cOVclGZD0pUKd/7vFB2QAi VHf8/B1Kz6zIPe0AT0cFdNx095daBME= X-Google-Smtp-Source: AGs4zMb2cfvSGiAi5SJYj+V1NI/SiUnp/jtPPrW56RHkwDGJi07HY/5A+D+Bd5MfKYfT4x6A9HjvwQ== X-Received: by 10.223.172.146 with SMTP id o18mr12988842wrc.128.1512396245568; Mon, 04 Dec 2017 06:04:05 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id g7sm22794279wra.38.2017.12.04.06.04.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 06:04:04 -0800 (PST) From: Christoffer Dall <cdall@kernel.org> To: kvmarm@lists.cs.columbia.edu, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Subject: [PULL 13/19] kvm: arm64: handle single-step during SError exceptions Date: Mon, 4 Dec 2017 15:03:42 +0100 Message-Id: <20171204140348.21965-11-cdall@kernel.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171204135637.21620-1-cdall@kernel.org> References: <20171204135637.21620-1-cdall@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171204_060423_001361_E40C36E6 X-CRM114-Status: GOOD ( 13.08 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 URIBL_DBL_ABUSE_SPAM Contains an abused spamvertized URL listed in the DBL blocklist [URIs: linaro.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@linaro.org>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org |
Series |
None
|
expand
|
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 029c28dd25e9..304203fa9e33 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -28,6 +28,7 @@ #include <asm/kvm_emulate.h> #include <asm/kvm_mmu.h> #include <asm/kvm_psci.h> +#include <asm/debug-monitors.h> #define CREATE_TRACE_POINTS #include "trace.h" @@ -252,7 +253,12 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, return 1; case ARM_EXCEPTION_EL1_SERROR: kvm_inject_vabt(vcpu); - return 1; + /* We may still need to return for single-step */ + if (!(*vcpu_cpsr(vcpu) & DBG_SPSR_SS) + && kvm_arm_handle_step_debug(vcpu, run)) + return 0; + else + return 1; case ARM_EXCEPTION_TRAP: return handle_trap_exceptions(vcpu, run); case ARM_EXCEPTION_HYP_GONE: