From patchwork Fri Feb 9 22:14:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 20183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1161222dyd; Fri, 9 Feb 2024 14:15:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW6MxJ4tBvrHIcPwyJDUYKzNooVij33AWHxNZIXCApJ7ydD0B2vMu99m7NqzvS6AY7bd9k3B7jjYLXBv+lb/HstTV+iiQ== X-Google-Smtp-Source: AGHT+IG7pGkR1nhxyle6AoVBRSRyDHH0nnKyUzDi+H1FQpihNjkswllEHKZDxwcmERnoEDJ3wdeK X-Received: by 2002:a05:6402:287:b0:560:b758:5e24 with SMTP id l7-20020a056402028700b00560b7585e24mr208647edv.0.1707516943648; Fri, 09 Feb 2024 14:15:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707516943; cv=pass; d=google.com; s=arc-20160816; b=vxaOn9jlfKP0D9h06zjHXWQY0oGztY0TVQX5gmJe1Wq2CPk66jcDIqqlXkJAdmNbDS ZZBQKjHKZE6H10MU+P+L6yRBamN/0fmPR8RUfH1Lw54HugQs5RAoGkSMe+iXAAu5W53Y mPK3ihkEcCxTkhb33pt9ZBPnjnZ69HzJ/+KLWGgQacLWxACeRvIOzwGdjt3NnjbMQ14T b3upiigfq/Ayvz1BDRt9PlQpxulah2IUpWjklpZ9cnixfpw62pc+rHWdGoDIPJzQDlNf CwUerc9QT/P1ehh7Uj9umk12NjwsYXtMTgO9L6s9WG9/DnO6HJYIaDlqMjJyyTJgdrQR Fl7g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=IHB7ZolLgofmfMRsfkbwn2QUSh6DVNhQllqTULKzUgI=; fh=uyq46fpoCBwn7nRdTeCVj2UmuL0NIHdwG7fBzLHsB/0=; b=MHfv4+MM2Ht30pHqvw/tkaMl2SPMOFlhyl3nQJa3izmwf6xuuQP3V2klhV68jbFWdZ tkKZzOrrZKKVxSyAGEAhSalATvs6EWpauyQfrblzPF7KJRKO+i/XejrrNzazet88UXwv 5UbEUIBi41H1AzyXyXRWySyE90RGPIWlvOdn+sfYo1JRiXHm6KUAZdrI0tXLXkLqWwSY +5Rh39/xHMAeGexSVuztldzgbS4CW1xOq3zUHfRBSgflgUWFgD67KHNFMCmI+uWcWK0h 0VGcpUAGF9zMk8tJJ32PUXeGZvrhYhkArM1TnekXaPmL9BonUGO6UkTknOv+EfewbA1y a0dQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SHOzVEDj; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-60072-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60072-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCWV+FeC6f4JAACTEtlW8MAwDnq+HFPVprm24J7TuS7Pxdrk4jIhfouJxX/lRxkh9EZhPJOAsjHKd8ZVeY+shlHZvef1mA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id w21-20020aa7dcd5000000b0055e3624949dsi174780edu.155.2024.02.09.14.15.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 14:15:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60072-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SHOzVEDj; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-60072-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60072-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 319DC1F24922 for ; Fri, 9 Feb 2024 22:15:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA1403611B; Fri, 9 Feb 2024 22:15:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SHOzVEDj" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EE0723B1 for ; Fri, 9 Feb 2024 22:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707516923; cv=none; b=V2yA6lU/RIqxUdITuRee202fvNerTSl+CVvDp62QGlGKbsoaJ8S99/3dIrQAm11iskjaop3IBqCuf+BxTyLthSWQ1l1reSTJao2UEeFttFDL5DqCSNXGYJf+igXZs+WdH3SogDTIcPvA2fHFEpyYJS5TDqSDkVaqYBakBRyNkgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707516923; c=relaxed/simple; bh=3aVfhg/C+wAo1wz9GZnGBRw740WrndMiu2OG5sNBjh8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uzLEFc9AsjhPgerGyNNLuC5ewZw0vA6nESCTRy6Jbo2LEsvAr9f1FpP3Mhuf4HjQ4I/83wsuZve4VStngD8ZAloFzIXPBJAGR8xxKFfCL8VeU2jMhJDCMru8cJLUovzFXZOWacx0flXvCpbN51VsCkVrJtgKnYEAXBHna3y+pIs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SHOzVEDj; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707516920; 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; bh=IHB7ZolLgofmfMRsfkbwn2QUSh6DVNhQllqTULKzUgI=; b=SHOzVEDjQ+4Y+h8yhuzoLSfLENz4pib2VDKT4VQx9+4blO+JsYWvJvYfd78LaRL6067XyE xnaANZNrhUGNrXjJY0c9LoyZ/rFzHp1GIaIDfnkxqIEZi/x1AFdfWQSl9CYnilyeRX37r4 4t3QwsbDGibNwI7KOivSrP0l5siw8LQ= 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-428-_SIakAvhN7i8GkgZgtC1Hw-1; Fri, 09 Feb 2024 17:15:17 -0500 X-MC-Unique: _SIakAvhN7i8GkgZgtC1Hw-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 3532785A589; Fri, 9 Feb 2024 22:15:16 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE8F71C14B04; Fri, 9 Feb 2024 22:15:10 +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 00/10] mm/memory: optimize unmap/zap with PTE-mapped THP Date: Fri, 9 Feb 2024 23:14:59 +0100 Message-ID: <20240209221509.585251-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790461286877889712 X-GMAIL-MSGID: 1790461286877889712 This series is based on [1]. Similar to what we did with fork(), let's implement PTE batching during unmap/zap when processing PTE-mapped THPs. We collect consecutive PTEs that map consecutive pages of the same large folio, making sure that the other PTE bits are compatible, and (a) adjust the refcount only once per batch, (b) call rmap handling functions only once per batch, (c) perform batch PTE setting/updates and (d) perform TLB entry removal once per batch. Ryan was previously working on this in the context of cont-pte for arm64, int latest iteration [2] with a focus on arm6 with cont-pte only. This series implements the optimization for all architectures, independent of such PTE bits, teaches MMU gather/TLB code to be fully aware of such large-folio-pages batches as well, and amkes use of our new rmap batching function when removing the rmap. To achieve that, we have to enlighten MMU gather / page freeing code (i.e., everything that consumes encoded_page) to process unmapping of consecutive pages that all belong to the same large folio. I'm being very careful to not degrade order-0 performance, and it looks like I managed to achieve that. While this series should -- similar to [1] -- be beneficial for adding cont-pte support on arm64[2], it's one of the requirements for maintaining a total mapcount[3] for large folios with minimal added overhead and further changes[4] that build up on top of the total mapcount. Independent of all that, this series results in a speedup during munmap() and similar unmapping (process teardown, MADV_DONTNEED on larger ranges) with PTE-mapped THP, which is the default with THPs that are smaller than a PMD (for example, 16KiB to 1024KiB mTHPs for anonymous memory[5]). On an Intel Xeon Silver 4210R CPU, munmap'ing a 1GiB VMA backed by PTE-mapped folios of the same size (stddev < 1%) results in the following runtimes for munmap() in seconds (shorter is better): Folio Size | mm-unstable | New | Change --------------------------------------------- 4KiB | 0.058110 | 0.057715 | - 1% 16KiB | 0.044198 | 0.035469 | -20% 32KiB | 0.034216 | 0.023522 | -31% 64KiB | 0.029207 | 0.018434 | -37% 128KiB | 0.026579 | 0.014026 | -47% 256KiB | 0.025130 | 0.011756 | -53% 512KiB | 0.024292 | 0.010703 | -56% 1024KiB | 0.023812 | 0.010294 | -57% 2048KiB | 0.023785 | 0.009910 | -58% CCing especially s390x folks, because they have a tlb freeing hooks that needs adjustment. Only tested on x86-64 for now, will have to do some more stress testing. Compile-tested on most other architectures. The PPC change is negleglible and makes my cross-compiler happy. [1] https://lkml.kernel.org/r/20240129124649.189745-1-david@redhat.com [2] https://lkml.kernel.org/r/20231218105100.172635-1-ryan.roberts@arm.com [3] https://lkml.kernel.org/r/20230809083256.699513-1-david@redhat.com [4] https://lkml.kernel.org/r/20231124132626.235350-1-david@redhat.com [5] https://lkml.kernel.org/r/20231207161211.2374093-1-ryan.roberts@arm.com --- The performance numbers are from v1. I did a quick benchmark run of v2 and nothing significantly changed -- because nothing in the code significantly changed. Sending this out ASAP, so Ryan can make progress with cont-pte. v1 -> v2: * "mm/memory: factor out zapping of present pte into zap_present_pte()" -> Initialize "struct folio *folio" to NULL * "mm/memory: handle !page case in zap_present_pte() separately" -> Extend description regarding arch_check_zapped_pte() * "mm/mmu_gather: add __tlb_remove_folio_pages()" -> ENCODED_PAGE_BIT_NR_PAGES_NEXT -> Extend patch description regarding "batching more" * "mm/mmu_gather: improve cond_resched() handling with large folios and expensive page freeing" -> Handle the (so far) theoretical case of possible soft lockups when we zero/poison memory when freeing pages. Try to keep old behavior in that corner case to be safe. * "mm/memory: optimize unmap/zap with PTE-mapped THP" -> Clarify description of new ptep clearing functions regarding "present PTEs" -> Extend patch description regarding relaxed mapcount sanity checks -> Improve zap_present_ptes() description * Pick up RB's Cc: Andrew Morton Cc: Matthew Wilcox (Oracle) Cc: Ryan Roberts Cc: Catalin Marinas Cc: Yin Fengwei Cc: Michal Hocko Cc: Will Deacon Cc: "Aneesh Kumar K.V" Cc: Nick Piggin Cc: Peter Zijlstra Cc: Michael Ellerman Cc: Christophe Leroy Cc: "Naveen N. Rao" Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-s390@vger.kernel.org David Hildenbrand (10): mm/memory: factor out zapping of present pte into zap_present_pte() mm/memory: handle !page case in zap_present_pte() separately mm/memory: further separate anon and pagecache folio handling in zap_present_pte() mm/memory: factor out zapping folio pte into zap_present_folio_pte() mm/mmu_gather: pass "delay_rmap" instead of encoded page to __tlb_remove_page_size() mm/mmu_gather: define ENCODED_PAGE_FLAG_DELAY_RMAP mm/mmu_gather: add tlb_remove_tlb_entries() mm/mmu_gather: add __tlb_remove_folio_pages() mm/mmu_gather: improve cond_resched() handling with large folios and expensive page freeing mm/memory: optimize unmap/zap with PTE-mapped THP arch/powerpc/include/asm/tlb.h | 2 + arch/s390/include/asm/tlb.h | 30 ++++-- include/asm-generic/tlb.h | 40 ++++++-- include/linux/mm_types.h | 37 ++++++-- include/linux/pgtable.h | 70 ++++++++++++++ mm/memory.c | 169 +++++++++++++++++++++++---------- mm/mmu_gather.c | 107 ++++++++++++++++++--- mm/swap.c | 12 ++- mm/swap_state.c | 15 ++- 9 files changed, 393 insertions(+), 89 deletions(-) base-commit: d7f43604944787ce929efeaabd0f462414002a8f