From patchwork Wed May 8 11:34:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13658609 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 A011BC19F4F for ; Wed, 8 May 2024 11:40:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32A746B0164; Wed, 8 May 2024 07:40:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DB036B0165; Wed, 8 May 2024 07:40:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 17BFC6B0166; Wed, 8 May 2024 07:40:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id EDE256B0164 for ; Wed, 8 May 2024 07:40:34 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A21A61412F4 for ; Wed, 8 May 2024 11:40:34 +0000 (UTC) X-FDA: 82095035988.16.06F8DEB Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf12.hostedemail.com (Postfix) with ESMTP id 8E94740004 for ; Wed, 8 May 2024 11:40:32 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dQZnEK7Z; dmarc=none; spf=pass (imf12.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.208.172 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=1715168432; 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=k7TbOelFCBPjD//aDEZ907vn9YCYdQxapVfhTuFqwGo=; b=msZdlL/LiD+zQoArVEFokM5d8CPy5y36vFkoGKYCHzZP2kgndvlrQKZKF4/lcT4eJIB1F0 6SBieqjUrDeRJkhesWYIJykzO7Jr2TR73sg/g0Gkkg8j8XFjhdBtj/vgqRPMXUgW5rgaUT i9jhojCiTq4zIgG1eAhvK7zVb2KJFLs= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dQZnEK7Z; dmarc=none; spf=pass (imf12.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715168432; a=rsa-sha256; cv=none; b=afQERKgA5X7FPV70JWbLj1MaCl/sLW/Ume/TjL0pM1KWBbliK1cnXX8kw23g0L7AeL9ppe 8Df9dgL8+WQU4jm3WCR4sHYYqyszghF4oUxaxWgOObImHBoFkU9bdRsk+qGwrev1GazX4y wSLMqh02Z9HiT9oS4NkQP/GkgSUX6wY= Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e242b1df60so51971401fa.1 for ; Wed, 08 May 2024 04:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715168431; x=1715773231; 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=k7TbOelFCBPjD//aDEZ907vn9YCYdQxapVfhTuFqwGo=; b=dQZnEK7ZBOM2uwDVViA1w9puvg55DYmjvO9E4GsKiqdH3MTQRddEX5f4JvZEujnSdU A3DuoHMerpp1DHCN94+6XHnr/AndztB79Dvd5qYc0Qs4sjkVDypImLc6eS4ciy3VBdWA PSNYF3humGnjjDymy5uZ/2X/+Rp7CJd3CDJV5YIykh0D6RpYTV0ilerOSjAInjYDwgKF Ne+0AKrXx1hVnD7SKC2xa05895TpY3J4dnZ+oWJL6soD3ngMPm+k0QwyvxDPVeI4Xg/b jWMMVFGEJdeKbsFRLHELsnf32OJlN5rmmLF8RRjQTGscgEJIsWxIElGHNVLfpEsPtU4m mH0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715168431; x=1715773231; 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=k7TbOelFCBPjD//aDEZ907vn9YCYdQxapVfhTuFqwGo=; b=GwyS174RM+DCRVtv5udNtsjX+ae7n104ixleJTr/PFwc5dUqrmUYYvxz8Q8/M2LIwo c56pEJx7P0/EBpsZKPKz7NukNpvTVQ/0/LXlTVDbon0w/HhhhN/zNA7uCRGSy56eR4XU 7XaKFhUEFVHL5q+ghuz34kkgzMgoYuDY0+5Y1ebnfk1ue675a7LKh93AW4AoLExHCIJ4 TqpbnQAMHAX70HS1/305jxmjF5VinI9ebgeYEyOKP9t2jpULDfp7+wlqGXyUPLbxXX/M a5ItO58InzAun2gUXpZTeAh5+zpOjWumgsPOUA86XG1nLtxTACrvqahQzi1J7q866Kv6 sZLA== X-Forwarded-Encrypted: i=1; AJvYcCVy5aTocpHxlsdU0fQ52Jl8HjPvgqM13IjQpUkUBiOsxxq7JvCXUJsZ9cl/OiS0UHiI5E8zFaQJVUaOPsyJhQOa76c= X-Gm-Message-State: AOJu0YzsjSrxAXowD0zy3QkLrYodHjkk4rOA6F8BwL2kwMHxY6PyXYmx UU/yqU4EkyIIy3CA2maDt0mUN36x47jTJz4QZQIg4pELIFouM7vzBiH4pyBBhkA= X-Google-Smtp-Source: AGHT+IHoKXWUN4OirZVjujYdTPRjtHlf5MTjdp4rZ05v4P+q2zGuw+P9Rq7y6u6CQwAZzw3ytsfSow== X-Received: by 2002:a2e:8749:0:b0:2e1:ae29:f28a with SMTP id 38308e7fff4ca-2e447697612mr22142151fa.34.1715168430817; Wed, 08 May 2024 04:40:30 -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 b15-20020a05600c4e0f00b0041aa79f27a0sm2003785wmq.38.2024.05.08.04.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:40:30 -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 6/9] mm: Use common huge_ptep_get_and_clear() function for riscv/arm64 Date: Wed, 8 May 2024 13:34:16 +0200 Message-Id: <20240508113419.18620-7-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 X-Rspamd-Server: rspam01 X-Stat-Signature: 9aic5hx4osz46oibp9iirok9iddp3p99 X-Rspam-User: X-Rspamd-Queue-Id: 8E94740004 X-HE-Tag: 1715168432-490911 X-HE-Meta: U2FsdGVkX19J1IVX5YiKJuqBmkN1+tCS6ClW79agJQIqvwkznrFT9O1o282rhk3suc0qPE9s7hIlGwtXgXkRVNXaJVRUc5UdHVPr8EcN3yo8xdEIl/uB7HIDi7vVdc8RLW7c6Y1Pv3JiHpS6rtDS0fodGtqWM11C82676kSAHZB4JQWjUkEC61eTT/024tmgA4mMHOl9k6dWakLJlXoETi8koVSEYXqALHE9MhvX06mX7fMVLCmougxsopN3zhL9goawONlKcYw9ZBrCLsL90ooYE08iUrUEKtfgi78rQnRdo9Nl2qkqxBHWD7gjABF06cRhIZSbioRVwm/MOXxcZSJKkXY8UGmjw+zxPB0B7y/lBdtHtvSFraMdE/iS1+smFcJDbstul8lceQc0Z2+fGXswUpmZ61OKVM7WNnlVm5TIcH0lM2OZr7K8VVX2EJYEx9ejKN0aIAK9NcLXRhnvkF9V2Q3CuFQhFya3pM91UvKiIqaIJjbl8I8b4mXD5NYpHIUCtFQcYMAzZDYyFHcehumaXjM23X+YefVjnqusXlWYmnKjeRXb8pOjUUWn+u8Wqn8aH1nM2FVDpSx3m6f4l3f0WE1H1IwRRWljBAI9oKvKQYU10fca1fYW6N00Op3Ebc3YRTUIxC3LjpOACAMXREHjpywK9onTWBaoef2vn7m0diknOhPeMyLuLpZq/dRUtkOEc9HDToAxb4PIhw5NtWbTR+hpCXmWZAy0ZP/WgPTYTq5XpBgnl106TFrDFU1kImLZfu6edSD4i2DUXSUgz+acAk34Ae+EGne4VMcBSxBTftPbo+uJ1MAH728yseZjBkWbkNO6FAoE1y8ZB+Upz3wlSkKLLllqaz5sfYnOrCFitLmxL+ybd9QV1IYoCxCMJUCCvwJxVwvL1LMMZEeIHzFjINaXati1m5Z5Vcn16k4rtBTokdtPnGZyoIWnrlMT3bl5Q+2M+uYQe8ojDz7 vwPFH8Y0 kLtfsY/yckYeSOgCV/0J0ZsItOfF81Cg71M9MDsB5mLuKaNm2OQujSLkQpy+K7ho4IkHVKiBnuhhQQMGYzufVbF+Jx9aKsu9OOI0ze9mQU+cBPzoqhrR1I1+OcAjYlKSFFGZ3zFJblLDtccvV/cgrUhQPwdlhaRVNLwK7aOf6CP9oORyXRrtQO0MbjVPDbB1fRMUFDNpXtl0SYq1iDebqG3TGFtaNA3RizJljrnheR/Z13TCbZt3C2TMpomSjrKVbch+YZ83kiJvTkBQ9pE0sBATVKiYlAFGSxRJ0Hs69METzA1LjkGUonaDTInCxXhrUG+HFFVYzorzCy0jAjh7u7XojcLXfHf/uTK1GF9ucGgkApNwbVdkuIblDGYvqgbePqioEybAf1blk5QsUe3PTuDx4jRtW0ebDa0GaQl9/OLbnOQ4dA5u/Az+dzVTJAHXxxMZi/gWHmtZheD7XQqSt9DrpXCwxLi2AuxUJIiKXNY4ATWIxQM1kNEUG1w== 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. Note that get_clear_contig() function is duplicated in the generic and the arm64 code because it is still used by some arm64 functions that will, in the next commits, be moved to the generic code. Once all have been moved, the arm64 version will be removed. Signed-off-by: Alexandre Ghiti --- arch/arm64/include/asm/pgtable.h | 14 +++++++++- arch/arm64/mm/hugetlbpage.c | 19 ++----------- arch/riscv/include/asm/pgtable.h | 4 ++- arch/riscv/mm/hugetlbpage.c | 21 ++------------ mm/contpte.c | 48 ++++++++++++++++++++++++++++++-- 5 files changed, 66 insertions(+), 40 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 2e0415fd5083..7c2938cb70b9 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1644,11 +1644,23 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, #endif /* CONFIG_ARM64_CONTPTE */ -static inline int arch_contpte_get_num_contig(pte_t *ptep, unsigned long size, +int find_num_contig(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, size_t *pgsize); + +static inline int arch_contpte_get_num_contig(struct mm_struct *mm, + unsigned long addr, + pte_t *ptep, unsigned long size, size_t *pgsize) { int contig_ptes = 0; + /* + * If the size is not passed, we need to go through the page table to + * find out the number of contiguous ptes. + */ + if (size == 0) + return find_num_contig(mm, addr, ptep, pgsize); + *pgsize = size; switch (size) { diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index cf44837369be..5ace4bf7ce35 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -93,8 +93,8 @@ int pud_huge(pud_t pud) #endif } -static int find_num_contig(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, size_t *pgsize) +int find_num_contig(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, size_t *pgsize) { pgd_t *pgdp = pgd_offset(mm, addr); p4d_t *p4dp; @@ -277,21 +277,6 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) return entry; } -pte_t huge_ptep_get_and_clear(struct mm_struct *mm, - unsigned long addr, pte_t *ptep) -{ - int ncontig; - size_t pgsize; - pte_t orig_pte = __ptep_get(ptep); - - if (!pte_cont(orig_pte)) - return __ptep_get_and_clear(mm, addr, ptep); - - ncontig = find_num_contig(mm, addr, ptep, &pgsize); - - return get_clear_contig(mm, addr, ptep, pgsize, ncontig); -} - /* * huge_ptep_set_access_flags will update access flags (dirty, accesssed) * and write permission. diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 0847a7fb8661..d976113a370d 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -532,7 +532,9 @@ static inline void __set_pte_at(struct mm_struct *mm, pte_t *ptep, pte_t pteval) #define PFN_PTE_SHIFT _PAGE_PFN_SHIFT #ifdef CONFIG_RISCV_ISA_SVNAPOT -static inline int arch_contpte_get_num_contig(pte_t *ptep, unsigned long size, +static inline int arch_contpte_get_num_contig(struct mm_struct *mm, + unsigned long addr, + pte_t *ptep, unsigned long size, size_t *pgsize) { unsigned long hugepage_shift; diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index 437b1df059eb..a757e0b2f090 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -187,7 +187,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, if (!pte_napot(pte)) return ptep_set_access_flags(vma, addr, ptep, pte, dirty); - pte_num = arch_contpte_get_num_contig(ptep, 0, &pgsize); + pte_num = arch_contpte_get_num_contig(vma->vm_mm, addr, ptep, 0, &pgsize); orig_pte = get_clear_contig_flush(mm, addr, ptep, pte_num); @@ -202,21 +202,6 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, return true; } -pte_t huge_ptep_get_and_clear(struct mm_struct *mm, - unsigned long addr, - pte_t *ptep) -{ - pte_t orig_pte = ptep_get(ptep); - int pte_num; - - if (!pte_napot(orig_pte)) - return ptep_get_and_clear(mm, addr, ptep); - - pte_num = arch_contpte_get_num_contig(ptep, 0, NULL); - - return get_clear_contig(mm, addr, ptep, pte_num); -} - void huge_ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) @@ -231,7 +216,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, return; } - pte_num = arch_contpte_get_num_contig(ptep, 0, &pgsize); + 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); @@ -249,7 +234,7 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, if (!pte_napot(pte)) return ptep_clear_flush(vma, addr, ptep); - pte_num = arch_contpte_get_num_contig(ptep, 0, NULL); + 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); } diff --git a/mm/contpte.c b/mm/contpte.c index 22e0de197bd3..68eb1634b922 100644 --- a/mm/contpte.c +++ b/mm/contpte.c @@ -22,6 +22,7 @@ * - huge_ptep_get() * - set_huge_pte_at() * - huge_pte_clear() + * - huge_ptep_get_and_clear() */ pte_t huge_ptep_get(pte_t *ptep) @@ -33,7 +34,7 @@ pte_t huge_ptep_get(pte_t *ptep) if (!pte_present(orig_pte) || !pte_cont(orig_pte)) return orig_pte; - ncontig = arch_contpte_get_num_contig(ptep, + ncontig = arch_contpte_get_num_contig(NULL, 0, ptep, page_size(pte_page(orig_pte)), &pgsize); @@ -87,7 +88,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, int i; int ncontig; - ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); + ncontig = arch_contpte_get_num_contig(mm, addr, ptep, sz, &pgsize); if (!pte_present(pte)) { for (i = 0; i < ncontig; i++, ptep++, addr += pgsize) @@ -111,8 +112,49 @@ void huge_pte_clear(struct mm_struct *mm, unsigned long addr, int i, ncontig; size_t pgsize; - ncontig = arch_contpte_get_num_contig(ptep, sz, &pgsize); + ncontig = arch_contpte_get_num_contig(mm, addr, ptep, sz, &pgsize); for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) __pte_clear(mm, addr, ptep); } + +static pte_t get_clear_contig(struct mm_struct *mm, + unsigned long addr, + pte_t *ptep, + unsigned long pgsize, + unsigned long ncontig) +{ + pte_t orig_pte = __ptep_get(ptep); + unsigned long i; + + for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) { + pte_t pte = __ptep_get_and_clear(mm, addr, ptep); + + /* + * If HW_AFDBM (arm64) or svadu (riscv) is enabled, then the HW + * could turn on the dirty or accessed bit for any page in the + * set, so check them all. + */ + if (pte_dirty(pte)) + orig_pte = pte_mkdirty(orig_pte); + + if (pte_young(pte)) + orig_pte = pte_mkyoung(orig_pte); + } + return orig_pte; +} + +pte_t huge_ptep_get_and_clear(struct mm_struct *mm, + unsigned long addr, pte_t *ptep) +{ + int ncontig; + size_t pgsize; + pte_t orig_pte = __ptep_get(ptep); + + if (!pte_cont(orig_pte)) + return __ptep_get_and_clear(mm, addr, ptep); + + ncontig = arch_contpte_get_num_contig(mm, addr, ptep, 0, &pgsize); + + return get_clear_contig(mm, addr, ptep, pgsize, ncontig); +}