From patchwork Mon May 4 01:52:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47982 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 778B12121F for ; Mon, 4 May 2015 01:57:07 +0000 (UTC) Received: by lamp14 with SMTP id p14sf42325112lam.3 for ; Sun, 03 May 2015 18:57:06 -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=jF6n1x6TZxs/drTMOsIc/C/o4CBxiAwGS7AvlrP8BGArusq9jCudHbGoHonqwavXI2 V7Hg1lECaNxQWqR8jMUjSpqe2rebouUH93SbvUh1Mb4BSsL51fOXPynlBc039O1CQJaa Wk9c4yaeQnHGo+TnAiNzbr9K8njxOzbzzVQSgOCfI4a7WT/h4ZnT4tXlfda6iG0TyhXD Ol45mGvjQIlvZDUArrpkiaNh8OujHXooW1C3ezIZJk0O4EdPezoYfDTj5q6/xQgck237 VOJMTTsjL1p7YDc8qKxga3CRWNAhe1hFpD8P/YLeUi7rFAt9OJfD3ugRhNdnxTV5IHnT D+qw== X-Gm-Message-State: ALoCoQnYX3NX07OewAFE2sYKSMThmMFD4eKAGi7EYVsgHklUGKSJZuhsVTUnma/dyYSV7Ccumz8Y X-Received: by 10.152.184.73 with SMTP id es9mr16977224lac.4.1430704626393; Sun, 03 May 2015 18:57:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.110 with SMTP id bf14ls652970lab.48.gmail; Sun, 03 May 2015 18:57:06 -0700 (PDT) X-Received: by 10.152.36.136 with SMTP id q8mr17245032laj.96.1430704625976; Sun, 03 May 2015 18:57:05 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id t4si9113997lbo.3.2015.05.03.18.57.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2015 18:57:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbuc2 with SMTP id uc2so95621468lbb.2 for ; Sun, 03 May 2015 18:57:05 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr17453547lbd.29.1430704625590; Sun, 03 May 2015 18:57:05 -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 l1csp1413348lbt; Sun, 3 May 2015 18:57:04 -0700 (PDT) X-Received: by 10.70.47.9 with SMTP id z9mr38437260pdm.69.1430704623750; Sun, 03 May 2015 18:57:03 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ix6si17838787pac.46.2015.05.03.18.57.02; Sun, 03 May 2015 18:57:03 -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 S1751977AbbEDB5B (ORCPT + 2 others); Sun, 3 May 2015 21:57:01 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:34544 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751987AbbEDB5B (ORCPT ); Sun, 3 May 2015 21:57:01 -0400 Received: by pdbqa5 with SMTP id qa5so149985113pdb.1 for ; Sun, 03 May 2015 18:57:01 -0700 (PDT) X-Received: by 10.66.139.167 with SMTP id qz7mr38131473pab.135.1430704620965; Sun, 03 May 2015 18:57:00 -0700 (PDT) Received: from localhost ([180.150.153.1]) by mx.google.com with ESMTPSA id el6sm11025137pdb.93.2015.05.03.18.56.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 03 May 2015 18:56:59 -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 44/47] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Mon, 4 May 2015 09:52:39 +0800 Message-Id: <1430704362-6292-45-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1430704362-6292-1-git-send-email-shannon.zhao@linaro.org> References: <1430704362-6292-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.181 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,