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 134A4C3ABBC for ; Tue, 6 May 2025 02:33:21 +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=CS3Nc6g5daGwp4WxnFpmzTzqRTWVm0NQSmxo7/V6EqM=; b=DDjAw7i8NA/uYf510qWMmieQ5m 8uXXktZ6D7wknF+zFgqCd7CdtYizObNSJ2qF7gebHFpvcGTOPj35dGZohxWEptIWAeIo0v12Amday M/FWnjBH13Ve1zt9MoEIIKuBZ/XGzUq+nQZ/7TExy9XBBCNgeL4nrgQsrIV2tNPjWkygvfOkyCjss IsL01h6854uWYa1RQlGH3VTe9TeI11ZSFHJVnZas4cnHYwc9402ekHmwmHIvbPzVV9Y7c1fwKwTYT /b5pUfo0qgm10N8l90EUYmUB99JdiZW7js1VhvYoFLGAgy5KBYwgSuYoyWy8u6bN7IJUAlklYQaiy aw/B5P+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uC87K-00000009mD3-1Rqy; Tue, 06 May 2025 02:33:10 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uC4mM-00000008vJz-2Lhn for linux-arm-kernel@lists.infradead.org; Mon, 05 May 2025 22:59:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 85ECA4370E; Mon, 5 May 2025 22:59:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F16DC4CEE4; Mon, 5 May 2025 22:59:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485958; bh=ta+mfXbkBTyOaaW4fLr+68sTfufipn2eImAP93DhKh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVtUBGQX2HWXFwGtfGItlSq9eUg1kLEGPU+T55H3bUKV9vEewsmtStLdIUBMSbsgY wDoBLoJK/WPdiT/DdrEWHxKNqv28JBkKY8x0hMq5oehzo+uOR5KEHAxyjxyYG1tHqI ATdCXHIRSPo/bLro84OOofXsKo2jo/YYUUcH5tCNMDDRj6KBAYEaugunu3rSVo0u4e +SGVSjflbMr5ZZ2MRcYsJEvJrOMQuPcJ9MeUSHPZ2DQIwDgcG1gOfWVI0JrnqwY2Se gNSmsst6UcjzK5eo9UxUJ64a5/4TbVnfiyvIgzeK6563j5SRePG4uzLTr1gG3eHQrJ 8MQ4Aqlv8XfIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ryan Roberts , Will Deacon , Ard Biesheuvel , Mark Rutland , linux-arm-kernel@lists.infradead.org, Anshuman Khandual , Catalin Marinas , Sasha Levin , peterx@redhat.com, joey.gouly@arm.com, yangyicong@hisilicon.com, ioworker0@gmail.com Subject: [PATCH AUTOSEL 6.6 085/294] arm64/mm: Check PUD_TYPE_TABLE in pud_bad() Date: Mon, 5 May 2025 18:53:05 -0400 Message-Id: <20250505225634.2688578-85-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250505_155918_622716_B0119D80 X-CRM114-Status: GOOD ( 11.83 ) 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 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