From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54086 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753080AbbF3ANa (ORCPT ); Mon, 29 Jun 2015 20:13:30 -0400 Date: Mon, 29 Jun 2015 17:13:30 -0700 From: Greg KH To: shannon.zhao@linaro.org Cc: stable@vger.kernel.org, christoffer.dall@linaro.org, Ard Biesheuvel , Marc Zyngier Subject: Re: [PATCH for 3.14.y stable 11/32] ARM/arm64: KVM: fix use of WnR bit in kvm_is_write_fault() Message-ID: <20150630001330.GF29763@kroah.com> References: <1433256507-7856-1-git-send-email-shannon.zhao@linaro.org> <1433256507-7856-12-git-send-email-shannon.zhao@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433256507-7856-12-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Jun 02, 2015 at 10:48:06PM +0800, shannon.zhao@linaro.org wrote: > From: Ard Biesheuvel > > commit a7d079cea2dffb112e26da2566dd84c0ef1fce97 upstream. > > The ISS encoding for an exception from a Data Abort has a WnR > bit[6] that indicates whether the Data Abort was caused by a > read or a write instruction. While there are several fields > in the encoding that are only valid if the ISV bit[24] is set, > WnR is not one of them, so we can read it unconditionally. > > Instead of fixing both implementations of kvm_is_write_fault() > in place, reimplement it just once using kvm_vcpu_dabt_iswrite(), > which already does the right thing with respect to the WnR bit. > Also fix up the callers to pass 'vcpu' > > Acked-by: Laszlo Ersek > Acked-by: Marc Zyngier > Acked-by: Christoffer Dall > Signed-off-by: Ard Biesheuvel > Signed-off-by: Marc Zyngier > Signed-off-by: Shannon Zhao > --- > arch/arm/include/asm/kvm_mmu.h | 11 ----------- > arch/arm/kvm/mmu.c | 10 +++++++++- > arch/arm64/include/asm/kvm_mmu.h | 13 ------------- > 3 files changed, 9 insertions(+), 25 deletions(-) Please always say that you modified the code from the original version, and _why_ you did such a modification. Otherwise I'll assume you did this backport wrong and throw it out. Like I'm doing now :) Please fix up and resend all of the remaining of the series you wish to see added to 3.14-stable. thanks, gre k-h