From patchwork Fri Jan 24 09:29:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8315EC2D0DB for ; Fri, 24 Jan 2020 09:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51BE9214AF for ; Fri, 24 Jan 2020 09:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859626; bh=R9KdXV7L1b3TSiiLfRys04FVfI9mVRkjd1uT/dLhNqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LfbqJVxYtHCKtsJCOGilk4+0MAlS8n6ahRXdwMz67dt1qfliWy6kOPSZ3OMQYa5HU gbdsFLW1gQyHrFrAULO4ieb5fgz+kBt3AanIdvCWn9fe5fCX67CRzvHOqLmyE3Ie7N ZrHsofVUn3UNy1Cz2yRs/RP2df7yZz++wvamrsmk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388138AbgAXJxp (ORCPT ); Fri, 24 Jan 2020 04:53:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:56516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730133AbgAXJxp (ORCPT ); Fri, 24 Jan 2020 04:53:45 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B00820709; Fri, 24 Jan 2020 09:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859624; bh=R9KdXV7L1b3TSiiLfRys04FVfI9mVRkjd1uT/dLhNqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2k0gaAm6vu2KPRRyxFg1E3xEOVdDP3kNOHgL9uW5wdq9mx7Mo0iCd6Pxd5Qrqj10 Tzs9TVSytX2zqEfG51iKXIUJaqnOFS2pR8C0qcunzwN6KV56ubyMeYL6AGcxJQ6ms1 Sw9KK4kUu5pEaHcCM6ucZCzDNYsGUacEWw3yf/Gs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rashmica Gupta , Michael Ellerman , Sasha Levin Subject: [PATCH 4.14 136/343] powerpc/mm: Check secondary hash page table Date: Fri, 24 Jan 2020 10:29:14 +0100 Message-Id: <20200124092937.855687291@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rashmica Gupta [ Upstream commit 790845e2f12709d273d08ea7a2af7c2593689519 ] We were always calling base_hpte_find() with primary = true, even when we wanted to check the secondary table. mpe: I broke this when refactoring Rashmica's original patch. Fixes: 1515ab932156 ("powerpc/mm: Dump hash table") Signed-off-by: Rashmica Gupta Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/mm/dump_hashpagetable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/mm/dump_hashpagetable.c b/arch/powerpc/mm/dump_hashpagetable.c index 5c4c93dcff190..f666d74f05f51 100644 --- a/arch/powerpc/mm/dump_hashpagetable.c +++ b/arch/powerpc/mm/dump_hashpagetable.c @@ -343,7 +343,7 @@ static unsigned long hpte_find(struct pg_state *st, unsigned long ea, int psize) /* Look in secondary table */ if (slot == -1) - slot = base_hpte_find(ea, psize, true, &v, &r); + slot = base_hpte_find(ea, psize, false, &v, &r); /* No entry found */ if (slot == -1)