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 A537FC54ED1 for ; Tue, 27 May 2025 17:32:35 +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=k4Ol87GmwJyk72R21jAvdBqoLc0nlhh2l24Zh3HKbvk=; b=MRhzw7JnPoobC3fVT5BNPtc5or cj/zODv1VptvoH2yf5jcn0mmJZmMNiURmqiciy837wtmsGQoFV0I5inyCf+T1HKcrJftybI4Un+b8 2o2Y1S1qUHOgQK5BY7ycOA2evO1Db/IWKXSaE0A8Ww6ZLcgZBuxLZN18uOLfeauLtX7QYSGKNnHi1 RNBeWt8Hf4JI8HFiCwFa3q8qde52TgtmXjROfeUf6xv3GmSqCbbxqGnNfXAqpTgb/5FEBhKxX7W6P 4JAMWoOLQ77R1S/i58yXce/L3CXSOS8pjQ4xhkCZrAY01xXdgn73ueXz6PVu343PWWKMdBBPKaWg1 wQtsqNUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJyA7-0000000BGR0-237h; Tue, 27 May 2025 17:32:27 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJy5v-0000000BG6F-0tC4 for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2025 17:28:08 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 69AB7A4F1E7; Tue, 27 May 2025 17:28:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EE95C4CEEA; Tue, 27 May 2025 17:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748366886; bh=K8pYUrF3JvFXNzpuAdSXyvw9Bmd6qChB1MDdOQFAYMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I2+nSg4gBZ9Jwu0sIT2Re3iOO+zmIX4Hzsiag3gcFG4NtY3mRfqu1W/kFRXwL0LFm NSvc3Zxkz129qLET5M/qNDoRPNrFHhgXTiwxfHHudu7nwodceDgFfoJu94VEWRwuhC wQP3pK4QpGdK9/qfMfLEXppR5XyRJeIFCBIrOWDQ= 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.14 208/783] arm64/mm: Check PUD_TYPE_TABLE in pud_bad() Date: Tue, 27 May 2025 18:20:05 +0200 Message-ID: <20250527162521.608476624@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250527_102807_317313_1DE452CC X-CRM114-Status: GOOD ( 13.01 ) 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.14-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 abf990ce175b1..665f90443f9e8 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -805,7 +805,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