From patchwork Mon Jul 17 14:31:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 121399 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1181653vqt; Mon, 17 Jul 2023 08:28:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlGodZccFiOW1UXsOu1PdTFPKxp3iWyCZGvbQtxLVLQxB/eLUMzHWEMwGrGcfi7zbj50VQ9P X-Received: by 2002:a05:6a21:585:b0:135:26ad:132 with SMTP id lw5-20020a056a21058500b0013526ad0132mr1221077pzb.7.1689607731472; Mon, 17 Jul 2023 08:28:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689607731; cv=none; d=google.com; s=arc-20160816; b=QJHW4KHG6cVDnz5onsIqjZj74ZoQPvzptiyoBqxmEZa/BpvFq458GaYRdMFYuLfRzz 0MXiEBb9HF7j3BzkALKl7TcZSVbkA6yFAHKGXrIx89tcriMso6Jd9o5XOQIXn6oSg25u W3SwdE9dKWsqgJWeEQyiwOINYxWbsY4BhDjftXOPlSXL5sUwcZ8DBNS7FC4E8dNFQGFH Nas5NxMz0rrjfs3qxcUjP/LxyjXkWnxOE528oPuCdJA82lWH0gm1cNplqPX7hODIRzKx LkRlsoKRF2QlN3I8oWfWaCZ4GmDewTdtF1UwRdDg+3d7RPRmar+3+GSyjYTqzdx4COSO K6Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BP+7rStUqlpLuRykLENwCQmjiIT3a8ADMh8sshpsKms=; fh=THi7eKCjaWcVibUnyL3CTjC3PwRMYqk9JChFkSe1vn0=; b=KyKXKN2hTfcFhQavargdESexq08tbthOljt5wpegU2usmYnwcZkwYxxGaaX0+W5jWg Iy2VpiwkhoGk4K2w3UVBOWyV54yH6rSfR6hXuDhVy4l0V/PvcEHy2dFUbE2bSyDLzMY5 j4ILYfDHmVhAw+oA+t2mTkUeRnZeIZxPMtwNHgS8qyoIuljxqWCWGMtngHmisBuJjJhs 8vCkUG3YLB9Gm1YLC3L2lglPaVzUh146d0QZUg3KkOTZpw1St1ZiTus4LJycVcRhP3lj D8M2pj5GBcUo355kXclHw8riuPtGZ0LrlCvH5Ew+E77FAfsNMnPmuAgw6U3S+k6joBpQ W4sQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s28-20020a63525c000000b0055bc97cc885si11482406pgl.614.2023.07.17.08.28.37; Mon, 17 Jul 2023 08:28:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231410AbjGQObd (ORCPT + 99 others); Mon, 17 Jul 2023 10:31:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbjGQOb2 (ORCPT ); Mon, 17 Jul 2023 10:31:28 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C3CAFE55 for ; Mon, 17 Jul 2023 07:31:23 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D926D75; Mon, 17 Jul 2023 07:32:06 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9E0313F738; Mon, 17 Jul 2023 07:31:21 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Yang Shi , "Huang, Ying" , Zi Yan Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 1/3] mm: Allow deferred splitting of arbitrary large anon folios Date: Mon, 17 Jul 2023 15:31:08 +0100 Message-Id: <20230717143110.260162-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717143110.260162-1-ryan.roberts@arm.com> References: <20230717143110.260162-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771682116517418783 X-GMAIL-MSGID: 1771682116517418783 In preparation for the introduction of large folios for anonymous memory, we would like to be able to split them when they have unmapped subpages, in order to free those unused pages under memory pressure. So remove the artificial requirement that the large folio needed to be at least PMD-sized. Signed-off-by: Ryan Roberts Reviewed-by: Yu Zhao Reviewed-by: Yin Fengwei Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand --- mm/rmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0c0d8857dfce..2baf57d65c23 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1430,7 +1430,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, * page of the folio is unmapped and at least one page * is still mapped. */ - if (folio_test_pmd_mappable(folio) && folio_test_anon(folio)) + if (folio_test_large(folio) && folio_test_anon(folio)) if (!compound || nr < nr_pmdmapped) deferred_split_folio(folio); } From patchwork Mon Jul 17 14:31:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 121387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1162749vqt; Mon, 17 Jul 2023 07:59:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlFlift0ZDQHAZaeDf68t5eIQLztorA1L1VZUwY5aCeKfXKrPitS6VI5iEZaBGJtwf110vG6 X-Received: by 2002:a05:6a20:2443:b0:12c:e745:78b3 with SMTP id t3-20020a056a20244300b0012ce74578b3mr13326554pzc.62.1689605951156; Mon, 17 Jul 2023 07:59:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689605951; cv=none; d=google.com; s=arc-20160816; b=ftiOKTK9q/zydhIp+kKOQyvjYTyEOcygWsp3JvmKqfI35kkMdoy0zracNTpQFdrS53 3AgARCytYpm820KwsMQ2eu44Yk8WB9KOuW32CRq2HAlqp36BHFlYeEeO2BIOL5YbphCu nGv0e0wloY9OlBvym774HaGizMFzFL3kFkJliE678FdmUr25J6D/DfFIxm1ueye6u45I Jrs8btK7XReqB8usZaf3BBBl20hG/hamXIgeP82VesQodqFafeNfG7zQjo5O//SDhIkr H0KbERMdDADxCTEX4pqCDDw9oGpj83U3kLpOK17M3tD1yezQuRXzkGiB1qw8CLsGy2QJ C8Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=GdameDER4NHHlwMn42ZID5qyKD9OC9rWI1a9WDRPBIY=; fh=THi7eKCjaWcVibUnyL3CTjC3PwRMYqk9JChFkSe1vn0=; b=D1MdtmJy/rsp6BN18/lgIa42DR0SeEy9ZTReVnTs1obyJB5chWl+ZzcXCnZessYuJ8 bHdYlAQTqpPj9Oy20KyppCrJdiYWUFqPQ+qA5b6DquGKeV49hpITDhT9NhAGG8W/LjXW S2S9uzCtsm+j+dlNckWLD4fGP/MbrOf5oJbOx94HrrJVNOlUcegAbnH3I0yrwrG+435O Q31qhzs/pAwTuwmYz9gCqrC4KBsUI2CGPu8hPNkAtOh2XwPiQE1uBQ4aQz2I8y7euJxJ oRx7NZNuLssNioYWbiQMosfg4jrxcNz3j2hIfeGW65Mf7xZZGSNKoTpPbydMyvt4GpBI Olbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t4-20020a63f344000000b00553836cb761si4946582pgj.717.2023.07.17.07.58.56; Mon, 17 Jul 2023 07:59:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231379AbjGQOba (ORCPT + 99 others); Mon, 17 Jul 2023 10:31:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjGQOb3 (ORCPT ); Mon, 17 Jul 2023 10:31:29 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4F17EE5E for ; Mon, 17 Jul 2023 07:31:25 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 642BD11FB; Mon, 17 Jul 2023 07:32:08 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 749663F738; Mon, 17 Jul 2023 07:31:23 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Yang Shi , "Huang, Ying" , Zi Yan Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 2/3] mm: Implement folio_remove_rmap_range() Date: Mon, 17 Jul 2023 15:31:09 +0100 Message-Id: <20230717143110.260162-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717143110.260162-1-ryan.roberts@arm.com> References: <20230717143110.260162-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771680249671247364 X-GMAIL-MSGID: 1771680249671247364 Like page_remove_rmap() but batch-removes the rmap for a range of pages belonging to a folio. This can provide a small speedup due to less manipuation of the various counters. But more crucially, if removing the rmap for all pages of a folio in a batch, there is no need to (spuriously) add it to the deferred split list, which saves significant cost when there is contention for the split queue lock. All contained pages are accounted using the order-0 folio (or base page) scheme. Signed-off-by: Ryan Roberts Reviewed-by: Yin Fengwei --- include/linux/rmap.h | 2 ++ mm/rmap.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b87d01660412..f578975c12c0 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -200,6 +200,8 @@ void page_add_file_rmap(struct page *, struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); +void folio_remove_rmap_range(struct folio *folio, struct page *page, + int nr, struct vm_area_struct *vma); void hugepage_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address, rmap_t flags); diff --git a/mm/rmap.c b/mm/rmap.c index 2baf57d65c23..1da05aca2bb1 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1359,6 +1359,71 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, mlock_vma_folio(folio, vma, compound); } +/* + * folio_remove_rmap_range - take down pte mappings from a range of pages + * belonging to a folio. All pages are accounted as small pages. + * @folio: folio that all pages belong to + * @page: first page in range to remove mapping from + * @nr: number of pages in range to remove mapping from + * @vma: the vm area from which the mapping is removed + * + * The caller needs to hold the pte lock. + */ +void folio_remove_rmap_range(struct folio *folio, struct page *page, + int nr, struct vm_area_struct *vma) +{ + atomic_t *mapped = &folio->_nr_pages_mapped; + int nr_unmapped = 0; + int nr_mapped; + bool last; + enum node_stat_item idx; + + if (unlikely(folio_test_hugetlb(folio))) { + VM_WARN_ON_FOLIO(1, folio); + return; + } + + if (!folio_test_large(folio)) { + /* Is this the page's last map to be removed? */ + last = atomic_add_negative(-1, &page->_mapcount); + nr_unmapped = last; + } else { + for (; nr != 0; nr--, page++) { + /* Is this the page's last map to be removed? */ + last = atomic_add_negative(-1, &page->_mapcount); + if (last) { + /* Page still mapped if folio mapped entirely */ + nr_mapped = atomic_dec_return_relaxed(mapped); + if (nr_mapped < COMPOUND_MAPPED) + nr_unmapped++; + } + } + } + + if (nr_unmapped) { + idx = folio_test_anon(folio) ? NR_ANON_MAPPED : NR_FILE_MAPPED; + __lruvec_stat_mod_folio(folio, idx, -nr_unmapped); + + /* + * Queue anon THP for deferred split if we have just unmapped at + * least 1 page, while at least 1 page remains mapped. + */ + if (folio_test_large(folio) && folio_test_anon(folio)) + if (nr_mapped) + deferred_split_folio(folio); + } + + /* + * It would be tidy to reset folio_test_anon mapping when fully + * unmapped, but that might overwrite a racing page_add_anon_rmap + * which increments mapcount after us but sets mapping before us: + * so leave the reset to free_pages_prepare, and remember that + * it's only reliable while mapped. + */ + + munlock_vma_folio(folio, vma, false); +} + /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from From patchwork Mon Jul 17 14:31:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 121402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1181832vqt; Mon, 17 Jul 2023 08:29:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlHxHXpl7yeq24AZJ0Wml/cK1b2XJcAIEyIETdwF1hQI/zAIVZb28B4wsompsq7mEsljQulD X-Received: by 2002:aa7:d9d0:0:b0:51e:4439:f480 with SMTP id v16-20020aa7d9d0000000b0051e4439f480mr12559070eds.34.1689607748541; Mon, 17 Jul 2023 08:29:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689607748; cv=none; d=google.com; s=arc-20160816; b=js705940Cuyd25GTt8Vyy6pnhS0yP8n2vakTZZMPy84EnzxYb9WwMjO9ovRv/kwndK A1X+Ojz3ofoU9jIvDpekcw/LJlQEFz0+mTi5ikLS/68Y/Zdqj8h7fzdhSoDY0mmvlzMX KOkuqhMfWGiu80LQLwicKDPsXV+WS6MIRR3d5y3/mT0afwml+5Lv6paTXxUd9yzFOm// ZW++DGC8+vJGMdzc56GDGmScw156AZ1q+wnX1Fv8s/cAAZpc4MjHkp1Apmqni+2CPMGA 6WMqVGjOW1Z/YhMdp5hJPvPoYnUQF+z3OlDUQrcrSu4c/CoqgWB4IdQchwriJ0ubedJ+ IQwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Z9tyZhKLEUiT4Cu9fZro8vsV1H+EfHsCasdo1zxwtLo=; fh=THi7eKCjaWcVibUnyL3CTjC3PwRMYqk9JChFkSe1vn0=; b=YNQsdKAWSopkVc7o/RaZggC7GDsRriwTn+x7sWsstVGkXudQOnuyF8CAw0uEmhdiWP gCS9TYL7Tc+v9UIWwULe3yP01J709O+VGg8pgF8ZwVrVZUMpaobqK55cqbQKiHvpGmG4 A/RVsz51Mv2OiQkdRwgzhnrd6E++qr/MhZ+vzoxx/U9XKvKjZVEcT1Rp8Ly0G0V2tJPo +KMaukr7b1J8/XwveANHeaKkFBAwgb0il/2TMK34+1C6jVOejmqJ2Np4gW2fvYxAuHCP FYJ8e7GOF+HW1iBegoVzpecsY5YE2EP7MjVEVeilNGIL848lVPl03EZIB0WqbPzUaD1J pk+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f24-20020a05640214d800b0051be9317ccasi14023399edx.508.2023.07.17.08.28.43; Mon, 17 Jul 2023 08:29:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231513AbjGQObh (ORCPT + 99 others); Mon, 17 Jul 2023 10:31:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231332AbjGQOba (ORCPT ); Mon, 17 Jul 2023 10:31:30 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 237C1E63 for ; Mon, 17 Jul 2023 07:31:27 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3A3BB1424; Mon, 17 Jul 2023 07:32:10 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4B2FC3F738; Mon, 17 Jul 2023 07:31:25 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Yang Shi , "Huang, Ying" , Zi Yan Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 3/3] mm: Batch-zap large anonymous folio PTE mappings Date: Mon, 17 Jul 2023 15:31:10 +0100 Message-Id: <20230717143110.260162-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717143110.260162-1-ryan.roberts@arm.com> References: <20230717143110.260162-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771682134368248044 X-GMAIL-MSGID: 1771682134368248044 This allows batching the rmap removal with folio_remove_rmap_range(), which means we avoid spuriously adding a partially unmapped folio to the deferrred split queue in the common case, which reduces split queue lock contention. Previously each page was removed from the rmap individually with page_remove_rmap(). If the first page belonged to a large folio, this would cause page_remove_rmap() to conclude that the folio was now partially mapped and add the folio to the deferred split queue. But subsequent calls would cause the folio to become fully unmapped, meaning there is no value to adding it to the split queue. Signed-off-by: Ryan Roberts --- mm/memory.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 01f39e8144ef..6facb8c8807a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1391,6 +1391,95 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, pte_install_uffd_wp_if_needed(vma, addr, pte, pteval); } +static inline unsigned long page_addr(struct page *page, + struct page *anchor, unsigned long anchor_addr) +{ + unsigned long offset; + unsigned long addr; + + offset = (page_to_pfn(page) - page_to_pfn(anchor)) << PAGE_SHIFT; + addr = anchor_addr + offset; + + if (anchor > page) { + if (addr > anchor_addr) + return 0; + } else { + if (addr < anchor_addr) + return ULONG_MAX; + } + + return addr; +} + +static int calc_anon_folio_map_pgcount(struct folio *folio, + struct page *page, pte_t *pte, + unsigned long addr, unsigned long end) +{ + pte_t ptent; + int floops; + int i; + unsigned long pfn; + + end = min(page_addr(&folio->page + folio_nr_pages(folio), page, addr), + end); + floops = (end - addr) >> PAGE_SHIFT; + pfn = page_to_pfn(page); + pfn++; + pte++; + + for (i = 1; i < floops; i++) { + ptent = ptep_get(pte); + + if (!pte_present(ptent) || + pte_pfn(ptent) != pfn) { + return i; + } + + pfn++; + pte++; + } + + return floops; +} + +static unsigned long zap_anon_pte_range(struct mmu_gather *tlb, + struct vm_area_struct *vma, + struct page *page, pte_t *pte, + unsigned long addr, unsigned long end, + bool *full_out) +{ + struct folio *folio = page_folio(page); + struct mm_struct *mm = tlb->mm; + pte_t ptent; + int pgcount; + int i; + bool full; + + pgcount = calc_anon_folio_map_pgcount(folio, page, pte, addr, end); + + for (i = 0; i < pgcount;) { + ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); + tlb_remove_tlb_entry(tlb, pte, addr); + full = __tlb_remove_page(tlb, page, 0); + + if (unlikely(page_mapcount(page) < 1)) + print_bad_pte(vma, addr, ptent, page); + + i++; + page++; + pte++; + addr += PAGE_SIZE; + + if (unlikely(full)) + break; + } + + folio_remove_rmap_range(folio, page - i, i, vma); + + *full_out = full; + return i; +} + static unsigned long zap_pte_range(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, unsigned long end, @@ -1428,6 +1517,36 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, page = vm_normal_page(vma, addr, ptent); if (unlikely(!should_zap_page(details, page))) continue; + + /* + * Batch zap large anonymous folio mappings. This allows + * batching the rmap removal, which means we avoid + * spuriously adding a partially unmapped folio to the + * deferrred split queue in the common case, which + * reduces split queue lock contention. Require the VMA + * to be anonymous to ensure that none of the PTEs in + * the range require zap_install_uffd_wp_if_needed(). + */ + if (page && PageAnon(page) && vma_is_anonymous(vma)) { + bool full; + int pgcount; + + pgcount = zap_anon_pte_range(tlb, vma, + page, pte, addr, end, &full); + + rss[mm_counter(page)] -= pgcount; + pgcount--; + pte += pgcount; + addr += pgcount << PAGE_SHIFT; + + if (unlikely(full)) { + force_flush = 1; + addr += PAGE_SIZE; + break; + } + continue; + } + ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr);