From patchwork Mon May 4 01:25:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47931 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A21D320553 for ; Mon, 4 May 2015 01:28:04 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf38711390lbb.0 for ; Sun, 03 May 2015 18:28:03 -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=dHp2ujd/Fd9RssPElCI1uCzlmyqYvz4XcdxEv8Apdjc=; b=VTeJwf+Tno3QQZEw6Wup8X4M7kK8c4iE/FkclmiRwS3ehhOpEVgFLQxgkYaSF4zW/Z 9OHqEZWisWL/J7DaUeb0FSaVVlpepRJFxXcMlJn634Axx8wOqoPnV1/BP+FS+AA/oQkr nj6gOHROHCq0D9Nmf9pk7Fn3sXAnczO7cOkrpQ71rHLszyWvWp6GARDesmYq/USIp9oc J0SmfauOEpxYfvBhAV9sQDSjm2ZjB5TSYOm5guE4haptNY6xnqsXzOfgUDmPzOuUz6ej ejtKHBCuTAyD3Ve2fuG6hwUdHPs0N3tf83bxMUoTC+xDEeGhkGqrA9IRIMzHj/htdfXx flow== X-Gm-Message-State: ALoCoQk9VnAAWFHvjWQSFiAIeiahgpaJZBgcQOveVPGsn2brOOGCwSBPdeICJP3R+BSdHI6fSUpg X-Received: by 10.112.189.131 with SMTP id gi3mr16900687lbc.6.1430702883610; Sun, 03 May 2015 18:28:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.73 with SMTP id lm9ls774951lac.20.gmail; Sun, 03 May 2015 18:28:03 -0700 (PDT) X-Received: by 10.112.130.129 with SMTP id oe1mr7649830lbb.37.1430702883307; Sun, 03 May 2015 18:28:03 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id z9si9058429lbu.81.2015.05.03.18.28.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2015 18:28:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbqq2 with SMTP id qq2so95364986lbb.3 for ; Sun, 03 May 2015 18:28:03 -0700 (PDT) X-Received: by 10.152.36.2 with SMTP id m2mr17316253laj.72.1430702883164; Sun, 03 May 2015 18:28:03 -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 l1csp1406083lbt; Sun, 3 May 2015 18:28:02 -0700 (PDT) X-Received: by 10.70.38.195 with SMTP id i3mr38467752pdk.82.1430702881423; Sun, 03 May 2015 18:28:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id es7si17680936pbd.123.2015.05.03.18.28.00; Sun, 03 May 2015 18:28:01 -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 S1751508AbbEDB2A (ORCPT + 2 others); Sun, 3 May 2015 21:28:00 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:35957 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751578AbbEDB17 (ORCPT ); Sun, 3 May 2015 21:27:59 -0400 Received: by pabsx10 with SMTP id sx10so147326557pab.3 for ; Sun, 03 May 2015 18:27:59 -0700 (PDT) X-Received: by 10.68.65.106 with SMTP id w10mr37408164pbs.75.1430702879227; Sun, 03 May 2015 18:27:59 -0700 (PDT) Received: from localhost ([180.150.153.1]) by mx.google.com with ESMTPSA id by13sm11007038pdb.37.2015.05.03.18.27.57 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 03 May 2015 18:27:57 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: sasha.levin@oracle.com, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Marc Zyngier , Paolo Bonzini Subject: [PATCH for 3.18.y stable 15/22] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Mon, 4 May 2015 09:25:19 +0800 Message-Id: <1430702726-2056-16-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1430702726-2056-1-git-send-email-shannon.zhao@linaro.org> References: <1430702726-2056-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.170 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 b72aa9f..a767f6a 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -1014,6 +1014,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,