From patchwork Tue Jun 2 14:48:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49404 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 CC77820BD1 for ; Tue, 2 Jun 2015 14:52:08 +0000 (UTC) Received: by laboh3 with SMTP id oh3sf38636562lab.0 for ; Tue, 02 Jun 2015 07:52:07 -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=ewbvvBC3Y9dPSupr4nycqV1Q910m0a0xEN6zJ0negHFOJ3ROw8ArLWeoEM99VcgdJH GconnblC8U7uV1brEtRxdZ2vxbZXExJRg3HoEf31VKZp6Rbl6F0miTW3jXgKrxsOBLO+ vzclD0PtM1wvjOyobKjTVSjV395Hgaqm+7wIPeHdn54YQeLOjN8hEMPr4hdiR9HbQmpk riSkuHuM8muwzuZq+PZHhIl1sRsDFNHnVJ1ntLFXW3gQsP5KwGy+Nr1wi8Ir9NOXd+xU loeDcu04E2yyfub114vKDHOJIWAeoONlsdL1xvlPvTanbGuFZ63xGpDVWUJ3VNEqt+kr Mo9g== X-Gm-Message-State: ALoCoQmek1Vk+yFDgIr/Ig38i091MCkTa5QdTPpiWNT9o+ErpdjlYMBXzrfTpp2JStxBSseVv/3v X-Received: by 10.180.37.198 with SMTP id a6mr4385993wik.7.1433256727637; Tue, 02 Jun 2015 07:52:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls724944laj.86.gmail; Tue, 02 Jun 2015 07:52:07 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr26621642lbc.73.1433256727470; Tue, 02 Jun 2015 07:52:07 -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 h1si15287387lah.56.2015.06.02.07.52.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 07:52:07 -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 lbbuc2 with SMTP id uc2so106186029lbb.2 for ; Tue, 02 Jun 2015 07:52:07 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr26609105laj.88.1433256727347; Tue, 02 Jun 2015 07:52:07 -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 hn6csp3130179lbb; Tue, 2 Jun 2015 07:52:06 -0700 (PDT) X-Received: by 10.70.103.230 with SMTP id fz6mr51171114pdb.1.1433256725379; Tue, 02 Jun 2015 07:52:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id po1si26750474pac.52.2015.06.02.07.52.04; Tue, 02 Jun 2015 07:52:05 -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 S1759213AbbFBOwD (ORCPT + 2 others); Tue, 2 Jun 2015 10:52:03 -0400 Received: from mail-oi0-f49.google.com ([209.85.218.49]:33119 "EHLO mail-oi0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759006AbbFBOwD (ORCPT ); Tue, 2 Jun 2015 10:52:03 -0400 Received: by oiww2 with SMTP id w2so127425385oiw.0 for ; Tue, 02 Jun 2015 07:52:02 -0700 (PDT) X-Received: by 10.202.91.212 with SMTP id p203mr7138395oib.108.1433256722804; Tue, 02 Jun 2015 07:52:02 -0700 (PDT) Received: from localhost ([167.160.116.34]) by mx.google.com with ESMTPSA id w130sm9617550oif.10.2015.06.02.07.52.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jun 2015 07:52:01 -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 29/32] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Tue, 2 Jun 2015 22:48:24 +0800 Message-Id: <1433256507-7856-30-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1433256507-7856-1-git-send-email-shannon.zhao@linaro.org> References: <1433256507-7856-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.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: 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,