From patchwork Thu Apr 30 09:24:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47802 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D62E2121F for ; Thu, 30 Apr 2015 09:34:29 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf13004593lbb.0 for ; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ZPxBd69iMG8G3Nzxc3EY8+Ol0xnivuWEHFgtxENn09A=; b=SedUkSVAKi28yiAmKfGINWn/gmWy0qv+kqoGXlJezcr50gYjVsBwtHT55Ve9Q8iB/8 7/QOt3qAfjld1tlZZF/Rt3lBvqT16LM9MoAbqAk1bQH2QB07QRrIhJuR8fSdnp24OCTV 9YEWS8GOHrbdP8M4cvVd1FBJIbp0hGYMgeU0KdvHdGj8mX99jqf9YzsUjfYImqrfh7Uu GghWSiY97bPbNy+L07t99rUZJyvzcIS4yVNVjNXRqs2/qO/TVk2mFkiaJFkTIy1F40jt +st+aj2Y5TmDBscsub4423ZFPFFCDMRYnVWKtob5OWHKjtHmz9izRsJnGDZRqtyRc3hh Ec/w== X-Gm-Message-State: ALoCoQnB30zKl3dixTn3VJLlpiSLkE7Fy/90i2kVPQ0NwlLuUz+PVsqFG7DC+hn8GaHOjzJcRRwC X-Received: by 10.152.8.17 with SMTP id n17mr2039241laa.0.1430386468271; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.2 with SMTP id ci2ls293701lad.17.gmail; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) X-Received: by 10.112.129.132 with SMTP id nw4mr3079048lbb.122.1430386468164; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id w7si1326169lae.160.2015.04.30.02.34.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 02:34:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbzk7 with SMTP id zk7so40068814lbb.0 for ; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr2954909lbc.73.1430386468079; Thu, 30 Apr 2015 02:34:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp2999065lbt; Thu, 30 Apr 2015 02:34:27 -0700 (PDT) X-Received: by 10.68.244.73 with SMTP id xe9mr6470019pbc.98.1430385980840; Thu, 30 Apr 2015 02:26:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nf2si2640288pbc.149.2015.04.30.02.26.20; Thu, 30 Apr 2015 02:26:20 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbbD3JZ6 (ORCPT + 2 others); Thu, 30 Apr 2015 05:25:58 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53084 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751551AbbD3JZT (ORCPT ); Thu, 30 Apr 2015 05:25:19 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnkiV-0005Mf-Vj; Thu, 30 Apr 2015 11:25:11 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Anup Patel , Pranavkumar Sawargaonkar , marc Zyngier , Shannon Zhao , Jiri Slaby Subject: [patch added to the 3.12 stable tree] arm64: KVM: Force undefined exception for Guest SMC intructions Date: Thu, 30 Apr 2015 11:24:20 +0200 Message-Id: <1430385911-20480-12-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1430385911-20480-1-git-send-email-jslaby@suse.cz> References: <1430385911-20480-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Anup Patel This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit e5cf9dcdbfd26cd4e1991db08755da900454efeb upstream. The SMC-based PSCI emulation for Guest is going to be very different from the in-kernel HVC-based PSCI emulation hence for now just inject undefined exception when Guest executes SMC instruction. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: marc Zyngier Signed-off-by: Shannon Zhao Signed-off-by: Jiri Slaby --- arch/arm64/kvm/handle_exit.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 8da56067c304..df84d7bcc7df 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -39,9 +39,6 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) { - if (kvm_psci_call(vcpu)) - return 1; - kvm_inject_undefined(vcpu); return 1; }