From patchwork Tue Jun 30 10:49:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 50467 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 61069229DF for ; Tue, 30 Jun 2015 10:51:50 +0000 (UTC) Received: by lagh6 with SMTP id h6sf2341036lag.0 for ; Tue, 30 Jun 2015 03:51:49 -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=2OJ3mPKge3llJM7aLDPqCgPzdBtKcmwWRUkls4wVrfw=; b=QVL9+rY573z+sQQLygIiRK+mkQFkqWfQRVOYA7AWV7r5BUqbux/eEXuALX86sInTvQ 6qhRd0T9ny7MyJkwa99U6HAgSKWmBz7wYTlYk1omzl1Eyjj8CXFrDFgXJ1UvjZag8H+9 wN1Yingfgv3MrL5T8rbYqL/BL7kN7gwKl7zpRyAOgDP0c32EXDfWfcjl38qFMTRyJT5L VYtTYFIiDnC4Sze7J9XBhQUyIQBychdo6ioZiTkGkHKRTItZCuet8+QpAvTPKrI7AxbP 7IA+Jwzdey2jb0iiRIEyS6gGVgqmd8TwJ21Pl2iuOyN+sj0yX9XUHYtFj7uGdJgcxbY2 2dAg== X-Gm-Message-State: ALoCoQmyjhZvNaGcNdXHvGe57DmgOlxl0+35WZx6PDKGkLI70EDbYgPw5x0KdV08yY4Q9hwyTUHs X-Received: by 10.152.6.103 with SMTP id z7mr13721298laz.8.1435661509385; Tue, 30 Jun 2015 03:51:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.136 with SMTP id q8ls27150laj.91.gmail; Tue, 30 Jun 2015 03:51:49 -0700 (PDT) X-Received: by 10.112.135.131 with SMTP id ps3mr18806097lbb.84.1435661509036; Tue, 30 Jun 2015 03:51:49 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id la8si37761337lac.141.2015.06.30.03.51.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2015 03:51:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lagx9 with SMTP id x9so8182703lag.1 for ; Tue, 30 Jun 2015 03:51:49 -0700 (PDT) X-Received: by 10.152.42.177 with SMTP id p17mr18859256lal.29.1435661508950; Tue, 30 Jun 2015 03:51:48 -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.108.230 with SMTP id hn6csp2353529lbb; Tue, 30 Jun 2015 03:51:47 -0700 (PDT) X-Received: by 10.70.103.70 with SMTP id fu6mr43032373pdb.22.1435661500972; Tue, 30 Jun 2015 03:51:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lj11si69631040pab.25.2015.06.30.03.51.39; Tue, 30 Jun 2015 03:51:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971AbbF3Kvg (ORCPT + 2 others); Tue, 30 Jun 2015 06:51:36 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:33239 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095AbbF3Kve (ORCPT ); Tue, 30 Jun 2015 06:51:34 -0400 Received: by pdjd13 with SMTP id d13so4355531pdj.0 for ; Tue, 30 Jun 2015 03:51:34 -0700 (PDT) X-Received: by 10.68.200.69 with SMTP id jq5mr42146306pbc.111.1435661494015; Tue, 30 Jun 2015 03:51:34 -0700 (PDT) Received: from localhost ([120.136.36.232]) by mx.google.com with ESMTPSA id da3sm45233129pdb.8.2015.06.30.03.51.31 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Jun 2015 03:51:32 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Marc Zyngier , Paolo Bonzini Subject: [PATCH for 3.14.y stable 19/22] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Tue, 30 Jun 2015 18:49:07 +0800 Message-Id: <1435661350-8060-20-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1435661350-8060-1-git-send-email-shannon.zhao@linaro.org> References: <1435661350-8060-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.43 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: Marc Zyngier commit 55e858b75808347378e5117c3c2339f46cc03575 upstream. It took about two years for someone to notice that the IPA passed to TLBI IPAS2E1IS must be shifted by 12 bits. Clearly our reviewing is not as good as it should be... Paper bag time for me. Reported-by: Mario Smarduch Tested-by: Mario Smarduch Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall Signed-off-by: Paolo Bonzini Signed-off-by: Shannon Zhao --- arch/arm64/kvm/hyp.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 5dfc8331..3aaf3bc 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -629,6 +629,7 @@ ENTRY(__kvm_tlb_flush_vmid_ipa) * Instead, we invalidate Stage-2 for this IPA, and the * whole of Stage-1. Weep... */ + lsr x1, x1, #12 tlbi ipas2e1is, x1 /* * We have to ensure completion of the invalidation at Stage-2,