From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AD3D519F135 for ; Tue, 28 Jan 2025 11:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738064332; cv=none; b=ahVeXVz2KJJojWwu6XxXXDm3EZt0U2PEgB+EBvB96+Nf3O7RTDywKI02a6nDSWPdu6msrCeR+Wmj4xTqNabYz8pnGyS9H1C1fE4WdF9xPNbgdJsxRo6XuhBIupl5VZlaDLRRsTyFboTJfYAwaZydUD03B0Uj+LJ9gQa9bUOG/Y4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738064332; c=relaxed/simple; bh=/g8va55aQcm3vckahQxBVoAzcMiOYtthwnmUaM4yZrw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Eee/m77iwOeRfvSotonWMd68rj8Fcp8vjPUYReiJZGLTTR6O0/YjrJtutXBsqeQZR3dI22zF+p32/o1NIJjS/TwpI1v/ZCKxwGiVzmXxcHCitvs6jwIKHV6ZbqD05OOAhBrjmrPfn0CzaVyUPHqxGFwJFrBIfdO3+sct2M5Yorg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=SAna/76r; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=ARPJhkiZ; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=SAna/76r; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=ARPJhkiZ; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="SAna/76r"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="ARPJhkiZ"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="SAna/76r"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="ARPJhkiZ" 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-out2.suse.de (Postfix) with ESMTPS id A249D1F381; Tue, 28 Jan 2025 11:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1738064328; 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=n4DaC+UTSShwpYPnPfb93ZpXXI/57dT6AUuaAzjfubM=; b=SAna/76rdIg0zB4e5cy0DTVrRXk6X9twT/xdhZHRLsewhku5zvS3o9aGcEPF47EUCMoT6K B8HRUrpt+4YlD4i9GkyUa/hoZUdw34XvFkZfyp569384Jvf2L5eyN7Js5BiVhhJ/gxE3UA +e6Zr1MRFULaAqBpMdIWc53QDi8nunQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1738064328; 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=n4DaC+UTSShwpYPnPfb93ZpXXI/57dT6AUuaAzjfubM=; b=ARPJhkiZKwvowLS5XEazq8Rlb5UTn3EHabWPdxXtPC4uc7+iO7kwftqXZ3rk+4B6i42lbt 732/pXfjlSRU/uDg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1738064328; 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=n4DaC+UTSShwpYPnPfb93ZpXXI/57dT6AUuaAzjfubM=; b=SAna/76rdIg0zB4e5cy0DTVrRXk6X9twT/xdhZHRLsewhku5zvS3o9aGcEPF47EUCMoT6K B8HRUrpt+4YlD4i9GkyUa/hoZUdw34XvFkZfyp569384Jvf2L5eyN7Js5BiVhhJ/gxE3UA +e6Zr1MRFULaAqBpMdIWc53QDi8nunQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1738064328; 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=n4DaC+UTSShwpYPnPfb93ZpXXI/57dT6AUuaAzjfubM=; b=ARPJhkiZKwvowLS5XEazq8Rlb5UTn3EHabWPdxXtPC4uc7+iO7kwftqXZ3rk+4B6i42lbt 732/pXfjlSRU/uDg== 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 911E513715; Tue, 28 Jan 2025 11:38:48 +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 hUH6IsjBmGeDIQAAD6G6ig (envelope-from ); Tue, 28 Jan 2025 11:38:48 +0000 Message-ID: <86bed9d6-299f-4e28-8cb3-c60a5df78493@suse.cz> Date: Tue, 28 Jan 2025 12:38:48 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/5] mm: simplify vma merge structure and expand comments Content-Language: en-US To: Lorenzo Stoakes , Andrew Morton Cc: "Liam R . Howlett" , Jann Horn , linux-mm@kvack.org, linux-kernel@vger.kernel.org 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-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email,suse.cz:mid] X-Spam-Score: -4.30 X-Spam-Flag: NO On 1/27/25 16:50, Lorenzo Stoakes wrote: > The merge code, while much improved, still has a number of points of > confusion. As part of a broader series cleaning this up to make this more > maintainable, we start by addressing some confusion around vma_merge_struct > fields. > > So far, the caller either provides no vmg->vma (a new VMA) or supplies the > existing VMA which is being altered, setting vmg->start,end,pgoff to the > proposed VMA dimensions. > > vmg->vma is then updated, as are vmg->start,end,pgoff as the merge process > proceeds and the appropriate merge strategy is determined. > > This is rather confusing, as vmg->vma starts off as the 'middle' VMA > between vmg->prev,next, but becomes the 'target' VMA, except in one > specific edge case (merge next, shrink middle). > > Int his patch we introduce vmg->middle to describe the VMA that is between > vmg->prev and vmg->next, and does NOT change during the merge operation. > > We replace vmg->vma with vmg->target, and use this only during the merge > operation itself. Yeah that's much better. > Aside from the merge right, shrink middle case, this becomes the VMA that > forms the basis of the VMA that is returned. This edge case can be > addressed in a future commit. > > We also add a number of comments to explain what is going on. > > Finally, we adjust the ASCII diagrams showing each merge case in > vma_merge_existing_range() to be clearer - the arrow range previously > showed the vmg->start, end spanned area, but it is clearer to change this > to show the final merged VMA. > > This patch has no change in functional behaviour. > > Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka > --- a/mm/vma.h > +++ b/mm/vma.h > @@ -69,16 +69,48 @@ enum vma_merge_flags { > VMG_FLAG_JUST_EXPAND = 1 << 0, > }; > > -/* Represents a VMA merge operation. */ > +/* > + * Describes a VMA merge operation and is threaded throughout it. > + * > + * Any of the fields may be mutated by the merge operation, so no guarantees are > + * made to the contents of this structure after a merge operation has completed. > + */ Well this patch seems like a step in the direction to limit what's mutated, and perhaps defining some of the guarantees (via const?) could be then possible? > struct vma_merge_struct { > struct mm_struct *mm; > struct vma_iterator *vmi; > - pgoff_t pgoff; > + /* > + * Adjacent VMAs, any of which may be NULL if not present: > + * > + * |------|--------|------| > + * | prev | middle | next | > + * |------|--------|------| > + * > + * middle may not yet exist in the case of a proposed new VMA being > + * merged, or it may be an existing VMA. > + * > + * next may be assigned by the caller. Caller of what?