From patchwork Fri Apr 24 05:27:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47497 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5B07120553 for ; Fri, 24 Apr 2015 05:30:36 +0000 (UTC) Received: by layy10 with SMTP id y10sf9413932lay.0 for ; Thu, 23 Apr 2015 22:30:35 -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=b4PxFSpboA6otdnTIefCxTUPPAU0MxU8vZCBW1xbONo=; b=V7zNGwQVn+kOJXS8O/C4w4GkNJvppRLcaVY+VitUSWLhIl3FTw4wBLs0BuaOXsBI2u Yc6MtDPzsEpLye6tw+9Az4U+H3IlSdm09eWTkavt4iL+pwvj37WdAMedZd9Q4f14LHKM AEUhSaSkca3jkCDbxnK2C+wv6sxVOI8t3a+gZB7YGRAgojSgfUKqbaO8jVxvSyVQ3gIJ 8DotO/yogqsBLvNXRBK9QB8lrTIQR4lRUtx1tHCvpwVMHp4iX8vph1d7FZVTLXxuS9Pt bEtWUT1tElsbGSNEZ9SLADiwB+ijLpdR/GUFltNMY9v3gXj1ieMDGTljtIc32klsBGb3 msVQ== X-Gm-Message-State: ALoCoQkMxwIM/SZpmKm0K2CX2g7i+r9RpF9aD3PPy9LloDM1u5QuSfNGCQOWSSJEtkYjWWp+LNPj X-Received: by 10.112.138.2 with SMTP id qm2mr3175786lbb.19.1429853435325; Thu, 23 Apr 2015 22:30:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.197 with SMTP id o5ls405600laf.66.gmail; Thu, 23 Apr 2015 22:30:35 -0700 (PDT) X-Received: by 10.152.179.39 with SMTP id dd7mr5256320lac.118.1429853434944; Thu, 23 Apr 2015 22:30:34 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id xl8si7384316lac.55.2015.04.23.22.30.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:30:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lagv1 with SMTP id v1so27514628lag.3 for ; Thu, 23 Apr 2015 22:30:34 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr5450095laj.88.1429853434846; Thu, 23 Apr 2015 22:30:34 -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 l1csp977240lbt; Thu, 23 Apr 2015 22:30:34 -0700 (PDT) X-Received: by 10.70.135.168 with SMTP id pt8mr3035878pdb.8.1429853433028; Thu, 23 Apr 2015 22:30:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.30.31; Thu, 23 Apr 2015 22:30:33 -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 S1754512AbbDXFab (ORCPT + 2 others); Fri, 24 Apr 2015 01:30:31 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:35106 "EHLO mail-ob0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754417AbbDXFaa (ORCPT ); Fri, 24 Apr 2015 01:30:30 -0400 Received: by obcux3 with SMTP id ux3so30180731obc.2 for ; Thu, 23 Apr 2015 22:30:30 -0700 (PDT) X-Received: by 10.202.209.148 with SMTP id i142mr5453471oig.113.1429853430101; Thu, 23 Apr 2015 22:30:30 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id u141sm6094231oie.8.2015.04.23.22.30.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:30:28 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Anup Patel , Pranavkumar Sawargaonkar , marc Zyngier Subject: [PATCH for 3.12.y stable 12/63] arm64: KVM: Force undefined exception for Guest SMC intructions Date: Fri, 24 Apr 2015 13:27:10 +0800 Message-Id: <1429853281-6136-13-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> 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: shannon.zhao@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.215.54 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 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 --- 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 8da5606..df84d7b 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; }