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 74A16C83F1B for ; Fri, 11 Jul 2025 16:03:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08DEA6B00A1; Fri, 11 Jul 2025 12:03:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 065E36B00A3; Fri, 11 Jul 2025 12:03:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E96A26B00A4; Fri, 11 Jul 2025 12:03:19 -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 D3E556B00A1 for ; Fri, 11 Jul 2025 12:03:19 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6E3AF140A9D for ; Fri, 11 Jul 2025 16:03:19 +0000 (UTC) X-FDA: 83652453318.29.6F90D3C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id BBA73C0009 for ; Fri, 11 Jul 2025 16:03:16 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U6l629c3; spf=pass (imf10.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=1752249797; 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=puVwQL05qd8EEwgC9v5NZXyKB2mpvAnWAfFUVhQ5+Wk=; b=3P1htJt1E45jeQOBRI3bTRwY2VAztkMej8fkTbbnJbvnz6+e8Ys7Gf4BcfkGpzQh0ht1Wv KfftqbgsNXM9WPNsXk/uMSGsLBxV/Zf04YyvmVq3tw13qtw/bojFdW447zdQbAa8UXuYZK gjCWoaxuLzyVZef1+n1ol3le2U2Tuwc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U6l629c3; spf=pass (imf10.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752249797; a=rsa-sha256; cv=none; b=mzjMWwjzg+vaI7cZyyU7gtpgxHqRv55xZXgbQ9cMELk4MCEa+hnAA1LIEwwZ1lOtUI+0wK V8DPucLc4xSbyDszn1v+iMP8ux5smH+aNgyyWV7V81T1k4HYkQYeCIMaK83Iv0qUnn2HzA fkdnc9ndtgwppDQ/X/gsfqLDxW3DqrE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752249796; 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=puVwQL05qd8EEwgC9v5NZXyKB2mpvAnWAfFUVhQ5+Wk=; b=U6l629c311EjZrGPxuz0qiKAcXW3kK5HG1GPWyZaQZPYyliIf4+7hFFq4+MJAl++HLV4oU zWCa/tMfabGr1Z9t2ewpjRsRp1UaCR17lwwftHe9WC9fumoqd2/xD9SYx9TmtCZJbxf0We 9XGYWmopIylKNsztMzSBg/ZRuW8P3Fk= 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-180-kQZclyxOPp2H2zEXu_kEAQ-1; Fri, 11 Jul 2025 12:03:14 -0400 X-MC-Unique: kQZclyxOPp2H2zEXu_kEAQ-1 X-Mimecast-MFC-AGG-ID: kQZclyxOPp2H2zEXu_kEAQ_1752249794 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-455f79a2a16so2828235e9.2 for ; Fri, 11 Jul 2025 09:03:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752249793; x=1752854593; 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=puVwQL05qd8EEwgC9v5NZXyKB2mpvAnWAfFUVhQ5+Wk=; b=gTLFjWY0AX4udL78ICjTfuf9G1Kqcv/cdCc2PYzIG0LPoQWcKE6bH9U7w1ZFpVcV5d g7yBh5h4LmJOyjzRXpafpFpN2Zpqu1R3lLIZ92VGAjTNOsEPbagXY/GqIReUa2WDwG/0 bXqqa+hpHpq7WTHB/L2dy664wwvEeCVdsyX8mV7A9G8uKwYATYrG2zrrrDhbgD1nzERE Z9QZDvCG7TADbuPHhYuMk7iYzTUkktja9aUy2NttitbcZLDH67YYxWBRsLm5oFmdtS5H vHBdVaHAmujTw303inbVhG4RAyiIp6HQdGv7neQmQ7A599HahP4u2emJ28MTFVhPVNKt BHCw== X-Forwarded-Encrypted: i=1; AJvYcCUsQAe3v5oStlgsE7U71Ot/rg46SarJ6EYazVTvAPWRc4n7/LUPWjhsg/DWJmjGNNSD8yNaj18Pvg==@kvack.org X-Gm-Message-State: AOJu0YzanNosSPMl4NunLHfcKZxRcKpKvnmrZKBvwEj61xN5leo+EAC9 a3ImCN8/Zr1K1mpvsv9x5BhRX93Lzqh3i4HUJ/cwBYw6sc2bCoJzmIM3znQxTEoS+FTBH+bVhqu Ze53BTNMF2zAS45k/vtXgjKp7qnF+rCQHnxGqlIplLFYacWLQSQ2j X-Gm-Gg: ASbGncvmjm4FFAqvzp03QqTcaVM8SlRQ9dOb3C/dhcgILn6R34/6lEfN+BvwnmJ7irM xEMx5vsaiK/geZObuTx1/7WCXpuKjp1N6/WK+k9EcDJHt3GMa3WDE1CF3O3KJS+b+Wn9I7m2EKV m1+PRg9+3ypMBzlcgIlPoUjQxxNIbhoq3yE9hc0sfOyoti53y12N8LwWODNajEHdisyfberlCg7 cyo4GYmBKhUUtS74XGrmtpOR5dvTGqxoZLbWDfhQQzPSBnj/nwSx7x42oTgjWVZY9nkKh3PWevD HWmh3uH/jr/5SlIc+5h9vrvaEFC7Vq39skgQtGryOQY7WnbqD1GAB9FxCiGvbO+jpwFOx/+fIXZ 6Q/7lfuPLaZD/yWJWvMAmrBokX98+Hg59EVSrbYlpi+p47HMgAj8T4z4HAF7D/ydMa50= X-Received: by 2002:a05:600c:1d98:b0:43c:efed:733e with SMTP id 5b1f17b1804b1-454ec140088mr43816935e9.14.1752249791924; Fri, 11 Jul 2025 09:03:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEXR2qC4ojmg/Msw/Xcv+JPJKO/J68SF+dBoWA2RVsNRRsANbIhVlYqEBoFsKj0KLatOOO9w== X-Received: by 2002:a05:600c:1d98:b0:43c:efed:733e with SMTP id 5b1f17b1804b1-454ec140088mr43812745e9.14.1752249789076; Fri, 11 Jul 2025 09:03:09 -0700 (PDT) Received: from ?IPV6:2003:d8:2f3c:3a00:5662:26b3:3e5d:438e? (p200300d82f3c3a00566226b33e5d438e.dip0.t-ipconnect.de. [2003:d8:2f3c:3a00:5662:26b3:3e5d:438e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d50fb874sm91231575e9.28.2025.07.11.09.03.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Jul 2025 09:03:08 -0700 (PDT) Message-ID: Date: Fri, 11 Jul 2025 18:03:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/huge_memory: move unrelated code out of __split_unmapped_folio() To: Zi Yan Cc: Balbir Singh , linux-mm@kvack.org, Andrew Morton , Lorenzo Stoakes , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , linux-kernel@vger.kernel.org References: <20250711030259.3574392-1-ziy@nvidia.com> <2AE055C4-BFFE-4B61-A96A-6DE227422C7B@nvidia.com> <3223bd3b-38cc-45d1-8080-d62117df0e85@redhat.com> 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: nSBFPoKo3LgS68fGb3hA81FL_NXQ2EEUuortrurOWgU_1752249794 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: BBA73C0009 X-Rspamd-Server: rspam09 X-Stat-Signature: r5qft1padigf7uzqk386iza613g45npj X-HE-Tag: 1752249796-740772 X-HE-Meta: U2FsdGVkX1/HAOMVSGv8pIjIaU2gtPYo++mLYTGqTY37BiRzRPh6M0waaxZJgopKFql013vV0HHbwfUTPZyECR1ZxG/whbvG/xEJI+8jDB6hrM7vMMZ3d2emWWLYR4mh5j3mOYFZupZ2oO5FaqEezEvswSTCwe0Hi/y0Hd5QOnWngG9Vo9VJJ1OgC88KaMFmzyRt2bPslZZZI0F8XF44lC8DJGmSrs2W9ae+dtgrK1Pnqt4EtWoYviuLz87WbSqj3q94/khynJudOaZCIX4SDa/BIccSnjHulvTmGWz4x9FvZ9LSQ/70fGkOKPOrCvZxp+e8U0t2oeNiWoL6XaHvf8RCDlbIX2aHa8YIpe1L0/bcarUViflA38u6qJoZt/uw0Gt214sD7IemP9U+tXHkCayul9tDAPS2Gfqy68+Ky+ZUgCx94MIHLsLFgPjb8UcT9YCedrL99eFWVUoYl6AUBM/ia/dtHIbmZ5hVXFKDZmtDe2e3BzObdwbmdjE8k7+ESX247n+6xBTrrqKRVLg0ULcia1oieV40ZqOUGvZp7pcb/f5w9PbgHp/i6Mfr86Stp+RyKOscKPymFsAJsZ/sPUYJuFxmL3Znn5FmWbIo9u4dODOcy3eTIeErWIMhyXhtzS6Kv7RnNTjqys/gDzoomwjxI1mRowUteQXru50a6rLFGfQJDTsKcIGA8knbApmguuPUnXxR3+jYBFw6RgfsxE6H18obC8cMWvTn0d9ahrG0IhkbssOm7iUV0FcguJEW4JWm50vFbGaCzE4f0+5W8hi3hvpH3J34NGaiVakkPf2SKIg1R2wZBVtmzHwLUB/+vjZ3oDF7dpr8GcWzzOU1GbotF7LgW5AyHh4tGgYI3ewXikTdAybc1iyw6zBKCCTuRLzmFIS3/n7zyMgbqG8gxAUd42dsw0RaTkAk517/38WNcEcejaH1MjzpFuXbu6PBn5NKxCtgUdykYNovV0T r9acyXxh 3Zk0B29FrSDL0OFUBxrvZeTOmK7s20bJUPZXBSo5jAxJ0JXDIcUGZZnz0uAFEgoI+5P6L6saZlovCGmx4FoxiV1JiLRzl2mwlyL1Ry8KSPC8lrCytK15EYnzHo06NxxTdHtYSm4D7DDWxp9jSXQO96mCnat+TyFzOAXPiKIIOY+kRbpDkWT5qEqT0BYPMTxywfKV3ySCfl8+h+pZRvzXkvE2CpuEt9kprkMjpQ1rKcSa4gU7R27jqXNU8rH2ictfE25hew2HfSauuvjOdbWuRYLEQNRlOAeUXZcQ8LfoDXcV2shiMRgl84asculugSu4zxrTUvsMEHcGUqWWdQD4+NF5TvcXZGm1weuobbsrVNTP3tGsAVGJLD4UmFlyfYm1/mQHDJruXjDhUWhEMotcCJtEiGBRLzbKyLgzn8eZOAC7yElr36+YBTfNyGmmHnFq3uKYjtd0yqbk5QTEIygShyaIgtZGyRQdhqGlwlvrUW+QOkjhTQ1iM33HZJK4q2rwSVPsy6EX+0nbnsbrzSf63neCQLyU0bkUdxjgjTr08/iXGAnNMD7xi0yHETZWKlfsHG/rFhs4iumGlM0k= 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 11.07.25 17:40, Zi Yan wrote: > On 11 Jul 2025, at 10:40, David Hildenbrand wrote: > >> On 11.07.25 16:37, Zi Yan wrote: >>> On 11 Jul 2025, at 2:41, David Hildenbrand wrote: >>> >>>> On 11.07.25 05:02, Zi Yan wrote: >>>>> remap(), folio_ref_unfreeze(), lru_add_split_folio() are not related to >>>>> splitting unmapped folio operations. Move them out to the caller, so that >>>>> __split_unmapped_folio() only splits unmapped folios. This makes >>>>> __split_unmapped_folio() reusable. >>>>> >>>>> Convert VM_BUG_ON(mapping) to use VM_WARN_ON_ONCE_FOLIO(). >>>>> >>>>> Signed-off-by: Zi Yan >>>>> --- >>>>> Based on the prior discussion[1], this patch makes >>>>> __split_unmapped_folio() reusable for splitting unmapped folios without >>>>> adding a new boolean unmapped parameter to guard mapping related code. >>>>> >>>>> Another potential benefit is that __split_unmapped_folio() could be >>>>> called on after-split folios by __folio_split() to perform new split >>>>> methods. For example, at deferred split time, unmapped subpages can >>>>> scatter arbitrarily within a large folio, neither uniform nor non-uniform >>>>> split can maximize after-split folio orders for mapped subpages. >>>>> Hopefully, performing __split_unmapped_folio() multiple times can >>>>> achieve the optimal split result. >>>>> >>>>> It passed mm selftests. >>>>> >>>>> [1] https://lore.kernel.org/linux-mm/94D8C1A4-780C-4BEC-A336-7D3613B54845@nvidia.com/ >>>>> --- >>>>> >>>>> mm/huge_memory.c | 275 ++++++++++++++++++++++++----------------------- >>>>> 1 file changed, 139 insertions(+), 136 deletions(-) >>>>> >>>>> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >>>>> index 3eb1c34be601..d97145dfa6c8 100644 >>>>> --- a/mm/huge_memory.c >>>>> +++ b/mm/huge_memory.c >>>>> @@ -3396,10 +3396,6 @@ static void __split_folio_to_order(struct folio *folio, int old_order, >>>>> * order - 1 to new_order). >>>>> * @split_at: in buddy allocator like split, the folio containing @split_at >>>>> * will be split until its order becomes @new_order. >>>>> - * @lock_at: the folio containing @lock_at is left locked for caller. >>>>> - * @list: the after split folios will be added to @list if it is not NULL, >>>>> - * otherwise to LRU lists. >>>>> - * @end: the end of the file @folio maps to. -1 if @folio is anonymous memory. >>>>> * @xas: xa_state pointing to folio->mapping->i_pages and locked by caller >>>>> * @mapping: @folio->mapping >>>>> * @uniform_split: if the split is uniform or not (buddy allocator like split) >>>>> @@ -3425,51 +3421,27 @@ static void __split_folio_to_order(struct folio *folio, int old_order, >>>>> * @page, which is split in next for loop. >>>>> * >>>>> * After splitting, the caller's folio reference will be transferred to the >>>>> - * folio containing @page. The other folios may be freed if they are not mapped. >>>>> - * >>>>> - * In terms of locking, after splitting, >>>>> - * 1. uniform split leaves @page (or the folio contains it) locked; >>>>> - * 2. buddy allocator like (non-uniform) split leaves @folio locked. >>>>> - * >>>>> + * folio containing @page. The caller needs to unlock and/or free after-split >>>>> + * folios if necessary. >>>>> * >>>>> * For !uniform_split, when -ENOMEM is returned, the original folio might be >>>>> * split. The caller needs to check the input folio. >>>>> */ >>>>> static int __split_unmapped_folio(struct folio *folio, int new_order, >>>>> - struct page *split_at, struct page *lock_at, >>>>> - struct list_head *list, pgoff_t end, >>>>> - struct xa_state *xas, struct address_space *mapping, >>>>> - bool uniform_split) >>>>> + struct page *split_at, struct xa_state *xas, >>>>> + struct address_space *mapping, >>>>> + bool uniform_split) >>>> >>>> Use two-tabs indent please (like we already do, I assume). >>> >>> OK. I was using clang-format. It gave me this indentation. >>>> >>>> [...] >>>> >>>>> @@ -3706,11 +3599,14 @@ static int __folio_split(struct folio *folio, unsigned int new_order, >>>>> { >>>>> struct deferred_split *ds_queue = get_deferred_split_queue(folio); >>>>> XA_STATE(xas, &folio->mapping->i_pages, folio->index); >>>>> + struct folio *next_folio = folio_next(folio); >>>>> bool is_anon = folio_test_anon(folio); >>>>> struct address_space *mapping = NULL; >>>>> struct anon_vma *anon_vma = NULL; >>>>> int order = folio_order(folio); >>>>> + struct folio *new_folio, *next; >>>>> int extra_pins, ret; >>>>> + int nr_shmem_dropped = 0; >>>>> pgoff_t end; >>>>> bool is_hzp; >>>>> @@ -3833,13 +3729,18 @@ static int __folio_split(struct folio *folio, unsigned int new_order, >>>>> */ >>>>> xas_lock(&xas); >>>>> xas_reset(&xas); >>>>> - if (xas_load(&xas) != folio) >>>>> + if (xas_load(&xas) != folio) { >>>>> + ret = -EAGAIN; >>>>> goto fail; >>>>> + } >>>>> } >>>>> /* Prevent deferred_split_scan() touching ->_refcount */ >>>>> spin_lock(&ds_queue->split_queue_lock); >>>>> if (folio_ref_freeze(folio, 1 + extra_pins)) { >>>>> + struct address_space *swap_cache = NULL; >>>>> + struct lruvec *lruvec; >>>>> + >>>>> if (folio_order(folio) > 1 && >>>>> !list_empty(&folio->_deferred_list)) { >>>>> ds_queue->split_queue_len--; >>>>> @@ -3873,18 +3774,120 @@ static int __folio_split(struct folio *folio, unsigned int new_order, >>>>> } >>>>> } >>>>> - ret = __split_unmapped_folio(folio, new_order, >>>>> - split_at, lock_at, list, end, &xas, mapping, >>>>> - uniform_split); >>>>> + if (folio_test_swapcache(folio)) { >>>>> + if (mapping) { >>>>> + VM_WARN_ON_ONCE_FOLIO(mapping, folio); >>>>> + ret = -EINVAL; >>>>> + goto fail; >>>>> + } >>>>> + >>>>> + /* >>>>> + * a swapcache folio can only be uniformly split to >>>>> + * order-0 >>>>> + */ >>>>> + if (!uniform_split || new_order != 0) { >>>>> + ret = -EINVAL; >>>>> + goto fail; >>>>> + } >>>>> + >>>>> + swap_cache = swap_address_space(folio->swap); >>>>> + xa_lock(&swap_cache->i_pages); >>>>> + } >>>>> + >>>>> + /* lock lru list/PageCompound, ref frozen by page_ref_freeze */ >>>>> + lruvec = folio_lruvec_lock(folio); >>>>> + >>>>> + ret = __split_unmapped_folio(folio, new_order, split_at, &xas, >>>>> + mapping, uniform_split); >>>>> + >>>>> + /* >>>>> + * Unfreeze after-split folios and put them back to the right >>>>> + * list. @folio should be kept frozon until page cache entries >>>>> + * are updated with all the other after-split folios to prevent >>>>> + * others seeing stale page cache entries. >>>>> + */ >>>>> + for (new_folio = folio_next(folio); new_folio != next_folio; >>>>> + new_folio = next) { >>>>> + next = folio_next(new_folio); >>>>> + >>>>> + folio_ref_unfreeze( >>>>> + new_folio, >>>>> + 1 + ((mapping || swap_cache) ? >>>>> + folio_nr_pages(new_folio) : >>>>> + 0)); >>>> >>>> While we are at it, is a way to make this look less than an artistic masterpiece? :) >>>> >>>> expected_refs = ... >>>> folio_ref_unfreeze(new_folio, expected_refs). >>>> >>>> >>>> Can we already make use of folio_expected_ref_count() at that point? Mapcount should be 0 and the folio should be properly setup (e.g., anon, swapcache) IIRC. >>>> >>>> So maybe >>>> >>>> expected_refs = folio_expected_ref_count(new_folio) + 1; >>>> folio_ref_unfreeze(new_folio, expected_refs). >>>> >>>> Would do? >>> >>> I think so. Even further, I think we probably can get rid of can_split_folio()’s >>> pextra_pins and use folio_expected_ref_count() too. >> >> That will only do the right think if we know that the folio is not mapped and that there is no way it can get mapped concurrently. >> >> Otherwise, when freezing, we might ignore a mapping (where we should fail freezing). > > You mean between unmap_folio() and folio_ref_freeze(), a concurrent mapping > happens? So that what folio_expected_ref_count() returns has > folio_mapcount() != 0. You are right. Thanks. Right, but maybe locking prevents that. E.g., a locked anon folio cannot get migrated or swapped in. So the mapcount cannot increase once locked. If already mapped, fork() could duplicate mappings, but in that case there would be at least one mapping already. For the pagecache, I think we always map a folio with the folio lock held: see filemap_map_pages(). So *maybe* just checking folio_mapped() before trying to freeze could be good enough, arguing that the mapcount cannot go from 0 -> !0 while the folio is locked. -- Cheers, David / dhildenb