From patchwork Thu Apr 30 12:11:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47833 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C01192121F for ; Thu, 30 Apr 2015 12:28:29 +0000 (UTC) Received: by layy10 with SMTP id y10sf15090454lay.0 for ; Thu, 30 Apr 2015 05:28: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: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=Y04bDjlm5eDm67uvhyG6JXV838/9Quj8LMgDUpyVfsM=; b=B4bJQg+3N2goXHIQtf0qYRiL6qdlJqf0pJBCNzbH9N5JoFomELqGkQ+GyFP+ko7IJb 8/O8VbgRKgozwspIgFKuqoJSYeKX7Kq7tVnzjW0uclkhQ57TYr8ZlbWJbQUuylT+k5hv 4mtbAY6nGt8/uWqLfPWN1w3YUIPL/Zpjq2naBjOS4vsbZ3zESgg5TiucKouNxAaUJRes X7Wugiy7wBTOwQhgEdaLvKXHJYJ52mGKylYQgt3an+j5xggq4uvZSezPCzwr6uXDbTjp lt5AbKVDyFC5jAG8FbBfiLqt16x8jQSggnmazZeoT45Z6QyNfi//xzt5hkZPVQodcK74 ClkQ== X-Gm-Message-State: ALoCoQmDsdQmhGE8KYL58TG+xAVJW9nHtkVRLSyh2rYSzHdwYDYwZal/gk2vUDQI48xo9942OO1q X-Received: by 10.194.249.1 with SMTP id yq1mr2427587wjc.2.1430396908839; Thu, 30 Apr 2015 05:28:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.2 with SMTP id ls2ls376036lac.31.gmail; Thu, 30 Apr 2015 05:28:28 -0700 (PDT) X-Received: by 10.152.29.138 with SMTP id k10mr3572591lah.114.1430396908483; Thu, 30 Apr 2015 05:28:28 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id cr5si1663289lad.49.2015.04.30.05.28.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 05:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbzk7 with SMTP id zk7so43250607lbb.0 for ; Thu, 30 Apr 2015 05:28:28 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr3557774lag.112.1430396908399; Thu, 30 Apr 2015 05:28: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 l1csp3082860lbt; Thu, 30 Apr 2015 05:28:27 -0700 (PDT) X-Received: by 10.68.69.107 with SMTP id d11mr8074078pbu.16.1430396904937; Thu, 30 Apr 2015 05:28:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j11si3276097pbq.178.2015.04.30.05.28.23; Thu, 30 Apr 2015 05:28:24 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1752934AbbD3M1h (ORCPT + 28 others); Thu, 30 Apr 2015 08:27:37 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53614 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751321AbbD3MMe (ORCPT ); Thu, 30 Apr 2015 08:12:34 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnnKS-00089T-RB; Thu, 30 Apr 2015 14:12:32 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Anup Patel , Pranavkumar Sawargaonkar , marc Zyngier , Shannon Zhao , Jiri Slaby Subject: [PATCH 3.12 12/63] arm64: KVM: Force undefined exception for Guest SMC intructions Date: Thu, 30 Apr 2015 14:11:41 +0200 Message-Id: <5c792059d2d57a19a19ab49507acdf0b8d0d5dd6.1430387326.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> References: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.171 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 3.12-stable review patch. If anyone has any objections, please let me 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; }