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 9F790C6FD1D for ; Tue, 14 Mar 2023 22:37:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 172888E0001; Tue, 14 Mar 2023 18:37:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 122DB6B0072; Tue, 14 Mar 2023 18:37:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F04DE8E0001; Tue, 14 Mar 2023 18:37:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DFCB26B0071 for ; Tue, 14 Mar 2023 18:37:01 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 892861A0D62 for ; Tue, 14 Mar 2023 22:37:01 +0000 (UTC) X-FDA: 80568965442.19.AAF12CC Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf05.hostedemail.com (Postfix) with ESMTP id AB620100014 for ; Tue, 14 Mar 2023 22:36:59 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="igGLKO/a"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678833419; 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=Z6l4jnUPgiSL9pwE7XPhJHqJWDs8eBCpbTvbsPB+B0A=; b=lIEByoGaYjP7EWQ8LAF1yvrcpKrW184IHO1MGdfFWVQMw8Z1qCavED80Z2iYVdhHs3OfHh WVocZHXX1HCKLC8Bq0E94lRUNK0+u/slV7PbTZC0AzCUIEWJtikwm2EuDunp3omtJDHcv3 P0TghF+ONlYjwkJDSxNI339sNZUO7XM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="igGLKO/a"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678833419; a=rsa-sha256; cv=none; b=K+iMagEXRy/exjOKKAzm5y1X/A1rYiO4Ffoszv9ZPLAKB5B7HrEO3hbBn+QxnuPtL+9Ln1 29gBlBvAmkJouFNcFX0dlcQ9DekkZCXc49hvP5d8QZvtl1uOQQlUtjyGlTpP6nQes/WZeW lhJqL5XgVCHcL01kw3QNR2tJRAjkO08= Received: by mail-wm1-f52.google.com with SMTP id k25-20020a7bc419000000b003ed23114fa7so5495149wmi.4 for ; Tue, 14 Mar 2023 15:36:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678833418; 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=Z6l4jnUPgiSL9pwE7XPhJHqJWDs8eBCpbTvbsPB+B0A=; b=igGLKO/amsFm2CuBDjGiFD2P4Vb8eBCG+38gyP5ACSj6Mk3L+PH70NcKWjCMJUD1bq WRpVxjeHiOOeYJBCS6UXYD2hc9a8WW1dYEYUWTeqcHz9i5VEStSk9WYXRiETB5DGv9CW i7VZwrlAwQWK4qelWd9pgQzNj+tz6OvSlU7TZ9TO9dJqnR9xD4X8J0YsQ3iefKmzHd1j FQKqrIpcWI8oBAAwaJx7pZOC1fPddtImqJwawqBAPs+eeKgEk5NIt7enJHAiON8dIO0f ZOGULCfGzM1k0Do67XCQsOJFB2VmW5YnPVpkzwy0HWVw49UCiuM6r0K0XpYjivnmYeF8 pyfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678833418; 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=Z6l4jnUPgiSL9pwE7XPhJHqJWDs8eBCpbTvbsPB+B0A=; b=iLKimmrNl0751C9jfinX9kHfN4VC1DsaiFVHtbf6u0sEu67z3LTcbsx3XPx9JJfoTr A56E+FakeMVtCcLJ2nnLILyXMjcFcNlytVHRY7IBb4bLuB/4pqy3mRZ97JVd6LRzqVik sWYpogvklfKeahjJIwMziUE5/EDPd4nPMxBiACOM3uLn0yx6LYxYJIcaFTxHX+jzFQyR BXxEVdTa2QBFffjxhq5q+TlQPAKp3oZ8M00v4yPjoePSXUYhsDBGtmOwziF+i7k58DPV A7VhC5b4jiGT5qykQSEeTw54fLK2AyIDI419zl0Q/zeLSi90Bg5pCXfOhfvP7GzczzZo TNaA== X-Gm-Message-State: AO0yUKVQ4lyJtfYrInQXYokfv4UKjLiFWTtYgSFBM+pVDe6y/OZpI2Wo zxrqnyBfyupXvGh1ujjbVUo= X-Google-Smtp-Source: AK7set8B+/2sE9/73LsBJy9qXjVPNWmDNhuCtXSX+pPd41Zq6FBHcSzizIIxnlvNwOCRrZfz8uFzmA== X-Received: by 2002:a05:600c:19d3:b0:3eb:3945:d3f9 with SMTP id u19-20020a05600c19d300b003eb3945d3f9mr15857968wmq.4.1678833418226; Tue, 14 Mar 2023 15:36:58 -0700 (PDT) Received: from localhost (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003ed2fb86f85sm1525693wmi.47.2023.03.14.15.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 15:36:57 -0700 (PDT) Date: Tue, 14 Mar 2023 22:36:56 +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, Suren Baghdasaryan Subject: Re: [PATCH 07/10] mm/mmap/vma_merge: rename adj_next to adj_start Message-ID: <8dcd3ff4-bcf3-4960-973a-d494d8bd5b11@lucifer.local> References: <20230309111258.24079-1-vbabka@suse.cz> <20230309111258.24079-8-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230309111258.24079-8-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: AB620100014 X-Stat-Signature: tzdkb1bd17d1i5sjxm4p6gqmoeqdijiy X-HE-Tag: 1678833419-693037 X-HE-Meta: U2FsdGVkX1+Gpnq8Hmx6ozDBCdIxRZu+sbJonDU0Bf0q+FkM1bpkXr7I70e3r83XSO7zO5g4q9lGgWDKaBDoX943jx7YgbL2Py3mWqI89LGMovH/6jgBJ0K3wHQZTqn7Z7VLNzf6Cov5s355BgCTyi6XUaGV/zxKdAaGaAj3mTh7U+LO+g3cGIOjyjPtW35nNWtUXXRBQqVCNfWksNKSNziI87p0vv8RBbJW3X2L27CaKkah8IFzBQrqTHymZC9MM3yJKucgiZzUM4jAc1yd28AYfvGJzIaDB5BeVgCrBWhfdDZ3tS4Ejzo5b3me2+GsxYgDUJupdmVY/Cnoh2x9qnlG5KpN6PC4XxhvZH+pbH5aGcDcyhaCt4hMiRB+zudNx7J9PqUskO7jBfdajwhGUGCfz13VtsBpVNHMW/TmniQKPz2khGk3f3HiJjTXE4tG6QguyhVdugvx0fhgUTnlPz3zr/0ZVz1e7Eoz8ghs4eZ+M0RRXZof6wu1zEP1RKOE6PlwDxGpnI5tMVZ/6KR1qO+lLVv4PT6jNH/TS+nSHSmRUctYihdI2Ks6uAw4euCQeKnVW/nwDcBJDG8MVrAv4tp5EH/cDFz3H8rdbpvG21CDEkKUlFgUVYXOwI+UlIS1n22NVUdcLuRMyB3WcqSaqOMJEEg5dBI55hzHIdftd1s7ny5TGtNzwYJUm4hYyt4nfAwXTh4f1oWl0WG84byM5aQ0qANCAJm+nYBwa8/+P1C//t9I4+aw+mgEt7tPgLNhSIhC1hQ/+g6DbHfzG2BgJ/vNGFVtHTKdPlE6GxGnnshp4l077tYPc6adbITLp8azoOYZKZ7FZpVR1DPaAu5vUL5vYVpaywDaM1rARn3/EzsM911Cuwqh1svOppsb+xruPHPsaw64QrhjgCi1HEdbmP9bJjWE/UwU7ylmYJVLPDOTyUseuKrQpyE1FMuYFZkJUkRhuRVVDOFripvUboM Qi3SSzkm CyAdSICYwqxNutsdqxXKrfcXUp8s/yqf89xuJJgDPptgYG0RFvM+pwv43AAs0BEc+FY8OS1xpwR1//ZHpB+5EhKF1B3RhdC0oC5lNLVFKZ9zrV4D5qygndO50nbf6QsLSxHQY7o7pnbHQklkDhv8/Bk1xyYNPm7Ro0IFDVs9cosww2fH0PVQsJNf+SKplboLfkRruWH8UnVCIdIbHJBm5dvWsV7BQq77D7/vOJGtbSBS0O4VPgRAOlzNfOVmbknEvfxrh1/kARiNwM5Iez1y/2Jn/Gw+uZ2erRghewDfccDpXJrHHK0SFo8lQavkPAvhkw1x/2vsjNqnazhwJix/I52N+AjXXf6KYTHhI964T70FF2FhIDTZvI27ymUWeQ1XHmReXR99OzkSCs6FMm9fl5KIa+L3ukdBgv0+mMJxMRPzB3ne7nSEdYD3Wf5aQ6b8sHdI/7z9oSPw8l2o= 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:55PM +0100, Vlastimil Babka wrote: > The variable 'adj_next' holds the value by which we adjust vm_start of a > vma in variable 'adjust', that's either 'next' or 'mid', so the current > name is inaccurate. Rename it to 'adj_start'. > > Signed-off-by: Vlastimil Babka > --- > mm/mmap.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 3396c9b13f1c..c51d69592e4e 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -903,7 +903,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > bool vma_expanded = false; > struct vma_prepare vp; > unsigned long vma_end = end; > - long adj_next = 0; > + long adj_start = 0; > unsigned long vma_start = addr; > > validate_mm(mm); > @@ -971,7 +971,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > remove = mid; > } else { /* case 5 */ > adjust = mid; > - adj_next = (end - mid->vm_start); > + adj_start = (end - mid->vm_start); > } > } > } else if (merge_next) { > @@ -979,7 +979,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > if (prev && addr < prev->vm_end) { /* case 4 */ > vma_end = addr; > adjust = next; > - adj_next = -(prev->vm_end - addr); > + adj_start = -(prev->vm_end - addr); > err = dup_anon_vma(next, prev); > } else { > vma = next; /* case 3 */ > @@ -1002,7 +1002,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > if (vma_iter_prealloc(vmi)) > return NULL; > > - vma_adjust_trans_huge(vma, vma_start, vma_end, adj_next); > + vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start); > init_multi_vma_prep(&vp, vma, adjust, remove, remove2); > VM_WARN_ON(vp.anon_vma && adjust && adjust->anon_vma && > vp.anon_vma != adjust->anon_vma); > @@ -1018,10 +1018,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, > if (vma_expanded) > vma_iter_store(vmi, vma); > > - if (adj_next) { > - adjust->vm_start += adj_next; > - adjust->vm_pgoff += adj_next >> PAGE_SHIFT; > - if (adj_next < 0) { > + if (adj_start) { > + adjust->vm_start += adj_start; > + adjust->vm_pgoff += adj_start >> PAGE_SHIFT; > + if (adj_start < 0) { > WARN_ON(vma_expanded); > vma_iter_store(vmi, next); > } > -- > 2.39.2 > It looks like Suren's dc72d59c416d ("mm/mmap: move vma_prepare before vma_adjust_trans_huge") trivially conflicts with this change.