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 A0402C677F1 for ; Fri, 24 Feb 2023 10:00:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9DE56B0082; Fri, 24 Feb 2023 05:00:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB11B6B007B; Fri, 24 Feb 2023 05:00:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65BEB6B007D; Fri, 24 Feb 2023 05:00:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 467556B007B for ; Fri, 24 Feb 2023 05:00:45 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 08D9FA17BB for ; Fri, 24 Feb 2023 10:00:45 +0000 (UTC) X-FDA: 80501741250.22.2A6CEB2 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf29.hostedemail.com (Postfix) with ESMTP id 2EC13120011 for ; Fri, 24 Feb 2023 10:00:42 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=fYzhrj11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=pRm1v3KH; spf=pass (imf29.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 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=1677232843; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NhRb7OEjq72gATHH+81L0Pb56Fl0vIOvf0iCMN4nYIU=; b=fy6p5tGXzjOapwg/g5X0foXhK7wB+l0wFH9NZXAf+yhNUWhNqnhfm0CdHy1/hkj8NFat5S ztJkMIJDfrXDXTbFQJhkgbiv88C/bwhI5lqlxka5S/IJ8LIk6ozHyocS3PIBdXGBa//esJ TcysXMTs1h1ky3MsWQ5y/Ln4nbEjvuo= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=fYzhrj11; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=pRm1v3KH; spf=pass (imf29.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677232843; a=rsa-sha256; cv=none; b=JSMuuJbSSiGstfB1eNtb/l52mqSeibM+oSnH1o8xa18a2s7OfgVbNnhpQm1b3lgSCXboVU nmcwjP5uZZw1r4VN0otiv2UGXTSdPXRSIrtopc42tV2GFj6ddo9RrIMlMaBjzY0b0Ab1/T VsWETQbT6rioWjZBjySGUt31FwX473c= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DAE8F5CF12; Fri, 24 Feb 2023 10:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1677232841; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NhRb7OEjq72gATHH+81L0Pb56Fl0vIOvf0iCMN4nYIU=; b=fYzhrj11ULyuqhA8Sagent4MDSnhNWl8R2BrOZiOHNx9yAxGii4l3b/DU9FJdKVwZb0bd0 iZoKwF2poIHgvY3Skpdlp910KuW5uXp9V7NYki4j5qv1RkOA4dGJjqXKV/gBoDa4TRbGko SzQxCkrn6JiYwn+wrf/fDRXMFA6rMNE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1677232841; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NhRb7OEjq72gATHH+81L0Pb56Fl0vIOvf0iCMN4nYIU=; b=pRm1v3KHo1fpox5NF177Fm9sTRwu/iI806K18nFWHsCXkfJoMqk6rxxwdLrBhH4l/+AfFj F7wKC2QJ3L4tXBDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BD04413A3C; Fri, 24 Feb 2023 10:00:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CIaKLcmK+GPeTgAAMHmgww (envelope-from ); Fri, 24 Feb 2023 10:00:41 +0000 From: Vlastimil Babka To: linux-mm@kvack.org, "Liam R. Howlett" Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, maple-tree@lists.infradead.org, Vlastimil Babka Subject: [RFC 05/11] mm/mmap/vma_merge: use the proper vma pointer in case 4 Date: Fri, 24 Feb 2023 11:00:16 +0100 Message-Id: <20230224100022.11268-6-vbabka@suse.cz> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230224100022.11268-1-vbabka@suse.cz> References: <20230224100022.11268-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2EC13120011 X-Stat-Signature: hycdo8tu81mf5ooxrcm4zcpeiky1nt7y X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677232842-711237 X-HE-Meta: U2FsdGVkX1/u9l91V4lRsIJQv4XAOABnKE3NdYulTJ+Ye/29aGUQS6Jqu5CmOyPjFRWtniiGuJW6P4H12r5eJkDG3yEfCVspp3LSQUyYKBhXk3arJR1qS80/vN9t4IBdHBIUVJ7UOtkwbhj4JLyztWT9tdGqJVy45GieXSeyYBcfaliDJu1DRSI9DkLLWDVW1mxX3w1LxWX1gw/SyRU0R2n8so/V/jnWI/8sVHCU2dwc8HvWMJnSCB52qdX+71v9UVUbdVLQNNUGWu2knlST78NBKqDs2pwHc+HjwDkwkuhZN5az+PrdnAoXLC07Q2h/zYkFc6UrVYGSRFUnmOmuGZrOr7T5zutjj8DKqlYy0Fyvg4eG9vJWp8oVCFuogAHp/frBcuvYGjgt65YWPJ5D4ai7ruK1q0jGUsvgwCOvBpsiHw0zV70uYrizLeLg2gcIl1mWc9VcuVc8Op/JVT5s5blO0q/5pftlF35kXq1AIeHMc+/Vk8d7hRfZw/aZqGRmQL4a4MjP8WWr1a6UNO+L6BjzASTO2jo9+8uLaAtyZoX7B8ZSoG/GxW30RdFCBTjIIBJ2dcqwLzlNKuuiFHWP/f5t2y6tMJOPepOu4p3nTJ6/6irA3sKfU1GkmrGgKy3cMo5UAt8nf4+rmoSrLPvXxmZhqtXPlS/TJBr9hzMJgTdZ5TBhHn31fIqgz6SF1qeCS031HhOugAfohS/RRux24fOferGIeiGvhgQEIig1RP7qQWbUP2+meNlCBAgXI0Yn01at1k4vyHG6cXjpDwmG+yV9QjnbA9z2wyqOS+Tzcfx3KHaXQxVsoC1smuiFQzHpitpDE/ERFDXPNSXqGVvv0JH9hIzZ5/ccK3F0Tn4SCoDgUz158mKK7zkhfhp1pZurYZPdQFHh4W5AP5EkOUZ0a5NtMmFAvI4Ck67O4vmvzIeQD0oflmx7hAC1BYKq0d6wzvq84hJ33MCvC9o9Ez/ URDXfllx Eszk6N6Zq4w2lThZqH5DH0o4Ffa0ZdnT4Gaxc0SD1qXOX6kYjilX/MEYPunqsZK10e48kRPBOIuPIpWfNVlH/XxZyRoIYy3bv3x9INyWw3N6UOoS5HmQv0NvK+iQFv6GfWoik0pLkvDlgh3dEYVTNZ3lwnFLse2SPE8FOOear5xq1xN8YzvvdLL2JfMiDDaWuY4naXQMHeianYCYno719+TkrsGOCBJGaj1FTipH7Ml5byUuDs75Typ+rSA== 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: Almost all cases now use the 'next' pointer for the vma following the merged area, and the cases diagram shows it as XXXX. Case 4 is different as it uses 'mid' and NNNN, so change it for consistency. No functional change. Signed-off-by: Vlastimil Babka --- mm/mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 704afa278a98..1e4be7174964 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -851,9 +851,9 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, * vma, PPPPPP is the prev vma specified, and NNNNNN the next vma after: * * AAAA AAAA AAAA - * PPPPPPNNNNNN PPPPPPNNNNNN PPPPPPNNNNNN + * PPPPPPNNNNNN PPPPPPXXXXXX PPPPPPNNNNNN * cannot merge might become might become - * PPNNNNNNNNNN PPPPPPPPPPNN + * PPXXXXXXXXXX PPPPPPPPPPNN * mmap, brk or case 4 below case 5 below * mremap move: * AAAA AAAA @@ -972,9 +972,9 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, res = next; if (prev && addr < prev->vm_end) { /* case 4 */ vma_end = addr; - adjust = mid; + adjust = next; adj_next = -(prev->vm_end - addr); - err = dup_anon_vma(mid, prev); + err = dup_anon_vma(next, prev); } else { vma = next; /* case 3 */ vma_start = addr; -- 2.39.2