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 8EAC0C47258 for ; Tue, 23 Jan 2024 10:34:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E358F8D0001; Tue, 23 Jan 2024 05:34:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE87A6B0081; Tue, 23 Jan 2024 05:34:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAC4F8D0001; Tue, 23 Jan 2024 05:34:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B69F96B0080 for ; Tue, 23 Jan 2024 05:34:33 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3941B1A0559 for ; Tue, 23 Jan 2024 10:34:33 +0000 (UTC) X-FDA: 81710216826.12.067DB93 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id E48ED140008 for ; Tue, 23 Jan 2024 10:34:30 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706006071; 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; bh=9ft2vh2xbijs++8G/WpeYRzvLN4V5d6ugy4/2aQE4FE=; b=CXUerXB6uGKtC/5ytD47JVODkSPwArXhoRi+d9V41JDu9sP794ZX4tCL5rMFqqMFPT1ZmE nXUrCw/NJYJaze2Ziac/IP47nlQvVVkFKfrEf8++3heCxfLfbs/qpL4bLAK7UWLV7/o5u+ aHtNIsEnzWVRLG9lmh+A5mYTery8omQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706006071; a=rsa-sha256; cv=none; b=gT00QzsHrZvCp2L986PWYr4FBEAWx2UO9KBsjPqtrHbMmCETOLNcaakLg6otOgp1okerSB 8PFRXfP4DVSIbNxect4lqCvVRSBPj3ZY/86R+SWh5KGAwsX1kOncoyFpICht7DUUJy+g65 QtgD1xSuCfSmyLEOrismN8vG2dr5kVI= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 43C5E1FB; Tue, 23 Jan 2024 02:35:14 -0800 (PST) Received: from [10.57.77.165] (unknown [10.57.77.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BD0EF3F5A1; Tue, 23 Jan 2024 02:34:23 -0800 (PST) Message-ID: Date: Tue, 23 Jan 2024 10:34:21 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 01/11] arm/pgtable: define PFN_PTE_SHIFT on arm and arm64 Content-Language: en-GB To: David Hildenbrand , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , Matthew Wilcox , Russell King , Catalin Marinas , Will Deacon , Dinh Nguyen , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , "David S. Miller" , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org References: <20240122194200.381241-1-david@redhat.com> <20240122194200.381241-2-david@redhat.com> From: Ryan Roberts In-Reply-To: <20240122194200.381241-2-david@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: E48ED140008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: uzxtk1j1gtirpanam58tppupyap58ymm X-HE-Tag: 1706006070-816519 X-HE-Meta: U2FsdGVkX1+PQJ4XMDU75zpsEcoccMXXEEavMBFFQ7+cXWRO6CgmJrIhPJ/mh926zK9NG+19/LHk2qnQlF+RO2Os6Kxtz9dRfUX5S81uzHbHCMR50fWn7sj0k9d88KmWpblQT7bOP4a1seayV4OefVBUQOU0GnE3J6n4cfTt5VVzRZYCVooQttZ0l9ZvQmgRMUIhtHMXKIUvtQRAqH1n2d6cmHJbuUabb0J3+BegnVZ61a1TpD2U15toyJUGG5r9UXBzNRiFfL1Y4wAEDaXZ5b1YipQPpydYEpDwegRvYWn9K04W1YdzHatGNVBjVYrxuxIEIzshTKk27D7jTOv/z9RkZpQ99RYM+6AMPDS5BKUf33RdDAZ1z/liNT7P2TlF8uylGtIF1MOY1jNmYK28lQY0qhfOVYPC4ZOUlLPBpFT2dsBhEuNGIOFkReMXeKUF71oSeKTB54Rl1mTXOP6x94dRs2OwZJUayGnj8X0eDMFl4fhBAWP450Iei6U1g8z8S1GGc6Yr4yfNSHBPh9CnUG0e1WaURrpxmMdZvy97ZR4AvlAlsI/+xWPsJkOEMwi9ZqzsN8Nbx3dl8CD2CUTWfPlwphZsOfX1YAIhgML1WutLU6s3afbaXkkXS9y/VvDKuT0hezR9gy/82RPYZ6oRqPt02AMIQt5XR00u2xyGS8h3Fs64M97V4s4qM9amG/JWNX/QqNjR3SHHZ4rwq6L6VI7hvhDK5V0kc96QKPFn+tEZ3D1XBK9hoFzi67MwucQHDt2oNMAmK0Pq5B8oePI8Y2hwxaNfQuvhp35umhj2ZMkJ9w3a8kqsRsTPJpI+dI1ybZNozYEFIQ3rwPsfZ0LIP1TTGaZ7swHMXRGQoZGfPM/eNN4/4ZZVfF5xBJ6hJZT1iAnmgVepAqzcsVYZn87rilWLuTRsGlf7f4xetKIFuT9HSwvuj1t+MJJ/ncS7fhl437yqlJ0xLbP0p4QvXlr plL9a5rb 7M9ilA8+hldn7htEGkPE9GBE2UmO0jwd2nfma5cBEM76Rzv3LQvFw7eCZUxO3gUJ6X9JO0kAX4ZzUoQQRU7Y+3yQgO9Klzz+R0ctfrKruucehkkWcgBom5/pztpTyoZP6DaTPSGi71n/73GUqOWC0ZVITK0h1+fQq1mVURTgSpvCbReVhfikz6N952H+Re364yQhWLtvzkYixqwAeZiUDpWU2lHN7Hw1n4HIS 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: On 22/01/2024 19:41, David Hildenbrand wrote: > We want to make use of pte_next_pfn() outside of set_ptes(). Let's > simpliy define PFN_PTE_SHIFT, required by pte_next_pfn(). > > Signed-off-by: David Hildenbrand > --- > arch/arm/include/asm/pgtable.h | 2 ++ > arch/arm64/include/asm/pgtable.h | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h > index d657b84b6bf70..be91e376df79e 100644 > --- a/arch/arm/include/asm/pgtable.h > +++ b/arch/arm/include/asm/pgtable.h > @@ -209,6 +209,8 @@ static inline void __sync_icache_dcache(pte_t pteval) > extern void __sync_icache_dcache(pte_t pteval); > #endif > > +#define PFN_PTE_SHIFT PAGE_SHIFT > + > void set_ptes(struct mm_struct *mm, unsigned long addr, > pte_t *ptep, pte_t pteval, unsigned int nr); > #define set_ptes set_ptes > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index 79ce70fbb751c..d4b3bd96e3304 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -341,6 +341,8 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) > mte_sync_tags(pte, nr_pages); > } > > +#define PFN_PTE_SHIFT PAGE_SHIFT I think this is buggy. And so is the arm64 implementation of set_ptes(). It works fine for 48-bit output address, but for 52-bit OAs, the high bits are not kept contigously, so if you happen to be setting a mapping for which the physical memory block straddles bit 48, this won't work. Today, only the 64K base page config can support 52 bits, and for this, OA[51:48] are stored in PTE[15:12]. But 52 bits for 4K and 16K base pages is coming (hopefully v6.9) and in this case OA[51:50] are stored in PTE[9:8]. Fortunately we already have helpers in arm64 to abstract this. So I think arm64 will want to define its own pte_next_pfn(): #define pte_next_pfn pte_next_pfn static inline pte_t pte_next_pfn(pte_t pte) { return pfn_pte(pte_pfn(pte) + 1, pte_pgprot(pte)); } I'll do a separate patch to fix the already broken arm64 set_ptes() implementation. I'm not sure if this type of problem might also apply to other arches? > + > static inline void set_ptes(struct mm_struct *mm, > unsigned long __always_unused addr, > pte_t *ptep, pte_t pte, unsigned int nr)