From patchwork Sun Apr 23 17:09:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9695153 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 1DF3A601E9 for ; Sun, 23 Apr 2017 17:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18A29203B9 for ; Sun, 23 Apr 2017 17:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AA11262F2; Sun, 23 Apr 2017 17:32:01 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 8C82D203B9 for ; Sun, 23 Apr 2017 17:32:00 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=9XPFandWiVYG+jjmkEobyqF8DdaAmkMKldHpnKiw510=; b=rYfIx08+viWFaD2jPIclHs0E5w 3fGPvSPoSiayklxVkun/cK5MdJXRxj9Mft3jbhhqiK2iygVGcXkFLTtMzTx8UnHHXBZTcMl6Fbi+T yDwdNkZ0/zySv60rdNvrVYBzlVpjeR9pwrg5q+xomc5281z5mpAtvvxVPfAbGBjNCZX1rNWSvtBmI Hbs+KuQgte1iZAHVB2DS80xmrMbXGG6UKalRHYOMxOdfd8oSDi8KMoti5hvdDNZzD1dDRNR9FHhSs C5WKnmO1enHCxGiMnECpfIrSOR0tFMqEHfdg2E9IaGg7S4Sw4aPzIkqzKIgsspctdYFjFOEUU+hhS GdgtGM1A==; 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 1d2LMe-0003jt-76; Sun, 23 Apr 2017 17:32:00 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2LLt-0002ZO-E5 for linux-arm-kernel@bombadil.infradead.org; Sun, 23 Apr 2017 17:31:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4PaLV+FAr/bxzzyX93jZCzpVlzZXE+I5zzjXvvrkAgU=; b=Sp9QCJeElP0+BBOcgoB9AU478 V96vj+Rhr3ix+22MDGnN839bQoc+HkWoCj7rxCIsI/XCSUetZcyQK7qSnKoHfzIH4lBNGqHRcBek+ zlbb2hlLyVwhSPl29AK++8Y04+yk3TZXWdbVXbu2oegeQq3KYRskFd5vQ2uf3iKPZHKn2Mh/HyyA0 4a1t7cOAocebakaZtpBJouCPrkyOr4D+9gMaddxwqEYBHKHGG1k+P7V0QmxXnUfiWLr+5jI/y0hqF LEyU1Syz+tw1AE6pwLuBoD09ZFoVzxCPyQNkSP7yrY3fmGHzcfX6Lt32N2c5Sxo5DFdk4kkT43TJi DnA+lQTdg==; Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L4M-0005Rb-BC for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:13:07 +0000 Received: by mail-wr0-x235.google.com with SMTP id w50so55838846wrc.0 for ; Sun, 23 Apr 2017 10:12:46 -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; bh=4PaLV+FAr/bxzzyX93jZCzpVlzZXE+I5zzjXvvrkAgU=; b=bXD+WPjcmJ4QGeSKuhTSiLPetbhbzNaftdLwSXk6+lKnqj8AFPHDyzJhNUiTuduJje 7ZFn05koihWFreXsC1D9J01G70HprOdGSjsxyeAIvgY3jmPxzHRB1SRaxcNy42CLDIC7 eauXvqlHG1ZT+EtUpwsG4aweG20oSCZsJ3rtg= 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; bh=4PaLV+FAr/bxzzyX93jZCzpVlzZXE+I5zzjXvvrkAgU=; b=ZdRxMhnM91KuO9pn09NO8uH9zgi6n04gSLV8+OGN5WdvbSV6PZIdvO8uy6mHlmT5g6 cg8nHNxN6AYf15vKU6kStWJN4xWd61dwen824SkSD1Fr3kFaGe8ELTve3KczreRTDcOG /q4bqB1ywOIulHlfXEVoiUAOtKAm9RG/zh6phdB5s2QXf5pak2Q2Uai08SPlTIyvUkOO AbzdgQcqLHu4A3lrAe/CDIFiZ5r+kLW9U1FgfdZeJi2glAKmx3m/cskG2F2Q9wHUVedW cphAx+s9GskpVTjCaCcXzb0uaiNCaeU9ypQFOiZroi851qJi8XskygxLGHy617v+EcWT b2DA== X-Gm-Message-State: AN3rC/5SRYIPeQowmzEwusVAWUPDZGSJi9l8IMn6SlvMG7HPf6AHGA6B rKcPAxe7IBDsjrCb X-Received: by 10.223.133.152 with SMTP id 24mr2710493wrt.86.1492967444274; Sun, 23 Apr 2017 10:10:44 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id 58sm2803521edz.2.2017.04.23.10.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:10:43 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 68/79] ARM: hyp-stub: Zero r0 on successful stub handling Date: Sun, 23 Apr 2017 19:09:18 +0200 Message-Id: <20170423170929.27334-69-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170423170929.27334-1-cdall@linaro.org> References: <20170423170929.27334-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_131306_544858_FEDA5B6A X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. 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: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 From: Marc Zyngier We now return HVC_STUB_ERR when a stub hypercall fails, but we leave whatever was in r0 on success. Zeroing it on return seems like a good idea. Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kernel/hyp-stub.S | 2 ++ arch/arm/kvm/init.S | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 918c64f..d8523cc 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -215,8 +215,10 @@ __hyp_stub_do_trap: beq __hyp_stub_exit ldr r0, =HVC_STUB_ERR + __ERET __hyp_stub_exit: + mov r0, #0 __ERET ENDPROC(__hyp_stub_do_trap) diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S index 87bcd7a..570ed4a 100644 --- a/arch/arm/kvm/init.S +++ b/arch/arm/kvm/init.S @@ -155,8 +155,10 @@ reset: b exit 1: ldr r0, =HVC_STUB_ERR + eret exit: + mov r0, #0 eret ENDPROC(__kvm_handle_stub_hvc)