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 08AEFC3DA41 for ; Wed, 10 Jul 2024 17:14:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F5D26B0096; Wed, 10 Jul 2024 13:14:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A6526B0098; Wed, 10 Jul 2024 13:14:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66DAC6B0099; Wed, 10 Jul 2024 13:14:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 43F826B0096 for ; Wed, 10 Jul 2024 13:14:56 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0A4B6A122A for ; Wed, 10 Jul 2024 17:14:56 +0000 (UTC) X-FDA: 82324492992.18.91F8BA1 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by imf23.hostedemail.com (Postfix) with ESMTP id 45310140012 for ; Wed, 10 Jul 2024 17:14:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Yy6ldeVt; spf=pass (imf23.hostedemail.com: domain of surenb@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720631669; 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=yZZPZ6oc0vtM3vYVsL/GSe7en3bxgVNx9RbpRjGxJ6E=; b=ZZd+MtFYkRUH0XM+eKuZ9B6BZKfpHwh6F3xzF1NCNhFrZXJvkBe+q7/A8VCJQb70tRIOhk 8lwZGip10QRl2CChSLswya0TMKMy7kqXVZIjV3B2Y+Qqc0HIoI0Gh9z2paMKnRK0KzEi/V WPNpPTzCIWaE5paEYPZ3XHFHMU2S+k8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Yy6ldeVt; spf=pass (imf23.hostedemail.com: domain of surenb@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720631669; a=rsa-sha256; cv=none; b=tRc0LUHzHW4BeC4jBxZnHQQWNvWDoszZut3pR+Nz6SZ28ICDqt3dP6m8Go5tDydJvWr4ls iP1Hat4bUVi3vy0zwnOoGmm4DSIbhZk7C5IgzmYFNveSX/UXiNtMCAB4jQ/RvkkZ95sfSJ bFPTu2XIYhCCTd0YZfeyvoWdoT1eKAo= Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-6512866fa87so60513177b3.2 for ; Wed, 10 Jul 2024 10:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720631693; x=1721236493; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=yZZPZ6oc0vtM3vYVsL/GSe7en3bxgVNx9RbpRjGxJ6E=; b=Yy6ldeVt4XA4UAPguIavn3vavmCQkJKw689HQHm/1JAYybeHWV5iolIS8mNxNgNo3h bIz/tJrDFiizG+knItaQFMOwq+cPM75iroJJAx2RaAw9YdfGzAlOi0DZJnS0fa6oIS4G LCitG+p7f4U3OnT7iBPtf3Waon6qnA2wEKxavtZIr87GBj6Jl3KZmxh/t0pAgN6La32G b4aiF3uwUwxxjmZo0FVNI22G+1WMzZmqh53IpK+KoHBBntPoFUa/3d+zA/D48W7kJgQu prYwmJzYNjOcL2RS55PoZbWXQbb2Q7B2ont7T4OqHGxcZRw5fmcXLQ2/is4iUo4V7ONt 9DGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720631693; x=1721236493; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yZZPZ6oc0vtM3vYVsL/GSe7en3bxgVNx9RbpRjGxJ6E=; b=WEeROg7M8FS3YtKXfvtAuEv/oIjtZF8mXfH0pjFdP+jbOg98Xqa1F/qTvFpATNAR3f ddvZMob1R3k2MRoiLavLvAPvy8XCrUC2HBAVwyeK6j4ff/zIfWJIzWl8P/fa3ZJR4KOu +y2RQ2xzyV5IjxSqcXMRXEeQUKMOfGf0EbY2OyXXoRPRg5R6iQSqhSJqv1aCz6yylqvV LHNtXVCudGfucX4rqX/iYAcpBAArskItNaFrcrgsQ8W0U5nhSpZRfee/OYSa3nZuCylB 6goIPbMVAqSTfAEAq8I3pPgnABns5CG1oKgctlmgUzBuyOuONBywXGapLqCiDLuJF++I rCZw== X-Forwarded-Encrypted: i=1; AJvYcCXR8dS7YmAXnG45qbXLHPhfSOCrq78VHr8olL7b+aCgi4r0s4tAom0Bkpu7o7L7YXeYSKBpfjH8s761Q6R5qXLMgzM= X-Gm-Message-State: AOJu0YwPxnBt1D2c3kLrXvZRIPBITH7+UNasNElEZtW0xsdv9xm0UJUT pE1D/MslByUXrTl7cU9RHEd9pvPJIIPx8EXCnXkVUBhegxL1/rugtlBxS+RNgzo/NYPC4ZYO5Nf fsHI6Uwe4rt2qI2u6aCTiYEj6HSkAZv8Ozi96 X-Google-Smtp-Source: AGHT+IG2NhnN+Dg6I6aeTHBqWbKfK2cI2ohnx7SNaE7JqPa8xBFQMbyVqE+yoKfBNCrElYsWzTj2CkwPGVR5L2jc+VQ= X-Received: by 2002:a05:690c:f14:b0:632:7161:d16c with SMTP id 00721157ae682-658ef3411demr91348227b3.28.1720631692966; Wed, 10 Jul 2024 10:14:52 -0700 (PDT) MIME-Version: 1.0 References: <20240704182718.2653918-1-Liam.Howlett@oracle.com> <20240704182718.2653918-13-Liam.Howlett@oracle.com> <44baee28-a626-4be6-98ed-f5473d99157c@lucifer.local> In-Reply-To: <44baee28-a626-4be6-98ed-f5473d99157c@lucifer.local> From: Suren Baghdasaryan Date: Wed, 10 Jul 2024 10:14:42 -0700 Message-ID: Subject: Re: [PATCH v3 12/16] mm/mmap: Clean up unmap_region() argument list To: Lorenzo Stoakes Cc: "Liam R. Howlett" , linux-mm@kvack.org, Andrew Morton , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: ydri3waxj1gbyrrz4rwyhc89sbtfefgb X-Rspam-User: X-Rspamd-Queue-Id: 45310140012 X-Rspamd-Server: rspam02 X-HE-Tag: 1720631694-745384 X-HE-Meta: U2FsdGVkX1+0NvHcrKdE7DKkdll85RA+4bSNvvi/5fYONu3wfqyv8FyjKNFvNQ28+ckl5PHGSb4ChWQ+gJtKALDDE9u2yOS51mj8lp6E0Bw2tCgVfsep9YUNEbsaox4Qc4G/I6sawBnPY456/CFJ3pB+ShbDRb+Tgma1b6e0ug70BJyATHHfaCXXRkL5v+YBO7xOsPV8ImVNNrb78JuazStqbe+h9363uv6m01rdoI+iXX+BBkf+1kmstp91+K/8G8574HCCuH2MhbxD4KoUrv+scyjgcrGSQRGMGK+SzziCf4tEa+3gopcymyjVSpb3go1ZwXS7IT0zGyMawjhqIK6u573f294tlF67h39nF3ez/fmUGK53lNqtyEaLY7jBrZPyUnJ6VMnU/qE3yCzhkBOaE/Y7S33b3cb72uVjraWP/vQtx6To8ry6WuMsqMbJI9brtkyXa3Xz26W2cScJu0tZNG4JzD8eYYjE+s0NpM0OI48KjJdmn34rGJUjqjdoCWRRZPCaMl/eMQs7g8CXVHKEAKKb3Ar10d8A/kKOGMNyYAO7CVe5FCjYYTaE1n+0o73NyBGGEGm4gO59DRaP5JWOOeVGcsPp0HiB+XpcDAE9VNzC/ksMaPZ+k8vtwyQYvX+TeUe+Rkg+tnB1HyWvZga4Lz95s9TUf9XWtm0FpakXuaDxvcrzqWLcXx4QfjXJPsXnQWoEj6xY49XptIX3Z7FGZIP2LW2UK9kH6dRXloFnd1L9d2Cub4krp3IhZexMcTA1rkxJdntXiQYJc9gLs3/KaXiL2L8ab0uGfDcmPQrWujGyZPU8A6IwI0JtalJL780NUPOcn7NEqbm/+JYuMOYUx3AZ8qyJGs1a43YatKYFeMUl/oarD/IJ0nBL1gBA5Km9/M0V0vCO8dsGRhU0B9uZIDP2hdmS9Wa9MtYGT3CMybM7+vLsCLcQ4cxwDxM6K1EkSMdbt0/GpM1cUrL 29CxKotf Baj2cjlUSAmFN9IWOSUjLEigbv12fsH9mjCOY77P1WuV/9yVY6z3pPgVuej8dJBkLJ6xT1RgY/Rugsi8Bxqv8OX9nGKJFzjTj7DKG6rVLnwjT2qf4gKPVmfruAON9kFpl6jwpRtCzU2xBGwkR6ubozT+uBwmKm1oQRgjnPub9LqZ/1FgL6s+mKVZwICSNDmfglm5X2Ain+LuiluT/bnGj9+TtjbK/PSpR8Lep4mSplrSQXz8luBWf+d4jm2b/9WFj44MwR+NIb209fUw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000475, 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 Fri, Jul 5, 2024 at 1:33=E2=80=AFPM Lorenzo Stoakes wrote: > > On Thu, Jul 04, 2024 at 02:27:14PM GMT, Liam R. Howlett wrote: > > From: "Liam R. Howlett" > > > > With the only caller to unmap_region() being the error path of > > mmap_region(), the argument list can be significantly reduced. > > > > There is also no need to forward declare the static function any > > longer. > > > > Signed-off-by: Liam R. Howlett > > --- > > mm/mmap.c | 25 +++++++++---------------- > > 1 file changed, 9 insertions(+), 16 deletions(-) > > > > diff --git a/mm/mmap.c b/mm/mmap.c > > index 45443a53be76..5d458c5f080e 100644 > > --- a/mm/mmap.c > > +++ b/mm/mmap.c > > @@ -76,11 +76,6 @@ int mmap_rnd_compat_bits __read_mostly =3D CONFIG_AR= CH_MMAP_RND_COMPAT_BITS; > > static bool ignore_rlimit_data; > > core_param(ignore_rlimit_data, ignore_rlimit_data, bool, 0644); > > > > -static void unmap_region(struct mm_struct *mm, struct ma_state *mas, > > - struct vm_area_struct *vma, struct vm_area_struct *prev, > > - struct vm_area_struct *next, unsigned long start, > > - unsigned long end, unsigned long tree_end, bool mm_wr_loc= ked); > > - > > static pgprot_t vm_pgprot_modify(pgprot_t oldprot, unsigned long vm_fl= ags) > > { > > return pgprot_modify(oldprot, vm_get_page_prot(vm_flags)); > > @@ -2398,22 +2393,21 @@ struct vm_area_struct *expand_stack(struct mm_s= truct *mm, unsigned long addr) > > * > > * Called with the mm semaphore held. > > */ > > -static void unmap_region(struct mm_struct *mm, struct ma_state *mas, > > - struct vm_area_struct *vma, struct vm_area_struct *prev, > > - struct vm_area_struct *next, unsigned long start, > > - unsigned long end, unsigned long tree_end, bool mm_wr_loc= ked) > > +static void unmap_region(struct ma_state *mas, struct vm_area_struct *= vma, > > + struct vm_area_struct *prev, struct vm_area_struct *next) > > { > > + struct mm_struct *mm =3D vma->vm_mm; > > struct mmu_gather tlb; > > - unsigned long mt_start =3D mas->index; > > > > lru_add_drain(); > > tlb_gather_mmu(&tlb, mm); > > update_hiwater_rss(mm); > > - unmap_vmas(&tlb, mas, vma, start, end, tree_end, mm_wr_locked); > > - mas_set(mas, mt_start); > > OK so the 'raise something in one patch only for it to be removed in the > next' pattern continues :) more aesthetically plasing. > > > + unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_en= d, > > + /* mm_wr_locked =3D */ true); > > + mas_set(mas, vma->vm_end); > > free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_AD= DRESS, > > - next ? next->vm_start : USER_PGTABLES_CE= ILING, > > - mm_wr_locked); > > + next ? next->vm_start : USER_PGTABLES_CEILING, > > + /* mm_wr_locked =3D */ true); > > tlb_finish_mmu(&tlb); > > } > > > > @@ -3186,8 +3180,7 @@ unsigned long mmap_region(struct file *file, unsi= gned long addr, > > > > vma_iter_set(&vmi, vma->vm_end); > > /* Undo any partial mapping done by a device driver. */ > > - unmap_region(mm, &vmi.mas, vma, prev, next, vma->vm_start= , > > - vma->vm_end, vma->vm_end, true); > > + unmap_region(&vmi.mas, vma, prev, next); > > } > > if (writable_file_mapping) > > mapping_unmap_writable(file->f_mapping); > > -- > > 2.43.0 > > > > Lovely reduction in parameters. > > Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan