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 C1324C61DA4 for ; Wed, 15 Mar 2023 19:54:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 625016B0075; Wed, 15 Mar 2023 15:54:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5AE056B0078; Wed, 15 Mar 2023 15:54:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 428356B007B; Wed, 15 Mar 2023 15:54:27 -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 2FEF06B0075 for ; Wed, 15 Mar 2023 15:54:27 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B44F01A0548 for ; Wed, 15 Mar 2023 19:54:26 +0000 (UTC) X-FDA: 80572184532.28.E02EE56 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by imf11.hostedemail.com (Postfix) with ESMTP id BE67940012 for ; Wed, 15 Mar 2023 19:54:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ckXUmTVE; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678910064; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gCSxA22SVm2VVHTdwZU+aI7cTzpxyEJzg2GfMCeHww4=; b=bor8QOIIHryXt46slKW4Tu4lvHAmBDwAzDO5IXgFNJFWvcNfzPPWI4QzUWA9n+dQ6Y/KJ8 myarFeRHxFcvD6ZMS3W73W3cjNf+bOT8XBxoMTE97tuYBvDH+XBXuPplfUJOgXPjXY8Yab x0uWSigBnmv7SqECjIx9AQ8eSNN1KLQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ckXUmTVE; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678910064; a=rsa-sha256; cv=none; b=Q5XRhYKKB1/dJYYQHmb8OEBaREq3dPHk8UGoGgiIBi7sbQ56LLloFoCZOxQzk0ECOuxGFv DLzmvjyv3mk8aoBeuOFL3uXjt/2tWK+2a22jLKj4Txh6R+L1dSjMyyiHIqpz+Oz6tBwHiu uBnnAI6ok2roBrDuxmL7bZFEUzeKp3c= Received: by mail-wm1-f43.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso1787415wmb.0 for ; Wed, 15 Mar 2023 12:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678910063; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=gCSxA22SVm2VVHTdwZU+aI7cTzpxyEJzg2GfMCeHww4=; b=ckXUmTVEo3xD771xIooynrnHGnLgWkoiXWuSCUXbS6hPckGoWE2gRZrcGBKET5O7iD p8gO2UfRmImBZ93ZIzskQ8OZXecW90USqCKBCS227xfHgb/TD6Munj4/lL/tw31iRqsK C7SWg0MeCSTovdWjFjeWwOWF7BkfINpbhfjOgYNkofrD9+6ukpZm0wbFElg3gcW9+kX2 sTeVnKnrAoHbCfq22gYR/DyitJO4avo4yppFhWzWzGUexINyHE/JGPmdkloPKHjffKZC L5te0MX9bGt5qd710X7CeTmd7WgAvqv2TrrSpx515Q3uE1sB7Qm27/yOVAImSy7IMqQF QmhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678910063; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gCSxA22SVm2VVHTdwZU+aI7cTzpxyEJzg2GfMCeHww4=; b=REIYKavGniRHc63B7VE/CWe/hqDG6/fHMxLpG8WH7FrfMP6pVy+wklZ6FoHXHVq649 J1UOd2+SaBigrkmiGqg8NQXamw4MUYRukCFmyozArMKO1Sr8b4PjLmfXmm8D/fCWbx+8 NbfgyfIsXaGY1+mA9+au0I44IiGUjW3W+yGb/PXu13CYf9d48Psqe8UTkYBxq/F0+TVl BEHhkBj/yNY+gT6Mkcissid02I2lWTvpqfv2hjOC00ibOzve6D34fTolI9CqNicItOyS arW+gs6M1jvwLIwHvC8nK2wFYNzQBQQBTA3OTWrY2Wj8SGhE6Jxo77cUGBOCUeoc7tb5 k5Ng== X-Gm-Message-State: AO0yUKUhZL/2x4xEQ+pU9R5QZCFF7RRX8gxdNT2F7BC1Ur85qz9z93Sp 2Ac25NpqSOVdfc4A1TmoWLI= X-Google-Smtp-Source: AK7set/JfTQ2o9CSsTNqTelAhywJgcjTZfTTQjho9/QNQwzz85bIKlQGIvuidMNUtqZDDf7M5k+HdQ== X-Received: by 2002:a05:600c:1d97:b0:3ea:f132:63d8 with SMTP id p23-20020a05600c1d9700b003eaf13263d8mr19821484wms.5.1678910063192; Wed, 15 Mar 2023 12:54:23 -0700 (PDT) Received: from localhost (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.gmail.com with ESMTPSA id q7-20020a7bce87000000b003e8dc7a03basm2720397wmj.41.2023.03.15.12.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 12:54:22 -0700 (PDT) Date: Wed, 15 Mar 2023 19:54:21 +0000 From: Lorenzo Stoakes To: Vlastimil Babka Cc: Andrew Morton , "Liam R. Howlett" , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, maple-tree@lists.infradead.org Subject: Re: [PATCH 04/10] mm/mmap/vma_merge: use the proper vma pointer in case 4 Message-ID: <3052d4e5-fcb5-479e-8691-b218a31b6243@lucifer.local> References: <20230309111258.24079-1-vbabka@suse.cz> <20230309111258.24079-5-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230309111258.24079-5-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BE67940012 X-Stat-Signature: o1wjwsecgam58jqb1mcw4jogbsc8gb3f X-HE-Tag: 1678910064-664893 X-HE-Meta: U2FsdGVkX1+T3WP2Nt7usIIk2PkVr8a3dNFPTR0DOoDNeIf89hXcGK3NVhUX2OiFHmle8q8FBIX4zfFGPYLcDV+iJ2Cxeh2EdQX3KciLtXEKJ4/TRsAY0Od7wn4jh4njR0zPxWVU/nPGBAuOKEHeJuY94mw+zJ3CROcoc55SPCjo5bOr6g2t7t5+uxQSPl3BhivGO6V0bXie0j+0jJUWye9sIo9+VilT2ySX2sJinoOWp/QC7J0IOZ+neBSIsCuxdqaCpkm/87K+Z3LT45YqIc0wvkO2/UzxxneIKJ0QvUeVyPeFKbdiKPWhMaNw9p/I1IqpJLLvP5CvNanqK8FcbDeb22A5CAvycVzs6qbRl+Tvl9wmdqG6ZTXWuzd2in/+gJlGoZzrpQISY+jnltzzZp0tL775RoQdExST3zUD/CzssVifLdjvbH/9TvdIYHTpWOX10VnJHUN9pscu4n2cVWttLD5xPDYcIqw/EI6dInOtjA7EacMfMFOyYECFAWzDUFGZASCpTLCu0+OBm13xrGmCzJWsj4nSCIrWI5f23Bfphx5sQmNnGZXf50/dvNdmg4K6MKut788aXyuLLELwa+qbFsmx4L60siYg32LUnTfqfOkJ0OjznQvxqbdfMmoDyLFA4yTYQLRJQmS2L5VLJe5F1xWeOhevzjV8aFxF7rHcDvdy/l2StvA2W40NPM9affQ0mrVcr/IpERgATi487ZdkO5WsnOoA75dehaP8t46NBS1x+4RVN9SfFxYdguq9jIdlOvG8PwgAa4r3Uj8sSt0OlsOKc51EChycDCvosUS6GPjAJ4+NpJgNlk9xEGP81dhf+WVkdoAHsnkNH25w0/OgYc/3DohdkRuLmW+LvFgWqNKYOrjfIlMe0iJzDnHw61+Llea6sW5/nJStVjJykmx7seZE9bZ8A8//x5NSrttxAFj/xGXtAkTfvtCrofgvOaTOxdN//O58h/f/2vV tL7fGoO6 fpNQywrWt2JpIP6uYtgHX9sApEGVjQZ1WK/sNMuCmd4XQbzF9z5FO7HeDTmFdvZfqJsVv3ckE34uIG4mjyQpB1K4HoOX3Ag/F7Eip/VcOy+/EnYgBuom2k4LkHtkxVEpyqDevDw6xhwjo70EjdVjhgoAMN9c6qX+W88t7KD6SyvQKl2zJ7rjqNjrPoZy0QLNRCGHbqgeTPDldSg3K1FW9gw94b580529LLWpshKOzIeiItOHvf9fwAxJheLWp9KL+Rf+VfjfH48fGXSXWT0QuCeREdbD3UF09/HswXBqqWca6PW/SZMsqKm8GXewxpDme4ce7aXI/KYzNRbjiZj2Ah5gm3TkMVrrFQjZM2cReg1HE70WPSC5/URKxtyk+4W7fnE1TclmlngOpbZlBvFn2fQmotI+zdN7dDo5zt7OLffwNKb/gir51ebwK+G5GDKjIFcJup0NEux/Objzjdi4+wenknOSwsWl1wGQO 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: On Thu, Mar 09, 2023 at 12:12:52PM +0100, Vlastimil Babka wrote: > 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 c33237b283c9..420d6847c94c 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 > Reviewed-By: Lorenzo Stoakes