From patchwork Fri Mar 21 13:06:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 14025410 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 01186C36000 for ; Fri, 21 Mar 2025 13:11:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB586280007; Fri, 21 Mar 2025 09:11:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D6566280001; Fri, 21 Mar 2025 09:11:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C05C5280007; Fri, 21 Mar 2025 09:11:50 -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 75F10280001 for ; Fri, 21 Mar 2025 09:11:50 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4144AADF5D for ; Fri, 21 Mar 2025 13:11:51 +0000 (UTC) X-FDA: 83245595622.27.4C1021C Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by imf05.hostedemail.com (Postfix) with ESMTP id C9063100014 for ; Fri, 21 Mar 2025 13:11:47 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="y5z/CSJt"; spf=pass (imf05.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.51 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=1742562707; 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=g+Ba9lH6i+4JHX31VX+vvn1rf15Jq1WxTsiq92NtkJo=; b=eLZlp9a/DYMf38iU3wu0xGFZ1k0e9NBJgp5VLZUc8UK5g51Ifvzz7lPbkwwz0KaK67EI5x bMzYoMir4Lx1OS+XyEnXr2WJcguN3x41xDDrR402nsRyJz9i9iZE6bpQdXvnbqkfbSci57 CdAbboLIGjZmVcu8y0rRC9ij20RPzbg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="y5z/CSJt"; spf=pass (imf05.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742562707; a=rsa-sha256; cv=none; b=gnFpQ8/ilmXDjllXPlDZZ+9vuM2SmgRtXT1wTmNqOgfrKvOS3tEPXSBitNoFEAxP0wqqBP 5vu8j77gSclVz+6EQ9W4MtppK8TEa4vgWO0NFhUMU9TjfGkFrNlPyfGe+Om0K8EMlZ6JAK gsvkypBDcRNuvP2e0GEVvZbfHAGZ1+k= Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-39149bccb69so1829420f8f.2 for ; Fri, 21 Mar 2025 06:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1742562706; x=1743167506; 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=g+Ba9lH6i+4JHX31VX+vvn1rf15Jq1WxTsiq92NtkJo=; b=y5z/CSJtTrGIulgf4EpWJtLiTBJYypkJXktTytE3DxdSlGbMRMC0RlSDP0+4KW9G02 5vBnIy4JQAXTrYY5UPqz/l1QDPuqjo6Kgwxbw/5KOvHAwXvVlFXiSeRK24vbyKRp8kYE VwSS7bcPpEDadlA7OADFAkMQQGDBWvyc4FIAfDBucP6nWUR6S0ztfYsRNABxGck/Q2qC zAc4rxWRcH61ezSa1pxc64yiafoAxVDsTPeQzciVxI8No6qhcw68p2mhh6QFwEiWUyVB BbmMq0fQHqpIarxfeYateAaxbDL+dmSRWiGXXHKcr6gNdnTITgBZ9RCGAj7/ytLtVGpx eN3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742562706; x=1743167506; 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=g+Ba9lH6i+4JHX31VX+vvn1rf15Jq1WxTsiq92NtkJo=; b=dSBqUPRZ/AYYlI0sTR0KAlgLv/IuleH1niBUgHdu3xn0vyRoIikdWDpn9qhmThm6Il beHwuiMuXLU3eIZ2W4L73sZM3jEypaBtr44efftbMu55YGoJEPqI7ksIQVEK/Ei1plp1 8Ggb8jJcocjIbX2xrIhXf/CuGwQ31ApubGzYu/fDekWQ1qrjS9qCXzpcA8+o+3713/Wx Sa/nJTblOZ5uSiHGzwtfAGov/5DSItwTmA0XkqWH4+UDamKVtCt13GmDudcY4lK1EaUl s3xouARswulXHxGuWuVX89CkUIPwl2fspGLlnJpCbN6i18mdUmDfdteAxa3m9vrB6e4l bcdw== X-Forwarded-Encrypted: i=1; AJvYcCX7rExsUPHgHVa6JR9X0WloE2TPAXkw+COK9VYOpVx+RNVZOeJHp/Qg0AGkUAiJMcWIEtgNfR7Cdg==@kvack.org X-Gm-Message-State: AOJu0YwParLxpuz818IIkAc4iDGXLmS2i5Ii8zjPEwQs6k5H9S7yHG0Q r/eUYXHhcrClVpyiz051unb6F0OQ8fuc3q4OAaOyF7dKyQE9RsAWshETFnq4S24= X-Gm-Gg: ASbGncsBoQJ/5ynV3lvrQXX9OdJLVBBd88LqKdxl0W8lrNn0GOg4Seph6qeZEgQqd5W nE8rv24Do2J4v9nLobvOfeLSPH9pM1RPyFqLY9BKZeaaxmFaCm2qkak6zLt1/ueAbqkaFE40Ny0 Z9lWrxgWkGZonbv0DM4QivPpasLOhBqIuWWJIZxtGJhNlYWJsTKjRqx5JUtyFkJbX1BCh0F0als 8+Ts4Vmkd85DxbR1648fTHoi34xW4dKmDj6EdtGcJkUNYG8yJ8laz4Lgi6eg8VPSU7LoXziBlkr PcSCxcfB49xaCWSBBudA4eMx8EBOzfakGz/UNvO6+Ku8XhzljHDEZnYJ5koI9g25RxFvrQ== X-Google-Smtp-Source: AGHT+IEGZPDoYAPQGYmkPYx5aU5RVlINcZRG7cNrGB3gR0sMYyiWL8XPHTT0J17da9GbtboJpKfvoQ== X-Received: by 2002:a05:6000:154a:b0:38f:3224:660b with SMTP id ffacd0b85a97d-3997f90a69bmr2874098f8f.22.1742562705888; Fri, 21 Mar 2025 06:11:45 -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-3997f9b26a6sm2310275f8f.44.2025.03.21.06.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 06:11:45 -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 5/9] mm: Use common huge_pte_clear() function for riscv/arm64 Date: Fri, 21 Mar 2025 14:06:31 +0100 Message-Id: <20250321130635.227011-6-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-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: C9063100014 X-Stat-Signature: zn6m6oh85xnbc5cx61ttpdgm5937pe7a X-HE-Tag: 1742562707-587150 X-HE-Meta: U2FsdGVkX199TALW1G7xfaHczW/T8iZAqbEidjTgovtfabIp91p42eVZyRwjS72Ff7FdYBoJpc7EokDBhNUdCkXEg7zDnQP3kohMpbmF1WnPdgsIxGqniytOHwa32rSHkg1sa5CBIQ+t0U1WyQyQ/vlZkfXzxT1R7nCpqsMewdcIo0+X2KzRvIEFmelvprwHinU18ALQxvldqiE+Wr8lz8RdEddyRlNiXR/BURRIgosVtGLupYheDXLfjOq4350bDarTSxrSKyyRoxMludXpE6z2yZ7bgU29xu3arALUsytuu8pksgEdmNgrJOgJTR+pfl0xdr36FsvJFlQ0EvHqDixmSy077R9ZSzj6YNAxV2lM9Ni6mhn+liKbm4mio9rJqdqxGCTjJ9/et7gM+rVZ2L9WVtU6BpVPrA+uDTlTKnGuHPaV6i4PyaeYMREAzXNqg64zNVsVx06ZbaUYBms3QorNNRrzxwTYEdFKNhF6Z21PkvN24+0yDz457NXDBWIR5uJAQx9nUAyKQ8HDiVBK51cNajyDjcPsBmRiDYMIXYJ3t3AIrdEKqUBdnZw+QIXeeTDX3N1/Em/qBwS/dmkBb6vCcI7XYeyaCUAYVJh25Fv38XvVJZPalgxUX51EZUZUdbJ7knshTuv14PPlaUrF+XzuxpEVnxXfx61Pgu7sR9xzVNdyfZSzWHq8Evf6oaRtvCXubDdKkQCRKP5KdVSR7zphDrKF8HwXR+LjfKYKoxP3+RxcAb99maQqCZzT4zA/xLgzEXjZK9nITrXDw5nRcy3p26Uh6UvSf8R8YfeBrExlsf7/I85PlmrwEW1gzdBZ+LzPbde9IHhdd/HbMRgmSS1RTlSI6erlKREBfoTvR6+Sf+ljeymsn4iM7fdorQWHRC0RSCXHlQdVz7cXCxNfrdU7VsoIsqCpZxASO08jemcg0UxQMDrvZi/y4r1n77H33BTHb0ZNxU2zOYqahkH 3HIB1BBn vsaLXis8Azz1Eph/J00dxvooy9GNeooYxxA4PG77RIU+14UJOVOBLp9ExQBAiOL7g+4WwGljV5QBSf+2eEHKuiLE/TID/43Qy9TtfbfyjGlMdfTeHNeu0RLSRI+AnpVtD1IqMZGdzeuU4/BtCIeYA2Ate9/HG3Bs7AyechNFIrduuAJeha+ulVz/eKQyw8adwHTY6lMem/wTApsDqLluJT4wTL8Gl3w6xgS7Bh+8lYq6ya/30PyJ/ND/7gSJTOk/anMBo3e6/NbHJGSWZEm8GSwT9HrtmJ0NcYqk9u1ISrbCirzFMqOkh9A5xIZCpifcVnIx36whB2gaKcR2Rr7+uLHAmDuiLQkulh17dI99183eArQdcf0mvqQKNIFJckROuyHHbBZ3iSE1933v76UWxPAd9JkEJEUuCaMJITSz/X28sM2WcBmAETH8XkwZskSsIP5Oio/iij0ttGAsOv+KG/OFScg== 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: Both architectures have the same implementation so move it to generic code. Signed-off-by: Alexandre Ghiti --- arch/arm64/include/asm/hugetlb.h | 3 --- arch/arm64/mm/hugetlbpage.c | 12 ------------ arch/riscv/include/asm/hugetlb.h | 4 ---- arch/riscv/include/asm/pgtable.h | 5 +++-- arch/riscv/mm/hugetlbpage.c | 19 ------------------- include/linux/hugetlb_contpte.h | 4 ++++ mm/hugetlb_contpte.c | 12 ++++++++++++ 7 files changed, 19 insertions(+), 40 deletions(-) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index cfdc04e11585..ed75631ad63c 100644 --- a/arch/arm64/include/asm/hugetlb.h +++ b/arch/arm64/include/asm/hugetlb.h @@ -48,9 +48,6 @@ extern void huge_ptep_set_wrprotect(struct mm_struct *mm, #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); -#define __HAVE_ARCH_HUGE_PTE_CLEAR -extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, unsigned long sz); void __init arm64_hugetlb_cma_reserve(void); diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 6feb90ed2e7d..99728b02a3ca 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -260,18 +260,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -void huge_pte_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, unsigned long sz) -{ - int i, ncontig; - size_t pgsize; - - ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); - - for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) - __pte_clear(mm, addr, ptep); -} - pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, unsigned long sz) { diff --git a/arch/riscv/include/asm/hugetlb.h b/arch/riscv/include/asm/hugetlb.h index 7049a17b819d..467bc30c2153 100644 --- a/arch/riscv/include/asm/hugetlb.h +++ b/arch/riscv/include/asm/hugetlb.h @@ -20,10 +20,6 @@ bool arch_hugetlb_migration_supported(struct hstate *h); #endif #ifdef CONFIG_RISCV_ISA_SVNAPOT -#define __HAVE_ARCH_HUGE_PTE_CLEAR -void huge_pte_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, unsigned long sz); - #define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 5b34b3c9c0f9..72d3592454d3 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -651,8 +651,8 @@ static inline int arch_contpte_get_num_contig(pte_t *ptep, unsigned long size, } #endif -static inline void pte_clear(struct mm_struct *mm, - unsigned long addr, pte_t *ptep) +static inline void __pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t *ptep) { __set_pte_at(mm, ptep, __pte(0)); } @@ -787,6 +787,7 @@ static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, #define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define ptep_get_and_clear __ptep_get_and_clear +#define pte_clear __pte_clear #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 75faeacc8138..fe82284c3dc4 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -254,25 +254,6 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, return get_clear_contig_flush(vma->vm_mm, addr, ptep, pte_num); } -void huge_pte_clear(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep, - unsigned long sz) -{ - size_t pgsize; - pte_t pte = ptep_get(ptep); - int i, pte_num; - - if (!pte_napot(pte)) { - pte_clear(mm, addr, ptep); - return; - } - - pte_num = arch_contpte_get_num_contig(ptep, sz, &pgsize); - for (i = 0; i < pte_num; i++, addr += pgsize, ptep++) - pte_clear(mm, addr, ptep); -} - static bool is_napot_size(unsigned long size) { unsigned long order; diff --git a/include/linux/hugetlb_contpte.h b/include/linux/hugetlb_contpte.h index 135b68bd09ca..e6aa9befa78c 100644 --- a/include/linux/hugetlb_contpte.h +++ b/include/linux/hugetlb_contpte.h @@ -14,4 +14,8 @@ extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned long sz); +#define __HAVE_ARCH_HUGE_PTE_CLEAR +extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, unsigned long sz); + #endif /* _LINUX_HUGETLB_CONTPTE_H */ diff --git a/mm/hugetlb_contpte.c b/mm/hugetlb_contpte.c index cbf93ffcd882..e881b302dd63 100644 --- a/mm/hugetlb_contpte.c +++ b/mm/hugetlb_contpte.c @@ -86,3 +86,15 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, set_contptes(mm, addr, ptep, pte, ncontig, pgsize); } + +void huge_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, unsigned long sz) +{ + int i, ncontig; + size_t pgsize; + + ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); + + for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) + __pte_clear(mm, addr, ptep); +}