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 86F16C3DA64 for ; Tue, 6 Aug 2024 12:50:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 173F16B0088; Tue, 6 Aug 2024 08:50:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FDB66B0089; Tue, 6 Aug 2024 08:50:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB97D6B008C; Tue, 6 Aug 2024 08:50:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C90066B0088 for ; Tue, 6 Aug 2024 08:50:23 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 84F541621DE for ; Tue, 6 Aug 2024 12:50:23 +0000 (UTC) X-FDA: 82421803926.24.F138D3F Received: from bee.tesarici.cz (bee.tesarici.cz [37.205.15.56]) by imf15.hostedemail.com (Postfix) with ESMTP id BDCC4A0016 for ; Tue, 6 Aug 2024 12:50:21 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=tesarici.cz header.s=mail header.b=SCE+sKVo; spf=pass (imf15.hostedemail.com: domain of petr@tesarici.cz designates 37.205.15.56 as permitted sender) smtp.mailfrom=petr@tesarici.cz; dmarc=pass (policy=quarantine) header.from=tesarici.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722948614; 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=y6V3imBPTklgQg9pDb3ERB5uieHvs7IMBkapax2rleY=; b=QCa8zcgEdk+sUyi2H/wGMiid/KBEsMXua6Fd8SQ+sexAzUwMJKc24uiqmr7Lk+cmiKA+7t pEMtav+Riw238g85OhTi1zrnUfE3lBleIEth4eYrBjmC/c8qmfjpVlmhJMr6VH4SuVReMx Hd7ft6FFAc4BSoA1TSJu+LkVuMwgNK4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=tesarici.cz header.s=mail header.b=SCE+sKVo; spf=pass (imf15.hostedemail.com: domain of petr@tesarici.cz designates 37.205.15.56 as permitted sender) smtp.mailfrom=petr@tesarici.cz; dmarc=pass (policy=quarantine) header.from=tesarici.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722948614; a=rsa-sha256; cv=none; b=L+eQWI77f5LG4+BaEkZ8OnzDsIwF/GdOgLSSIbnZ4HiXI1iDEnYCOS5iqupa5yNw0Fa6a6 QPoflqCvuILdJxjz1QSTN283TgNI3pTf+sla2vgXaQGZd3z0c+uZx0FEU2RkEAhIohi6Pa MwNLtrgXuffQ1TW0d5bjTfmEk62+Zik= Received: from mordecai.tesarici.cz (unknown [213.235.133.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bee.tesarici.cz (Postfix) with ESMTPSA id 2E5B81D3A2C; Tue, 6 Aug 2024 14:50:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tesarici.cz; s=mail; t=1722948620; bh=y6V3imBPTklgQg9pDb3ERB5uieHvs7IMBkapax2rleY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SCE+sKVoJK9wRiLzRNTOfiJn9tXWapLJX+9qKA60wTjhNwn0dgduoeQ0+QcvcdU/i 3y2BR26g15cQFJ1gOn86AN9mTYDBdIKRAeeoQJCj0KD+gqbrjJXTN43lZLxqHWoDgr QEzZxA+Ye3BL9orS90/bZqutsT7DznSqQzDoGmEW15SOh+op9V1qQPG7a+LVAlxtKk /mzX2b9brrw+yoHV8MfaHW6bZ+HwsfsnQExZGfpmpkd8J3G3ovErJk+zyZ01FztgRb oRBcuDZG73BXYIZsuLDkvWCOJ1x+lj9xIh6rLw3Ht/m9rRP0zC1mtXTI+RPIu4JdFq NSEeEYurgfuIg== Date: Tue, 6 Aug 2024 14:50:14 +0200 From: Petr =?UTF-8?B?VGVzYcWZw61r?= To: Lorenzo Stoakes Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , "Liam R . Howlett" , Vlastimil Babka Subject: Re: [PATCH 03/10] mm: abstract duplicated policy comparison Message-ID: <20240806145014.7e2c8557@mordecai.tesarici.cz> In-Reply-To: References: X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: ot1nkjux1aa8d1kwz5tapw4i3wims85r X-Rspamd-Queue-Id: BDCC4A0016 X-Rspamd-Server: rspam11 X-HE-Tag: 1722948621-544621 X-HE-Meta: U2FsdGVkX1+2Pey7aXZGTRb3fWooUHjXy3s2fS/jsuIgv6p8VRu88VNKBRKJOGQnQfnmoXm5U7aqX0pVreKSnvqjNUpbkjhVlfKW9dOnMtK4JtUEHjJqvw9Es6NTUhGRlNfhNArMmT/4JpVa+OJxCWTSc/Db6GGA+b59YqBLkkQ75pA6/vXj3YoPooOjoHo4Btjd0wEF4d+Tt0Be7bJyju4ArqHha2a/Sjck5ououIDtp6FRrfd9P7xxfDW/iMLOYASqnx+V3y7nme/pZifgQaNJMAtWzBHZLpadAmxoWVdiZ6JYab01R2gU3VVUtd05BB9TFpTNe3Cb9DnKkZgSugOpkeyRRvTNdtJa07H2D5Kp4MD8+n80F+4BlPD8zkLFPc6K9CcK2ILslUhdBY/enEL9nyzKuz86Kbs/98eEUbzWxTSLfJ6uK9gvbO0nn4fFeMoDkg0/odR+ZOMZBeEbEzEmQKKo70NAb7UPD2FS46umr46MecHolxm6jlok4uHzxzbfe+LKyfPHGETw/82KfTHrjMkaR0tv0QEDd1ws2+t9a24QeYLWsQCQml8hIdJE2zG2VnqGqBnv9EmUwe456qVT+EZgh0bpX3uI+x3L4jxwQWPrCHUJLGG1loVLU1FzU6e8H66iFIEgwQv44uNZgH6+D1MnfJykglXCb9rRBlWd5AB7yhCBq+LkAszfnWMU+IMNCD/goGOawcO3JQwxRdbhEELDE+8YDVGZhqI+62sQVf3uXnRgJ9PRzpTkCMCyC1tF0eGomvnUTNz8eW/PjnELHc+OhHqm4rriVJbLXwkhnu8a8kFxkCx9y1ZRGjEIq75YmdT5GbdTyz+HKOLRC0Oo6dpJ3LPk20l5bemv/PgPtj40FvSzaop31M6XnEqNKTshREfFp6IVmXrPTYY14yp/B3v/x+B92psBy9cbQhr3FzC13wZ3L+MwPG4Q0jbOPocxNqLHX72ULnGSrT6 adbcrfI+ G/a1ey1hrY/ZG7g5RP1N9QWDfi+nadUdZaSWEK3ZnbBgNOeeymi3oJqDy5hoyFiZY+mhjBEjz0d5w2tHYjOsjCaPpFOKDgpK8fAZR0X79AqYku1AR2lhQ0iBSTrjqc7IHgENdyog18N7p2Kgs/gZnnTKjJap78+IaYqHoIo5zidz5Cm/J4/lIy339+lLsoaWOKzYIDjwKMxc/gBoHSU92N70vqRg97/iqbTY1DTFF0qU/D0pLnQm7RrfXGSpXJ86rfxsnRtakpX7FSPE81W+ZYIu3kylCGI4st6Cr1rLtV6xG7g8= 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 Mon, 5 Aug 2024 13:13:50 +0100 Lorenzo Stoakes wrote: > Both can_vma_merge_before() and can_vma_merge_after() are invoked after > checking for compatible VMA NUMA policy, we can simply move this to > is_mergeable_vma() and abstract this altogether. > > Signed-off-by: Lorenzo Stoakes > --- > mm/mmap.c | 8 +++----- > mm/vma.c | 9 ++++----- > 2 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index f931000c561f..721ced6e37b0 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1422,8 +1422,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > > /* Attempt to expand an old mapping */ > /* Check next */ > - if (next && next->vm_start == end && !vma_policy(next) && > - can_vma_merge_before(&vmg)) { > + if (next && next->vm_start == end && can_vma_merge_before(&vmg)) { > merge_end = next->vm_end; > vma = next; > vmg.pgoff = next->vm_pgoff - pglen; > @@ -1435,8 +1434,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > } > > /* Check prev */ > - if (prev && prev->vm_end == addr && !vma_policy(prev) && > - can_vma_merge_after(&vmg)) { > + if (prev && prev->vm_end == addr && can_vma_merge_after(&vmg)) { > merge_start = prev->vm_start; > vma = prev; > vmg.pgoff = prev->vm_pgoff; > @@ -1798,7 +1796,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma, > * Expand the existing vma if possible; Note that singular lists do not > * occur after forking, so the expand will only happen on new VMAs. > */ > - if (vma && vma->vm_end == addr && !vma_policy(vma)) { > + if (vma && vma->vm_end == addr) { > struct vma_merge_struct vmg = { > .prev = vma, > .flags = flags, > diff --git a/mm/vma.c b/mm/vma.c > index 20c4ce7712c0..b452b472a085 100644 > --- a/mm/vma.c > +++ b/mm/vma.c > @@ -19,6 +19,8 @@ static inline bool is_mergeable_vma(struct vma_merge_struct *vmg, bool merge_nex > */ > bool may_remove_vma = merge_next; > > + if (!mpol_equal(vmg->policy, vma_policy(vma))) > + return false; > /* > * VM_SOFTDIRTY should not prevent from VMA merging, if we > * match the flags but dirty bit -- the caller should mark > @@ -971,17 +973,14 @@ static struct vm_area_struct *vma_merge(struct vma_merge_struct *vmg) > vma_pgoff = prev->vm_pgoff; > > /* Can we merge the predecessor? */ > - if (addr == prev->vm_end && mpol_equal(vma_policy(prev), vmg->policy) > - && can_vma_merge_after(vmg)) { > - > + if (addr == prev->vm_end && can_vma_merge_after(vmg)) { > merge_prev = true; > vma_prev(vmg->vmi); > } > } > > /* Can we merge the successor? */ > - if (next && mpol_equal(vmg->policy, vma_policy(next)) && > - can_vma_merge_before(vmg)) { > + if (next && can_vma_merge_before(vmg)) { > merge_next = true; > } > Looks good. Petr T