Message ID | 20170607171152.21874-4-cdall@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 956DD6034B for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 7 Jun 2017 17:13:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4704626785 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 7 Jun 2017 17:13:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B90B28451; Wed, 7 Jun 2017 17:13:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD90626785 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 7 Jun 2017 17:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uUmPjLTuyskmyTvr5Fm4VuklYG+3OLdKVL4Eqtg+MmQ=; b=fhj9F6Pg80VpMyxRNHAtS14hvv urI31+peTwNtvh+qZXXx1wMPgVnxuZw7X+K1MPZa9tDHrj66ziyyKfHELFwa8brIeXafsMA144tTF UfRd3nH/f7JaFCST1nEn2/zKmRQZ++6i5Q5W2NvB9lt9Hl4d4zOzx7ldcH/v3myZWVB31zGMJsVk2 XsIcT6f3deA1V7mVG/1tB2G//DncZ+DsIltvAasY8jVYHkZSqZoPdkdUdEzmkSoeVJ2Y+mXQrUId5 yzQED7LyNfmsxTt2ZUUJPf57o16f9s2hZLudEtFt1pOaEDBoSt9nW8/yFBkfka8eXUubQo3peFW1X 6YfgtsqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dIeVy-00057S-09; Wed, 07 Jun 2017 17:13:02 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dIeVT-0004pO-54 for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2017 17:12:33 +0000 Received: by mail-wm0-x22f.google.com with SMTP id 7so122726094wmo.1 for <linux-arm-kernel@lists.infradead.org>; Wed, 07 Jun 2017 10:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S5X4aVMVwKwyxCJ1P/KCFfH7YvSJsKAmtf5ebjhgSb8=; b=YAe9b5a6BXC8S5jpR0wtvu8n9dWAh/8kLpCzwuLboDF0Co1Wt6mcIjuBQ3tGv9S07F uv3S6XJ2njVhutKQHtm00CXM2kmLPSm+4qiPajnbgQ/gioImsj0vWPRUp3aD8sTS7K6N xpRtaBY+SsH81EO0zb4m4LePH3FLkSJrGGQtU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S5X4aVMVwKwyxCJ1P/KCFfH7YvSJsKAmtf5ebjhgSb8=; b=VNzqtMakEMVWUIp3lirOdhA3knsrwXmFLaF5ujV36FT8xRPpgkvwfoQnj2S1u7vS5s 3ly/OkDN8HZWHzyY8D4oyw/ov2UaLwaK4VsEbMwus1oftjlol+w2sUvrlJfpb9zysxVi kpCgZP81eZobcyEsokVc3zADd9lDrrASUOuXF1R9ln4Ajkwh6CNwmt3hwZYK0WjN983W xjbhgFz6pENv9MYhvRh5NLSH/IVNAJo54ipOH9fp0I3dtfhQJUTtSGH7QZn4RiI69Ll6 EpaVigz8Il6GOrMUBOZ9j4JGCPJ7iYA+Zj17ptCrg6Lo97Lew2XaewafzYuNKw4zG5KN 0grw== X-Gm-Message-State: AODbwcBbRBPquq9jsxspgfPZsbcSRmjG4TzZ6wQefzsXtZYnphDRWQNn ZapxZx6Ny0w+ddkaOebNhQ== X-Received: by 10.80.151.131 with SMTP id e3mr25588068edb.61.1496855529274; Wed, 07 Jun 2017 10:12:09 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id c2sm966244edc.34.2017.06.07.10.12.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 10:12:08 -0700 (PDT) From: Christoffer Dall <cdall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com>, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com> Subject: [PULL v2 3/6] KVM: arm/arm64: Handle possible NULL stage2 pud when ageing pages Date: Wed, 7 Jun 2017 19:11:49 +0200 Message-Id: <20170607171152.21874-4-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170607171152.21874-1-cdall@linaro.org> References: <20170607171152.21874-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170607_101231_351885_0AB1DA03 X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Christoffer Dall <cdall@linaro.org>, kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, stable@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index a2d6324..e2e5eff 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -879,6 +879,9 @@ static pmd_t *stage2_get_pmd(struct kvm *kvm, struct kvm_mmu_memory_cache *cache pmd_t *pmd; pud = stage2_get_pud(kvm, cache, addr); + if (!pud) + return NULL; + if (stage2_pud_none(*pud)) { if (!cache) return NULL;