Message ID | 1446648600-27297-18-git-send-email-christoffer.dall@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 849E29F36A for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 4 Nov 2015 15:02:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97CA8206D5 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 4 Nov 2015 15:02:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA6CF2049D for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 4 Nov 2015 15:02:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtzY5-0005wa-Fi; Wed, 04 Nov 2015 15:00:29 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtzRU-0005Gv-0Q for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Nov 2015 14:53:40 +0000 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1ZtzRR-0001O0-O4 for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 14:53:39 +0000 Received: by wmeg8 with SMTP id g8so112702580wme.0 for <linux-arm-kernel@lists.infradead.org>; Wed, 04 Nov 2015 06:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mTtxRGwWmKfXrP6ztxPLIECX9lHeI5BKTP2WIZRQEMc=; b=z9shWfOWe3LgGIvRHa1GX4AvAib3eIKw9ALPjI4taxUUJk2O014m7XG79TeA+mkdzJ oj49/pNvmVghNej+iARp/uTE18SlBw9s8OeAIkMbIBc1SBVUZGNkJlAjl5bu8cJkzCSY mugAWOMYz/P4bUCrdYdRP+JaI9FXl0kcggnLq2qyJLMeT5vKvFpXHuqwxWcrHm2IJMoY 6INasq8FYPpOXAxfqD8swsXIK4yRK6B+anzRyUuXWBfxOjLuJF1XilrDJn9WaAHXkWeu JkQPphEdtBmH36qUkZohzfEm2M1TctxlzGW8ZyTRHctTXlichSsCB8eEdScPaQvAAOuv my6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mTtxRGwWmKfXrP6ztxPLIECX9lHeI5BKTP2WIZRQEMc=; b=PkCexgIW9AsDXHAEKKh/3jpzjvLIY/FI+ibRjo9HSbCeGllLuQBnK0ruYAI3MIKvzq 1pNRQGGByYz5Aoi8Miq5CZZ11NIdWbO6NJZXjo5rLC9m4suBBwG3/VbGaa8ZQhf2vbsU MHV09UeixIhqaX8KB1jjyKygONfzLEIbE7XEC6WME1y+dOjptoClbnoy4sUkb3jEgWrp Uujpkn7cMCatadWhQngpDzbY1xiCJtLuNBqDox7arvx3QPOMSL0J6e8T8zmFkajT23zV TmJulxCVIdDCZQ6e4HWBkS+P+kZ9aTfAnH6LuUQO4hEdodJ77a39zFHisS2q0/Sr9hKx 7ecA== X-Gm-Message-State: ALoCoQnC3e3N6NUZVJ41tKGqBduTqnWNvj4VOeVB0h/Ok96eGIOIFXcwo7YD1r4RUkxlOoitGmnL X-Received: by 10.28.140.208 with SMTP id o199mr4113946wmd.58.1446648795611; Wed, 04 Nov 2015 06:53:15 -0800 (PST) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id e9sm1985081wjw.8.2015.11.04.06.53.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 06:53:14 -0800 (PST) From: Christoffer Dall <christoffer.dall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PULL 17/21] arm64: kvm: restore EL1N SP for panic Date: Wed, 4 Nov 2015 15:49:56 +0100 Message-Id: <1446648600-27297-18-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> References: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_095337_906092_F2C7B4F8 X-CRM114-Status: GOOD ( 15.69 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> 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>, Mark Rutland <mark.rutland@arm.com>, Christoffer Dall <christoffer.dall@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index e583613..1599701 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -880,6 +880,14 @@ __kvm_hyp_panic: bl __restore_sysregs + /* + * Make sure we have a valid host stack, and don't leave junk in the + * frame pointer that will give us a misleading host stack unwinding. + */ + ldr x22, [x2, #CPU_GP_REG_OFFSET(CPU_SP_EL1)] + msr sp_el1, x22 + mov x29, xzr + 1: adr x0, __hyp_panic_str adr x1, 2f ldp x2, x3, [x1]