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 65751C48297 for ; Fri, 9 Feb 2024 22:15:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D87AF6B0096; Fri, 9 Feb 2024 17:15:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CE93E6B0098; Fri, 9 Feb 2024 17:15:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B154C6B0099; Fri, 9 Feb 2024 17:15:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9DB3F6B0096 for ; Fri, 9 Feb 2024 17:15:57 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7D574A1627 for ; Fri, 9 Feb 2024 22:15:57 +0000 (UTC) X-FDA: 81773673954.09.D77473D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id CE37E8000F for ; Fri, 9 Feb 2024 22:15:55 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Aq7XDoWl; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707516955; 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=X4BN9bDZrrapc7Xd1FDfmQmuEZxXG5tNILRPdL9R2lg=; b=KAEwzcHhi8VvU0bebvkVZuMqwsxZnhBCa5hbcOCHl04Nl0jLs7ZLKx+vzNyCFM+KqrDfrT nVHXRsu5Cx2vKtQ9m3WHZVtt0kraJciYfekYQl6d/vYxi84qWExljdzMlXLpHboE4M6gH9 ApXxHtosLHX62N+WPtWuIFkWa7FT9UA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Aq7XDoWl; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707516955; a=rsa-sha256; cv=none; b=wyg/oYtjFJ5BuCXXEAzS+bzRK/V+chp8djtm3+BZuIRd8ZRejV4fY9sYw/4CTMd5nlO0h4 X1dPm0G8mU71e7kNUThyULCVF+oMfyE9eCJrArfoGIA+YFbpBcWM+eQRVYtqjuoSK7wwHs knefH4Li17WO9VY8cDSiRaOetNYi2XI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707516955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X4BN9bDZrrapc7Xd1FDfmQmuEZxXG5tNILRPdL9R2lg=; b=Aq7XDoWlzWdU0M1ZB24bcJKUdI9P1E/sY0MFR2XAEd2mZM9iujqDsPOMr7hZbeUQC7wjNQ cz4QgWCMJID2EUMrLR7mtYf47XkRDrA5BSUmq2ne8pkL942fg/5AjW+VkJBneaZHy5KMxP /J2PbveXfaTV6ejwzrOdwuzrMqJH+f8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-373-AMAEvJNUPyeeH3DHaeR2Bw-1; Fri, 09 Feb 2024 17:15:52 -0500 X-MC-Unique: AMAEvJNUPyeeH3DHaeR2Bw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B6CF83722E; Fri, 9 Feb 2024 22:15:51 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 666531C14B04; Fri, 9 Feb 2024 22:15:47 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Matthew Wilcox , Ryan Roberts , Catalin Marinas , Yin Fengwei , Michal Hocko , Will Deacon , "Aneesh Kumar K.V" , Nick Piggin , Peter Zijlstra , Michael Ellerman , Christophe Leroy , "Naveen N. Rao" , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Arnd Bergmann , linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org Subject: [PATCH v2 07/10] mm/mmu_gather: add tlb_remove_tlb_entries() Date: Fri, 9 Feb 2024 23:15:06 +0100 Message-ID: <20240209221509.585251-8-david@redhat.com> In-Reply-To: <20240209221509.585251-1-david@redhat.com> References: <20240209221509.585251-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CE37E8000F X-Stat-Signature: tdutyt4pe4ec3dodhjy1oohfx5g4b19r X-Rspam-User: X-HE-Tag: 1707516955-694079 X-HE-Meta: U2FsdGVkX1+BbgxVN2coqGCFVAuWFhUzYW7mEvamcgDAdchmdqdVWBe5/M3HSC+0qGDvFRnhFXkM8fW8duzN+AaBoDqYE3IqKAoR1/uShioCFtaOJ5nLqbQSZ+b5ZFIj/7WDWthoBO+bjrlsdp2mXLkA/14WCcbkGIV11ER/VmhOHkmEgr21IkiSsIliCMkPrHs+ulzc/kycx4/i+BfzDXHoRrq5pDTQjBiaaDGspEKm2j+Ix5TMPYdywEIUhTC2TB5ho770dlIxFbdyP6SC9Lxq6nyLwzzXOr7a8l/TezLQeB3POMmb8/z2gqiRu0QSMgfyWP517k/1xT17/1G583MyStoYykqpdWwNfubqI6TocONfFIRUEcj3qCyn5v0fq4AE8b62MzE+Tt9Ej4BLq5TcMjAVMjUiLwOu09GrhUQ61+p0M8Js2itF7rqEx+/QXD3bxvAJ7GT4LycBViZ12ZMM719O3bdOmD9OSWZbW7YLmPSjvFmjgwIzKI4sYnnTmU3CtpQCDjW62o6v87l0XyG61K/mw9TLxhOhFt+FESKDCnp2x1m0FmTzJ9gvmiTfKJhv3x2Izp57XtIgfBlDsVha5F4pk/YOIunJHJpGetJCuvUiE2Uv9VHLpHilBFDSFhKtdGOfw5dygHedqUiOnvQKSuVe9N3YVOSv7YfH5NyCUG61CgPGKLSHbTuscNTFML+olAW2Z2jM1+TtL/OLRdrux6riphznZTvzBdzlj14Aoak3s7186V3aN99cpSeRCjE/CHDFLNsc34532faEhdy1x45WTAoMfTi9eA3oGaaAjmhg/58n7tEyprXaZxkRGdDn4XEBEXsmEQcw/bL/nSlL6HWAUh2iPNG38XcgGFeLJGvQ9hNK9XdUSxht8t3mg4oll51XcbR/CAuhagjnvVmrTJ04FQDe84hS8GsvYOaKkokKU9lU3Yp36wEaMi9XBLDBSg1YkpQ2Yl064Af x7oPsuvJ lY3l5ZEKYqsydI6mGlOaBrIApC9k3usV8amKAOOH1VoxmtozlyAr1TRxjTcKM4PN/6z1XJN4/CWLQ34trC47ZpRf8IGHXnIl87Mt3l+xq1FfIpk8/RRWWOYXsu944LvXgA+G7nK4OtF74mEGFZ261FtaUod/cE/mdp21NlpzLmwG/ZwWF/VMxy0lt8WqKTbEjXWC9KDZrPYAX6RYnEBX/BwNp7U7B4RmVJzOYYNdm6bYn8q2GTqnwxpv48RnCNqR1h/u+JA+e4bo1LLBl6r5s1CEhaQ== 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: Let's add a helper that lets us batch-process multiple consecutive PTEs. Note that the loop will get optimized out on all architectures except on powerpc. We have to add an early define of __tlb_remove_tlb_entry() on ppc to make the compiler happy (and avoid making tlb_remove_tlb_entries() a macro). Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- arch/powerpc/include/asm/tlb.h | 2 ++ include/asm-generic/tlb.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h index b3de6102a907..1ca7d4c4b90d 100644 --- a/arch/powerpc/include/asm/tlb.h +++ b/arch/powerpc/include/asm/tlb.h @@ -19,6 +19,8 @@ #include +static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, + unsigned long address); #define __tlb_remove_tlb_entry __tlb_remove_tlb_entry #define tlb_flush tlb_flush diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 2eb7b0d4f5d2..95d60a4f468a 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -608,6 +608,26 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb, __tlb_remove_tlb_entry(tlb, ptep, address); \ } while (0) +/** + * tlb_remove_tlb_entries - remember unmapping of multiple consecutive ptes for + * later tlb invalidation. + * + * Similar to tlb_remove_tlb_entry(), but remember unmapping of multiple + * consecutive ptes instead of only a single one. + */ +static inline void tlb_remove_tlb_entries(struct mmu_gather *tlb, + pte_t *ptep, unsigned int nr, unsigned long address) +{ + tlb_flush_pte_range(tlb, address, PAGE_SIZE * nr); + for (;;) { + __tlb_remove_tlb_entry(tlb, ptep, address); + if (--nr == 0) + break; + ptep++; + address += PAGE_SIZE; + } +} + #define tlb_remove_huge_tlb_entry(h, tlb, ptep, address) \ do { \ unsigned long _sz = huge_page_size(h); \ -- 2.43.0