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 38EDEC3DA4A for ; Thu, 8 Aug 2024 16:27:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 982DD6B0085; Thu, 8 Aug 2024 12:27:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90AE66B0088; Thu, 8 Aug 2024 12:27:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75D646B008A; Thu, 8 Aug 2024 12:27:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 541D66B0085 for ; Thu, 8 Aug 2024 12:27:53 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DC4AD8141C for ; Thu, 8 Aug 2024 16:27:52 +0000 (UTC) X-FDA: 82429609584.02.38EA8CB Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf03.hostedemail.com (Postfix) with ESMTP id 591FD2002E for ; Thu, 8 Aug 2024 16:27:49 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R6phpp2G; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="sfNBYC7/"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R6phpp2G; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="sfNBYC7/"; spf=pass (imf03.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 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=1723134404; 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=yp+k+hBMouHQOgU7UqLezr6qgqiaH9RJ8ONtm90+BPc=; b=Yi8Z2qh4XgukkT18m4Ei9pTsb4gsAjAoG0GigMsyMtpVde1zPfzwnIewMLk60s1Z/+7HJS 02VGg0dhVUfiyfs6GteskZNr6FXjqbw9WlZX6Mh1Y6CcHugEfdLBhAhvRCHZCfUJD3CH92 pIan82aGgED40sNsaVzaPq67GYVc8Pw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723134404; a=rsa-sha256; cv=none; b=T5ZpBKcb1s3SlV4f6j04Y197DfFDYsAYo+85b1ZWfzgrC/1KwkVFWfvK2M6e9yNjIXw1Oz /Noo7dnpx9erKC/RDHIEYGITM/XfwCZuBFfCLkvDVysUk6GVimRdkB2x0tt0v2HmrN8M6I r+PLdoiAVmVWDqQoKh9ELgr0PhWTJoA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R6phpp2G; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="sfNBYC7/"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R6phpp2G; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="sfNBYC7/"; spf=pass (imf03.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 78F971FCF0; Thu, 8 Aug 2024 16:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1723134467; 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=yp+k+hBMouHQOgU7UqLezr6qgqiaH9RJ8ONtm90+BPc=; b=R6phpp2GYsmhNBIXB2mQ8G/bB4xrf0+vZO9G39Ra9t9zpdrjXbs3ZC/jV/1fH78LMyDcPG GdrQu9Sr/hpRMb/2eqm8A7JdWlpoQ8vyvrSud8D0XgB21DpDFSmot4Fc7TVngMvkKdYf/d 66DJoyHWPshfG7C9bOJXYIkcQiYIAJs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1723134467; 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=yp+k+hBMouHQOgU7UqLezr6qgqiaH9RJ8ONtm90+BPc=; b=sfNBYC7/qG0crGDqwyXCY1lXDO7Dy9ggWvXXHdAf5jC4QYYtu/xXy7KxkAtxgiWK3RB+Tz x7M9mubnN2dzF/Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1723134467; 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=yp+k+hBMouHQOgU7UqLezr6qgqiaH9RJ8ONtm90+BPc=; b=R6phpp2GYsmhNBIXB2mQ8G/bB4xrf0+vZO9G39Ra9t9zpdrjXbs3ZC/jV/1fH78LMyDcPG GdrQu9Sr/hpRMb/2eqm8A7JdWlpoQ8vyvrSud8D0XgB21DpDFSmot4Fc7TVngMvkKdYf/d 66DJoyHWPshfG7C9bOJXYIkcQiYIAJs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1723134467; 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=yp+k+hBMouHQOgU7UqLezr6qgqiaH9RJ8ONtm90+BPc=; b=sfNBYC7/qG0crGDqwyXCY1lXDO7Dy9ggWvXXHdAf5jC4QYYtu/xXy7KxkAtxgiWK3RB+Tz x7M9mubnN2dzF/Aw== 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 D687013BA9; Thu, 8 Aug 2024 12:49:03 +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 fDh4M7++tGZQZAAAD6G6ig (envelope-from ); Thu, 08 Aug 2024 12:49:03 +0000 Message-ID: Date: Thu, 8 Aug 2024 14:49:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 02/10] mm: introduce vma_merge_struct and abstract merge parameters Content-Language: en-US To: Lorenzo Stoakes , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: "Liam R . Howlett" 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-Action: no action X-Stat-Signature: eobq4ipsm53qcfpqg8ao8j6t3fcykyeh X-Rspamd-Queue-Id: 591FD2002E X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1723134469-722636 X-HE-Meta: U2FsdGVkX1/k+euImiJeKH6D4as6JvWKMsCUftIb/JN49QScwIWRugyLI52jptXm/EvyCvWkmEAA8VyuP7n9DJAP84OsSLAaa7j9h+2+hGOt1MmPLnCe1/68ruJfc+jBo0sDcMC/4RUaUBUlW77ac2dap65/LQDRQPxAzMnAqDumRzoQqK/udUjLwil1TH974MENwwa5oi04rXOSDxBqChUjPgh4Qsm3UxXjb6aSJji6LZp5Om1PSepxebZRU5XeDD0j+Et35/tS+wDWdSeh4fmMnaz4c5k3bpAe8R5bY2d1CMF2Qvf41kr3Hahhj0v4HbXxGW0Qx9FOgPp6ml8RpDXOgVmMSopn6eD8mgAGJxblCZHMtK2tJ8YY4ffT4LwAnl2zTMB6UwLJQ85cUYsW8TbldhPiwL/3v7//dEbRWudqZPtzdw/tJXEi3vQZBahGAl0YkgQfA/8WFz8GhiqrzRiQ+SSr1zbJ0FRSSkg8eMxI6rGUp1z0JQdfB/aTFnsYEApBAcxpfGJCdQQU9lbkfputj7sL2AEOz6OX0+JIXTJ5mienhczNdw7Qb5YUDleaXLPaR8fyY4IVYg5sIfnwRmge7ShyS8qgy4+BH+SknGFkMpJHJWSjcoGtqV8q1OdeddPA0HHBl1wZJ04EAouN3MpzklhysGF27wcqpZCLILHtgrF4z/fAJcP7yfsXJwnh3ZJXg9UZC63A0JsIPFM0UzL5exbRLrImdileu148iseemwE00K//Ug+hD2fu60FZBf0v9TlV7+8J3PH6vtjtx6VtwdofkubOM+g+sxEKYeKnJcboIMLYe8h4g0NzbpfK3G/eIn2Sr9PoZLT4qjGqnIEVYbpelGJH2biIh2Ewv6EFHRmHHAbWIxk5LtfIK5tVstY7bccZ6k+f2klg6CYoNmzuC+EUoQbDxQ1ZTfLTg4djnhhX/U6WdSloxx2VZO06QAvuLKmunwBL765/kFG YvttJh9V Cnf50Ub41g22Zy8NcpYVxaroOsQBexywROmeFo5wocPb/c3C7mo/JBAmsGOKWxHtYkcocYxxWhO7FoESGFheZSDbb4icfavWm4APLaMLX8iOMzypAsq5imHJEAjBJQMViJRrOALDN3aIN9r8YyOxeOcOxrZqm3KOfKL6puwZmUk8byIwp1MZqlutQeJdnlNGx7EAJPPs+FmxzVsZ3hV/n+4iIy0fkmiiVl+kjVFCh8bkheQof7bjzXrSptoW+O3+EfuIQRsqL+B5kuOdDNBQTGC7F78bUe12tsiZV5wIIfRwNRQGFkCoT8iAiApW+GFKQmrN+Qww8+aPDJIM= 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 8/5/24 14:13, Lorenzo Stoakes wrote: > Rather than passing around huge numbers of parameters to numerous helper > functions, abstract them into a single struct that we thread through the > operation. > > Signed-off-by: Lorenzo Stoakes In general, Acked-by: Vlastimil Babka It would be great to have the tests already at this point but I understand they depend on this. At least the result can be tested later in the series... I haven't seen the final form yet, so some suggestions may become moot. > +static struct vm_area_struct *vma_merge(struct vma_merge_struct *vmg) > { > - struct mm_struct *mm = src->vm_mm; > - struct anon_vma *anon_vma = src->anon_vma; > - struct file *file = src->vm_file; > + struct mm_struct *mm = container_of(vmg->vmi->mas.tree, struct mm_struct, mm_mt); This feels weird, but I'll leave it to Liam. Can't we just pass the mm? Hope it's one of the things that will disappear in later patch :) > + struct vm_area_struct *prev = vmg->prev; > struct vm_area_struct *curr, *next, *res; > struct vm_area_struct *vma, *adjust, *remove, *remove2; > struct vm_area_struct *anon_dup = NULL; > +/* Assumes addr >= vma->vm_start. */ > +static pgoff_t vma_pgoff_offset(struct vm_area_struct *vma, unsigned long addr) > +{ > + return vma->vm_pgoff + PHYS_PFN(addr - vma->vm_start); > +} > + > +struct vm_area_struct *vma_modify_flags(struct vma_iterator *vmi, > + struct vm_area_struct *prev, > + struct vm_area_struct *vma, > + unsigned long start, unsigned long end, > + unsigned long new_flags) > +{ > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = prev, > + .vma = vma, > + .start = start, > + .end = end, > + .flags = new_flags, > + .pgoff = vma_pgoff_offset(vma, start), > + .file = vma->vm_file, > + .anon_vma = vma->anon_vma, > + .policy = vma_policy(vma), > + .uffd_ctx = vma->vm_userfaultfd_ctx, > + .anon_name = anon_vma_name(vma), > + }; > + > + return vma_modify(&vmg); > +} > + > +struct vm_area_struct > +*vma_modify_flags_name(struct vma_iterator *vmi, > + struct vm_area_struct *prev, > + struct vm_area_struct *vma, > + unsigned long start, > + unsigned long end, > + unsigned long new_flags, > + struct anon_vma_name *new_name) > +{ > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = prev, > + .vma = vma, > + .start = start, > + .end = end, > + .flags = new_flags, > + .pgoff = vma_pgoff_offset(vma, start), > + .file = vma->vm_file, > + .anon_vma = vma->anon_vma, > + .policy = vma_policy(vma), > + .uffd_ctx = vma->vm_userfaultfd_ctx, > + .anon_name = new_name, > + }; > + > + return vma_modify(&vmg); > +} > + > +struct vm_area_struct > +*vma_modify_policy(struct vma_iterator *vmi, > + struct vm_area_struct *prev, > + struct vm_area_struct *vma, > + unsigned long start, unsigned long end, > + struct mempolicy *new_pol) > +{ > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = prev, > + .vma = vma, > + .start = start, > + .end = end, > + .flags = vma->vm_flags, > + .pgoff = vma_pgoff_offset(vma, start), > + .file = vma->vm_file, > + .anon_vma = vma->anon_vma, > + .policy = new_pol, > + .uffd_ctx = vma->vm_userfaultfd_ctx, > + .anon_name = anon_vma_name(vma), > + }; > + > + return vma_modify(&vmg); > +} > + > +struct vm_area_struct > +*vma_modify_flags_uffd(struct vma_iterator *vmi, > + struct vm_area_struct *prev, > + struct vm_area_struct *vma, > + unsigned long start, unsigned long end, > + unsigned long new_flags, > + struct vm_userfaultfd_ctx new_ctx) > +{ > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = prev, > + .vma = vma, > + .start = start, > + .end = end, > + .flags = new_flags, > + .file = vma->vm_file, > + .anon_vma = vma->anon_vma, > + .pgoff = vma_pgoff_offset(vma, start), > + .policy = vma_policy(vma), > + .uffd_ctx = new_ctx, > + .anon_name = anon_vma_name(vma), > + }; > + > + return vma_modify(&vmg); > } > > /* > @@ -1180,8 +1274,22 @@ struct vm_area_struct > struct vm_area_struct *vma, unsigned long start, > unsigned long end, pgoff_t pgoff) > { > - return vma_merge(vmi, prev, vma, start, end, vma->vm_flags, pgoff, > - vma_policy(vma), vma->vm_userfaultfd_ctx, anon_vma_name(vma)); > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = prev, > + .vma = vma, > + .start = start, > + .end = end, > + .flags = vma->vm_flags, > + .file = vma->vm_file, > + .anon_vma = vma->anon_vma, > + .pgoff = pgoff, > + .policy = vma_policy(vma), > + .uffd_ctx = vma->vm_userfaultfd_ctx, > + .anon_name = anon_vma_name(vma), > + }; > + > + return vma_merge(&vmg); > } > > /* > @@ -1193,11 +1301,22 @@ struct vm_area_struct *vma_merge_extend(struct vma_iterator *vmi, > unsigned long delta) > { > pgoff_t pgoff = vma->vm_pgoff + vma_pages(vma); > + struct vma_merge_struct vmg = { > + .vmi = vmi, > + .prev = vma, > + .vma = vma, > + .start = vma->vm_end, > + .end = vma->vm_end + delta, > + .flags = vma->vm_flags, > + .file = vma->vm_file, > + .pgoff = pgoff, > + .policy = vma_policy(vma), > + .uffd_ctx = vma->vm_userfaultfd_ctx, > + .anon_name = anon_vma_name(vma), > + }; Wonder if there's a way to initialize a "standard" vmg and then apply the usage-specific differences on top, instead of needing many repeated but subtly different blocks like above. > > /* vma is specified as prev, so case 1 or 2 will apply. */ > - return vma_merge(vmi, vma, vma, vma->vm_end, vma->vm_end + delta, > - vma->vm_flags, pgoff, vma_policy(vma), > - vma->vm_userfaultfd_ctx, anon_vma_name(vma)); > + return vma_merge(&vmg); > } > > void unlink_file_vma_batch_init(struct unlink_vma_file_batch *vb) > diff --git a/mm/vma.h b/mm/vma.h > index 6efdf1768a0a..c31684cc1da6 100644