From patchwork Fri Feb 9 22:15:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13551946 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 9D926C4828F for ; Fri, 9 Feb 2024 22:15:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34EC66B0095; Fri, 9 Feb 2024 17:15:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D7C86B0096; Fri, 9 Feb 2024 17:15:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 129DB6B0098; Fri, 9 Feb 2024 17:15:56 -0500 (EST) 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 006216B0095 for ; Fri, 9 Feb 2024 17:15:55 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D5F301C16AE for ; Fri, 9 Feb 2024 22:15:55 +0000 (UTC) X-FDA: 81773673870.23.CF75B44 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 4A8181A0016 for ; Fri, 9 Feb 2024 22:15:54 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fAjr6zyz; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1707516954; 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=BfteBvWtn9YL0u+ZWWzLkAZQ9TqgPhMIROF4I2AA+84=; b=bOmcSvAakRt+Bib0PAVGHmPdiB8N+iaF35kuJ2r4DYWHe4D2PvZ/R9269gIeGra5gxV6Om XXNriNsB4SG1WyJs7olu/MyMnpgfCOLv3DZ84FdySNsTChJh4NuIhneuCrb9aJFcRW9IDD cM8AB0g+4Gr1umI8D/5WHw5A7RIxv7g= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fAjr6zyz; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1707516954; a=rsa-sha256; cv=none; b=bAYs0aSshraS45AVsODcgCPGKQm8+QzJEsXjs08TgrnWVZnk96CF/EWVQaXjURCT9J/GQj BkQzCcOtDq5n1JGoGQpA7sV5nPVRJaBLXAw9mFX+F//iiukkKudD8gt7rToRvqDa97870g cyshIYBXYrSNDgK3m1cuJ9xwe+RgmgA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707516953; 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=BfteBvWtn9YL0u+ZWWzLkAZQ9TqgPhMIROF4I2AA+84=; b=fAjr6zyzz746bAOq7EIMHu1+KarPgZjUQ3m/OfliyYE5EYvE85mFJAnWdRxYcZHWydKChJ pa6ZABbT5pt9YwPWIXB3OHNPIuqOhdWTMd/tgMY7tRHPuAfg3pgx6OGVZWtH+Caj9GEtIh 1XeDEefqvDzQkMS0BSuyFXS/fCHtXdU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-DUvgpdnlM0OO1UlRjbDzjg-1; Fri, 09 Feb 2024 17:15:48 -0500 X-MC-Unique: DUvgpdnlM0OO1UlRjbDzjg-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 025DF2823807; Fri, 9 Feb 2024 22:15:47 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5A541C14B04; Fri, 9 Feb 2024 22:15:41 +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 06/10] mm/mmu_gather: define ENCODED_PAGE_FLAG_DELAY_RMAP Date: Fri, 9 Feb 2024 23:15:05 +0100 Message-ID: <20240209221509.585251-7-david@redhat.com> In-Reply-To: <20240209221509.585251-1-david@redhat.com> References: <20240209221509.585251-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4A8181A0016 X-Stat-Signature: sh4hwqbsqr4usi8oad91w173m1k1imf8 X-HE-Tag: 1707516954-640642 X-HE-Meta: U2FsdGVkX1/rrOo9q7BocFp6IAvLDw6+ChpNFjWtHfJV5+4hymM0Hy4JoqVmel++5jgldbxrZc43dAbUBLISnNXGZ8o/P/oYZ3S9CHkkUrpUVWna6rthPo7GtepW++qB6/w8C/VIOQuNIjW7auwIPMOkIexOH8SDZEjYPkV+2VNOWmUjKOadJYjhVKIdyq85JQM3VxDRKRU9pqXuda5Yq2C7w9R7qtuyw0iTWCtZEDMef4xk791kMwNVisloBjlRUPn6mC3tG6jo4kTCW3J8xdirkVS1oFglVwLsvVIlqVycU6kl127uK6y/8GvbT5vTx+dK7i7Y3D0PtZP2llKkeLS8qReLJ6sbl6QoWyPk9cLv1xugxSNX5RCBcgYqITHmG0RfvKC6Wwc5rDSh5/zBO+jh9XIXbggzn6CZAiXJ1yetcyeDbLyAgGwBW9gCYQKJIFlw2v1q/9wEz8Hz0DOoM9Hw739EQZATn+yWKKfbwKGnj/tyzQlXPcDMjbcFzbtucPFOenmbn46O5Noo+hBJnvf/EiXugPwKGiKMwa6UcU4ODbBV3JfvSLZBFFP+9dc9G2WPYJDELE2SnW6qMOiLuH/Z+H6XIe4+h1sm2ngRJyvEzssn3LE8vutw/fdPQL2FGCGcOCrww9kEew9PS+Keb/o+hXGzo5DRaRG98XOd/ujYqEChOSk3fKPCGp9NXioVR97DTooQC40ayIv17IRUQkflozTv5AXPic41XMifVeJLLWz+98cDRrRQah4khVOCAku7KxDKynQpUoRb64/ADINvBo5rk2cJZjbFf0CRTf8qW/hhzXxRrgtINSmRS3y0gTULYDwDJaHo6Eb3SPf38E9rclvQI70qFc4PXSsdUEo0fxav6jcTPyKp7Vih+snbOV63p5IjRe3U2Y5mM/n2HFeBf1oXXjsxJ7dDT+EebYMMoOkPSkQPOVuLEr8DTVyY 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: Nowadays, encoded pages are only used in mmu_gather handling. Let's update the documentation, and define ENCODED_PAGE_BIT_DELAY_RMAP. While at it, rename ENCODE_PAGE_BITS to ENCODED_PAGE_BITS. If encoded page pointers would ever be used in other context again, we'd likely want to change the defines to reflect their context (e.g., ENCODED_PAGE_FLAG_MMU_GATHER_DELAY_RMAP). For now, let's keep it simple. This is a preparation for using the remaining spare bit to indicate that the next item in an array of encoded pages is a "nr_pages" argument and not an encoded page. Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- include/linux/mm_types.h | 17 +++++++++++------ mm/mmu_gather.c | 5 +++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 8b611e13153e..1b89eec0d6df 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -210,8 +210,8 @@ struct page { * * An 'encoded_page' pointer is a pointer to a regular 'struct page', but * with the low bits of the pointer indicating extra context-dependent - * information. Not super-common, but happens in mmu_gather and mlock - * handling, and this acts as a type system check on that use. + * information. Only used in mmu_gather handling, and this acts as a type + * system check on that use. * * We only really have two guaranteed bits in general, although you could * play with 'struct page' alignment (see CONFIG_HAVE_ALIGNED_STRUCT_PAGE) @@ -220,21 +220,26 @@ struct page { * Use the supplied helper functions to endcode/decode the pointer and bits. */ struct encoded_page; -#define ENCODE_PAGE_BITS 3ul + +#define ENCODED_PAGE_BITS 3ul + +/* Perform rmap removal after we have flushed the TLB. */ +#define ENCODED_PAGE_BIT_DELAY_RMAP 1ul + static __always_inline struct encoded_page *encode_page(struct page *page, unsigned long flags) { - BUILD_BUG_ON(flags > ENCODE_PAGE_BITS); + BUILD_BUG_ON(flags > ENCODED_PAGE_BITS); return (struct encoded_page *)(flags | (unsigned long)page); } static inline unsigned long encoded_page_flags(struct encoded_page *page) { - return ENCODE_PAGE_BITS & (unsigned long)page; + return ENCODED_PAGE_BITS & (unsigned long)page; } static inline struct page *encoded_page_ptr(struct encoded_page *page) { - return (struct page *)(~ENCODE_PAGE_BITS & (unsigned long)page); + return (struct page *)(~ENCODED_PAGE_BITS & (unsigned long)page); } /* diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index ac733d81b112..6540c99c6758 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -53,7 +53,7 @@ static void tlb_flush_rmap_batch(struct mmu_gather_batch *batch, struct vm_area_ for (int i = 0; i < batch->nr; i++) { struct encoded_page *enc = batch->encoded_pages[i]; - if (encoded_page_flags(enc)) { + if (encoded_page_flags(enc) & ENCODED_PAGE_BIT_DELAY_RMAP) { struct page *page = encoded_page_ptr(enc); folio_remove_rmap_pte(page_folio(page), page, vma); } @@ -119,6 +119,7 @@ static void tlb_batch_list_free(struct mmu_gather *tlb) bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, bool delay_rmap, int page_size) { + int flags = delay_rmap ? ENCODED_PAGE_BIT_DELAY_RMAP : 0; struct mmu_gather_batch *batch; VM_BUG_ON(!tlb->end); @@ -132,7 +133,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, * Add the page and check if we are full. If so * force a flush. */ - batch->encoded_pages[batch->nr++] = encode_page(page, delay_rmap); + batch->encoded_pages[batch->nr++] = encode_page(page, flags); if (batch->nr == batch->max) { if (!tlb_next_batch(tlb)) return true;