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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC2F1C54FB3 for ; Mon, 2 Jun 2025 14:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IeyzL5010NlYzXvxE8MExfueYoj6ASxI6+Dlma7bM5g=; b=sbuvVUs4mb34qn6j8gFDp+CmjC B7U2KfuYDrfHIwM8oHnwIvnEY2wk+DS/dS/qUBy7SjPTqSdO4LKAEjhtsuiUOXoFgIEcD5sN77rwV B9dT0IqHsNYetvwXbZSk7xtcdAkr+DgTvOIYgx/p0Yo7UfmKZ3CYZ+Vo7ebDsEy69dY/thx+RuIZh Sj1xHLPFnv3hlUGsqxek1s4H0t9tOVUf/7l9H1MrjsMr28umYXhUvx2UQqvDJsLQSsoq4zgkpjZHt tVSjhyoLZcnjypX+QaAMSn08l+QihFEN69LywAzg9X9sD0dPhPVrjG/NRvCfcx2iN7K3XyKyg+XnK ie9EzVIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uM5uQ-00000007aeL-2yl4; Mon, 02 Jun 2025 14:13:02 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uM5sE-00000007a22-3ivw for linux-arm-kernel@lists.infradead.org; Mon, 02 Jun 2025 14:10:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 3D06D6111C; Mon, 2 Jun 2025 14:10:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FA87C4CEEB; Mon, 2 Jun 2025 14:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748873445; bh=N8seNeAUl9s8e3bRXZKsnSUPb4UCADG2BvjRH2kJqFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eMDtW/PlKkl/W5OSPzhGcOhoOybZZG+R+wCwuyINVGGoaFo5uxzyBUrIKubF9DwYa PcaT+R8cdMXncXCTr5HmNAUsD2szMSAp9Xap9PNdmIYU6e+0b9W3smmmHgtu7qkogT yRBfL0+0hOe/ER6oaG0fymihnoCkrjqEH6rDAMB4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Will Deacon , Ard Biesheuvel , Ryan Roberts , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Anshuman Khandual , Catalin Marinas , Sasha Levin Subject: [PATCH 6.6 114/444] arm64/mm: Check PUD_TYPE_TABLE in pud_bad() Date: Mon, 2 Jun 2025 15:42:58 +0200 Message-ID: <20250602134345.520529719@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134340.906731340@linuxfoundation.org> References: <20250602134340.906731340@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ryan Roberts [ Upstream commit bfb1d2b9021c21891427acc86eb848ccedeb274e ] pud_bad() is currently defined in terms of pud_table(). Although for some configs, pud_table() is hard-coded to true i.e. when using 64K base pages or when page table levels are less than 3. pud_bad() is intended to check that the pud is configured correctly. Hence let's open-code the same check that the full version of pud_table() uses into pud_bad(). Then it always performs the check regardless of the config. Cc: Will Deacon Cc: Ard Biesheuvel Cc: Ryan Roberts Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Ryan Roberts Signed-off-by: Anshuman Khandual Link: https://lore.kernel.org/r/20250221044227.1145393-7-anshuman.khandual@arm.com Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/include/asm/pgtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 07bdf5dd8ebef..0212129b13d07 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -679,7 +679,8 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e)) #define pud_none(pud) (!pud_val(pud)) -#define pud_bad(pud) (!pud_table(pud)) +#define pud_bad(pud) ((pud_val(pud) & PUD_TYPE_MASK) != \ + PUD_TYPE_TABLE) #define pud_present(pud) pte_present(pud_pte(pud)) #define pud_leaf(pud) (pud_present(pud) && !pud_table(pud)) #define pud_valid(pud) pte_valid(pud_pte(pud)) -- 2.39.5