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 EBCF4C19F4F for ; Wed, 8 May 2024 11:39:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 831846B015D; Wed, 8 May 2024 07:39:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E1F96B015F; Wed, 8 May 2024 07:39:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 682D36B0160; Wed, 8 May 2024 07:39:33 -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 4377D6B015D for ; Wed, 8 May 2024 07:39:33 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0A2FCA1457 for ; Wed, 8 May 2024 11:39:33 +0000 (UTC) X-FDA: 82095033426.30.343AF4D Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by imf23.hostedemail.com (Postfix) with ESMTP id 272F5140017 for ; Wed, 8 May 2024 11:39:30 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="iEIqb/Qt"; dmarc=none; spf=pass (imf23.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.50 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=1715168371; 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=hkOJ479CewvDdU5HWPEgLgm2sAjKEVUPHaCHVUUKnDI=; b=bH9qDNltJx5FEeAnyx/Hq1qmF+aA28djMHAF/kA7w7lrec0A/X4lJ100irw+Jt59aeYJbV AGc8TFWJ4u3vjFyJuUAVQ6sIUik2ufGUi9PQbyOfhOAC3UeAGB0p3dRfy3/sK6zSg7DyI0 SGnM2eUI6/g0c5b1RIgzwbiX3H1yuLA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="iEIqb/Qt"; dmarc=none; spf=pass (imf23.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715168371; a=rsa-sha256; cv=none; b=AQ1T/JBTYE10eDQwpYrYpCFffjJIwhSl+alFNya/mQ2AXKPeOonkugWp33TDmQKvaSoCKd VAh1VnXMLj883cgLStx6kp7zBH2SSoIcPAUn524DFC2lJ4MIGq4N8GGElzp4qCAFhDkx+n y33GKFQC5RJOra/+l5Eogpj3vpV+a/A= Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-34eb52bfca3so3057946f8f.0 for ; Wed, 08 May 2024 04:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715168370; x=1715773170; 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=hkOJ479CewvDdU5HWPEgLgm2sAjKEVUPHaCHVUUKnDI=; b=iEIqb/QtsVknN2+qtIhVsgI/aHx15THqcNdwP0s8weMszFwYXKuak3mFlSQgD3j6Zu u1KuNZpsNjq3Qyyv4dS6mgyZcR2rXfGY/Sa47nYslHI7OjpIY8uc4d2TOZc5/v2timKC f6UE/GGJLLzMxpjlvmoXNklXVBWq0rh1enpNCNIYiFhQEX9rTs1W/ZVpkrwC0FyjNs+T tNq5HrVFky8ETWqHuaHYDCDYFN03PsabG5TqpTo6ddPNA2Rby/1LIBUlZR137cUap+2B vTmmm4lfS55AW8fCvK1ywtyiMgA0bfx9fvzCAEAE4e1Nfrbuj8sUbKYhIJyefKcvg+kJ tRgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715168370; x=1715773170; 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=hkOJ479CewvDdU5HWPEgLgm2sAjKEVUPHaCHVUUKnDI=; b=TuwH94nx3wVGw2EPafaKdwBekxMME2H0nzQPFsasU4NyaYJe1ySuRhd5MwHUYNe1Jk fo+e6+fD9LZ1e25neFWrgF+j7emNNMXOe42oDYEvVhsTAOlkc9Yza4Sg0PGICK9jJRvN lm4PwgbWGEEEiZNoprTvKcT3zcPhIfpd11gAQ4Ks/Iem11bxF+A1cYlHOE2m+ZDHg3/d RgCghMlKkowVRDE7uZfMU7OEtVDZEV6xg1jXBn3qlI0PbWQESirt6sBNoq+prMnqc73g opQgV9nyCgWsQxK56+J4jqAEUHxREvINTTn6BC707kzs5DhqT9BkWoqsn4WhiD8UH+7S eJxA== X-Forwarded-Encrypted: i=1; AJvYcCVm8xNxlExczjlbhwA35XN+3icKFmERsASRaulE/rZSVNyTZfT3zrlMyYX8Es6TIbonG4XCXQNvC5s7l1iByWYVqRU= X-Gm-Message-State: AOJu0YxheKngI6TaL2JgaQxR3C2rpqtKGS93XBWDB/QY5zLvoeqEqK26 53PcB2NhvlbvNsJZ9qDYNMZ2R0IT5//kT4GE4AyliiCrLP1l3EhvO/OD9T09HQs= X-Google-Smtp-Source: AGHT+IEZS4ddGwIWcQuhI1g6wktPlm5wrgDKEngfcuzPllSn67aCj73nYZBEmuYd+HrBwCZhVDrutw== X-Received: by 2002:adf:e752:0:b0:34d:17f2:956d with SMTP id ffacd0b85a97d-34fca80dffcmr2356969f8f.66.1715168369782; Wed, 08 May 2024 04:39:29 -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 5b1f17b1804b1-41f88110ff8sm20241365e9.38.2024.05.08.04.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:39:29 -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 5/9] mm: Use common huge_pte_clear() function for riscv/arm64 Date: Wed, 8 May 2024 13:34:15 +0200 Message-Id: <20240508113419.18620-6-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-Server: rspam07 X-Rspamd-Queue-Id: 272F5140017 X-Stat-Signature: es783gjhawhks6abewkkwbrd8jte7ofy X-Rspam-User: X-HE-Tag: 1715168370-766685 X-HE-Meta: U2FsdGVkX18jirgLvuCizw/4yPhf7hMHCTcEYarHuiToqabtCfQnfKZMJrmu9B4vGQLCk6jpWf5pu8TesK5ukN8v29aWt5pXq3VNwzckaSjtOm3l9bYcQi4970iCai3JjE4zCI8VxMomqwLekhcdMTaxnJ5ehhOzxs+nytK2DXXjVAOFcSl6As/8em0B2mD7HYvaUUUJOJkmfc/xCEpaJHBNby1tlLwwn6ZerK3955JoSPk/hxL9Pxy8/b0WHjCjJUkLEskuWH1jsyoSDgB07KWtKS6sSkC62fldaxe/thKfQ1yb7b4t1nvFYyucl2Xa6l2kP00Abfg7VwCHZJAuaqlv5rJ2SqtmSE/d8vY94R96G5lT9bXTsu9JMi1Ze/40YvzMnmwlobsBS3NYLcv03yEwfC7/BPonGMsj7JCqCOcKuC0QwzZEm/vGgOA1T300eixfAAQIkitn2H4p4sscT6/zzYIil5wUcnjse8eylewpXzGvt82Ixm0lm8Jb4dv0TeyBTlCnEMBW/+LLNeZvf05W9xR5vxv1XZkpjxixSqMD/EBz0D9KIyoCA1EBrKeVnHNN/m1oMlf0ajafmk4SD+F8nzzavUqPGkVTHpMUHgxltpKfLtTsL6BHZbDBV6c0smIafEthM27uSTSFOrUVs21+UJ0lfs0QFPWGpuklF5PbNDYDGWUId4jrkexvxTJYBy7QbOhT7f10qjuulhrbcqTpEB0jbnqZvBgJABStoc30s+2koHA53vMbtMqRsWd7hkZNU2xFnhvU0F3XEhRhct/kI2K+62duACj3w9Wm4aP3QRiqIQlu0RBxjR/cWJLSPrsjSxSbsKbwUV6UYlGK94Uiilzu7aqu7lNphbCmIekpsRCSD+Xw1/w6h3+yilBHAyWRMJfHVVhIDGHghBlfoWqIZH2rR37QuI9MecxrFMJhciCLUfjV1ZYa3dBHjiM9NBO80XBIl0+33GOyN3i 9AtJjeUj WLMZ3Rmag4j/mbXgk167somLG3nWrSVCBH5aS6TXAR/FLlZ4xGer1+4USC0IkzRjv/zi4pu2Uthdf+8alZ1wjlxITSkzuHjmJ+eozrD5v6UlOYsAJP7gfwkmooIxeTyU07ohMW0gkrr2yc1uxX7yZPGF0NOfXJX2S7PpU8Xp+atxFJlcv05M+TsB/OFH9wG+kRTd/FUVYUXUWlNB0oz0wSS8ktryqPt0luAmLAaLddkd/Nzacn7EGc0RgrQ8yz6FKGXskQseRgKW5ZOJ0ePVuzP92rFADi4nEuNSD9txkq5dZmDkvOsCdBDVpCsGDA9/2e47289PATvUE6db/eJqEHDpA6X45yPBfYM9CNkwKMz5cW67gdmkoQG9V/sxKZtpBXrzF9WEV9IqmLZm4UXdnpgVFSKcpaiq6gphkGCctavMteSVHB5U7RkeqtMbdQ0UtRw3pZkfnbPvR6RlshSgc6adl+H7PEUvNNgUjQ+UtShVoYXPgT0oUR/BVIA== 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/mm/hugetlbpage.c | 12 ------------ arch/riscv/include/asm/pgtable.h | 5 +++-- arch/riscv/mm/hugetlbpage.c | 19 ------------------- mm/contpte.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 33 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index b8353b0a273c..cf44837369be 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -277,18 +277,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) { diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 5d1d3a6c7c44..0847a7fb8661 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -644,8 +644,8 @@ static inline void __set_ptes(struct mm_struct *mm, unsigned long addr, #define set_contptes(mm, addr, ptep, pte, nr, pgsize) \ __set_ptes(mm, addr, ptep, pte, nr) -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)); } @@ -700,6 +700,7 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, #define set_ptes __set_ptes #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 d8f07aef758b..437b1df059eb 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, 0, &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/mm/contpte.c b/mm/contpte.c index 2320ee23478a..22e0de197bd3 100644 --- a/mm/contpte.c +++ b/mm/contpte.c @@ -12,6 +12,7 @@ * - __ptep_get() * - __set_ptes() * - __ptep_get_and_clear() + * - __pte_clear() * - pte_cont() * - arch_contpte_get_num_contig() */ @@ -20,6 +21,7 @@ * This file implements the following contpte aware API: * - huge_ptep_get() * - set_huge_pte_at() + * - huge_pte_clear() */ pte_t huge_ptep_get(pte_t *ptep) @@ -102,3 +104,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); +} -- 2.39.2