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 27B38C04FFE for ; Wed, 8 May 2024 11:42:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B91B76B00C4; Wed, 8 May 2024 07:42:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B42486B00C5; Wed, 8 May 2024 07:42:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0A476B00C6; Wed, 8 May 2024 07:42:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 821086B00C4 for ; Wed, 8 May 2024 07:42:39 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4432D120A7F for ; Wed, 8 May 2024 11:42:39 +0000 (UTC) X-FDA: 82095041238.24.AF5B809 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf30.hostedemail.com (Postfix) with ESMTP id 5309580008 for ; Wed, 8 May 2024 11:42:37 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PQ1TCWqQ; spf=pass (imf30.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715168557; 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:dkim-signature; bh=p3J74NkW9ioW00Pqnp327XZ4SYUtOBKlfZoGCCQmZ+M=; b=bZIzCTWxS3e1XzAKRnsyzyXaWkUq4iCg7nONP96EQV3IPGti+r3LAbEJwqk5wXgZS9CWBz phr0PyHlibSmsJyvnAqxYBnwd5jzpBSlKX9q8UKxVEZwx696MOhdSDsXRVRGc3e9qgw83B 09mKHjtklpKJc15fZvq+qwOpWr90EYI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PQ1TCWqQ; spf=pass (imf30.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715168557; a=rsa-sha256; cv=none; b=ebWcgVY5+qYCEczhOkEQkwlZhigESVsBEa9cbxal+J2dynuQXyJrTo2Ci+mUP5+cKTiN9v 81NdFEhCsWKFoTA1CAQODc9oUUvi4lM0fPaeKnz6Co+3bxOziu4EQuFCDqMDdDRKgv0NA/ 6B7sA0yBu0FRO05LhnVEKR5qYvtXaP8= Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41b2119da94so27255925e9.0 for ; Wed, 08 May 2024 04:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715168556; x=1715773356; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p3J74NkW9ioW00Pqnp327XZ4SYUtOBKlfZoGCCQmZ+M=; b=PQ1TCWqQ4meEUDLzFNKus6oE0YZrU1baGf1bDRsojSDsrBZjzfBT440EWvmEYFxOTq vh+7IG3oFxT+/GLwazWYHxxfW9LRsZ9L7p2rZwo/Iv5ltsRPBjpX4R7rsLeLQLRxkawo AEXd7li3wLEcHjnAbryF12DBD84IThLIMXY8M0hEpchq4LH2RjqIPOg/y7XiF12NEWER Fbf3655IpVEMogZ5MsCWJ4003FVP//yEpYs9y/9MP6GmoqBlXpJvGcciM388waL/znUh ut+qUXcjG3YyvkUdyRsTtRlxGLyXTfB1hx9T/B2cj8kpBQm3TP+Ht/Oy/BDEpkxPLbQG JCDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715168556; x=1715773356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p3J74NkW9ioW00Pqnp327XZ4SYUtOBKlfZoGCCQmZ+M=; b=UEvrw1K4LgUDu19x1YK0i4Ah51ZWkhkt8NcVvjMCDDi7mweGKXkcU3mUWeMJOHS3u0 NmIz5cjPylt9ZdGkgj4B5QXTI7V4lPYxUS0LItWToicFNeA1Irqwv2EWmi9cV5o8Rzgx ODlv1wplzc48I3BglRRlAULcjQgWJIkaX+pDFxAcRRHrifBnwO7yzmNfvJ2hEMNFUBtJ aQnH/7/oe11f1sTPAhsbPDsknxh7040/BjVxDwjyJ0p/FXGs1QyoivFM7jOqHR6c11zx Ydi7BOmPoslimD2jGeVD9mc+Y7lbDbJH1GmSWB5XBnTHvR0L7Cb2IFhx2OpxQLmZa12u OPMQ== X-Forwarded-Encrypted: i=1; AJvYcCXNgwSebHPke2+rPCDfk8n0h/7c/HhK519u3aKhdakZ1asM79RGJuA0Nv33elSJDY6xK9J3Jo5lyZwiMgyeZS675U8= X-Gm-Message-State: AOJu0YzmbRxyrZcrB5euYjrwqKnwPmXLbZVfnF8K0infdnWdJKBmW6CN +08t+SgzcBp3Bn8X3gy532Kd4Kgf+/eGUa56DOHH8MRtXmd58WH5qmTH4/MxVCo= X-Google-Smtp-Source: AGHT+IHE8o6Es8ZSc8TwRFtN83wex84gZARiN4tVTDQiUBBDnfszL6lfcSMLSwFM5H55V+vhK3nrvQ== X-Received: by 2002:adf:b1d1:0:b0:34f:6c9c:19a3 with SMTP id ffacd0b85a97d-34fcade2a1cmr2221817f8f.15.1715168555855; Wed, 08 May 2024 04:42:35 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id h1-20020a056000000100b0034e0b56a62bsm15118070wrx.44.2024.05.08.04.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:42:35 -0700 (PDT) From: Alexandre Ghiti To: Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org Cc: Alexandre Ghiti Subject: [PATCH RESEND v2 8/9] mm: Use common huge_ptep_set_wrprotect() function for riscv/arm64 Date: Wed, 8 May 2024 13:34:18 +0200 Message-Id: <20240508113419.18620-9-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240508113419.18620-1-alexghiti@rivosinc.com> References: <20240508113419.18620-1-alexghiti@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5309580008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: a7gg3i5rpfpfartk84upzqz8cgdmbn1n X-HE-Tag: 1715168557-997871 X-HE-Meta: U2FsdGVkX1/iTPwERXM6dsTFcYomqR2l2RWHCBoCG/SjGE1dMWd3DAzsCOvaqFbGHM0dDT/wTpHf8AXmfDhAxiEA9R+Er94iNjbb/c56B3zVaFO0kwgNh7039l3bJc16fPrM1IBJWfVHTPprhpltHhyqji9F6b2CPxKZVQB/fu0P2vHXWVePcDJ7YNqmYTzfAzt+qxnIJzTHbAKa61dO/w9ljAxp5ioTDEOHHymy3351n4GK6BQwfCZpYUJmg/Zywr8sYZFoDGIX5c5u6VGIBUq6iuq1P8EG81SZcoBZMT3pmGvgEwqDx0kgsPEnABYMrYQR2W7rmS3V/vFuGjerZeLRqCIc6GtUwYGcQ8Jbnq7g/TMI4saAaDacd4K0R7VdwVS3m3ry8lJgQ1/35p9bg9rOUI9a0/ia1+goHvgRJFLwTGMnohDSAXDit5uhSiewFg4onLKg5gZjSMJv1TvhsbFPAvwHxY8ZaDPEZEtn+wdrw2Zijw6r0BZa4v94H2SxCWEabW7VgdORqQFfDygFPCIgJDvyoolVNnOGTqLQ66r4DCNkwQYxKt8ONF2jgCLVazE6QWA605SCHqvyD8HwyaijqoDgc3W7g5twok3wRNlP9Q1YRtZnWH8QNYuWHoI7QX0FTBHjogwDS7tytHFE1FgKrQN30LkV1XKNJv6zcDlllvoybJDUHaAcFInzx5llPzvx4p7ZIz81Q+mnORy/kKaw6lW091SJrJXRZGEvQ/ZsTL5P8mDd4Z/z05Fo2g4C5PV3+1ngTEB0uir0p95Qruh1vYy/o5B5WSfGWnOMKNG5Ckc9F/Lp9Z7wxo6FJmOoXyeKT8SXWCGkJyV3NnxBl28NaLHTfVKiVkELTl4igcWMCf9RkZCHi5F8uHDxa6y4VBIFpr830upgm68ngSf2I/6WoprP7qujHJ9UGy0dqBPanKVrQpjezbCPjYW03Gk+LUKQ3MyUlAZNX2jEwgl 11G4R7Ct opvKqKG6a/Xw9BJISe+G6o828lPSiY9L0QtoAQK6gjej3cm4GNNYsMypZ3HKzxg7KQwgcQExki5jWDS7tozshs5T3e1okcXUR1xmtS/oIWDmKxwNiXaiwff0LOepWE9lwnSN6An4RIvT1WSgFSsXzjt55xukEsu/hnG5yBM/oVp5YhKFnZ+ZuQxFoFHpJB/LLVhjKju5GHypTkDUNdDK2yvB9ZJB20WwzuzGfqyYcwyLdDqLkwx30zKHK4rWyM8pQdxrEjhcan55Fr5pJrb1wzfR/PI+DpdyZ2o41ij+H537T0E7BZmroqxLIWiICGY10xzT4q7KXxAZxtgLvcrmrZjjIt5QY69tYJzk4/dIEcNuayS88VSsR/IRlPd90llszswIzfmxNr0znTLZZnlCJEtH8ui6OozLVOckRyGkkYLHAe7y7Dl+yWuHCk5rF5NNVRgi0f2YeRiRbrJ7f6fUdF0Qcbjo2kOsG5r+K+bxaL1p8QYJGclUSkdkTqw== 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: After some adjustments, both architectures have the same implementation so move it to the generic code. Signed-off-by: Alexandre Ghiti --- arch/arm64/mm/hugetlbpage.c | 27 --------------------------- arch/riscv/include/asm/pgtable.h | 7 ++++--- arch/riscv/mm/hugetlbpage.c | 22 ---------------------- mm/contpte.c | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+), 52 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 052a5bf2926c..e56f2c8ec7e7 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -277,33 +277,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -void huge_ptep_set_wrprotect(struct mm_struct *mm, - unsigned long addr, pte_t *ptep) -{ - unsigned long pfn, dpfn; - pgprot_t hugeprot; - int ncontig, i; - size_t pgsize; - pte_t pte; - - if (!pte_cont(__ptep_get(ptep))) { - __ptep_set_wrprotect(mm, addr, ptep); - return; - } - - ncontig = find_num_contig(mm, addr, ptep, &pgsize); - dpfn = pgsize >> PAGE_SHIFT; - - pte = get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); - pte = pte_wrprotect(pte); - - hugeprot = pte_pgprot(pte); - pfn = pte_pfn(pte); - - for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) - __set_ptes(mm, addr, ptep, pfn_pte(pfn, hugeprot), 1); -} - pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) { diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 20f62505d0bc..9e397935536e 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -668,9 +668,8 @@ static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, return pte; } -#define __HAVE_ARCH_PTEP_SET_WRPROTECT -static inline void ptep_set_wrprotect(struct mm_struct *mm, - unsigned long address, pte_t *ptep) +static inline void __ptep_set_wrprotect(struct mm_struct *mm, + unsigned long address, pte_t *ptep) { atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep); } @@ -704,6 +703,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, #define pte_clear __pte_clear #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS #define ptep_set_access_flags __ptep_set_access_flags +#define __HAVE_ARCH_PTEP_SET_WRPROTECT +#define ptep_set_wrprotect __ptep_set_wrprotect #define pgprot_nx pgprot_nx static inline pgprot_t pgprot_nx(pgprot_t _prot) diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index a59b776e9c8b..440d3bde88f2 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -173,28 +173,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -void huge_ptep_set_wrprotect(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep) -{ - pte_t pte = ptep_get(ptep); - size_t pgsize; - pte_t orig_pte; - int pte_num; - - if (!pte_napot(pte)) { - ptep_set_wrprotect(mm, addr, ptep); - return; - } - - pte_num = arch_contpte_get_num_contig(mm, addr, ptep, 0, &pgsize); - - orig_pte = get_clear_contig_flush(mm, addr, ptep, pte_num); - orig_pte = pte_wrprotect(orig_pte); - - set_ptes(mm, addr, ptep, orig_pte, pte_num); -} - pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) diff --git a/mm/contpte.c b/mm/contpte.c index 9c7a9f250bca..8ad2a3099dfd 100644 --- a/mm/contpte.c +++ b/mm/contpte.c @@ -14,6 +14,7 @@ * - __ptep_get_and_clear() * - __pte_clear() * - __ptep_set_access_flags() + * - __ptep_set_wrprotect() * - pte_cont() * - arch_contpte_get_num_contig() */ @@ -25,6 +26,7 @@ * - huge_pte_clear() * - huge_ptep_get_and_clear() * - huge_ptep_set_access_flags() + * - huge_ptep_set_wrprotect() */ pte_t huge_ptep_get(pte_t *ptep) @@ -233,3 +235,23 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, return 1; } + +void huge_ptep_set_wrprotect(struct mm_struct *mm, + unsigned long addr, pte_t *ptep) +{ + int ncontig; + size_t pgsize; + pte_t pte; + + if (!pte_cont(__ptep_get(ptep))) { + __ptep_set_wrprotect(mm, addr, ptep); + return; + } + + ncontig = arch_contpte_get_num_contig(mm, addr, ptep, 0, &pgsize); + + pte = get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); + pte = pte_wrprotect(pte); + + set_contptes(mm, addr, ptep, pte, ncontig, pgsize); +} -- 2.39.2