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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C827CC25B74 for ; Tue, 21 May 2024 14:14:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F28106B009D; Tue, 21 May 2024 10:14:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED8346B009F; Tue, 21 May 2024 10:14:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9F036B00A1; Tue, 21 May 2024 10:14:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BAA466B009D for ; Tue, 21 May 2024 10:14:08 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1894716124C for ; Tue, 21 May 2024 14:14:08 +0000 (UTC) X-FDA: 82142597376.02.1ABE13C Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf22.hostedemail.com (Postfix) with ESMTP id C0460C001B for ; Tue, 21 May 2024 14:14:05 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rDdLV31M; spf=pass (imf22.hostedemail.com: domain of bjorn@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=bjorn@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716300846; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Jcc7gRXzz/diemhfHmRBhrheaa6MC8Cyxnn6ZfxCafU=; b=EGkvw166U8rJhxSewBOuSjw/8MOPqVAbY7mOyc98sA9ph5OPfyFX0NwChdQEGVWlw8sZa2 TV7ymsflRYNoDzB9FW8JRCxXAOIfjX96aKQYAectu0AW3aMo2oNY+DdjtHOzUTiEg8NBr0 5s3yLDgAei4Y1saJkCcGodj4kH2fBuE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716300846; a=rsa-sha256; cv=none; b=znIFdWwSomaq+ktNGxExU03Vl9W2o4tXMZQn3O7FDu3kpx6Pp5XPXU6R18eYPTzecOcjsk QEvnwMcNZhvsGmVolcds1lOQLUD7wwXSlRwEI0T6xxlK9evcRHETcs0F3SZeZPYgMbSONs H16gttePpgQz5Q3zs8zqAh26RkKHZWE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rDdLV31M; spf=pass (imf22.hostedemail.com: domain of bjorn@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=bjorn@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 42794CE0F93; Tue, 21 May 2024 14:14:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09770C2BD11; Tue, 21 May 2024 14:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716300840; bh=IfBzG6Jslwq80j1PaUKC/nbk7dw2f5dLPW+Dn8TzDk4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=rDdLV31M/Rnssi32k8I78G80H12gj4bfX7j9DaXPEN1aX9BUsimWeZ3+kOnXz4pfR KQthzpqNHet08+kfxxXHnZeMmeKBMbvK1UQpJukKPcYVOKTUE6xasKg+9d3p8/MaAh qqcoqfuEt0DTPChsVyUvpCpLlnZBSWbAFQKsLWtXGaYOopGv5mnPuPiULVt90bwASL 8y0h+7Ann3k0lAFjAhqmVCAcWb879VbULQ0qQ2LqMezYPJIwWtlCSEw+3Ify3QQ1Lh nDZjCDP/b3nGxujpdhnSLcI/76WZC0/20AtQ3lCE5861wlb213399eLa/lrT0ly4Lb Q9qh9GAbQp5rQ== From: =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= To: Alexandre Ghiti Cc: Albert Ou , David Hildenbrand , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Oscar Salvador , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= , Andrew Bresticker , Chethan Seshadri , Lorenzo Stoakes , Santosh Mamila , Sivakumar Munnangi , Sunil V L , linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v3 9/9] riscv: mm: Add support for ZONE_DEVICE In-Reply-To: References: <20240521114830.841660-1-bjorn@kernel.org> <20240521114830.841660-10-bjorn@kernel.org> Date: Tue, 21 May 2024 16:13:57 +0200 Message-ID: <87pltfdzh6.fsf@all.your.base.are.belong.to.us> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Stat-Signature: p8wjymi9jpxrxpkbttwthsn7urrhgp56 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C0460C001B X-HE-Tag: 1716300845-136266 X-HE-Meta: U2FsdGVkX1+jKJxh19wXeL7tzfgZC8aimq3HmB6GA4R+qFWUSBqNpg3ZnW8HGwhtEeVl+yFvtplnOJoOHYN9dJkCCjGWvGoSiEZxifb2Rmh26e0qejsLDHXggThBx5wAgeR0s2vRzkUUomO6ZQPeiJzyIXGFBQ0UNgdyHF5A3OaT5yOBcjwigpcXm06X0Ak5u9xQJBg1dTIdik6CZ82Ssl6IPhA40ib+kCC5oP4ANHOB28bx7gfK6VFb4W/ht2rGhAuLIWZlUqVhtl0tY+bKTsYaHLXt5k5E85PgaJLAdumSXHck1lqqcNlmzoZYC1XXncyKFifMSYg7XqjISq3fX0EC6lg3pQnnFnlJcZ9g8Hccnx1g9GNpsbEXX8eiK3CAdoKKf+1zFyZ+EWX7DEhhipY4bfbRX4/1JU0uxyCUqyPHabhKO902ou+zxoMWn6hdPOS/SIv/xy1DDfSSGS1NEqD0XAEnxVN2b/QAnHrNzcrcoU0J8kdPeAZRYeG6T3PYgGOuXJ5qTglNtQZtdx0t1SgUf5KTUkMzC9lde+yX9+DcBcE7bdXmlxWfs83CrihMjeEmIKEd1DUGIb1OtPyUZnqovzUtyN7esLoUErhzFyIizpVbQ1pK4k287vCGuKHu+7wCFtksbPZdRcJykv7DdcLp9bOLxgZbtrVKsmjH7/RS5ZZXuTEMWHl2Scbykkym8Iou4G3Bj7lxHa3j1OIQOfR8jKuonNJgbbsvANHQZY2+qA8Plk46vmp5AD+V3VH2+ti1/ymyx6PYO2oB95S3cQcawsIKpmyo8yieRF67XWHBMB0GCNvC4CkMgOzeORcHu6ufClqLWWx/HukHrri6eEVq6dSa/kYBuyUlyDHJylxfixXLkxbPH5QpEQwn0ylpxYx3KVvVYJW00SUybLFbh6rCHnHdpQAyot3T30H/svllDEhMv2/EYXiTWatZh51YixtR3Vwe1rcmyRReoC6 z7QnXH3H SrZLb+7z4iux5TaATfZE16pcW7f0CXQJ0/RZOIHEUa+v4nVt6msn9tDFeTTaqRxLBUXKPrv32dnKjWdBrL96TvoLU1eSZvBJ4QA5pHs1jgE31y33GlgdLcodmiUZQdsmMaYcpGxzeJjtUCZPIrUtvd7QK9utI48gsCt5z3W1XOedstJlK8xMr3G+7xfMsx/eDIa0kuLrDf9h/7l4myqdFjOjd0iL9w8a/L+KwkAgKDTZwka+ht1EX3p/3DS43rFYeBuchQEvnnR6tcy5tStjHgyL5PxurIvlbjhU/qUuDcW+QCIIanSR2X8H4o90fdAHEf4JFwkiqt/bdvOw5z7bJsxPMheIWzyRXvHAhfSzji7/IHB7wH/K+djOGfPWRXFzgbuHq X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Alexandre Ghiti writes: > On Tue, May 21, 2024 at 1:49=E2=80=AFPM Bj=C3=B6rn T=C3=B6pel wrote: >> >> From: Bj=C3=B6rn T=C3=B6pel >> >> ZONE_DEVICE pages need DEVMAP PTEs support to function >> (ARCH_HAS_PTE_DEVMAP). Claim another RSW (reserved for software) bit >> in the PTE for DEVMAP mark, add the corresponding helpers, and enable >> ARCH_HAS_PTE_DEVMAP for riscv64. >> >> Signed-off-by: Bj=C3=B6rn T=C3=B6pel >> --- >> arch/riscv/Kconfig | 1 + >> arch/riscv/include/asm/pgtable-64.h | 20 ++++++++++++++++++++ >> arch/riscv/include/asm/pgtable-bits.h | 1 + >> arch/riscv/include/asm/pgtable.h | 17 +++++++++++++++++ >> 4 files changed, 39 insertions(+) >> >> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >> index 2724dc2af29f..0b74698c63c7 100644 >> --- a/arch/riscv/Kconfig >> +++ b/arch/riscv/Kconfig >> @@ -36,6 +36,7 @@ config RISCV >> select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE >> select ARCH_HAS_PMEM_API >> select ARCH_HAS_PREPARE_SYNC_CORE_CMD >> + select ARCH_HAS_PTE_DEVMAP if 64BIT && MMU >> select ARCH_HAS_PTE_SPECIAL >> select ARCH_HAS_SET_DIRECT_MAP if MMU >> select ARCH_HAS_SET_MEMORY if MMU >> diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/as= m/pgtable-64.h >> index 221a5c1ee287..c67a9bbfd010 100644 >> --- a/arch/riscv/include/asm/pgtable-64.h >> +++ b/arch/riscv/include/asm/pgtable-64.h >> @@ -400,4 +400,24 @@ static inline struct page *pgd_page(pgd_t pgd) >> #define p4d_offset p4d_offset >> p4d_t *p4d_offset(pgd_t *pgd, unsigned long address); >> >> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE >> +static inline int pte_devmap(pte_t pte); >> +static inline pte_t pmd_pte(pmd_t pmd); >> + >> +static inline int pmd_devmap(pmd_t pmd) >> +{ >> + return pte_devmap(pmd_pte(pmd)); >> +} >> + >> +static inline int pud_devmap(pud_t pud) >> +{ >> + return 0; >> +} >> + >> +static inline int pgd_devmap(pgd_t pgd) >> +{ >> + return 0; >> +} >> +#endif >> + >> #endif /* _ASM_RISCV_PGTABLE_64_H */ >> diff --git a/arch/riscv/include/asm/pgtable-bits.h b/arch/riscv/include/= asm/pgtable-bits.h >> index 179bd4afece4..a8f5205cea54 100644 >> --- a/arch/riscv/include/asm/pgtable-bits.h >> +++ b/arch/riscv/include/asm/pgtable-bits.h >> @@ -19,6 +19,7 @@ >> #define _PAGE_SOFT (3 << 8) /* Reserved for software */ >> >> #define _PAGE_SPECIAL (1 << 8) /* RSW: 0x1 */ >> +#define _PAGE_DEVMAP (1 << 9) /* RSW, devmap */ >> #define _PAGE_TABLE _PAGE_PRESENT >> >> /* >> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/p= gtable.h >> index 7933f493db71..02fadc276064 100644 >> --- a/arch/riscv/include/asm/pgtable.h >> +++ b/arch/riscv/include/asm/pgtable.h >> @@ -387,6 +387,13 @@ static inline int pte_special(pte_t pte) >> return pte_val(pte) & _PAGE_SPECIAL; >> } >> >> +#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP >> +static inline int pte_devmap(pte_t pte) >> +{ >> + return pte_val(pte) & _PAGE_DEVMAP; >> +} >> +#endif > > Not sure you need the #ifdef here. W/o it 32b builds break (!defined(CONFIG_ARCH_HAS_PTE_DEVMAP) will have a default implementation).. Maybe it's cleaner just to use that instead? >> + >> /* static inline pte_t pte_rdprotect(pte_t pte) */ >> >> static inline pte_t pte_wrprotect(pte_t pte) >> @@ -428,6 +435,11 @@ static inline pte_t pte_mkspecial(pte_t pte) >> return __pte(pte_val(pte) | _PAGE_SPECIAL); >> } >> >> +static inline pte_t pte_mkdevmap(pte_t pte) >> +{ >> + return __pte(pte_val(pte) | _PAGE_DEVMAP); >> +} >> + >> static inline pte_t pte_mkhuge(pte_t pte) >> { >> return pte; >> @@ -711,6 +723,11 @@ static inline pmd_t pmd_mkdirty(pmd_t pmd) >> return pte_pmd(pte_mkdirty(pmd_pte(pmd))); >> } >> >> +static inline pmd_t pmd_mkdevmap(pmd_t pmd) >> +{ >> + return pte_pmd(pte_mkdevmap(pmd_pte(pmd))); >> +} >> + >> static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, >> pmd_t *pmdp, pmd_t pmd) >> { >> -- >> 2.40.1 >> > > Otherwise, you can add: > > Reviewed-by: Alexandre Ghiti Thank you! Bj=C3=B6rn