From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 6ACCBC33CAF for ; Thu, 16 Jan 2020 19:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 372F12053B for ; Thu, 16 Jan 2020 19:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201436; bh=ym474XaUAzg8O52I4veViPZJ5pKolRrM+e+R9cUVBp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ltlVj4ajxNoF656cuKq6WwN8ALmz0LHW2Ex/O7fB5fhtuG1g4qVQFcQm3Jtde1beU N2rRcUGwYOLvNhmUZSylFg1LesPS3FoKllMUXcv5lWygDQ8tpgIvw1fxRzXRVS+i0G +ZKbnsI1YiIpmfiiangcz9HIVN398C5/cW0njCpw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407287AbgAPTDz (ORCPT ); Thu, 16 Jan 2020 14:03:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:55264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729160AbgAPRC3 (ORCPT ); Thu, 16 Jan 2020 12:02:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2B5CA2077B; Thu, 16 Jan 2020 17:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194148; bh=ym474XaUAzg8O52I4veViPZJ5pKolRrM+e+R9cUVBp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQgBoH4kgHn/niKQ53i4AaY2d1e7N9ayBDbQ9c73nm6y3wwOk0RucJpD0CcAIiBig /1oFoSevypSj1y/SyYmKZxYBMjVA/mRyZ76088jhbizxSdjj4Jy5q+SrHe/oV9WNxW R/GDp/E7Q4h7PNbr3KjndSMIE/L3JFCxcya5gxrw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rashmica Gupta , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.19 233/671] powerpc/mm: Check secondary hash page table Date: Thu, 16 Jan 2020 11:52:22 -0500 Message-Id: <20200116165940.10720-116-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116165940.10720-1-sashal@kernel.org> References: <20200116165940.10720-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 869294695048..b430e4e08af6 100644 --- a/arch/powerpc/mm/dump_hashpagetable.c +++ b/arch/powerpc/mm/dump_hashpagetable.c @@ -342,7 +342,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) -- 2.20.1