Received: by 2002:a05:7412:518d:b0:e2:908c:2ebd with SMTP id fn13csp404456rdb; Thu, 5 Oct 2023 09:08:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFg71XBtcRhbmrrECJm/BTOB9OgzhVVffqwrioEWwrVFV6LbxOd4V7jk92HBonzv/FSVKtH X-Received: by 2002:a05:6a20:ce90:b0:15e:a8:6bb4 with SMTP id if16-20020a056a20ce9000b0015e00a86bb4mr5123287pzb.8.1696522126840; Thu, 05 Oct 2023 09:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696522126; cv=none; d=google.com; s=arc-20160816; b=hpfJkjprz48BApq6G2XJ2pTwmrp9GG0j+LW8TMmnQe2qSWo2Yd6HaSWHAxiwDLezPO xXbZQwOWi7vIgWxYbMmjtqBEHxP5/kYPWzQu45dewI/xk2oEh6JjBbdx8+dYzLbjv6pa 0nzOVVb49OY1IvqSKKcr/ykqZEH5TcHiIqyDEfTatWlXoXSkJWmSLdzBZmTLyRR9GQ8E BWsdTQkIA7NbQGlR7f5YhLw4uk5uAq99t6WcOpas2kErkObm9DcvmZRh4Hjq4mB5gMnZ mFcv1Z5kn+E0mvj4lGzOhJRn/mee+pGhs81AwS5dpvSHO13IB4Ah8Sqgb4Ahu9h3MV8C nyAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:references :cc:to:subject:from:user-agent:mime-version:date:message-id :dkim-signature; bh=a3FzNmt2Pp89JMPeuTaQSjhdRYVegTP8bI9PQ5clgP0=; fh=/lIMW26osK6pIWiEj1Mc236Ww+VW8nQAt1C2uLFjv9s=; b=mpGTSOVehYVWrbCXn932nrptfQJWxeCu4e1cPwB3OCPXV16TkIKB+qpxYYZWETUX78 3mJKlSW7OdP+3IdQApc6lNDVEHQXXR+ietdEYmGUr48dnqxGIAnXZ1Q4r1oGV73Hde1k 7BQUe0zwtwUL7/+oRE+NS2uC8pM3JJmhYb3FESGDpyPnKVG6ZnhnmBVAGk1AlxB04sAJ xZvjWnHSqPe9jr33NdBi0J8ChFgQwV+9POS12raRxVDea/r63aCZFC+/zAa0Dq3OlfC6 y9ljIfvaZqUkV7LdFvwjI9wybV/LbAKX7ChSNKnPg+vUCBpUsfCqP4Jbsc9DfLx4z1D9 cHXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=G8bvmaeD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id m21-20020a638c15000000b0057ab7d43d5fsi1700617pgd.57.2023.10.05.09.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:08:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=G8bvmaeD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 014BB83BBE63; Thu, 5 Oct 2023 09:08:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237084AbjJEQFc (ORCPT + 99 others); Thu, 5 Oct 2023 12:05:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbjJEQDU (ORCPT ); Thu, 5 Oct 2023 12:03:20 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BAE97FF2B for ; Thu, 5 Oct 2023 08:56:23 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-690bccb0d8aso956788b3a.0 for ; Thu, 05 Oct 2023 08:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1696521382; x=1697126182; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:references:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=a3FzNmt2Pp89JMPeuTaQSjhdRYVegTP8bI9PQ5clgP0=; b=G8bvmaeD1US6ruIPlnElfTLOYJ4EttR0I2wPK2qwQ/XQzg4h2Flm/p5B+JJtZEPOpe MNApFf4C629ZtWDTwyTvaVjwIlSLTRIfaYa7mOoWFMeu52jDtFzSlmScZHXJlQCJrulJ WS3Lne19K0atfSi2tTgcTsCoVjclNzVe7/IdoaxZMcCyzM3YnQYaN40caYfJl8mBfMPT 9zDXLTDW2njumIYys20fbd2p5pDeRg8zEsfGfdBdxfCrjEXSXI3n1T9WuBO8EivwPzVW SwcWzz+fM9b5mwc8JQbTcSkF6tKFMxHq8FgcjhrO95tZTE35VqyRjDkzOezibV0LWY+q o0Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696521382; x=1697126182; h=content-transfer-encoding:in-reply-to:references:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=a3FzNmt2Pp89JMPeuTaQSjhdRYVegTP8bI9PQ5clgP0=; b=rlHAYmZLm2rTGk+YnttJaQhbHLZiTi8QmTKSINNc4OPOOETJa7GaaJYkiHduZBybof c/sjHkg+XHT96SXuXm+1WWpWf+wNP57oDGKMUkKAnep7KzWr9B1Rwp+Oa4iYiaNMalii pPrjH5aTvWHLsbUOcTgqGjLFVHdK38kSjOp/MFrEMnfzEy6CC0QDMf+ZIaruk8QoLM4d 6/1na2sqUvlp/xDubYXeCzRdQX+b1mHi9uJKIL+aywm4OeK8n8jFdXVaYHXj4V2lEuUN EXdCYCOV1Qnmy2UFDVqbe4lBcFtx6R/unuCy0fxPZ29EixWFe0itigrqUBwh/Pht/rz2 8G2w== X-Gm-Message-State: AOJu0YxRz8gptpZzrLLbYeUS7W5lx7IfhakK+RbMiXa3gXMcON6roPhf e4IXwpI96lzL4DJNkrGomddB3w== X-Received: by 2002:a05:6a20:9384:b0:15d:facd:f20c with SMTP id x4-20020a056a20938400b0015dfacdf20cmr6804129pzh.41.1696521382153; Thu, 05 Oct 2023 08:56:22 -0700 (PDT) Received: from [10.254.225.239] ([139.177.225.225]) by smtp.gmail.com with ESMTPSA id m10-20020a170902768a00b001c631236505sm1872060pll.228.2023.10.05.08.56.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 05 Oct 2023 08:56:21 -0700 (PDT) Message-ID: <785511a6-8636-04e5-c002-907443b34dad@bytedance.com> Date: Thu, 5 Oct 2023 23:56:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Peng Zhang Subject: Re: [PATCH v3 9/9] fork: Use __mt_dup() to duplicate maple tree in dup_mmap() To: "Liam R. Howlett" Cc: Peng Zhang , corbet@lwn.net, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, surenb@google.com, michael.christie@oracle.com, mjguzik@gmail.com, mathieu.desnoyers@efficios.com, npiggin@gmail.com, peterz@infradead.org, oliver.sang@intel.com, maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org References: <20230925035617.84767-1-zhangpeng.00@bytedance.com> <20230925035617.84767-10-zhangpeng.00@bytedance.com> <20231003184634.bbb5c5ezkvi6tkdv@revolver> <58ec7a15-6983-d199-bc1a-6161c3b75e0f@bytedance.com> <20231004195347.yggeosopqwb6ftos@revolver> In-Reply-To: <20231004195347.yggeosopqwb6ftos@revolver> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-5.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 05 Oct 2023 09:08:13 -0700 (PDT) 在 2023/10/5 03:53, Liam R. Howlett 写道: > * Peng Zhang [231004 05:10]: >> >> >> 在 2023/10/4 02:46, Liam R. Howlett 写道: >>> * Peng Zhang [230924 23:58]: >>>> In dup_mmap(), using __mt_dup() to duplicate the old maple tree and then >>>> directly replacing the entries of VMAs in the new maple tree can result >>>> in better performance. __mt_dup() uses DFS pre-order to duplicate the >>>> maple tree, so it is very efficient. The average time complexity of >>>> duplicating VMAs is reduced from O(n * log(n)) to O(n). The optimization >>>> effect is proportional to the number of VMAs. >>> >>> I am not confident in the big O calculations here. Although the addition >>> of the tree is reduced, adding a VMA still needs to create the nodes >>> above it - which are a function of n. How did you get O(n * log(n)) for >>> the existing fork? >>> >>> I would think your new algorithm is n * log(n/16), while the >>> previous was n * log(n/16) * f(n). Where f(n) would be something >>> to do with the decision to split/rebalance in bulk insert mode. >>> >>> It's certainly a better algorithm to duplicate trees, but I don't think >>> it is O(n). Can you please explain? >> >> The following is a non-professional analysis of the algorithm. >> >> Let's first analyze the average time complexity of the new algorithm, as >> it is relatively easy to analyze. The maximum number of branches for >> internal nodes in a maple tree in allocation mode is 10. However, to >> simplify the analysis, we will not consider this case and assume that >> all nodes have a maximum of 16 branches. >> >> The new algorithm assumes that there is no case where a VMA with the >> VM_DONTCOPY flag is deleted. If such a case exists, this analysis cannot >> be applied. >> >> The operations of the new algorithm consist of three parts: >> >> 1. DFS traversal of each node in the source tree >> 2. For each node in the source tree, create a copy and construct a new >> node >> 3. Traverse the new tree using mas_find() and replace each element >> >> If there are a total of n elements in the maple tree, we can conclude >> that there are n/16 leaf nodes. Regarding the second-to-last level, we >> can conclude that there are n/16^2 nodes. The total number of nodes in >> the entire tree is given by the sum of n/16 + n/16^2 + n/16^3 + ... + 1. >> This is a geometric progression with a total of log base 16 of n terms. >> According to the formula for the sum of a geometric progression, the sum >> is (n-1)/15. So, this tree has a total of (n-1)/15 nodes and >> (n-1)/15 - 1 edges. >> >> For the operations in the first part of this algorithm, since DFS >> traverses each edge twice, the time complexity would be >> 2*((n-1)/15 - 1). >> >> For the second part, each operation involves copying a node and making >> necessary modifications. Therefore, the time complexity is >> 16*(n-1)/15. >> >> For the third part, we use mas_find() to traverse and replace each >> element, which is essentially similar to the combination of the first >> and second parts. mas_find() traverses all nodes and within each node, >> it iterates over all elements and performs replacements. The time >> complexity of traversing the nodes is 2*((n-1)/15 - 1), and for all >> nodes, the time complexity of replacing all their elements is >> 16*(n-1)/15. >> >> By ignoring all constant factors, each of the three parts of the >> algorithm has a time complexity of O(n). Therefore, this new algorithm >> is O(n). > > Thanks for the detailed analysis! I didn't mean to cause so much work > with this question. I wanted to know so that future work could rely on > this calculation to demonstrate if it is worth implementing without > going through the effort of coding and benchmarking - after all, this > commit message will most likely be examined during that process. > > I asked because O(n) vs O(n*log(n)) doesn't seem to fit with your > benchmarking. It may not be well reflected in the benchmarking of fork() because all the aforementioned time complexity analysis is related to the part involving the maple tree, specifically the time complexity of constructing a new maple tree. However, fork() also includes many other behaviors. > >> >> The exact time complexity of the old algorithm is difficult to analyze. >> I can only provide an upper bound estimation. There are two possible >> scenarios for each insertion: >> >> 1. Appending at the end of a node. >> 2. Splitting nodes multiple times. >> >> For the first scenario, the individual operation has a time complexity >> of O(1). As for the second scenario, it involves node splitting. The >> challenge lies in determining which insertions trigger splits and how >> many splits occur each time, which is difficult to calculate. In the >> worst-case scenario, each insertion requires splitting the tree's height >> log(n) times. Assuming every insertion is in the worst-case scenario, >> the time complexity would be n*log(n). However, not every insertion >> requires splitting, and the number of splits each time may not >> necessarily be log(n). Therefore, this is an estimation of the upper >> bound. > > Saying every insert causes a split and adding in n*log(n) is more than > an over estimation. At worst there is some n + n/16 * log(n) going on > there. > > During the building of a tree, we are in bulk insert mode. This favours > balancing the tree to the left to maximize the number of inserts being > append operations. The algorithm inserts as many to the left as we can > leaving the minimum number on the right. > > We also reduce the number of splits by pushing data to the left whenever > possible, at every level. Yes, but I don't think pushing data would occur when inserting in ascending order in bulk mode because the left nodes are all full, while there are no nodes on the right side. However, I'm not entirely certain about this since I only briefly looked at the implementation of this part. > > >>> >>>> >>>> As the entire maple tree is duplicated using __mt_dup(), if dup_mmap() >>>> fails, there will be a portion of VMAs that have not been duplicated in >>>> the maple tree. This makes it impossible to unmap all VMAs in exit_mmap(). >>>> To solve this problem, undo_dup_mmap() is introduced to handle the failure >>>> of dup_mmap(). I have carefully tested the failure path and so far it >>>> seems there are no issues. >>>> >>>> There is a "spawn" in byte-unixbench[1], which can be used to test the >>>> performance of fork(). I modified it slightly to make it work with >>>> different number of VMAs. >>>> >>>> Below are the test results. By default, there are 21 VMAs. The first row >>>> shows the number of additional VMAs added on top of the default. The last >>>> two rows show the number of fork() calls per ten seconds. The test results >>>> were obtained with CPU binding to avoid scheduler load balancing that >>>> could cause unstable results. There are still some fluctuations in the >>>> test results, but at least they are better than the original performance. >>>> >>>> Increment of VMAs: 0 100 200 400 800 1600 3200 6400 >>>> next-20230921: 112326 75469 54529 34619 20750 11355 6115 3183 >>>> Apply this: 116505 85971 67121 46080 29722 16665 9050 4805 >>>> +3.72% +13.92% +23.09% +33.11% +43.24% +46.76% +48.00% +50.96% > delta 4179 10502 12592 11461 8972 5310 2935 1622 > > Looking at this data, it is difficult to see what is going on because > there is a doubling of the VMAs per fork per column while the count is > forks per 10 seconds. So this table is really a logarithmic table with > increases growing by 10%. Adding the delta row makes it seem like the > number are not growing apart as I would expect. > > If we normalize this to VMAs per second by dividing the forks by 10, > then multiplying by the number of VMAs we get this: > > VMA Count: 21 121 221 421 821 1621 3221 6421 > log(VMA) 1.32 2.00 2.30 2.60 2.90 3.20 3.36 3.81 > next-20230921: 258349.8 928268.7 1215996.7 1464383.7 1707725.0 1842916.5 1420514.5 2044440.9 > this: 267961.5 1057443.3 1496798.3 1949184.0 2446120.6 2704729.5 2102315.0 3086251.5 > delta 9611.7 129174.6 280801.6 484800.3 738395.6 861813.0 681800.5 1041810.6 > > The first thing that I noticed was that we hit some dip in the numbers > at 3221. I first thought that might be something else running on the > host machine, but both runs are affected by around the same percent. > > Here, we do see the delta growing apart, but peaking in growth around > 821 VMAs. Again that 3221 number is out of line. > > If we discard 21 and anything above 1621, we still see both lines are > asymptotic curves. I would expect that the new algorithm would be more > linear to represent O(n), but there is certainly a curve when graphed > with a normalized X-axis. The older algorithm, O(n*log(n)) should be > the opposite curve all together, and with a diminishing return, but it > seems the more elements we have, the more operations we can perform in a > second. Thank you for your detailed analysis. So, are you expecting the transformed data to be close to a constant value? Please note that besides constructing a new maple tree, there are many other operations in fork(). As the number of VMAs increases, the number of fork() calls decreases. Therefore, the overall cost spent on other operations becomes smaller, while the cost spent on duplicating VMAs increases. That's why this data grows with the increase of VMAs. I speculate that if the number of VMAs is large enough to neglect the time spent on other operations in fork(), this data will approach a constant value. If we want to achieve the expected curve, I think we should simulate the process of constructing the maple tree in user space to avoid the impact of other operations in fork(), just like in the current bench_forking(). > > Thinking about what is going on here, I cannot come up with a reason > that there would be a curve to the line at all. If we took more > measurements, I would think the samples would be an ever-increasing line > with variability for some function of 16 - a saw toothed increasing > line. At least, until an upper limit is reached. We can see that the > upper limit was still not achieved at 1621 since 6421 is higher for both > runs, but a curve is evident on both methods, which suggests something > else is a significant contributor. > > I would think each VMA requires the same amount of work, so a constant. > The allocations would again, be some function that would linearly > increase with the existing method over-estimating by a huge number of > nodes. > > I'm not trying to nitpick here, but it is important to be accurate in > the statements because it may alter choices on how to proceed in > improving this performance later. It may be others looking through > these commit messages to see if something can be improved. Thank you for pointing that out. I will try to describe it more accurately in the commit log and see if I can measure the expected curve in user space. > > I also feel like your notes on your algorithm are worth including in the > commit because it could prove rather valuable if we revisit forking in > the future. Do you mean that I should write the analysis of the time complexity of the new algorithm in the commit log? > > The more I look at this, the more questions I have that I cannot answer. > One thing we can see is that the new method is faster in this > micro-benchmark. Yes. It should be noted that in the field of computer science, if the test results don't align with the expected mathematical calculations, it indicates an error in the calculations. This is because accurate calculations will always be reflected in the test results. ???? > >>>> >>>> [1] https://github.com/kdlucas/byte-unixbench/tree/master >>>> >>>> Signed-off-by: Peng Zhang >>>> --- >>>> include/linux/mm.h | 1 + >>>> kernel/fork.c | 34 ++++++++++++++++++++---------- >>>> mm/internal.h | 3 ++- >>>> mm/memory.c | 7 ++++--- >>>> mm/mmap.c | 52 ++++++++++++++++++++++++++++++++++++++++++++-- >>>> 5 files changed, 80 insertions(+), 17 deletions(-) >>>> >>>> diff --git a/include/linux/mm.h b/include/linux/mm.h >>>> index 1f1d0d6b8f20..10c59dc7ffaa 100644 >>>> --- a/include/linux/mm.h >>>> +++ b/include/linux/mm.h >>>> @@ -3242,6 +3242,7 @@ extern void unlink_file_vma(struct vm_area_struct *); >>>> extern struct vm_area_struct *copy_vma(struct vm_area_struct **, >>>> unsigned long addr, unsigned long len, pgoff_t pgoff, >>>> bool *need_rmap_locks); >>>> +extern void undo_dup_mmap(struct mm_struct *mm, struct vm_area_struct *vma_end); >>>> extern void exit_mmap(struct mm_struct *); >>>> static inline int check_data_rlimit(unsigned long rlim, >>>> diff --git a/kernel/fork.c b/kernel/fork.c >>>> index 7ae36c2e7290..2f3d83e89fe6 100644 >>>> --- a/kernel/fork.c >>>> +++ b/kernel/fork.c >>>> @@ -650,7 +650,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, >>>> int retval; >>>> unsigned long charge = 0; >>>> LIST_HEAD(uf); >>>> - VMA_ITERATOR(old_vmi, oldmm, 0); >>>> VMA_ITERATOR(vmi, mm, 0); >>>> uprobe_start_dup_mmap(); >>>> @@ -678,16 +677,25 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, >>>> goto out; >>>> khugepaged_fork(mm, oldmm); >>>> - retval = vma_iter_bulk_alloc(&vmi, oldmm->map_count); >>>> - if (retval) >>>> + /* Use __mt_dup() to efficiently build an identical maple tree. */ >>>> + retval = __mt_dup(&oldmm->mm_mt, &mm->mm_mt, GFP_KERNEL); >>>> + if (unlikely(retval)) >>>> goto out; >>>> mt_clear_in_rcu(vmi.mas.tree); >>>> - for_each_vma(old_vmi, mpnt) { >>>> + for_each_vma(vmi, mpnt) { >>>> struct file *file; >>>> vma_start_write(mpnt); >>>> if (mpnt->vm_flags & VM_DONTCOPY) { >>>> + mas_store_gfp(&vmi.mas, NULL, GFP_KERNEL); >>>> + >>>> + /* If failed, undo all completed duplications. */ >>>> + if (unlikely(mas_is_err(&vmi.mas))) { >>>> + retval = xa_err(vmi.mas.node); >>>> + goto loop_out; >>>> + } >>>> + >>>> vm_stat_account(mm, mpnt->vm_flags, -vma_pages(mpnt)); >>>> continue; >>>> } >>>> @@ -749,9 +757,11 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, >>>> if (is_vm_hugetlb_page(tmp)) >>>> hugetlb_dup_vma_private(tmp); >>>> - /* Link the vma into the MT */ >>>> - if (vma_iter_bulk_store(&vmi, tmp)) >>>> - goto fail_nomem_vmi_store; >>>> + /* >>>> + * Link the vma into the MT. After using __mt_dup(), memory >>>> + * allocation is not necessary here, so it cannot fail. >>>> + */ >>>> + mas_store(&vmi.mas, tmp); >>>> mm->map_count++; >>>> if (!(tmp->vm_flags & VM_WIPEONFORK)) >>>> @@ -760,15 +770,19 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, >>>> if (tmp->vm_ops && tmp->vm_ops->open) >>>> tmp->vm_ops->open(tmp); >>>> - if (retval) >>>> + if (retval) { >>>> + mpnt = vma_next(&vmi); >>>> goto loop_out; >>>> + } >>>> } >>>> /* a new mm has just been created */ >>>> retval = arch_dup_mmap(oldmm, mm); >>>> loop_out: >>>> vma_iter_free(&vmi); >>>> - if (!retval) >>>> + if (likely(!retval)) >>>> mt_set_in_rcu(vmi.mas.tree); >>>> + else >>>> + undo_dup_mmap(mm, mpnt); >>>> out: >>>> mmap_write_unlock(mm); >>>> flush_tlb_mm(oldmm); >>>> @@ -778,8 +792,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, >>>> uprobe_end_dup_mmap(); >>>> return retval; >>>> -fail_nomem_vmi_store: >>>> - unlink_anon_vmas(tmp); >>>> fail_nomem_anon_vma_fork: >>>> mpol_put(vma_policy(tmp)); >>>> fail_nomem_policy: >>>> diff --git a/mm/internal.h b/mm/internal.h >>>> index 7a961d12b088..288ec81770cb 100644 >>>> --- a/mm/internal.h >>>> +++ b/mm/internal.h >>>> @@ -111,7 +111,8 @@ void folio_activate(struct folio *folio); >>>> void free_pgtables(struct mmu_gather *tlb, struct ma_state *mas, >>>> struct vm_area_struct *start_vma, unsigned long floor, >>>> - unsigned long ceiling, bool mm_wr_locked); >>>> + unsigned long ceiling, unsigned long tree_end, >>>> + bool mm_wr_locked); >>>> void pmd_install(struct mm_struct *mm, pmd_t *pmd, pgtable_t *pte); >>>> struct zap_details; >>>> diff --git a/mm/memory.c b/mm/memory.c >>>> index 983a40f8ee62..1fd66a0d5838 100644 >>>> --- a/mm/memory.c >>>> +++ b/mm/memory.c >>>> @@ -362,7 +362,8 @@ void free_pgd_range(struct mmu_gather *tlb, >>>> void free_pgtables(struct mmu_gather *tlb, struct ma_state *mas, >>>> struct vm_area_struct *vma, unsigned long floor, >>>> - unsigned long ceiling, bool mm_wr_locked) >>>> + unsigned long ceiling, unsigned long tree_end, >>>> + bool mm_wr_locked) >>>> { >>>> do { >>>> unsigned long addr = vma->vm_start; >>>> @@ -372,7 +373,7 @@ void free_pgtables(struct mmu_gather *tlb, struct ma_state *mas, >>>> * Note: USER_PGTABLES_CEILING may be passed as ceiling and may >>>> * be 0. This will underflow and is okay. >>>> */ >>>> - next = mas_find(mas, ceiling - 1); >>>> + next = mas_find(mas, tree_end - 1); >>>> /* >>>> * Hide vma from rmap and truncate_pagecache before freeing >>>> @@ -393,7 +394,7 @@ void free_pgtables(struct mmu_gather *tlb, struct ma_state *mas, >>>> while (next && next->vm_start <= vma->vm_end + PMD_SIZE >>>> && !is_vm_hugetlb_page(next)) { >>>> vma = next; >>>> - next = mas_find(mas, ceiling - 1); >>>> + next = mas_find(mas, tree_end - 1); >>>> if (mm_wr_locked) >>>> vma_start_write(vma); >>>> unlink_anon_vmas(vma); >>>> diff --git a/mm/mmap.c b/mm/mmap.c >>>> index 2ad950f773e4..daed3b423124 100644 >>>> --- a/mm/mmap.c >>>> +++ b/mm/mmap.c >>>> @@ -2312,7 +2312,7 @@ static void unmap_region(struct mm_struct *mm, struct ma_state *mas, >>>> mas_set(mas, mt_start); >>>> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, >>>> next ? next->vm_start : USER_PGTABLES_CEILING, >>>> - mm_wr_locked); >>>> + tree_end, mm_wr_locked); >>>> tlb_finish_mmu(&tlb); >>>> } >>>> @@ -3178,6 +3178,54 @@ int vm_brk(unsigned long addr, unsigned long len) >>>> } >>>> EXPORT_SYMBOL(vm_brk); >>>> +void undo_dup_mmap(struct mm_struct *mm, struct vm_area_struct *vma_end) >>>> +{ >>>> + unsigned long tree_end; >>>> + VMA_ITERATOR(vmi, mm, 0); >>>> + struct vm_area_struct *vma; >>>> + unsigned long nr_accounted = 0; >>>> + int count = 0; >>>> + >>>> + /* >>>> + * vma_end points to the first VMA that has not been duplicated. We need >>>> + * to unmap all VMAs before it. >>>> + * If vma_end is NULL, it means that all VMAs in the maple tree have >>>> + * been duplicated, so setting tree_end to 0 will overflow to ULONG_MAX >>>> + * when using it. >>>> + */ >>>> + if (vma_end) { >>>> + tree_end = vma_end->vm_start; >>>> + if (tree_end == 0) >>>> + goto destroy; >>>> + } else >>>> + tree_end = 0; >>>> + >>>> + vma = mas_find(&vmi.mas, tree_end - 1); >>>> + >>>> + if (vma) { >>>> + arch_unmap(mm, vma->vm_start, tree_end); >>>> + unmap_region(mm, &vmi.mas, vma, NULL, NULL, 0, tree_end, >>>> + tree_end, true); >>> >>> next is vma_end, as per your comment above. Using next = vma_end allows >>> you to avoid adding another argument to free_pgtables(). >> Unfortunately, it cannot be done this way. I fell into this trap before, >> and it caused incomplete page table cleanup. To solve this problem, the >> only solution I can think of right now is to add an additional >> parameter. >> >> free_pgtables() will be called in unmap_region() to free the page table, >> like this: >> >> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, >> next ? next->vm_start : USER_PGTABLES_CEILING, >> mm_wr_locked); >> >> The problem is with 'next'. Our 'vma_end' does not exist in the actual >> mmap because it has not been duplicated and cannot be used as 'next'. >> If there is a real 'next', we can use 'next->vm_start' as the ceiling, >> which is not a problem. If there is no 'next' (next is 'vma_end'), we >> can only use 'USER_PGTABLES_CEILING' as the ceiling. Using >> 'vma_end->vm_start' as the ceiling will cause the page table not to be >> fully freed, which may be related to alignment in 'free_pgd_range()'. To >> solve this problem, we have to introduce 'tree_end', and separating >> 'tree_end' and 'ceiling' can solve this problem. > > Can you just use ceiling? That is, just not pass in next and keep the > code as-is? This is how exit_mmap() does it and should avoid any > alignment issues. I assume you tried that and something went wrong as > well? I tried that, but it didn't work either. In free_pgtables(), the following line of code is used to iterate over VMAs: mas_find(mas, ceiling - 1); If next is passed as NULL, ceiling will be 0, resulting in iterating over all the VMAs in the maple tree, including the last portion that was not duplicated. > >> >>> >>>> + >>>> + mas_set(&vmi.mas, vma->vm_end); >>>> + do { >>>> + if (vma->vm_flags & VM_ACCOUNT) >>>> + nr_accounted += vma_pages(vma); >>>> + remove_vma(vma, true); >>>> + count++; >>>> + cond_resched(); >>>> + vma = mas_find(&vmi.mas, tree_end - 1); >>>> + } while (vma != NULL); >>>> + >>>> + BUG_ON(count != mm->map_count); >>>> + >>>> + vm_unacct_memory(nr_accounted); >>>> + } >>>> + >>>> +destroy: >>>> + __mt_destroy(&mm->mm_mt); >>>> +} >>>> + >>>> /* Release all mmaps. */ >>>> void exit_mmap(struct mm_struct *mm) >>>> { >>>> @@ -3217,7 +3265,7 @@ void exit_mmap(struct mm_struct *mm) >>>> mt_clear_in_rcu(&mm->mm_mt); >>>> mas_set(&mas, vma->vm_end); >>>> free_pgtables(&tlb, &mas, vma, FIRST_USER_ADDRESS, >>>> - USER_PGTABLES_CEILING, true); >>>> + USER_PGTABLES_CEILING, USER_PGTABLES_CEILING, true); >>>> tlb_finish_mmu(&tlb); >>>> /* >>>> -- >>>> 2.20.1 >>>> >>> >> >