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 3D734C7EE30 for ; Wed, 25 Jun 2025 11:01:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2A4E6B009C; Wed, 25 Jun 2025 07:01:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CDC366B009D; Wed, 25 Jun 2025 07:01:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA3516B009E; Wed, 25 Jun 2025 07:01:37 -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 A6D2A6B009C for ; Wed, 25 Jun 2025 07:01:37 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 72D61160159 for ; Wed, 25 Jun 2025 11:01:37 +0000 (UTC) X-FDA: 83593632234.12.E009538 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id DC25F40016 for ; Wed, 25 Jun 2025 11:01:34 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T8NMi8K8; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750849295; a=rsa-sha256; cv=none; b=iuyOlpFabWpfGtabkgRwncz4jB6EUUD84FV3keh02LMHPf/oF/F0ZZYP5eRmbZKsf7jQNR Gh1nz0anwkQunqliYxsUrIjbCONSDMQIhzWIwOmC/UW665bC/mrpAHgjGOaXfyK8DoEquH 0rPdhV9Tm6OvdY/jwLxRWCSl6LFAOZM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T8NMi8K8; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1750849295; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Kz6APK9dsF4j4P9pg66c0MDK7d+JPOfYEid0r31fCbs=; b=Q5fPQxUoknnlkLskq5F/X/3BsfjsNJtxRqOlPtE6TTNPKe59EFqcrk5ZYy2nudX8c/SxS+ hlVWLHBOvh4ZaFsNI+Olzl+Btlgozh1mNVinomaK4Kx8cn15CUkgjkA7Nro4ClwiHI+sXx SvEJFLoISbM5HpUzPjHYM5moJtsqm6U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750849294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Kz6APK9dsF4j4P9pg66c0MDK7d+JPOfYEid0r31fCbs=; b=T8NMi8K8V48XEiohwY/MvBqbejqJTo30qm37WEowl2AEPgtryRYWdpgbl6bnsnDK7T1x/V U5spjR/UhG3P0bZq4fyqtH4bVD3AryqAnreRY1YHhRwYZifNtMsBYr+VQpel8Lsl8izJ1S Nn7CNuLkNrVRHRNGswFody+X3nFdy0A= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-IJfzYgXpMiq_6N55EV-kMA-1; Wed, 25 Jun 2025 07:01:33 -0400 X-MC-Unique: IJfzYgXpMiq_6N55EV-kMA-1 X-Mimecast-MFC-AGG-ID: IJfzYgXpMiq_6N55EV-kMA_1750849292 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-450de98b28eso3908795e9.0 for ; Wed, 25 Jun 2025 04:01:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750849292; x=1751454092; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Kz6APK9dsF4j4P9pg66c0MDK7d+JPOfYEid0r31fCbs=; b=OwZhskQLB5zc14JwVy80neHaiJnmNp7iUiDHTR12mQl6FC65o9o29bY+GFsnfynJl8 w6UGATkXkCYq2yWcC/0AEa2eshcbyDRT++2OWHwhTSkh6jLfsu0HxPm+XQVRbeADvrlM t2/9bHykOBTQJfN0syW/b3j6OLDkOp18Qj9jJDbSbyOCeWR6ivCNmn0FaRQiQL02tbxV l+X3X07XXKcz5RwQZRE8bNmFZp4GHkOxcb5sROO8uTEfN/gYkDirxv61Py/wD4pMI+Oj oeQ8nZoIFTaGTcetIkkQdTB1QoPS3ldEQk4rnVWGBw2Yt0u3BVZyu9fwcykVGY3NWNwc xa7A== X-Forwarded-Encrypted: i=1; AJvYcCU2UKFaEpxqE2pd1KDoe6obkgyGrjfQP3Ll2Ks1hTykYIp0Qf5KffNS06xxlmNCWbxRhuL9amIT/w==@kvack.org X-Gm-Message-State: AOJu0YxiBStWpqx9Cf4JocwBq3KslIQxHvWF141noJ8DgEniepk/ZfiX CZ5VH3qNq1sg3hXfml+bUhpu+W2BLtoh4K2UwGdJs3UYH86QfdLuiyug5Jkkc98R7jnjzQ0X0Sg U5uA07ksd+uc/OWi1kUCOIHkpl0GY7l87E4MPZjI04e1HOVA1WDnb X-Gm-Gg: ASbGncs2RaBbqdvHdhWXnu4C9k3bc4kCs1u7Hv+KVZvy8ppFVc9hDEsJm0xHEdiw0Ev SYXRMSTAZqCKvoEWFwgm9WECw3lmUAtYkE0Be5Zf8huPEa29hg23EwDSr/xtnydaimeFfZoRBdq E4fUFWwqmiBT3p6py0qU8zhxpHJRkFlaB+Oxtyz6lxsEzKTv++rSOyj0wGrDEIE6UAtjAUXjOmv QSG5Nk5UW75SSUc+hu4XdSdiZaRVfrxgZZFn5c+sGUv7OzCw4KPHcWQab9G88nLe3lUFnCyu/Cs DL5NbZ3DjTiLxlpDfRSDicVi+pq58qFx+8al5Qyf8CLX8dveyhSB8MYxkd9jiJuFsAj+m+OY05t XxRkVaWLeiSa0VMrjRdljAZeM/kBdHQnwfRf/iitoL6a/ X-Received: by 2002:a5d:64e6:0:b0:3a4:f722:a46b with SMTP id ffacd0b85a97d-3a6e71ff6aamr6361389f8f.15.1750849291867; Wed, 25 Jun 2025 04:01:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPZFLBLmsDHtXRB4H5l5o76XKJEC5l5yx1gYpH977UiB1XroTTTWDmy2sKvb5kr0xD7UuyEA== X-Received: by 2002:a5d:64e6:0:b0:3a4:f722:a46b with SMTP id ffacd0b85a97d-3a6e71ff6aamr6361311f8f.15.1750849291308; Wed, 25 Jun 2025 04:01:31 -0700 (PDT) Received: from ?IPV6:2003:d8:2f12:1b00:5d6b:db26:e2b7:12? (p200300d82f121b005d6bdb26e2b70012.dip0.t-ipconnect.de. [2003:d8:2f12:1b00:5d6b:db26:e2b7:12]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538235600csm16446145e9.20.2025.06.25.04.01.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Jun 2025 04:01:30 -0700 (PDT) Message-ID: <5ba95609-302b-456a-a863-2bd5df51baf2@redhat.com> Date: Wed, 25 Jun 2025 13:01:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/4] mm: Support batched unmap for lazyfree large folios during reclamation To: Barry Song <21cnbao@gmail.com>, Lance Yang Cc: akpm@linux-foundation.org, baolin.wang@linux.alibaba.com, chrisl@kernel.org, kasong@tencent.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, lorenzo.stoakes@oracle.com, ryan.roberts@arm.com, v-songbaohua@oppo.com, x86@kernel.org, ying.huang@intel.com, zhengtangquan@oppo.com, Lance Yang References: <2c19a6cf-0b42-477b-a672-ed8c1edd4267@redhat.com> <20250624162503.78957-1-ioworker0@gmail.com> <27d174e0-c209-4851-825a-0baeb56df86f@redhat.com> <938c4726-b93e-46df-bceb-65c7574714a6@linux.dev> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SLXxprvPM4CrGFXb8YQWlt4JkR8uR-iVfCw1NmToBFQ_1750849292 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: DC25F40016 X-Rspamd-Server: rspam10 X-Stat-Signature: xwfyzrfqzn9s86c18fynnekbtjiyba43 X-HE-Tag: 1750849294-476512 X-HE-Meta: U2FsdGVkX18dHzq54y6mJetmtKY3zL0WCbdl3NWbQWxEcwb58V5fSFObVgMAUfc2eyAMCEsZIV7FT36ShO/5B4BKXENSGgaEd2fo/x+7cCYEZlobdKV08r/x2ZR19WXEY0LgUYcfxU7pG7Q5cFZFXJ8Hu5z1GdbUY/zcUzxzLhGsnliuK2rO9vjtfiMwJB8d5/6UVV1mZU03dI2dE8aVLttIVAwCZDDqWg7V1ThTIiaoHkrDz5tehj3INXVPM0hsLFqfyH+t9UffkeD8SCot4T0L1wb7Uq3bdwVKjoZFwAJKlVFepr04C66P4DbsMYGH4Haelae2onXVKs7HH4SLpAMfQV/6qnE4kvX/es7doyeUKcQ6y3jCoLyAUHgc/R+51ntTFnER7Wj9I487JDLA3YxKLpAzuHPM2GsKUkcOxe4TjHX3FsYmRmMESGntHFDvuO0rD703mEnaEPCbsDaVkdaCtbdhzcADtgci7Zk6OhsnTbG8+JI0NcYQwhgw9qoGq95ke8eCouy6WM2ZxDfK3V9f3p6rJ5P4F8tuNh2qa5CZkmi/bBmFZWGnW4Viky+eyFEAzjdBambIT4Mp56nazsURqlPl87AH3CtDXkV4/04FY1I+wEz4bUc8S92OCd2Hkx850ZSOIhUqEzwcIr3EIORiDsU/zpNlTUSVGJzFiA6ttRGJrduA56g1SVeZr4d22pKDFAtdPqhskXDsYV6U2gnzS8L+0i7kBo6C+gYFkGafnQCJ9aTnkGsz/v5I+U41QVi+ejPFZ5t5a3v0iWUReyKsC9QrmmJmXC59YG932vfI44jlT3aoRjASXm5uPvfJcnv4lLVv0qXTj99DTAZ39dyXgzpL60o+38f3cHD6nrQ9HQQoBc1gtvEo1oGcZ+fODmrHT5oStvXbred9oXOqsO8Jyquh2iOalbA+mlLEJzdaMgWVxn+J4cRo3kekAQzTDC1TXKZa+qSBLzUGIYF NzS25uf1 0/EeGNQe11N0Un+MV7y/Lut1zyxnq3r59C0TmNO9tHUHNK9NPhIuRG8Th/Scbn1asfUlfTfwJWej6H3MmIyomXtyP7RnvJIoB7KeeweUcx1D2Snaeu7aX4ou8i+GT8pVQzg6NXrqZ6WKIBsi2PFA/uDARplQ9InBGSPgVq7+frIl3rlw5Y6fGVwBIN6ehY/pTA5UPQ1B+e3/9tYXzDOFEBaj5nbH6g7X8npUZRSWxsd9DXBHs/WbUmMfny5VkputyEUhigjuoCaC6TZQNwQachpDJST/pWgJZFGXWijtt8U+9hwHO2eSu86lO9g+fV8kxqFOupXHcgd7OxOh/5FC/QWt/S/0NaoOpZU8MNrjDiPFIqfT7mluuqg8Lfdo2wvn83TLCkjdLGxXivjQSFOij8XT4fPWtTV8MqbACqmrnnqQaOfE= 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: On 25.06.25 12:57, Barry Song wrote: >>> >>> Note that I don't quite understand why we have to batch the whole thing >>> or fallback to >>> individual pages. Why can't we perform other batches that span only some >>> PTEs? What's special >>> about 1 PTE vs. 2 PTEs vs. all PTEs? >> >> That's a good point about the "all-or-nothing" batching logic ;) >> >> It seems the "all-or-nothing" approach is specific to the lazyfree use >> case, which needs to unmap the entire folio for reclamation. If that's >> not possible, it falls back to the single-page slow path. > > Other cases advance the PTE themselves, while try_to_unmap_one() relies > on page_vma_mapped_walk() to advance the PTE. Unless we want to manually > modify pvmw.pte and pvmw.address outside of page_vma_mapped_walk(), which > to me seems like a violation of layers. :-) Please explain to me why the following is not clearer and better: diff --git a/mm/rmap.c b/mm/rmap.c index 8200d705fe4ac..09e2c2f28aa58 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1845,23 +1845,31 @@ void folio_remove_rmap_pud(struct folio *folio, struct page *page, #endif } -/* We support batch unmapping of PTEs for lazyfree large folios */ -static inline bool can_batch_unmap_folio_ptes(unsigned long addr, - struct folio *folio, pte_t *ptep) +static inline unsigned int folio_unmap_pte_batch(struct folio *folio, + struct page_vma_mapped_walk *pvmw, enum ttu_flags flags, + pte_t pte) { const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; - int max_nr = folio_nr_pages(folio); - pte_t pte = ptep_get(ptep); + struct vm_area_struct *vma = pvmw->vma; + unsigned long end_addr, addr = pvmw->address; + unsigned int max_nr; + + if (flags & TTU_HWPOISON) + return 1; + if (!folio_test_large(folio)) + return 1; + + /* We may only batch within a single VMA and a single page table. */ + end_addr = min_t(unsigned long, ALIGN(addr + 1, PMD_SIZE), vma->vm_end); + max_nr = (end_addr - addr) >> PAGE_SHIFT; + /* We only support lazyfree batching for now ... */ if (!folio_test_anon(folio) || folio_test_swapbacked(folio)) - return false; + return 1; if (pte_unused(pte)) - return false; - if (pte_pfn(pte) != folio_pfn(folio)) - return false; - - return folio_pte_batch(folio, addr, ptep, pte, max_nr, fpb_flags, NULL, - NULL, NULL) == max_nr; + return 1; + return folio_pte_batch(folio, addr, pvmw->pte, pte, max_nr, fpb_flags, + NULL, NULL, NULL); } /* @@ -2024,9 +2032,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (pte_dirty(pteval)) folio_mark_dirty(folio); } else if (likely(pte_present(pteval))) { - if (folio_test_large(folio) && !(flags & TTU_HWPOISON) && - can_batch_unmap_folio_ptes(address, folio, pvmw.pte)) - nr_pages = folio_nr_pages(folio); + nr_pages = folio_unmap_pte_batch(folio, &pvmw, flags, pteval); end_addr = address + nr_pages * PAGE_SIZE; flush_cache_range(vma, address, end_addr); -- Cheers, David / dhildenb