From patchwork Thu Jul 2 10:59:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 50569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6B396214B3 for ; Thu, 2 Jul 2015 11:00:19 +0000 (UTC) Received: by wgbbj7 with SMTP id bj7sf20279329wgb.2 for ; Thu, 02 Jul 2015 04:00:18 -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=NWm4+2kkknnwhfYg91PqbBlAHbNdyxd3hwa8E19DeWAcCS7v/ulGo29C+9pyRS6VAz UmzxifY6KalmWQDE7OWuuu7INwWstFmbF2emT7zyaZj2MXiAZsu776itk7v9HW25pQNg G0OgrrfY+Ozsc0/aikY8VdTWKAkpMhVvc39nO4pMF1uCfqsLRXXxs5naJe42BvW8e8n8 jzMc6VroJVLUfk4AqbRc0JwU6bvmfc1NhFkaxlxxoXkal7Xq1mj5LTUWn1U+YnFPpEvp D+L00HKfovVjx6uud13yIWqSa5FS/ZT28gXlQ+kwR2X+dewypddAYba/4fK+x2p8zFGd WkQQ== X-Gm-Message-State: ALoCoQnpzPeQBzV9LLZx5dCGrIV88/bBTtrHf9146qx0POEe4lbE+GlvOiq+9tc4MT2n4ITcOzHT X-Received: by 10.112.181.37 with SMTP id dt5mr6128022lbc.10.1435834818575; Thu, 02 Jul 2015 04:00:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.10 with SMTP id j10ls340462lae.6.gmail; Thu, 02 Jul 2015 04:00:18 -0700 (PDT) X-Received: by 10.112.136.166 with SMTP id qb6mr30235780lbb.54.1435834818289; Thu, 02 Jul 2015 04:00:18 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id ci2si4164273lbd.65.2015.07.02.04.00.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 04:00:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagx9 with SMTP id x9so58551397lag.1 for ; Thu, 02 Jul 2015 04:00:17 -0700 (PDT) X-Received: by 10.112.93.37 with SMTP id cr5mr30084328lbb.106.1435834817871; Thu, 02 Jul 2015 04:00:17 -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 hn6csp392612lbb; Thu, 2 Jul 2015 04:00:16 -0700 (PDT) X-Received: by 10.70.129.143 with SMTP id nw15mr64231862pdb.101.1435834815968; Thu, 02 Jul 2015 04:00:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p3si8481613pds.160.2015.07.02.04.00.15; Thu, 02 Jul 2015 04:00:15 -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 S1752472AbbGBLAO (ORCPT + 2 others); Thu, 2 Jul 2015 07:00:14 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:34645 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668AbbGBLAM (ORCPT ); Thu, 2 Jul 2015 07:00:12 -0400 Received: by pdbep18 with SMTP id ep18so43482694pdb.1 for ; Thu, 02 Jul 2015 04:00:12 -0700 (PDT) X-Received: by 10.68.129.134 with SMTP id nw6mr64607073pbb.109.1435834812390; Thu, 02 Jul 2015 04:00:12 -0700 (PDT) Received: from localhost ([120.136.34.253]) by mx.google.com with ESMTPSA id on3sm5291654pbc.48.2015.07.02.04.00.09 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 Jul 2015 04:00:10 -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 2/5] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Thu, 2 Jul 2015 18:59:46 +0800 Message-Id: <1435834789-8020-3-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1435834789-8020-1-git-send-email-shannon.zhao@linaro.org> References: <1435834789-8020-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.44 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,