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 7E170C54ED1 for ; Tue, 27 May 2025 16:58:14 +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=qcQMEm8JOg67JU210pbNv2bortehxKkM0ho6YyE5Px0=; b=rmvLs13KUSCzqG/ntw0i2ERLWT tQWNFrgUMZEA2B88nN0Ph2ZP2EN4tkMC204aIykcYs6M5qKItLK6UHWcU/DQjL5IAxFdmusufL6UO 1Y2WcDfsvtbNcnyReA5U3dRfQdT0koO1kL4GQCiYC1xB2229k8dGpt9QD+MJRYkJfrk7CFMjAyYm/ vPQV9SZCNpLlizmUL/DOfP1cJsrgXSopgxa9KI9z9tXsoMw02xeYFNzEaVKIZ82tMSGCK7RlVFHkQ EALBCB0UIUTYTafO9exxNDqYXK1HnnSAs9mhOmUa79LvezEx5YLRFWDzQLF5/g8I/tmPVhmrR8Pry YTDkKQFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJxcs-0000000BDg1-34fO; Tue, 27 May 2025 16:58:06 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJxYe-0000000BD9A-1065 for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2025 16:53:44 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8C9B4614E0; Tue, 27 May 2025 16:53:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E497FC4CEED; Tue, 27 May 2025 16:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748364823; bh=cwXrtbihqwxd4lD4eRlLpyeAXzMJJzQSh2etFWMMXW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhNPPqSRLpAgmuVBSM/McRcebQFt+JIuwj1ejdAx1AB43oKus7A7TCoCyEIcAMEFN lUOyDopmjbr87flarS5JuM57hrp0EIZoquNLQ8WMdaQbAdAaqehGPu6nLYmA56jSAT W9HkYgqsE0D6kWN8TYzC12QaIRTE8Wbf3tLggBdI= 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.12 176/626] arm64/mm: Check PUD_TYPE_TABLE in pud_bad() Date: Tue, 27 May 2025 18:21:09 +0200 Message-ID: <20250527162452.167269260@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@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.12-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 8ee56ae999c16..5ba8376735cb0 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -806,7 +806,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)) #ifndef __PAGETABLE_PMD_FOLDED #define pud_leaf(pud) (pud_present(pud) && !pud_table(pud)) -- 2.39.5