From patchwork Thu Feb 1 18:47:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 126578 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1971731ljc; Thu, 1 Feb 2018 10:50:40 -0800 (PST) X-Google-Smtp-Source: AH8x225tUgrYjUets7YxH8iphspPPwlegb8oESrhs2bSa+PMxIKGLcXEWsOr6qPETqzg+JsGYK/Z X-Received: by 10.36.250.193 with SMTP id v184mr13099420ith.64.1517511040196; Thu, 01 Feb 2018 10:50:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517511040; cv=none; d=google.com; s=arc-20160816; b=HbKMZn2HvqWx0jiIXwO4sQTwq6kpd+hZ8/xjTwC5Zd0s94hJPHMGJG4Iy+xQ/fN5nQ +PgMeoKbnO1VLppE0rIfHk1UuiDrLO/Emv/3U/79sVpmeiJqPkqwWdzjdDUGPHKhzYgO uHyqaKtyi1OTxyS/zhLzAprMVxfoaVdj3A/zpfg+/RwyUM3HCPrBlPmmCMM0O98+wvA2 JQoI9su/di64OZFuscDaMPnI0/WZ9CktTZJOZo0IE08oT6/newCizPmQVnhRlYAG3k/g JNKmvGIG7qEIzafByuQShsX1BQJbBCw320d14rz6ONY8STjiaruhJzk6Be3o3m8RLVsR RK8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=fx8gO0NkYIsJIipHW+OVWUluFn6+eU6welLReTQpWRM=; b=k8vZRkiz2CBloFdTNyqd4wnmEM4Guwy/JS4PYHOHjMK99YS5AD7EGmcoW+x0hFwpd7 ahsKA6zFJEOSdusHxCPucf5dyMqB5XsRIvvVZf2bbzb6edASw2klxTKtMl8bHYXWAOpQ ANpHL83dvItS5TU8zPtbAagdXMuO3U9ZwgYy/UVSgT5yqQDBcL7gp0yjARDBoiELo8rS 2MRMRoHRIvYtAfrgZ4Loe/nlP/mEwN1lqdvSq6mVISfJKVlPqo+DLIJaBMiEG4fzCaGl XfI1IlooyI189R2Ikfp969bDAv7+ZkvMHzCA1oULgs1PDHmSu7CfkJcMyoAeB2MxN8It wMeg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id m203si432535itd.164.2018.02.01.10.50.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:50:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ehJu2-0007Ug-Tf; Thu, 01 Feb 2018 18:48:06 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ehJu2-0007Ua-2r for xen-devel@lists.xen.org; Thu, 01 Feb 2018 18:48:06 +0000 X-Inumbo-ID: 6620fbdf-0780-11e8-ba59-bc764e045a96 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 6620fbdf-0780-11e8-ba59-bc764e045a96; Thu, 01 Feb 2018 19:47:48 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6BFEB1435; Thu, 1 Feb 2018 10:48:04 -0800 (PST) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5C2563F25C; Thu, 1 Feb 2018 10:48:03 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 1 Feb 2018 18:47:49 +0000 Message-Id: <20180201184749.29430-4-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201184749.29430-1-julien.grall@arm.com> References: <20180201184749.29430-1-julien.grall@arm.com> Cc: andrew.cooper3@citrix.com, Julien Grall , sstabellini@kernel.org, andre.przywara@linaro.org Subject: [Xen-devel] [PATCH v2 3/3] xen/arm: Don't crash the domain on invalid HVC immediate X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" domain_crash_synchronous() should only be used when something went wrong in Xen. It is better to inject to the guest as it will be in a better position to provide helpful information (stack trace...). Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- We potentially want to return -1 instead. This would make Xen more future-proof if we decide to implement the other HVC immediate. Changes in v2: - Add Stefano's reviewed-by --- xen/arch/arm/traps.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 1e85f99ec1..1cba7e584d 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1471,14 +1471,17 @@ static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) #endif static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr, - unsigned long iss) + const union hsr hsr) { arm_hypercall_fn_t call = NULL; BUILD_BUG_ON(NR_hypercalls < ARRAY_SIZE(arm_hypercall_table) ); - if ( iss != XEN_HYPERCALL_TAG ) - domain_crash_synchronous(); + if ( hsr.iss != XEN_HYPERCALL_TAG ) + { + gprintk(XENLOG_WARNING, "Invalid HVC imm 0x%x\n", hsr.iss); + return inject_undef_exception(regs, hsr); + } if ( *nr >= ARRAY_SIZE(arm_hypercall_table) ) { @@ -2109,7 +2112,7 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) if ( hsr.iss == 0 ) return do_trap_hvc_smccc(regs); nr = regs->r12; - do_trap_hypercall(regs, &nr, hsr.iss); + do_trap_hypercall(regs, &nr, hsr); regs->r12 = (uint32_t)nr; break; } @@ -2123,7 +2126,7 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) #endif if ( hsr.iss == 0 ) return do_trap_hvc_smccc(regs); - do_trap_hypercall(regs, ®s->x16, hsr.iss); + do_trap_hypercall(regs, ®s->x16, hsr); break; case HSR_EC_SMC64: /*