From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B6A52F73CF; Mon, 5 May 2025 23:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487163; cv=none; b=HcWRNsvhisxaf3ODcYqbJNNTnNVVRcslLSVohIKSATmLAKcLKB2MhZ/saNoEQBaifZz5xX0ymrMoZb7mslP5F4qWABtKnXqHXFv8Z6gCm6tzvKLxkEPxa1G0jalw9Q3MAa4P+myk0ybNDwU1zf0WBw/lqMh4Vm28SdQ9qWxA4WQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487163; c=relaxed/simple; bh=jMVhMb90pTBBDR8HVAGZnjtvmzmZ8P6g0h8V/n1oEkU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R9rtQ3S4msk9c4YonB0Zef+PGPJ9Yngqvhu1yOT6RmnO9oEp1Qpo2SMJb+yRFA89hAAzTjM2ZKZJsCH2Ptml4busuiCdwHqRp06oxGaXKcmESGWsy3R8vAjbVQo2V+XdKpDKivo/3hsrZ2QyII0K6C9Rnmghr2Nan1MTsdgoYNU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZsLQmiWm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZsLQmiWm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FEA7C4CEE4; Mon, 5 May 2025 23:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487162; bh=jMVhMb90pTBBDR8HVAGZnjtvmzmZ8P6g0h8V/n1oEkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZsLQmiWmSSvWnNbxMcm+BLMXVN8SUvjrBp52wtNgwTm6IzvGOE+b1cBcisomLzXgC sPoxxoK5TiCZSv9AzylHsj9qbAwvMSCSKcpg6Nk+grkEfK7YJhPt4igRi4Y80qmIcu ZBxrFkF9MiFL3CNGmaduCXoGgbCHnUefvedd6hdWgqLgA15gkgyKfGtgyUZZTXSI0/ MY18kCgDTZcPFdTLFYrIh3oT2NHcFbfWma7L6HDyCviwZB27L6E76WTBEWXOKW2XOj XoqHdaHRS1PrCAm6ConF9RbykbxpTnCzzgo2x1ogwwqTAzjVt9vUPCNzUwy6pGChlH M7kzgJfjCnuOA== 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 , gshan@redhat.com, peterx@redhat.com, joey.gouly@arm.com, yangyicong@hisilicon.com, ioworker0@gmail.com Subject: [PATCH AUTOSEL 5.10 034/114] arm64/mm: Check PUD_TYPE_TABLE in pud_bad() Date: Mon, 5 May 2025 19:16:57 -0400 Message-Id: <20250505231817.2697367-34-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231817.2697367-1-sashal@kernel.org> References: <20250505231817.2697367-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.237 Content-Transfer-Encoding: 8bit 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 7756a365d4c49..d92b5aed354e9 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -601,7 +601,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