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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9C88CA0ED2 for ; Mon, 11 Sep 2023 21:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350822AbjIKVlg (ORCPT ); Mon, 11 Sep 2023 17:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240950AbjIKO5t (ORCPT ); Mon, 11 Sep 2023 10:57:49 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BA881B9 for ; Mon, 11 Sep 2023 07:57:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE95BC433C8; Mon, 11 Sep 2023 14:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694444265; bh=6X+Gx96Jj4VyxmJO5fV2EJ5MypQiljitmCtQbtczV6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgk/d3YkZ6fb2kyXg3ponet6pAa9BR6inSE0kyxghQOke1g7zdtm3ki00Zxn92bvx Yr8FwcRRA2PqFhmMvzeJ7KUXDqhvCBYPR5pkhS9nRQn+DLW+qOW+cGUb+mCHxKDaSl wniv0Ua19ACHpi+WnRDbAPeoLFgpkeESrs2FOnak= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Hildenbrand , Hongchen Zhang , Huacai Chen Subject: [PATCH 6.4 668/737] LoongArch: mm: Add p?d_leaf() definitions Date: Mon, 11 Sep 2023 15:48:47 +0200 Message-ID: <20230911134709.201868274@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230911134650.286315610@linuxfoundation.org> References: <20230911134650.286315610@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hongchen Zhang commit 303be4b33562a5b689261ced1616bf16ad49efa7 upstream. When I do LTP test, LTP test case ksm06 caused panic at break_ksm_pmd_entry -> pmd_leaf (Huge page table but False) -> pte_present (panic) The reason is pmd_leaf() is not defined, So like commit 501b81046701 ("mips: mm: add p?d_leaf() definitions") add p?d_leaf() definition for LoongArch. Fixes: 09cfefb7fa70 ("LoongArch: Add memory management") Cc: stable@vger.kernel.org Acked-by: David Hildenbrand Signed-off-by: Hongchen Zhang Signed-off-by: Huacai Chen Signed-off-by: Greg Kroah-Hartman --- arch/loongarch/include/asm/pgtable.h | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -593,6 +593,9 @@ static inline long pmd_protnone(pmd_t pm } #endif /* CONFIG_NUMA_BALANCING */ +#define pmd_leaf(pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0) +#define pud_leaf(pud) ((pud_val(pud) & _PAGE_HUGE) != 0) + /* * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture.