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 0FC01C83F1D for ; Tue, 15 Jul 2025 09:56:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A25506B00B5; Tue, 15 Jul 2025 05:56:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D57F6B00B6; Tue, 15 Jul 2025 05:56:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89D066B00B7; Tue, 15 Jul 2025 05:56:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7863A6B00B5 for ; Tue, 15 Jul 2025 05:56:36 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3393E12D922 for ; Tue, 15 Jul 2025 09:56:36 +0000 (UTC) X-FDA: 83666044392.28.4547B92 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id B37A01C0005 for ; Tue, 15 Jul 2025 09:56:33 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DFBt6eUO; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752573393; 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=pnA4IPD44g6/jzC6xd2sZTmwSU0IvchPHU5KZSlw0ao=; b=Y5ro/XlhQoz41E9d38xyg38cOMAwM4WaNkR0RsBLK2rk17gmNhNu9A3I0qlOr6GcDm8dLA vADN5IBYXOh8e/QgnZn+a0WHaUc8f2LLAbRUwfgQuXz36tuUhNfG2YQXje6e0tIcJ0+GAk U0+JTcjfLxB2yIgCZjQ93snfNP+HVEg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752573393; a=rsa-sha256; cv=none; b=a+O1n/7yRlG0WHnRdP1xObxqewMAaMr5QXPjRuPZJtePKlBLhinLAbOe8+AjfU1IYHo7wJ ZftIipDQxTkZyutcgvC0z0av4EpM7xtGu1pGazxz448lAl3yh3ZCgNLrXuDVXZN019RYxp ZvPwEfYBZwqlh2jmXz3OWSxHyjOCAYM= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DFBt6eUO; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752573393; 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; bh=pnA4IPD44g6/jzC6xd2sZTmwSU0IvchPHU5KZSlw0ao=; b=DFBt6eUOBj+ukJ9gjmyDddJJaUXIIZPMLGoFHeeeV4SDcQIMu67eRTVvriqDmwUKfEuJsK XbQzBvNFhseHpwnTC23u5fhyhwIl45DiiHMlHCsd5m5sO2/BS3jsd5IwR/J5ag0fjZ/5Ci qLkIYXFlp9x5Q8U9N2F1DsCVVAFAM9I= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-36-2ENOBhzEPsuhhZR6ruFxYw-1; Tue, 15 Jul 2025 05:56:29 -0400 X-MC-Unique: 2ENOBhzEPsuhhZR6ruFxYw-1 X-Mimecast-MFC-AGG-ID: 2ENOBhzEPsuhhZR6ruFxYw_1752573389 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-45626532e27so4747195e9.1 for ; Tue, 15 Jul 2025 02:56:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752573388; x=1753178188; h=content-transfer-encoding:in-reply-to:organization: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=pnA4IPD44g6/jzC6xd2sZTmwSU0IvchPHU5KZSlw0ao=; b=Zs2icFBU27nbZY9cyqPGTe4Dn07krA50doPRRoFwnhPYQYx2m/toqgfvMZFqDoNnvQ zRgYf5iM0TdCsxWdqXAoxGUR1+y72UOAwnmZE2Zfox/JQ4P43ZoEfmZmQLVQMqLzOXiJ uAydq0+TyDFnMw3Cnzp79h/SlGEsfvIqZDqvCaQTKw5sWnY2OhtudFeeTmI9N9YMvRBl uFhvAgpNh1dLusnlb4LdQ5bz901DOr7yOoaR7YK8yb1OnPqjoyywjCSxqD7qB1Zrykx5 6vjGm7IOJyNIhqTf0ndzVLFRnvfblL9QUdH0QSerTe+xfeiQDVC6zv85Gp4MfIzhUzb3 gZNQ== X-Forwarded-Encrypted: i=1; AJvYcCXYkdNyIijJ82u6U/9adfdSsB8m0xin5pmJ+NDEVRGGqS9ZneuUxZzWhAgSXnIMhqMb6fL/NwawJA==@kvack.org X-Gm-Message-State: AOJu0YzEyxdmGwlrkyr/uqU1SsEy3SXiyaR9QNzcfV2+AyP5xk29nefM 8KxCGwsSy0aa9lGAmKZjdtGJl7NrFvZ0Cf5L9evGrzbqw4UCEUt8NKDBlcXC4f2W1Kk7A0oMDMh KcpgNMJzB8Bey12mXLMYdfFRxrNwRkqgd11YOwv1hNt9J0/XpjDO8uL0Fuk1J0jk= X-Gm-Gg: ASbGncsdRiKjYVayTGNonYJ2O9hAkZcVOU2ce+KuLdJ3JA0FG0inIELMTc95Akkgrha QUUdXzds7YyN2BK0Mx9rQe26tb2g6S3DbH++EUGLORcx7m8OKNtABaJGMhKcRqydvNUEGQHb7RB k77LfbIRmZOjnEZ98BSIRGZ1IhJb+5mkYBAQ9tWBTCY2E0uE07cVIxII/zKnMK2f9MtzNlQT7b5 RiIKtIrMroAT0L6V+ddCA3s01rjYRxiHNubEnu4k1BvWZpfM4vp+r12xbs8lw1kd2fcxRAB7czq 94bCLbVG6irp4RBiwdUyV0pcytg0z/spfXb+6kcD00N0qMuuYNTR4GGIXR5hDAlIdjNSdmWKrST jA9abUa8nunJAP0X7FpDdVSHoO4yZ4yiHXFmQdrBjgyC9x6hbDjhWqZamgxvHJcz+MYU= X-Received: by 2002:a05:600c:3f18:b0:456:c50:1b3 with SMTP id 5b1f17b1804b1-4560c50065emr98445245e9.29.1752573388322; Tue, 15 Jul 2025 02:56:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmicJJzD1wNt94gADTgMM4AQf4F351QVMOQmuSesstilvzLQXa7U5J7AiW3EOW3ayr91rNng== X-Received: by 2002:a05:600c:3f18:b0:456:c50:1b3 with SMTP id 5b1f17b1804b1-4560c50065emr98444765e9.29.1752573387783; Tue, 15 Jul 2025 02:56:27 -0700 (PDT) Received: from ?IPV6:2003:d8:2f28:4900:2c24:4e20:1f21:9fbd? (p200300d82f2849002c244e201f219fbd.dip0.t-ipconnect.de. [2003:d8:2f28:4900:2c24:4e20:1f21:9fbd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4561b176f87sm55096675e9.35.2025.07.15.02.56.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 02:56:27 -0700 (PDT) Message-ID: Date: Tue, 15 Jul 2025 11:56:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/3] khugepaged: Optimize collapse_pte_mapped_thp() for large folios by PTE batching To: Lorenzo Stoakes , Dev Jain Cc: akpm@linux-foundation.org, ziy@nvidia.com, baolin.wang@linux.alibaba.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, baohua@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250625055806.82645-1-dev.jain@arm.com> <20250625055806.82645-3-dev.jain@arm.com> <71350398-b5d8-45b9-b05c-d2b63030f766@lucifer.local> <8109236a-9288-4935-8321-dbff361dc529@arm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: k_N5R9L9-VO_I4yvUcAM6hSs9nb9v9qMsd5qfTXF_RM_1752573389 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B37A01C0005 X-Stat-Signature: c4jdccuaz19pigjgoyqpmyhqn8358fdq X-Rspam-User: X-HE-Tag: 1752573393-28943 X-HE-Meta: U2FsdGVkX1/Y/koF7iszV3AufRsw5sCujO/JzpVvdAGOJ1fAW+52sU3sUzuOb1gCtlraC3EBasknOZwnIJSMf3/uvyCNH/LV4YtcKcdJTvj1uuQTxkknMDzeOkEheSMbE3eFugQVX1R1lgIOlds/T7oxDsZEGVmb3GZnodBIwAlE7O1zIXVcApWbgACqi/6CEmQFbZtzVcjDKnahfvxBhLdyfiA78EjiEH5Q+dmAJA2hVhOwVUWHQMu0gp8Df06IT9zadVCyWeXlKqs3nCCN1km5ao5B6pkrmNd/sMPBGHOEzm6x71PUBVTBuG7lsQvRkRFDkDQq1WrGxbnlvJoLx3wD+Ezhtb1/ZeN3szhICa+IRbjV7GH5fsVNsqNYN+znarhnpwczdrcaPrbuEWuoSUlPRGHkaqZjhTalVFqpmhNvpRnTcy0JNgIRtYm1JSPj6jFThtO33waCp2FObqzr6h5AwoDObEji7fXb4UJ+ZMBqY5UnF0ALkOnXCfMcHU5ZIxqRpdQ0tmlFItb1PjL4TuZOMllkIZ1DO5fd9KJQDrWXU+T26y2b0MPy7jHhUBbU45y4d7mv4qEq+OIKyJ2mEpyDG/bEnLkLmH8NeKQ8mp5KvdAv/5hTiGOsXN67Yx1+AkWNwiKT4ir/LJVj3YITRspoiL59dsH2fH8riNFOuo+RPmGiOgXAil2ORr6lk9n8UH5sr1YEIfBYAQoqXqNf1MVeQsR1wDqvcdO042X7PvfQvEUlI9pWLb9VX3HUioXm18oTqt0NVBQfEXWWwVramZTtpEIL34Ft4p/TMuYSx2wP/CzElKTHe8tZ+qGaxrbw/HmJrBrhXhZvKtV5/32lum7X7KREoQQ8XJIQYZ//NPhPx8UkxW4B4uYfndhBc28hZoqUTFaVzgVtLMhX+UOiQNzNZ+I5uQplFnQLB7cVdllFx565OjYGmKLgVH71cjjHOcFnQIqMM6PzM+JTe+P 3B+T9yM6 +SBUWiRtGYM2hQPLchn4uUneNcwfI4+/jGgffvuLJGDT1PbnF1SCaNYRyzNHxON7VnKdp0Qfod/kNNeGcwQSOcrq/F2Q7CLvZDkwxmIvssvQnZV2ZQ/ca+ec3JD8/mH/6QILerKEr+iMnRAvKCMcjyhmEY7o6t2RJLfsaCg61H/iZ6kMnbDfy8374KeqP968tyrFvTVUhhKROpQVhuh/VWvaxCcDNqlfNH6soPgjV5poCY5fCBhnGB3WvA7gCouAxInONDvJMDBvML8CBxxAWgAo3tv2qPzsxbtAB5NlOHZ2hXAGpvB8o89oCA1wmSfKhOoHOXRaiQYKVdSsHEn0YLzVyUKYwdwx8ESBFt+8uvrGuW56Dge36hl1xZ9Sl9bY+vTL1VTw1+D2mk+rnuZj54pE5ZvX++y9WIX8A4mCV9jsLrLy32NeCEaGFDh3PwBa7odYP0uPvogCK/Ca+YxXUEMGz/P4w2Or14IzKmfjqmQcucM93MzFhmCSQ5vasPOlMjF1FHDdfEiXkIGlOWeafyykcIGBTpnrf+BNtatBRgfY7GIxrqmQ/+wynWv0m27cx0PRGMyrqmfg/MQbTgMLCMENTwjRFQKJ0B9Ix 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 15.07.25 11:43, Lorenzo Stoakes wrote: > On Tue, Jul 15, 2025 at 12:04:56PM +0530, Dev Jain wrote: >> >> On 26/06/25 10:17 am, Lorenzo Stoakes wrote: >>> On Thu, Jun 26, 2025 at 09:18:47AM +0530, Dev Jain wrote: >>>> On 25/06/25 6:41 pm, Lorenzo Stoakes wrote: >>>>> On Wed, Jun 25, 2025 at 11:28:05AM +0530, Dev Jain wrote: >>>>>> Use PTE batching to optimize collapse_pte_mapped_thp(). >>>>>> >>>>>> On arm64, suppose khugepaged is scanning a pte-mapped 2MB THP for collapse. >>>>>> Then, calling ptep_clear() for every pte will cause a TLB flush for every >>>>>> contpte block. Instead, clear_full_ptes() does a >>>>>> contpte_try_unfold_partial() which will flush the TLB only for the (if any) >>>>>> starting and ending contpte block, if they partially overlap with the range >>>>>> khugepaged is looking at. >>>>>> >>>>>> For all arches, there should be a benefit due to batching atomic operations >>>>>> on mapcounts due to folio_remove_rmap_ptes(). >>>>>> >>>>>> Note that we do not need to make a change to the check >>>>>> "if (folio_page(folio, i) != page)"; if i'th page of the folio is equal >>>>>> to the first page of our batch, then i + 1, .... i + nr_batch_ptes - 1 >>>>>> pages of the folio will be equal to the corresponding pages of our >>>>>> batch mapping consecutive pages. >>>>>> >>>>>> No issues were observed with mm-selftests. >>>>>> >>>>>> Signed-off-by: Dev Jain >>>>>> --- >>>>>> mm/khugepaged.c | 38 ++++++++++++++++++++++++++------------ >>>>>> 1 file changed, 26 insertions(+), 12 deletions(-) >>>>>> >>>>>> diff --git a/mm/khugepaged.c b/mm/khugepaged.c >>>>>> index 3944b112d452..4c8d33abfbd8 100644 >>>>>> --- a/mm/khugepaged.c >>>>>> +++ b/mm/khugepaged.c >>>>>> @@ -1499,15 +1499,16 @@ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, >>>>>> int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, >>>>>> bool install_pmd) >>>>>> { >>>>>> + int nr_mapped_ptes = 0, nr_batch_ptes, result = SCAN_FAIL; >>>>>> struct mmu_notifier_range range; >>>>>> bool notified = false; >>>>>> unsigned long haddr = addr & HPAGE_PMD_MASK; >>>>>> + unsigned long end = haddr + HPAGE_PMD_SIZE; >>>>>> struct vm_area_struct *vma = vma_lookup(mm, haddr); >>>>>> struct folio *folio; >>>>>> pte_t *start_pte, *pte; >>>>>> pmd_t *pmd, pgt_pmd; >>>>>> spinlock_t *pml = NULL, *ptl; >>>>>> - int nr_ptes = 0, result = SCAN_FAIL; >>>>>> int i; >>>>>> >>>>>> mmap_assert_locked(mm); >>>>>> @@ -1621,11 +1622,17 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, >>>>>> goto abort; >>>>>> >>>>>> /* step 2: clear page table and adjust rmap */ >>>>>> - for (i = 0, addr = haddr, pte = start_pte; >>>>>> - i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE, pte++) { >>>>>> + for (i = 0, addr = haddr, pte = start_pte; i < HPAGE_PMD_NR; >>>>>> + i += nr_batch_ptes, addr += nr_batch_ptes * PAGE_SIZE, >>>>>> + pte += nr_batch_ptes) { >>>>>> + const fpb_t flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; >>>>>> + int max_nr_batch_ptes = (end - addr) >> PAGE_SHIFT; >>>>>> + struct folio *mapped_folio; >>>>>> struct page *page; >>>>>> pte_t ptent = ptep_get(pte); >>>>>> >>>>>> + nr_batch_ptes = 1; >>>>>> + >>>>>> if (pte_none(ptent)) >>>>>> continue; >>>>>> /* >>>>>> @@ -1639,26 +1646,33 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, >>>>>> goto abort; >>>>>> } >>>>>> page = vm_normal_page(vma, addr, ptent); >>>>>> + mapped_folio = page_folio(page); >>>>>> + >>>>>> if (folio_page(folio, i) != page) >>>>>> goto abort; >>>>> Isn't this asserting that folio == mapped_folio here? We're saying page is the >>>>> ith page of folio, so why do we need to look up mapped_folio? >>>> We need to check for all PTEs whether they map the right page or not. This may >>>> get disturbed due to mremap and stuff. >>> Right but I'm saying mapped_folio == folio right? You're literally asserting it >>> here? So there's no need to assign mapped_folio at all, just reference folio no? >>> >>>>>> + mapped_folio = page_folio(page); >>>>> You're assigning this twice. >>>> Forgot to remove, thanks. >>>> >>>>>> + nr_batch_ptes = folio_pte_batch(mapped_folio, addr, pte, ptent, >>>>>> + max_nr_batch_ptes, flags, >>>>>> + NULL, NULL, NULL); >>>>>> + >>>>>> /* >>>>>> * Must clear entry, or a racing truncate may re-remove it. >>>>>> * TLB flush can be left until pmdp_collapse_flush() does it. >>>>>> * PTE dirty? Shmem page is already dirty; file is read-only. >>>>>> */ >>>>>> - ptep_clear(mm, addr, pte); >>>>>> - folio_remove_rmap_pte(folio, page, vma); >>>>>> - nr_ptes++; >>>>>> + clear_full_ptes(mm, addr, pte, nr_batch_ptes, /* full = */ false); >>>>>> + folio_remove_rmap_ptes(folio, page, nr_batch_ptes, vma); >>>>>> + nr_mapped_ptes += nr_batch_ptes; >>>>>> } >>>>>> >>>>>> if (!pml) >>>>>> spin_unlock(ptl); >>>>>> >>>>>> /* step 3: set proper refcount and mm_counters. */ >>>>>> - if (nr_ptes) { >>>>>> - folio_ref_sub(folio, nr_ptes); >>>>>> - add_mm_counter(mm, mm_counter_file(folio), -nr_ptes); >>>>>> + if (nr_mapped_ptes) { >>>>>> + folio_ref_sub(folio, nr_mapped_ptes); >>>>>> + add_mm_counter(mm, mm_counter_file(folio), -nr_mapped_ptes); >>>>>> } >>>>>> >>>>>> /* step 4: remove empty page table */ >>>>>> @@ -1691,10 +1705,10 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, >>>>>> : SCAN_SUCCEED; >>>>>> goto drop_folio; >>>>>> abort: >>>>>> - if (nr_ptes) { >>>>>> + if (nr_mapped_ptes) { >>>>> I know it's ironic coming from me :P but I'm not sure why we need to churn this >>>>> up by renaming? >>>> Because nr_ptes is an existing variable and I need a new variable to make >>>> the jump at the end of the PTE batch. >>> I thought you eliminated nr_ptes as a variable here? Where else is it used? >>> >>> Oh how this code needs refactoring... >> >> If we retain nr_ptes, then the two variables will be nr_ptes and nr_mapped_ptes, >> which is confusing since the former is plain and the latter has a _mapped_ thingy >> in it, so instead now we call them nr_batch_ptes and nr_mapped_ptes. >> > > Sigh, this is still awful. But probably just existing awfulness. This whole > thing needs a tent thrown over it and fumigation... but again not your fault :) > > I mean fine, this is fine then. Probably best to be pragmatic here: as long as the educated reader understands the code, all good. I hope I'll never have to explain it to my daughters. I know, I'm a perfectionist myself ;) -- Cheers, David / dhildenb