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 07322C6FD1D for ; Wed, 15 Mar 2023 21:38:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D7D56B0075; Wed, 15 Mar 2023 17:38:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 588016B0078; Wed, 15 Mar 2023 17:38:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 450276B007B; Wed, 15 Mar 2023 17:38:43 -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 37A406B0075 for ; Wed, 15 Mar 2023 17:38:43 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0AF36121213 for ; Wed, 15 Mar 2023 21:38:43 +0000 (UTC) X-FDA: 80572447326.14.A78FF5E Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by imf12.hostedemail.com (Postfix) with ESMTP id 2992B40019 for ; Wed, 15 Mar 2023 21:38:40 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=a7dd7ol8; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.54 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=1678916321; 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=EXOeJTwK4KmrIlxPr5Klq/AQ/BW356EV8A+6kgkSRD0=; b=a3wthMBeVGeYiRia9VKWGB9ICj7rZWNe4gl7n3YLJNjwwqtabmuTu/YjBLgyTkntl4f9oR aL3b+SUVPR9thvHFjtrymIxn/UCnjW8JUzBnGxMcP6fVJh2p9GoceEclWH1J9/qKST7/dM 7mXNYNP77Mt7DRRXNg0QeElIsAFoyxk= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=a7dd7ol8; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.54 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=1678916321; a=rsa-sha256; cv=none; b=tiotFMIOMm+A9t0eJEMNtSLMXz7IMSzqPiAqhrmRZg4dJR+0xtUoFuQ90lDpWLuqRtTRhp IXGDfs8Zrac84aZYo0Vr/EA/9mVVYR3I7xLwv88c4ivVDssCJjvJvOE/p5fGqfXQiGNGV0 WxivUoj6fmeelzXs0xvBDVB8fw0eETw= Received: by mail-wr1-f54.google.com with SMTP id j2so18554401wrh.9 for ; Wed, 15 Mar 2023 14:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678916320; 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=EXOeJTwK4KmrIlxPr5Klq/AQ/BW356EV8A+6kgkSRD0=; b=a7dd7ol8g0McRzHN9i+DikaHfAmyHidSQuumacuyPuGkR7b5c7Pex1Zwe5vsDridmY ZqXUXQ9S0+QpVKTXvFelyu4lbJIt+Mb5v8Ouf9kU2R3ci02M4bIny2Q4I6TeRgHTcyMA +OHeuYvKI8Nsxq4bqNg9XH5rtK9h7E+gcFM+pfGpUB/dBpABMfP2MshZMQhlMq9L24eq Jjao0w/tVY1gkq2AMxJbtoK7DeojIHkccR8x8+MhJO5nsu5mrsu0CPNrSkpAtqZkdQ+v qsLr37rO5o1yS8QCCSADy/bDKJr8mSeCHxlqmbbnnG5D2H3EgOnmFcb/aUp8rflLLt8n Nanw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678916320; 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=EXOeJTwK4KmrIlxPr5Klq/AQ/BW356EV8A+6kgkSRD0=; b=aZT9wceZHP6jvp0rTxq5/zW49px9PZqgLns4jdysEhqQWLdR8OCR/0DxHZWGQALcd9 sdJzola51k3O+aTnn+DtX+ve+dtHxOnu7Pqfj8phQ2mcYgQj09WKJbOjYv5Vrd8pwJRt Pn07dRsfhZ9KkGD46wV6j+1c3YM8/aQNC8Ju/Y16Cpyvdz//PzWfIRFQtUmK8hXiuwR9 K8f3xOSLfI7pinrFhRTH1giikH0/E/rWBIe8tvVPMXxyrezxchRT4RgY/x2LsF/RI1/v y40RhN27D6H1ExeqHxQPa22nyuIGMpFewg9OrSU/GQ6YcrrfNTbXZ7MHXU/gMmFccCEV R/aw== X-Gm-Message-State: AO0yUKWAAdkkl3FgJcB6J3XVRq8yQat2pylrGQHyQmoQ2UiwuBH+TQOc MlSKMXFdOYrQdBzXvEdv0VE= X-Google-Smtp-Source: AK7set81j8IB4FbIu43mVKYxxp6kE0h/UZ6TURg26EiYc4FNvjDKvEMTAT/LfN1Vsqopn93EObZbow== X-Received: by 2002:adf:dcc2:0:b0:2ce:aa2d:c625 with SMTP id x2-20020adfdcc2000000b002ceaa2dc625mr3116855wrm.22.1678916319688; Wed, 15 Mar 2023 14:38:39 -0700 (PDT) Received: from localhost (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.gmail.com with ESMTPSA id t4-20020a0560001a4400b002be5bdbe40csm5584754wry.27.2023.03.15.14.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 14:38:38 -0700 (PDT) Date: Wed, 15 Mar 2023 21:38:37 +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 07/10] mm/mmap/vma_merge: rename adj_next to adj_start Message-ID: 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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2992B40019 X-Stat-Signature: ewx9xtgttwkgi19bf6q3n7juh4uezh14 X-Rspam-User: X-HE-Tag: 1678916320-683027 X-HE-Meta: U2FsdGVkX1+UekfHNMRWbcqYgtQbE/EcIwmQ9x9XvXO2/RqnigGQ78E8Sc8yss9XOE8qYwmPXAYeJIKQs1LCIeMwdD4ZIrTCyhhUYXEz1sFYU+6ajcsx9Q9sMG5JZ4p5H+mzWZE6jXKzFv6R6MiAzYskBz6FZ5LF9flAS1+7bOKhDcMBkmm1LjwRPewB2v5K99l3Tg8rA9y32yWjUgODKIf0XGLZyIQ5ORzT9AQaDBTJRjh3dB/Vbmfvx6sSrFJI8XsrfCi3Sd68nWL4TE5zTBbklmbqCiZe/iBe4iGAExTamTv1A92SHMBIeuxbM3i3O/4MWEvNyaHuOODzYM6cy2ECNdE0vjh0gSn3FYV6OK43Lf916NpwZRMsITh1getJAaz87USx1cvhq7VPePA44ubPwHoxtXftU6XILoBGLAT4GKqtWVe8jEh+1D/jzJQVxFv+1rsmKV4fBzhWHx9IYiKOzXw3N5X3GjYlCXczixhxk6iMCrc03yh9dHfaRv2mzxUsiLmfSB/Qv3rqlkB0rCAcfF2Y1aZaNLNzUL9BUn/Z+oPlrsf6l0dxRp6lLiy+75pI4mDr3jNQys90cBowcLN99G2NHc9BwzToxBSpuG12ahLF1k4EPYQAxdRrxWQ8lEO1HKLHbJs6+p1/X71iKtv7c7mHo/T1EXdXFwLzr44pIccc/1Rn9n+h2C3qRH3V9xIdYbemM33NlwFgcwdr3QxCptx8lZppj9Lph5YbwiOsB5nrer170gjJejtVnHF4AXJaisOt2T11o/vXmYnr9iLlOjFGPDaETXdhdJwomxhPUUitZ80lzlKnvri4L5Rjbjy9CLQ2QXythqF0szkD8C+kgkEf9Mw0+DlV94CXSlr30drithrNbKdZ9TvmI/VH/iWCZIpAfKe5IKvyhD1LbohWgrgB2VG499bYCord/vjJh11+62dXKfws/VMbJUoVdndjgYx0pe2xpl++LE9 1vr7cdxV lZ7+jvria1FqLTvGUTpblLwJI+R2zVeUQuw/2coypjn2Rnx5RY4uBnBN0JTved9UokAEWhoXnnn/G+EUYoQUTZ+/C/gj5Xy2woht1eWtV1v9OwD7BfRP3CZYQGpprdqnuWKInxx3e0cKmB67WCw1LGO/zKhRJAmuBpxRX60I08i6xTlsLVHg2ALawtCpPF8SJK+i6WxPKdTn+b0VrlgfYt6HB+raYrl950Z2DHO0NmaQ5E3QCDasPX5mZeM+PwxYRNYY4fB+7jRi3WEovF0rGJfp7iLdZkFlTLTzRT7hqPI57U4ESCx37ToI5O3r5OAbH8RD6hdhwn7I7oaXMrCKXJAxlQnjtJEUu9n48EgWHKNEGFtYEX6osRACnnNnYS71chVxU+47axEsaLklCdphVonwsdewSs7pu+Y6LazG3VtWM5SqIwgmWpgu8fJFQTdRMsA9FpuRNpZ7H0tcNKC3Vvt7WqEHEQCKQ2APi 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 > This feels like a very silly oversight in the first instance but I imagine one that is a result of 'code evolution' :) excellent improvement in clarity, so:- Reviewed-By: Lorenzo Stoakes