| Message ID | 1413633422-14907-12-git-send-email-marc.zyngier@arm.com |
|---|---|
| State | Accepted |
| Commit | 3d08c629244257473450a8ba17cb8184b91e68f8 |
| Headers | show
Return-Path: <patchwork-forward+bncBCPZR5X4TYBBB25XRGRAKGQE65FTIIY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3CC9B202DB for <linaro@patches.linaro.org>; Sat, 18 Oct 2014 12:24:12 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b57sf1324562eek.0 for <linaro@patches.linaro.org>; Sat, 18 Oct 2014 05:24:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=xZNraTfVMfURzAeBcQT0nw70qYiTr5rH+q0FUpvhs2c=; b=GHkXGLSsgSHhhgzfyFxcDJbCI/L4/sIQ4hJpw9IasniwwZY8aCMpbfX+qOakzZ5wax q+exnKi/p3geLZbLtYVDaKMqouCVktDcspq9jhXKnes9jvoMNtmnJrw+oivYd6UIgNGZ NTlSDUVuKe1/h10quuHoN6ktgDaaeibC9fSQc42J3NQOiCIjZQ5JUw7Pbxux150+POrG Ls1K6v0q1k4yV+gMiLFNBe48ujwyjqbXIHCiILSv8Lp9msPwCzp2n/aWEEkxR1VDl80t xHoP11QdkA59bLEmWOafwlKCr1jiEPepWL2KGQPlHCrYW57h32PCbUEAeDiPw6I1Q1D7 lSoQ== X-Gm-Message-State: ALoCoQkXL5TiwPaUDOmL0+fa0Y0E1EzUtMOmS6Tl/ugZhpDyFTFkzvQ/Zeaa/LalWuYlsn3Zzfbt X-Received: by 10.180.186.142 with SMTP id fk14mr753336wic.4.1413635051374; Sat, 18 Oct 2014 05:24:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.43 with SMTP id cj11ls321135lad.85.gmail; Sat, 18 Oct 2014 05:24:11 -0700 (PDT) X-Received: by 10.152.206.36 with SMTP id ll4mr15188086lac.64.1413635051084; Sat, 18 Oct 2014 05:24:11 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id j5si6070790lam.25.2014.10.18.05.24.11 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 Oct 2014 05:24:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id p9so1870233lbv.5 for <patchwork-forward@linaro.org>; Sat, 18 Oct 2014 05:24:11 -0700 (PDT) X-Received: by 10.112.221.197 with SMTP id qg5mr14834257lbc.32.1413635050964; Sat, 18 Oct 2014 05:24:10 -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.84.229 with SMTP id c5csp40578lbz; Sat, 18 Oct 2014 05:24:10 -0700 (PDT) X-Received: by 10.68.222.70 with SMTP id qk6mr14933275pbc.65.1413635049480; Sat, 18 Oct 2014 05:24:09 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id uf4si3454667pbc.38.2014.10.18.05.24.08 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Oct 2014 05:24:09 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XfT21-0003tk-Cg; Sat, 18 Oct 2014 12:22:49 +0000 Received: from inca-roads.misterjones.org ([213.251.177.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XfT1x-0003jy-PS for linux-arm-kernel@lists.infradead.org; Sat, 18 Oct 2014 12:22:46 +0000 Received: from [90.219.10.17] (helo=zomby-woof.wild-wind.fr.eu.org) by cheepnis.misterjones.org with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.80) (envelope-from <marc.zyngier@arm.com>) id 1XfSdI-0005Fz-2o; Sat, 18 Oct 2014 13:57:16 +0200 From: Marc Zyngier <marc.zyngier@arm.com> To: Gleb Natapov <gleb@kernel.org>, Paolo Bonzini <pbonzini@redhat.com> Subject: [PATCH 11/12] arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort Date: Sat, 18 Oct 2014 12:57:01 +0100 Message-Id: <1413633422-14907-12-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1413633422-14907-1-git-send-email-marc.zyngier@arm.com> References: <1413633422-14907-1-git-send-email-marc.zyngier@arm.com> X-SA-Exim-Connect-IP: 90.219.10.17 X-SA-Exim-Rcpt-To: gleb@kernel.org, pbonzini@redhat.com, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, christoffer.dall@linaro.org, steve.capper@linaro.org X-SA-Exim-Mail-From: marc.zyngier@arm.com X-SA-Exim-Scanned: No (on cheepnis.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141018_052245_976115_C28B4261 X-CRM114-Status: UNSURE ( 9.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) Cc: linux-arm-kernel@lists.infradead.org, Steve Capper <steve.capper@linaro.org>, Christoffer Dall <christoffer.dall@linaro.org>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: marc.zyngier@arm.com 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.174 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 8c40829..57a403a 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -930,7 +930,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, } coherent_cache_guest_page(vcpu, hva, PAGE_SIZE); ret = stage2_set_pte(kvm, memcache, fault_ipa, &new_pte, - mem_type == PAGE_S2_DEVICE); + pgprot_val(mem_type) == pgprot_val(PAGE_S2_DEVICE)); }