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 BABCED0C5F4 for ; Fri, 25 Oct 2024 09:43:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52D346B008A; Fri, 25 Oct 2024 05:43:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DC786B008C; Fri, 25 Oct 2024 05:43:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37D846B0096; Fri, 25 Oct 2024 05:43:25 -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 1C11D6B008A for ; Fri, 25 Oct 2024 05:43:25 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 97AE3A0721 for ; Fri, 25 Oct 2024 09:42:49 +0000 (UTC) X-FDA: 82711636560.14.DF721A0 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf16.hostedemail.com (Postfix) with ESMTP id 0E9ED18001B for ; Fri, 25 Oct 2024 09:43:02 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=A8k+KCSk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=xMGhyKyg; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=A8k+KCSk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=xMGhyKyg; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729849249; 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=Fkow1kgNcOrWQwdPZWs0Qu/RTSGpxVj/arg07S6n7jc=; b=FSUFuK7k7sSe3SrnSU5/Td1kqQ982MZkva557corxgsola0nEkPeH9542RfpeRiWsBtpZl +hvxE71W57HAegI5CzkcfdIXTq52osnaDYQ0KRzUv9QtxMJYY5JNhua3GIUDBi82XUzVh2 iGbn3egA93g+J56LwjPyUko1nSB3voc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729849249; a=rsa-sha256; cv=none; b=LXo7Ci8PsxFKk89NzyXqmB5mRZiNuwhE2D4XLl2C7aREJ2hpFvOuO+AaFn85cIW1N/UjHD hUlmZDWMoA5GdAVgY5IGlZ2S+KyRQH5zrGl+I3nCKfSkUSXtb+mjOzsXCvZg4yLvkjpFOH SEEo62pu0dBUj3HUQjjzzh3T9tZur40= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=A8k+KCSk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=xMGhyKyg; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=A8k+KCSk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=xMGhyKyg; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AF45321D0E; Fri, 25 Oct 2024 09:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1729849400; h=from:from:reply-to: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=Fkow1kgNcOrWQwdPZWs0Qu/RTSGpxVj/arg07S6n7jc=; b=A8k+KCSkM672TBgSBF1cFG7ymJkWpsUfBzM/3TKETSiUqpFTolZpkpDYIDKqXvselQDAnZ HnlQEUfiHEl0V3F74TlPEWS/HY29l9mnKJ3saU734+6RLfA9TDBsQVKQvA+gSbutFhuSY7 3ezUjKfGkRwjBNlgqNRhWPfW3qoGD4Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1729849400; h=from:from:reply-to: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=Fkow1kgNcOrWQwdPZWs0Qu/RTSGpxVj/arg07S6n7jc=; b=xMGhyKygu0tYuflrUM0/MQx//7x+EGlBuzm/d/3P5gZ9tJa/qMvqtJ4U0or5MZ7/2hXMWU Ut8m3MBJgSG4FjCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1729849400; h=from:from:reply-to: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=Fkow1kgNcOrWQwdPZWs0Qu/RTSGpxVj/arg07S6n7jc=; b=A8k+KCSkM672TBgSBF1cFG7ymJkWpsUfBzM/3TKETSiUqpFTolZpkpDYIDKqXvselQDAnZ HnlQEUfiHEl0V3F74TlPEWS/HY29l9mnKJ3saU734+6RLfA9TDBsQVKQvA+gSbutFhuSY7 3ezUjKfGkRwjBNlgqNRhWPfW3qoGD4Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1729849400; h=from:from:reply-to: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=Fkow1kgNcOrWQwdPZWs0Qu/RTSGpxVj/arg07S6n7jc=; b=xMGhyKygu0tYuflrUM0/MQx//7x+EGlBuzm/d/3P5gZ9tJa/qMvqtJ4U0or5MZ7/2hXMWU Ut8m3MBJgSG4FjCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8E20E132D3; Fri, 25 Oct 2024 09:43:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 8s9ZIjhoG2ezewAAD6G6ig (envelope-from ); Fri, 25 Oct 2024 09:43:20 +0000 Message-ID: <2ca9450c-b5aa-4e7d-aa7b-437d9aec45dd@suse.cz> Date: Fri, 25 Oct 2024 11:43:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 8/8] mm: defer second attempt at merge on mmap() Content-Language: en-US To: Lorenzo Stoakes , Andrew Morton Cc: "Liam R . Howlett" , Jann Horn , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Peter Xu References: From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 0E9ED18001B X-Stat-Signature: c76uyc4jiititxxo6fcfqazg4zpkatgu X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1729849382-940103 X-HE-Meta: U2FsdGVkX1/AxdzF7piq59DEkAq3SEHT6Ntb5QXruWDK149kFW3Iaz0ns871FL+RM6s84oSoCLt4wg4vfuXZfSstWBYqIaxwJoqmu9hpf+c7/5KcNhiWCtwjF2HVvfiDzLZ+EdLwY1p1QdmRRYbiDSsbdCLvixOSiJPpkdIjBFxZUD5uyc2odWOG0SSZjKDoIOcHfskan8sPr76zKnEy1E0zHEGBEvCHIRcLaB9gKKbGdkpXPDTEY5hfYGcfBLrP3xsVXKTZJVs3/xWNZN25cFfhpCNGdKuoCTsYI/f0v0d1pvFfWTFzcgfv+t2szX8AP4OgR6Gjt2Z9XI9i1RLHxcV9o+lXhPTrWfNJY21rVzGR+dt84GXKji53uammHCb5JMqFEUnB3d/Jukcw+8+Bccv7j7hFehWF+eefXXYOH6ayv0liSixDcO0M6mr0mC/OK5Gxcde6s80+aMLx1DsHAZvqbqB2JvLJ5TMgKXSQU2v+OouG5RME/rcvUetdncvo+slzLpTCwh5VeFwEwo45qwwUw+g9OfRo8rMvqmEjIkx/F1wYAhMDCirdpbVhb/u+1icRjHNeh8SzpiVfeumsr1fd/QO/bWPMa+N03Ef0ypFIizQAdsXj5KNzJsLMBk1JGGYzha/MqxRjXkIttAbtc+90GnjeVH0SiRuP+W8p92YtnREN3mNB6jQL0LPsCDcd5gLY4xPM0RSgvss1NNzplUYap9lLc9qlgewqKDf9g+minTJAO5iojBhOG4PALK8JI8XqmdHCY6DkWwQKzJkhl5osSVHwmQsbbnAt1hXUy9ljcjkM42cWz0kwBxm+XU4zvQSg170axle7QljQUpQdxJZZRAQRVnJ3qFImhv9kyR6KXZsPUxg0nQ9pEHAMDXKNeFsCes5mJeEHs0ROrDhzNWlKhNIbx4D8VX4YoY9E841yHhOU5++EDXXdXu24EYyAHWI7L023XnVMcp8wic0 lBq1cyBk 51Apotr79TRri3CmD9j7Hc8v7l2SX94uWo+vqnRdXd0zzUevC5qO7bdvxbE/6p9mGoi2/Pe/qMo/y5rfXl0NKC7KgafrjopSnVKnKcGqwPhHYnDeE3VYu74MpIpezgB05nzE9meAgqu7Ohu8ldyC8nmNZei+lA9O9TBeTa8eGfsq28m4+IA+3YPqpuObi/eMq22/fqJccZ7nKC9K/oUF+R8uyeZkoPg/M976OiIyqVZ3szEZ/AyHwWIQaFZhVTtXLr3bS5JjI7RINfdNLBmY/7WWcT4uY3v+FyCyYQrPkv7MrefU9MvmZAHwvlw== 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 10/23/24 22:38, Lorenzo Stoakes wrote: > Rather than trying to merge again when ostensibly allocating a new VMA, > instead defer until the VMA is added and attempt to merge the existing > range. > > This way we have no complicated unwinding logic midway through the process > of mapping the VMA. > > In addition this removes limitations on the VMA not being able to be the > first in the virtual memory address space which was previously implicitly > required. > > It also performs this merge after the final flag adjustments are performed, > something that was not done previously and thus might have prevented > possibly valid merges in the past. > > In theory, for this very same reason, we should unconditionally attempt > merge here, however this is likely to have a performance impact so it is > better to avoid this given the unlikely outcome of a merge. Maybe just expand the cases where we set map->retry_merge, i.e. in case the final flag adjustments do anything? > The vmg state will already have been reset by the first attempt at a merge > so we only need to reset the iterator, set the vma and flags and try again. > > Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka A nit: > --- > mm/vma.c | 75 ++++++++++++++++++++------------------------------------ > 1 file changed, 26 insertions(+), 49 deletions(-) > > diff --git a/mm/vma.c b/mm/vma.c > index 065f5e1f65be..c493ecebf394 100644 > --- a/mm/vma.c > +++ b/mm/vma.c > @@ -19,6 +19,7 @@ struct mmap_state { > struct file *file; > > unsigned long charged; > + bool retry_merge; > > struct vm_area_struct *prev; > struct vm_area_struct *next; > @@ -2280,9 +2281,9 @@ static int __mmap_prepare(struct mmap_state *map, struct vma_merge_struct *vmg, > return 0; > } > > + > static int __mmap_new_file_vma(struct mmap_state *map, > - struct vma_merge_struct *vmg, > - struct vm_area_struct **vmap, bool *mergedp) > + struct vm_area_struct **vmap) > { > struct vma_iterator *vmi = map->vmi; > struct vm_area_struct *vma = *vmap; > @@ -2311,37 +2312,11 @@ static int __mmap_new_file_vma(struct mmap_state *map, > !(map->flags & VM_MAYWRITE) && > (vma->vm_flags & VM_MAYWRITE)); > > - vma_iter_config(vmi, map->addr, map->end); > - /* > - * If flags changed after mmap_file(), we should try merge > - * vma again as we may succeed this time. > - */ > - if (unlikely(map->flags != vma->vm_flags && map->prev)) { > - struct vm_area_struct *merge; > - > - vmg->flags = vma->vm_flags; > - /* If this fails, state is reset ready for a reattempt. */ > - merge = vma_merge_new_range(vmg); > - > - if (merge) { > - /* > - * ->mmap() can change vma->vm_file and fput > - * the original file. So fput the vma->vm_file > - * here or we would add an extra fput for file > - * and cause general protection fault > - * ultimately. > - */ > - fput(vma->vm_file); > - vm_area_free(vma); > - vma = merge; > - *mergedp = true; > - } else { > - vma_iter_config(vmi, map->addr, map->end); > - } > - } > + /* If the flags change (and are mergeable), let's retry later. */ > + map->retry_merge = vma->vm_flags != map->flags && !(vma->vm_flags & VM_SPECIAL); > > + vma_iter_config(vmi, map->addr, map->end); Do we need this still? __mmap_new_vma() did that and nothing changed since in the non-error case, AFAICS? > map->flags = vma->vm_flags; > - *vmap = vma; > return 0; > } >