From patchwork Fri Feb 2 08:07:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13542343 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 3AA6FC47258 for ; Fri, 2 Feb 2024 08:08:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C522E6B008A; Fri, 2 Feb 2024 03:08:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BDB236B008C; Fri, 2 Feb 2024 03:08:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAEA26B0092; Fri, 2 Feb 2024 03:08:49 -0500 (EST) 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 9AE236B008A for ; Fri, 2 Feb 2024 03:08:49 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3D750405C9 for ; Fri, 2 Feb 2024 08:08:49 +0000 (UTC) X-FDA: 81746137578.25.B06858E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id 9327E40016 for ; Fri, 2 Feb 2024 08:08:47 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706861327; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m802SiXxPoDIA4ME1C8BlYO8FuTHIGUVigVkR29YgiU=; b=zhUKWuEx1LB3sLySVQWKuaHOQc/PUqc5tvScUg8jaL86SPvUgpoMG8xCh4K0S3WiWhNazg HxRsEhRyHdmFPBiwUcJz9ytGAAcztXaEYDjzNbleHGsaIE9waEVqOY9Aog3UJ4xdLu95qf nKnp1x05DM16L0N3kLIC4IZSUN1WDso= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706861327; a=rsa-sha256; cv=none; b=6HGLVZ0Yk0Pj81NMQOoXomzywqD1fIYOD5E19uK9gQYK5G+/PAxCdorBoSdhC2TJ8nQPOD knYBAN94EYnguzQxJSqH+MQcWKV84qILK9VcahgvV0uIk1LNqlaG5/Oq95BHTejAniJxtO N1QBkM66P0R2Evw2xULSuVH9pJrHAIU= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 34710176C; Fri, 2 Feb 2024 00:09:29 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 489F23F5A1; Fri, 2 Feb 2024 00:08:43 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 08/25] mm: Remove pte_next_pfn() and replace with pte_advance_pfn() Date: Fri, 2 Feb 2024 08:07:39 +0000 Message-Id: <20240202080756.1453939-9-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240202080756.1453939-1-ryan.roberts@arm.com> References: <20240202080756.1453939-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 9327E40016 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: q6f8g98163dkxcyi8xmjp37hb86iet4x X-HE-Tag: 1706861327-248857 X-HE-Meta: U2FsdGVkX19vzrQE407omiWkBYSUxzrXOdRqaxnzG9PpgbZJEiis4/BSVMxelugoxW6Hk/IELoNYYEIQdNbit4I/swSoivMMxFwZszkc7kjulewkuQtmPVJ9vyPeQ6d5DBYB2aV2uFfg5LvrTGUC6yoDpcuLa7USuQODvJePelCiwy/mjohc06/G33QuITbJp9o5vLNdWSh+Vs5QZcZiYpGFhqx8rcMczCXqwQ6gnlGL5JHryuF7FXpQz2IyRM8ABoLJ/li0BityQL0QCm5afW09l+8Bq/Xgl6R2L0waEcD2rT20ATBwvJf8mTbvtaNwD3ynPc/bEeKO4Lbjk8d1GIAFcDRpfgQPDf8BZJB0/Q3il8pZP6NoDXSoiBzLXchF0d3AwbnebPq5k513/rhRAozmd8u/JmhvY39L+t87QvddBgLmzLP000yMNnqGxtD2wZeQn3JopLCCf6aC2Lw1KBXtPtket9IbSQ3bFGFFQ5Cq5o/GVBqDSvFuaqO9XCTyq8vbi5+BsFQsTdTZab73yZU6ymAIXZ3kgQpVIrkWRPbH1QckLa/JveREDi7F2H0CPS81TSbv90MLMrq7ebEaZgBl/T77H3JB8dX2+YSwh1Cjf6iUmUAksQvpyD3LO1Co6E1dN2T5eGYXCwmW1mam61J3mrgBOy6btOjJnaNx/j9oK1bysJpNO5jH4zFMz9xzJs+hnE7EBuw+/UEB9zGC97q0waTiakVQF6mrxcnqBColuMMT06O6eNtSmyctMR8dFFcjn9xHH+UovPQcU0XtqbnLFuGbr7wtSyREQsGosLS+mNGeABHkpSMefV8rSdUPz0f3Jf0lJ4CxIoJx+c5gBqoN6uE9UblDU+3JKRvHltNriZ8tanq04q7GRcbJpk4vMScqFHuJhOyC4Mcr4W08PG8HtUv35PLHhm0TDr+PtLl0aRmhObkGxUTXyuORcjpSHck0PA9n/aAMlVhpSZi oD21To/A DdhJRx8nObDjdQee5/NA/cTuFV5ohYHKYfYuQVlqGt3tRxe3oDyf1cRy6i+acGQPy4Vs46ehJC73ytkslqBJynf1m8wumXUFhg8El6hikYFcVv4dJplNmTRJ9aDlm2Xxz1yi2xyFVJpQqbGa6PX+hJTTzbPsynqoS06w8zwOL0U3giWThNPh6DbP1iX9xVhnyONX3npFEIkHtOHR6ue9HBLr+MKg5aSIoZXfTV9lyqQYFmVAiQ6AzSJMyc0pmn2I/eW3UrUvgTxLABAzR2rWCW0BXtA== 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: Now that the architectures are converted over to pte_advance_pfn(), we can remove the pte_next_pfn() wrapper and convert the callers to call pte_advance_pfn(). Signed-off-by: Ryan Roberts --- include/linux/pgtable.h | 9 +-------- mm/memory.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 815d92dcb96b..50f32cccbd92 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -212,19 +212,12 @@ static inline int pmd_dirty(pmd_t pmd) #define arch_flush_lazy_mmu_mode() do {} while (0) #endif - -#ifndef pte_next_pfn #ifndef pte_advance_pfn static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) { return __pte(pte_val(pte) + (nr << PFN_PTE_SHIFT)); } #endif -static inline pte_t pte_next_pfn(pte_t pte) -{ - return pte_advance_pfn(pte, 1); -} -#endif #ifndef set_ptes /** @@ -256,7 +249,7 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, if (--nr == 0) break; ptep++; - pte = pte_next_pfn(pte); + pte = pte_advance_pfn(pte, 1); } arch_leave_lazy_mmu_mode(); } diff --git a/mm/memory.c b/mm/memory.c index 38a010c4d04d..65fbe4f886c1 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -988,7 +988,7 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, { unsigned long folio_end_pfn = folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep = start_ptep + max_nr; - pte_t expected_pte = __pte_batch_clear_ignored(pte_next_pfn(pte), flags); + pte_t expected_pte = __pte_batch_clear_ignored(pte_advance_pfn(pte, 1), flags); pte_t *ptep = start_ptep + 1; bool writable; @@ -1017,7 +1017,7 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, if (any_writable) *any_writable |= writable; - expected_pte = pte_next_pfn(expected_pte); + expected_pte = pte_advance_pfn(expected_pte, 1); ptep++; }