From patchwork Fri Mar 21 13:06:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 14025422 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 13D2EC36000 for ; Fri, 21 Mar 2025 13:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9699C28000B; Fri, 21 Mar 2025 09:14:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CC9F28000A; Fri, 21 Mar 2025 09:14:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7468228000B; Fri, 21 Mar 2025 09:14:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 52F1A28000A for ; Fri, 21 Mar 2025 09:14:52 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0D72D16250E for ; Fri, 21 Mar 2025 13:14:54 +0000 (UTC) X-FDA: 83245603308.30.B0DB377 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by imf10.hostedemail.com (Postfix) with ESMTP id D2330C000A for ; Fri, 21 Mar 2025 13:14:51 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=thm+3h9R; spf=pass (imf10.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.42 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=1742562891; 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=JOImW0XTENLZqMOVas1NKgXRQH/ppGnjlH3sp/4Pu3c=; b=N4ikf1V3yxJvcqp0OAeYExqMFQKSev4g4iipE7q1nZd+KSheuugeyz+xZ4x6nkDZ92FLEp XVRCA/QrZMdowE5+mr8Hpj/ofzFUTilpYzK5hgj+Ggu9QeTjYUWdevdMh1FZMhswSUgOdd 2m5G5GCKjdEM406V41LyxAQq4w6o+uY= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=thm+3h9R; spf=pass (imf10.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742562891; a=rsa-sha256; cv=none; b=wFVdUK+inHmQRyzrAratHJLe5CnxmxPFsUuBiOIeepQZn7SzdOku+a8wjgQ65crRabg0ta X7/R8RCyLMPp0Yr33iAIRNtbSNZs92MOZTqL3M9H6XxN5yOzmMIjtRxB85seEMOsNYDOrU D35hkueuLRWjUrQek7cvSkGiU8IR5NI= Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-39130ee05b0so1860147f8f.3 for ; Fri, 21 Mar 2025 06:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1742562890; x=1743167690; 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=JOImW0XTENLZqMOVas1NKgXRQH/ppGnjlH3sp/4Pu3c=; b=thm+3h9Rki5fw8j53//WWa8CGc71iMmRaP9hmw3Wi71AMpvgTswjMdipcDqz/LZ7lf N0DSHxQbG9TcsUyHz4caxdv7leQWtvNVC2q6iBRdWwH9fHh6fMjUNme57yLvXTyYMm4w irlZcPL6UQ9kw2K222x+ZRQd8kZwdVosl+RiW2T/9MtwE1qT5qffSTklmKCSs32ioamI JoWd1RcxpOryBq2170/vicCFVIneTETBkXt6Jya2jjM1BCPn69UN1tVIUXtVwOLzxJ05 sqCy1+uy9wV2nbzT58+o0xpOR7mjzEjFyqoAaZ55ukq22HcRCSvweGqc+cOlZEIqQHtg GJHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742562890; x=1743167690; 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=JOImW0XTENLZqMOVas1NKgXRQH/ppGnjlH3sp/4Pu3c=; b=YuoLD/9bvO91kW2Lzqxv6JyF2CdzvXwdg3c8MVoec5pOJe1kN1pu06qAQL2zkR3caM jHbbu9OerK8vI/QIf1HYtNG5uPZNqT8nsHcmiELGu6r4H6fEoTYFEd493EDzMK8uwUcz 9S+pL8dIHBC/HSTxgICcOqwqyU0wN/mNsUfS47J8vrnc08ATJg83oRlmQcrxnwUCs+j/ aeTjRRBr6WaCtYMyi0rirwGBXODlLMxl3s6x1E0IuSdz0EDG8sEPEAeyeKIMe+gK/xN/ UPzoXIZDsh9VzawX4cQ+TDM9GwMOku/W0/Vbc9/0jnTmWSSJX5kArhZPnZNMW3P3fMOo BP/Q== X-Forwarded-Encrypted: i=1; AJvYcCVGNS92j9tAo4mcmq312EdKp0N2HSeQffClbQbnTw2XTb35csgv4UZmNF24+MehiWijSawbnQSQQw==@kvack.org X-Gm-Message-State: AOJu0YwmYnDjajADQZkwaRqztwpRSn3xSATuu/vvA4P3dgZ5ORrYuTLD FL3luvTH00Dn51z6ozfnC1goZkBvaPZ6ncQuoeaWMF/oNduaUB0By8Z6AAr7uH2q087WRgDF2fV C X-Gm-Gg: ASbGncvXTY1OnWOw2tOgVLsz9iLpWYeQ2kBZZCRep8w146V7v34oAkJ2s4N5q61HSe4 TlXyNOoAg3xwwVUPhwlUHdkGkBDR9Zqnk7pv3E9sZkuB3I6XwTYc+Wh1BpS5HSoOdzbhrODigXU uzuMoy9/fP3sPLpi5iuCZidxJQOGOuaPvT9cfDnx4jwG/Fk+b685wTV9f2BbPL5QkhATQo1VJxX lxJyRmuJR+oTz2yBqcQ1vzas64mZWxRx3D26iXGCLsBVf1C3lGjO0toETYn8AYhbcFsF1qNmQxI nL4QztnpJDy6y3jifhGww0k3iCwG7PdJsxcvN8Aj9Q7qNhqYVV+TSEMF+Xt3+b6x//AtWw== X-Google-Smtp-Source: AGHT+IG4Bh4b8ljgMGozvKhj+gGf/zTKUltGlpRU5vbjoRJl/qtI6QCkciAO8DnHWDVRjHELB4GFxw== X-Received: by 2002:a05:6000:381:b0:399:737f:4e02 with SMTP id ffacd0b85a97d-3997f938798mr3602833f8f.39.1742562890297; Fri, 21 Mar 2025 06:14:50 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com ([2001:861:3382:ef90:3d12:52fe:c1cc:c94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9eef37sm2294241f8f.85.2025.03.21.06.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 06:14:49 -0700 (PDT) From: Alexandre Ghiti To: Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Matthew Wilcox , Paul Walmsley , Palmer Dabbelt , Alexandre Ghiti , 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 v5 8/9] mm: Use common huge_ptep_set_wrprotect() function for riscv/arm64 Date: Fri, 21 Mar 2025 14:06:34 +0100 Message-Id: <20250321130635.227011-9-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250321130635.227011-1-alexghiti@rivosinc.com> References: <20250321130635.227011-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D2330C000A X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: yecydbjdqz4zq8a67acwh8he5yhsfy9u X-HE-Tag: 1742562891-2133 X-HE-Meta: U2FsdGVkX182bELhvzQKXRv1LqDkmh+t6MQsB6aPV+UFZoAd1DbAALoVpmbgU7pwnhs0/ikcd8HYzAPHSJQSo9qB/xPw2RCM4tEa16qJMGFKWHgHLD31vPQ9Ga116LxrkMeIYf0gsuwi5YjxAxYC1ka+4wk5oT6nEVbuOutj20QOEhUbFdJk5eUGHz9/PuJ/u15YZrfe6B1lEDsj4WH+WLi1nmzRWJajZ2LLPxa06d/U8vd9cY6UtvbiVUt+7pvHLh176wOE5JEloswowOnVqTYglRUW1O+KVbGYliY6I/1qlH9efneq3B04NEcVhdBLMtxkgFQEHHYp8GVfAxleiSEGuXrQYUYwQcgL+uUvF4WtDUAf72KaL8EJXDBxkghaykDgAyHVuDWucJR+gzbCi7kFhuFhdhZ+FOpiaNKtNbuJh5aXkNXgWf616niO0YEGEOKF76yUV5FxkG03Of7SflQqLqhX0/ihulLfYjA9lHpUnxnVVCnZ3Mja5Ow6PPFf1cCtyc4IA/BBU+/cD/EwJgAhTJv+C56kf8pGzQQ+ms6sq3f4/i/kxHtQWecd+jNxLFb4wOuXccqD7BRWNR5yN4P7sZABGEraYJbwB3KjqoE+P7vV/SK6sleM8XxqBvOYE8td+3f4iL/1v6+mD+e/LYchCERpr9dOBSZ4Iw8+3Oa1P+BormM4B2meMM1sRXHPw5wFwVJD/deQ7D6JxpOyLOb5+trWX11akcDleix5f7kytTlcqq97y2rzaBmaNi41HawIK5ui0wPEqXl7v8r+53t0Yl45EI7K/YWThLGJp+OCJRmMME2h98FygAuwxTIYvNMkgmh+VbppbbLxVQFTjjxzn91KK9rxH85AdJpMIMIBjyCbD7yqdYe4vXJGEjzAE5CeqwJAkqPRrOnlErp+tSWkl70cVmXoFT6jT4LB3H1rk2kD36SvNNKjtBx6FHPEBk945tMOL7+5bZeXYjL /3K9zAME TrX4PFHsDTpjAvPPOcmURopVi2BGnKv56YFa4bYMioYx8Su/cZDCJTAJtsh8LgqzGfPdE62ssfG99L/Cvl1knz66JudCDViHTfNHkd6vVZfugjcEq7IVsYMmuyUJgn48CWd9780rCzqAB53aNXd1QfWOLXvCCVvWxyatbC0m5Es+E3bdw7N2bsFTkbMX3i6spdorLjvYN821UtkM8h/4Ub/SRNC3xasItInZJBKVqAU2rM0g6PhfznoGAg1FJ5YSKuTzQPLPf1V2XAnHjURGsWYBAe4wFyumycde8x/6KmnRPqylkfH94Sbh/idyzT0qTuclZN5MLc9bOSESl+6TCedDrLstjEJ/BwRa8bZKoTCDBUB5nS/ZdcaqexWms/xoRm2fUKbWsYlLwMpq0/Kma0UOPehfT4nCV22DPa5gMzeO+CHfrTQUym6DFAjl7Fv4mEfdDSm0JKlIubqL3+mSpz9fNPA== 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/include/asm/hugetlb.h | 3 --- arch/arm64/mm/hugetlbpage.c | 27 --------------------------- arch/riscv/include/asm/hugetlb.h | 4 ---- arch/riscv/include/asm/pgtable.h | 7 ++++--- arch/riscv/mm/hugetlbpage.c | 22 ---------------------- include/linux/hugetlb_contpte.h | 4 ++++ mm/hugetlb_contpte.c | 20 ++++++++++++++++++++ 7 files changed, 28 insertions(+), 59 deletions(-) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index 29a9dac52cef..f568467e8ba2 100644 --- a/arch/arm64/include/asm/hugetlb.h +++ b/arch/arm64/include/asm/hugetlb.h @@ -35,9 +35,6 @@ static inline void arch_clear_hugetlb_flags(struct folio *folio) pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags); #define arch_make_huge_pte arch_make_huge_pte -#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT -extern void huge_ptep_set_wrprotect(struct mm_struct *mm, - unsigned long addr, pte_t *ptep); #define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH extern pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep); diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 03cb757f7935..17f1ed34356d 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -260,33 +260,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/hugetlb.h b/arch/riscv/include/asm/hugetlb.h index bf533c2cef84..4c692dd82779 100644 --- a/arch/riscv/include/asm/hugetlb.h +++ b/arch/riscv/include/asm/hugetlb.h @@ -24,10 +24,6 @@ bool arch_hugetlb_migration_supported(struct hstate *h); pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep); -#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT -void huge_ptep_set_wrprotect(struct mm_struct *mm, - unsigned long addr, pte_t *ptep); - pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags); #define arch_make_huge_pte arch_make_huge_pte diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 081385e0d10a..c41b49948ee9 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -665,9 +665,8 @@ extern int __ptep_set_access_flags(struct vm_area_struct *vma, unsigned long add extern int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long address, pte_t *ptep); -#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); } @@ -791,6 +790,8 @@ static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, #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 b2046f4bd445..db13f7bcdd54 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -176,28 +176,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); - 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, NULL); - - 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/include/linux/hugetlb_contpte.h b/include/linux/hugetlb_contpte.h index e129578f6500..9ec8792a2f4d 100644 --- a/include/linux/hugetlb_contpte.h +++ b/include/linux/hugetlb_contpte.h @@ -28,4 +28,8 @@ extern int huge_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte, int dirty); +#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT +extern void huge_ptep_set_wrprotect(struct mm_struct *mm, + unsigned long addr, pte_t *ptep); + #endif /* _LINUX_HUGETLB_CONTPTE_H */ diff --git a/mm/hugetlb_contpte.c b/mm/hugetlb_contpte.c index b4c409d11195..629878765081 100644 --- a/mm/hugetlb_contpte.c +++ b/mm/hugetlb_contpte.c @@ -222,3 +222,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); +}