From nobody Fri Dec 19 20:57:55 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27A6B1FDE28 for ; Wed, 8 Jan 2025 13:57:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736344627; cv=none; b=AcoSGuhyuuJvetOglTpaixgJjXolCgh0WWwsX/QkPzkALZ9Xd6ywIww2ysoomlouNNKf9g9wpjRVY6tOxwushSwhnQO33/rA3y6LFAvz+/SdOPTLN7ynXjkQFfxK2z/DJxXVycJ0WCl+UTiIB4QUSMBez4kReRWtRzARRiEGBS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736344627; c=relaxed/simple; bh=3/tklNerunaTlLf0imSUmCR6C21uelXCoD3jm3zydWA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=q6UPZC94o+ga8F/347xHtxFqcDxLsee49S1k3p5WAndgElnNmYHgiRlrw9l3Mp11Z3uXsODlMWMwuUQJ4hOaHlzYXagCXooW41IA0yxk71JXZpnLvpmKhm2EdnLYpZJ34SEMVtf1xaMBq1zsYQKC2W3/zXSRjTfDLWNZrl2cbZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=FqU3ajNo; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="FqU3ajNo" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21a1e6fd923so38630615ad.1 for ; Wed, 08 Jan 2025 05:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1736344624; x=1736949424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4pRB7K480Ktzu7LIhxM3cgafAsbUnzVulYWgonhP1nI=; b=FqU3ajNoyokoR3hvdvDOD1XWj5QbH+tSKJhhkwKRbs+zjE4Pnmzn0Jw3ayjVe/OckV qv3a6AqWntoqRAWesO+ptvUuz5VlwHszj6CsvPPvsy7iPfHPVO0akpkmQx9F8dGKS2oU xVtny1tIdgZF/mdIB+RTob0jayy4Z1xEaLJWbJSsC8QHNIP5rpXbBVw0XHSwpV5S81G2 dT5PV6shzSkkojbZGBQi0JXHXAv9u6gbdntJwx820bZe0I0zEaVovlsf6II0P8WhqilA j8IVJN/daIhMXCDb/Bl6Gpj5sXmBGmq0Zr6RESLvveHH2VqJBxArmVd5Z0L4tkK144zw BkbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736344624; x=1736949424; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4pRB7K480Ktzu7LIhxM3cgafAsbUnzVulYWgonhP1nI=; b=vEai+zgzLlimhovMb92wrZWqL+57Hq9N2jyjansbT1IYK7Zo1mC2DfhsABfCjLjkCo rK75G5jhqXXIMOGyaFqL0BmZptxkHf7V++Iu3V/o89EQAsckGoTkxpLLdJ6Edvi+lQ7Y f8lbll4+4s6ezh0hh3IE6SdhIT3xmdt44/dCiNpLuk7qVY6H1SVnIl4eBpLufChMp17Z KVk1zwPiXF705oIOCsxpzu2coW84H7kUJo2RT7oKR2uadxJyyN5mmMk39iNxN/fRjYbL Nt0KaaZRineOPehMUeudplrDdIH5jN28+3B/YWNAc8PBMgLBG2F4b+l0f6IUK9dRt0I3 ZHEA== X-Forwarded-Encrypted: i=1; AJvYcCWqn9AfbvR3ZSi9j2k/AArv2Wv1bUMHJVB7JwyMj2zg9JMkT8w8N7UicDlKL57tLw9k34iCrSRNuWiQEY8=@vger.kernel.org X-Gm-Message-State: AOJu0YxHc8ShssIy+8TyIE4AA7xXhtl/SFDHZMiNTOlJWhiFTrbeplVJ 8JHHU0EYj1sV0tbw9e0nQB0x5sXUbC2mLsiiymXAFTr+g7uvHiujhe1gayHqDYc= X-Gm-Gg: ASbGncum9Mk52m9Pl9fUlwhVRT8WkxRynWYgINQcbkfnEcCECvAkZMWZwBx+SLIAXBl WN6Ig0AatV8vlb7ibuVSZvQhgr+u1n5fKEUzh3O4Bpz+iGyDZOT/v7UULPEddwuSQFyxIzM4U2U eOwI0ZAsxspcmdK6SZrbQMaOYwpJpkMbVu8GA6PTAJD7rn7Poc1IgSXmzGda8qsN3BAtq94a/nW 76lfERG9dGpORj0mR3K8jbgNTAWFtUKInq9sEFDorL5nuMi1/o1NVlx5nyp5mzYGpg6iidhnpE= X-Google-Smtp-Source: AGHT+IFoq5GVozgjYlMOiOHZMC31npTN3aQ9ZHeqdwftoCR7nxGXgX76itHUwFHlmFm2NtgA0CBPVA== X-Received: by 2002:a17:902:d48f:b0:216:281f:820d with SMTP id d9443c01a7336-21a83f3f560mr42421835ad.11.1736344624524; Wed, 08 Jan 2025 05:57:04 -0800 (PST) Received: from abrestic.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca04c85sm326131925ad.271.2025.01.08.05.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 05:57:03 -0800 (PST) From: Andrew Bresticker To: Palmer Dabbelt Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Ghiti , Peter Xu , Andrew Bresticker Subject: [PATCH] riscv: Support huge pfnmaps Date: Wed, 8 Jan 2025 05:57:00 -0800 Message-Id: <20250108135700.2614848-1-abrestic@rivosinc.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use RSW0 as the special bit for pmds and puds, just like for ptes. Also define the {pte,pmd,pud}_pgprot helpers which were previously missing and are needed for the follow_pfnmap APIs. Signed-off-by: Andrew Bresticker Reviewed-by: Alexandre Ghiti --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/pgtable.h | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index d4a7ca0388c0..ff4849e35545 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -61,6 +61,7 @@ config RISCV select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_CFI_CLANG select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU + select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE select ARCH_SUPPORTS_HUGETLBFS if MMU # LLD >=3D 14: https://github.com/llvm/llvm-project/issues/50505 select ARCH_SUPPORTS_LTO_CLANG if LLD_VERSION >=3D 140000 diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgta= ble.h index d4e99eef90ac..95ee745e3ef7 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -341,6 +341,14 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_= t prot) =20 #define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot) =20 +#define pte_pgprot pte_pgprot +static inline pgprot_t pte_pgprot(pte_t pte) +{ + unsigned long pfn =3D pte_pfn(pte); + + return __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte)); +} + static inline int pte_present(pte_t pte) { return (pte_val(pte) & (_PAGE_PRESENT | _PAGE_PROT_NONE)); @@ -674,6 +682,11 @@ static inline pmd_t pte_pmd(pte_t pte) return __pmd(pte_val(pte)); } =20 +static inline pud_t pte_pud(pte_t pte) +{ + return __pud(pte_val(pte)); +} + static inline pmd_t pmd_mkhuge(pmd_t pmd) { return pmd; @@ -699,6 +712,18 @@ static inline unsigned long pud_pfn(pud_t pud) return ((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT); } =20 +#define pmd_pgprot pmd_pgprot +static inline pgprot_t pmd_pgprot(pmd_t pmd) +{ + return pte_pgprot(pmd_pte(pmd)); +} + +#define pud_pgprot pud_pgprot +static inline pgprot_t pud_pgprot(pud_t pud) +{ + return pte_pgprot(pud_pte(pud)); +} + static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) { return pte_pmd(pte_modify(pmd_pte(pmd), newprot)); @@ -768,6 +793,30 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) return pte_pmd(pte_mkdevmap(pmd_pte(pmd))); } =20 +#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP +static inline bool pmd_special(pmd_t pmd) +{ + return pte_special(pmd_pte(pmd)); +} + +static inline pmd_t pmd_mkspecial(pmd_t pmd) +{ + return pte_pmd(pte_mkspecial(pmd_pte(pmd))); +} +#endif + +#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP +static inline bool pud_special(pud_t pud) +{ + return pte_special(pud_pte(pud)); +} + +static inline pud_t pud_mkspecial(pud_t pud) +{ + return pte_pud(pte_mkspecial(pud_pte(pud))); +} +#endif + static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pmd_t pmd) { --=20 2.34.1