From patchwork Fri Mar 21 13:06:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 14025423 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 EA16FC36000 for ; Fri, 21 Mar 2025 13:15:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5867A280007; Fri, 21 Mar 2025 09:15:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50FD1280006; Fri, 21 Mar 2025 09:15:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B0EB280007; Fri, 21 Mar 2025 09:15:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CF92A280006 for ; Fri, 21 Mar 2025 09:15:56 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 531B0C23C9 for ; Fri, 21 Mar 2025 13:15:58 +0000 (UTC) X-FDA: 83245605996.28.7CB0D71 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by imf19.hostedemail.com (Postfix) with ESMTP id D1ED61A000B for ; Fri, 21 Mar 2025 13:15:53 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NMp9Jijk; dmarc=none; spf=pass (imf19.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742562953; 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=Vd9K/fWiMAnzVZgWbX0wvtztqz4Hm8uA/kr1foq/koQ=; b=yevtoGqhR+9fEtMvAJl6fEb7wYbeMGQB/w9cnBDf1ZnUJ0lsZOTTrBuZp5cja9yqtr7Jp2 1InSZf2H05gxYQkb58VYtgMEo3WB2XU0UEUyveqghVukzaxpdSgmSM31CDxoplHfUgUyvy 7hwQzYW/FLPExsPX/IeqmFOy85uQjLo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742562953; a=rsa-sha256; cv=none; b=LrfVVOXhXEnXqxmUyi7a+g12EFaC1t6Wa/ltlLJLFbfaJ1XW5VqG4h6+oSOcYtlh4bZVBM puKHaMNtAPJcORzK5fTD71S1fmx6UW3X+jYGYpYkPZ38o8HQxURTS/E7CrgC1DRid/bj+z O2F6b99mwzdh2gxCZCBbhO8boTkxK6A= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NMp9Jijk; dmarc=none; spf=pass (imf19.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43cf848528aso16413635e9.2 for ; Fri, 21 Mar 2025 06:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1742562952; x=1743167752; 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=Vd9K/fWiMAnzVZgWbX0wvtztqz4Hm8uA/kr1foq/koQ=; b=NMp9JijkSFooxclHIdt0PdjE0cPPLh3jAO1o2+zIa6wzcdgzAkCB+DXkDS/D+D054F eUnk7r5ZA/lck3CcsF4UZOkx9cg+/nxC3WUHitF+5WZzCIzNpuschNhbdAExgwIRs76T 8MdqaFxAC06xl6eUDWOUAht4X+UHTwSZuptMe9Z98uwufoFwu8zAgI+4OEeYGa/2em7i ukB/dE6uXcskvE1h1fiSRzwussa96Ro65NNnw9VMME8kQ1hgrJWRRovqNA+JkURdOrul NPX0fZkGuRnI0FDkCGZ2dVcBfk98h82xLxbKh9MvWDK22j/PA/GQcAfdd0twcOMB9rqJ TNLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742562952; x=1743167752; 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=Vd9K/fWiMAnzVZgWbX0wvtztqz4Hm8uA/kr1foq/koQ=; b=pQkk3OVF/o+fnuQH1BFdxyhmIFlYHfCNvWAsPl5lOd3mOjYUS1Op4xTZgqosgdeBwh YNSrtBZ1ok78nk4xmCbUqk9YbbK1tTXpbjCANLjs2a+6nJXR5EezkmHkMlPYLN+/z9Qc kZWTlfnQkuV5HE88OVwN42cf4/UdadYUogd/+epx4P0cmJOGPullnjeIhkUChAXMEU9s HlQk7iCM2Ln3tDMe4fnA02lnsJT1w0lac3MJy5mG64NH/n3FbqprLTEQCPEhwx/LrK6d 3vjG8uF44ur80/mi/76UzlAd8KvTlMn9b8Pm26EYGVH+evyb/SvbS30/d+DHBCpGCzvv noyA== X-Forwarded-Encrypted: i=1; AJvYcCXfKt8oNdjhIJnGf4Zuvd+KkRL2TR62t3pbxKRp27m5qUpP1UDj+yCNbMfuALzpwdvVLrGebUMu+g==@kvack.org X-Gm-Message-State: AOJu0Ywpp4yhnBswR+eGlxLkYdfuyK3qGvl+EpNUG0T7B9vkd64yH3Mn I3rkxMsXX+1Qfe17g4jyNVU1ENVe8/LKBFLLvHo4+KlbVMr7JBu3+9ZLqWN+1x0= X-Gm-Gg: ASbGnctqoojVi7k/x8nN8VPE2+7ppz2CseSKq4ou9YDuKdo7VsgijiRD17VqKm3NsLZ Aq0TyogrxFRGWJDmq+mXfFvSMRHHViTsBF2t+WYlh6omUVGMPWHhG9/AUL+m8l466BT5+9ahGBC IYvq3PljyIFS1WGynAXa/W8NMoxzyf1uj6PRxBGTm95nCCZKGp8nw8Uc1/faENZMh9tD2O99ByB mHi+X3IOzz1zZ59AVxxuglS0VKZsWOyBhwwl3NQ9qhDZbjoAwC7uQJcH8kIWE5pzjruVHnKTzAy LvneTOTcig9GrvVk5Hqzzi46BN84hoCx6s+L90Eu+XO8Jk6R9HAg4nB1WMzDD9AvEeUrow== X-Google-Smtp-Source: AGHT+IEeSuJJCualMyRGxNrWV663ipohlvvxYL4TpbesKMPlj8TlM2yLM3TCv4QBVXMIE7MjteYhiA== X-Received: by 2002:a05:600c:83cf:b0:43c:ec28:d310 with SMTP id 5b1f17b1804b1-43d509ec838mr36046425e9.10.1742562951783; Fri, 21 Mar 2025 06:15:51 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com ([2001:861:3382:ef90:3d12:52fe:c1cc:c94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fdb06b9sm26435515e9.36.2025.03.21.06.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 06:15:51 -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 9/9] mm: Use common huge_ptep_clear_flush() function for riscv/arm64 Date: Fri, 21 Mar 2025 14:06:35 +0100 Message-Id: <20250321130635.227011-10-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-Server: rspam07 X-Rspamd-Queue-Id: D1ED61A000B X-Stat-Signature: ij9k8ap1qyto159zk3uyso4okk33fp8a X-Rspam-User: X-HE-Tag: 1742562953-820248 X-HE-Meta: U2FsdGVkX1/M+ThAHGU3Q6AW4RtpeHtmEo8/Cgdy2K8XGVzrAg8ZbrJzQbkuL45g+qvit56yM6M5RU9vaqTHXr7/fzx6bou51xH9pxElAGvYQVUuxKC9sYSbL990kZoAkHQQZxU1K7nwYEOgK+GgKC/qyzQTOm/ub6yHYfc3wp3ObjBA++aR/cyUuquoZMfCy26b4t00gK25t7sVobKowaWv0luuBfv83fyxFz0/nCY5wa56fnZYeuHR4HhdqK5sv6mUHIDHdOxWP0AAW7tQnExzNKJg8i2Rw0u09COjYBFlEQlIAu+P4osdkY9l6/CyQzqIaKxbSiSBdKFt7YrnD6dcWgJZb4Tnezf3/Jn/pRMBNlAZ0lJZCCrC0QBEcShEsCD4zZquCJgTEvxlfEN3EFiYiWrpZM6xLs4gTHrMFpdapcn+9YkL+lD2bBFzoK6dxqBwDoHCXaisgAh4LsyTbta6IJsHR9nIExgWMS9Q7ZJ8auqujbEdEQP7qX8miUqKh1MVaXU8q4ptGgmjFeEmdpDmZRAq3jDXFPuKf/k4kSlf/gVfja0eQEhO+rgrKQHRj/du5KBpozQDTAAA1gMihYKVG6F8CRGDzhA5wd5TjSFLa8TknmYiFMgSYz755ZN5wTRONA6KKKz0sdoKN0udu7X9cSGJ3ECb+TupGcg0j0L8RM19DhfrKedZbshf6CBaYUfgkSktZThxyfQx8Wi5tHyo2CvK8VSzwODny8nyuMVppmYCe8ZAfggQKfcmDAA2eiiT0GfpOa/+Ph8FR5FV2AQJRYAoN2MDyocZD7ErBcXWTfcc8a9qw7ALKGPZd8fwbBWHIectVCaTEBvJiOi7Ld1aumteBv1ND0k0KeLJ0mVyqUcLJU9VCM5LC5Ga4f5KDt8mod80GvAh8ABw5P4Skzpt90aW+WESxempTCxZliadZn+lXa5aKjtzNCTvWcawTw825Gv+GMqeQpmg1vd K3w31XxY H3WPG1jVcTjqClWUtdIK3PyM0BHTESxRoqH+GSNpDOeovuqw5JKWxwQ9yKKXIsdE9Uyh1GS7sYeAP/OJWaYUssTupPMtEKTnPYeJ3aiAbKDBambn9H48GKxouKPq6oOvLCZRNhSvsYx6itGQ+wHAfYRUO4DM9l0p2zWeNLDrsLFikc+NSKIjsnwN3Q1ZSk21NSd7YArHS1pQDcsiPuBGAt2HoIY2J+D1YQJEp3dvLkGn9E+9rPegQgA6QOnibbjai3AccmmUE+yXwUdillhAHkNXD5UxssvIpUuNTJfJoqZ2pZeOV29W9UIp81vKYl5OoXJ9gxQZ9iA9J/3kMvn304EKwzjxU/ipKKXYUxB/qzoqvQ51O+HsqHhGFrOmgbdDtfttr9fwECYkkXyPOkp9fIx1lDrfKodkpXzB8fU6iImQ5fiYNztOIcKj9+IuQomX0aZp2nbTTW9/IfgO8ViI0sLsRgg== 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 | 60 -------------------------------- arch/riscv/include/asm/hugetlb.h | 7 +--- arch/riscv/mm/hugetlbpage.c | 54 ---------------------------- include/linux/hugetlb_contpte.h | 4 +++ mm/hugetlb_contpte.c | 14 ++++++++ 6 files changed, 19 insertions(+), 123 deletions(-) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index f568467e8ba2..368600764127 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_CLEAR_FLUSH -extern pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep); void __init arm64_hugetlb_cma_reserve(void); diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 17f1ed34356d..08316cf4b104 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -82,52 +82,6 @@ int find_num_contig(struct mm_struct *mm, unsigned long addr, return CONT_PTES; } -/* - * Changing some bits of contiguous entries requires us to follow a - * Break-Before-Make approach, breaking the whole contiguous set - * before we can change any entries. See ARM DDI 0487A.k_iss10775, - * "Misprogramming of the Contiguous bit", page D4-1762. - * - * This helper performs the break step. - */ -static pte_t get_clear_contig(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep, - unsigned long pgsize, - unsigned long ncontig) -{ - pte_t pte, tmp_pte; - bool present; - - pte = __ptep_get_and_clear(mm, addr, ptep); - present = pte_present(pte); - while (--ncontig) { - ptep++; - addr += pgsize; - tmp_pte = __ptep_get_and_clear(mm, addr, ptep); - if (present) { - if (pte_dirty(tmp_pte)) - pte = pte_mkdirty(pte); - if (pte_young(tmp_pte)) - pte = pte_mkyoung(pte); - } - } - return pte; -} - -static pte_t get_clear_contig_flush(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep, - unsigned long pgsize, - unsigned long ncontig) -{ - pte_t orig_pte = get_clear_contig(mm, addr, ptep, pgsize, ncontig); - struct vm_area_struct vma = TLB_FLUSH_VMA(mm, 0); - - flush_tlb_range(&vma, addr, addr + (pgsize * ncontig)); - return orig_pte; -} - pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long sz) { @@ -260,20 +214,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep) -{ - struct mm_struct *mm = vma->vm_mm; - size_t pgsize; - int ncontig; - - if (!pte_cont(__ptep_get(ptep))) - return ptep_clear_flush(vma, addr, ptep); - - ncontig = find_num_contig(mm, addr, ptep, &pgsize); - return get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); -} - static int __init hugetlbpage_init(void) { /* diff --git a/arch/riscv/include/asm/hugetlb.h b/arch/riscv/include/asm/hugetlb.h index 4c692dd82779..63c7e4fa342a 100644 --- a/arch/riscv/include/asm/hugetlb.h +++ b/arch/riscv/include/asm/hugetlb.h @@ -20,14 +20,9 @@ bool arch_hugetlb_migration_supported(struct hstate *h); #endif #ifdef CONFIG_RISCV_ISA_SVNAPOT -#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH -pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, - 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 - -#endif /*CONFIG_RISCV_ISA_SVNAPOT*/ +#endif /* CONFIG_RISCV_ISA_SVNAPOT */ #include diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index db13f7bcdd54..a6176415432a 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -121,45 +121,6 @@ unsigned long hugetlb_mask_last_page(struct hstate *h) return 0UL; } -static pte_t get_clear_contig(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep, - unsigned long ncontig) -{ - pte_t pte, tmp_pte; - bool present; - - pte = ptep_get_and_clear(mm, addr, ptep); - present = pte_present(pte); - while (--ncontig) { - ptep++; - addr += PAGE_SIZE; - tmp_pte = ptep_get_and_clear(mm, addr, ptep); - if (present) { - if (pte_dirty(tmp_pte)) - pte = pte_mkdirty(pte); - if (pte_young(tmp_pte)) - pte = pte_mkyoung(pte); - } - } - return pte; -} - -static pte_t get_clear_contig_flush(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep, - unsigned long pte_num) -{ - pte_t orig_pte = get_clear_contig(mm, addr, ptep, pte_num); - struct vm_area_struct vma = TLB_FLUSH_VMA(mm, 0); - bool valid = !pte_none(orig_pte); - - if (valid) - flush_tlb_range(&vma, addr, addr + (PAGE_SIZE * pte_num)); - - return orig_pte; -} - pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) { unsigned long order; @@ -176,21 +137,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, - unsigned long addr, - pte_t *ptep) -{ - pte_t pte = ptep_get(ptep); - int pte_num; - - if (!pte_napot(pte)) - return ptep_clear_flush(vma, addr, ptep); - - pte_num = arch_contpte_get_num_contig(vma->vm_mm, addr, ptep, 0, NULL); - - return get_clear_contig_flush(vma->vm_mm, addr, ptep, pte_num); -} - 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 9ec8792a2f4d..e217a3412b13 100644 --- a/include/linux/hugetlb_contpte.h +++ b/include/linux/hugetlb_contpte.h @@ -32,4 +32,8 @@ extern int huge_ptep_set_access_flags(struct vm_area_struct *vma, 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); + #endif /* _LINUX_HUGETLB_CONTPTE_H */ diff --git a/mm/hugetlb_contpte.c b/mm/hugetlb_contpte.c index 629878765081..1dc211d6fbe1 100644 --- a/mm/hugetlb_contpte.c +++ b/mm/hugetlb_contpte.c @@ -242,3 +242,17 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, set_contptes(mm, addr, ptep, pte, ncontig, pgsize); } + +pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep) +{ + struct mm_struct *mm = vma->vm_mm; + size_t pgsize; + int ncontig; + + if (!pte_cont(__ptep_get(ptep))) + return ptep_clear_flush(vma, addr, ptep); + + ncontig = arch_contpte_get_num_contig(mm, addr, ptep, 0, &pgsize); + return get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); +}