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 C9974C6FD1D for ; Wed, 15 Mar 2023 21:43:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2EE016B007B; Wed, 15 Mar 2023 17:43:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 29DF56B007D; Wed, 15 Mar 2023 17:43:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13FE06B007E; Wed, 15 Mar 2023 17:43:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 02C6E6B007B for ; Wed, 15 Mar 2023 17:43:55 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B3339A1223 for ; Wed, 15 Mar 2023 21:43:55 +0000 (UTC) X-FDA: 80572460430.18.412D5AA Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by imf27.hostedemail.com (Postfix) with ESMTP id B402440004 for ; Wed, 15 Mar 2023 21:43:53 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aE0XYUOc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.44 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=1678916633; 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=GhDkz9cygAKI6omptYlnjhp4nG7oC/xwiqYxOhUgxAM=; b=VDldeFwNoPwUxBGD8gzU61NTliUBfOMBvTuMdEB+zaj0MA5tXIEfz8HDtI2mY3BqlB1/2o uNzN0xPNSCuZwafda4o4BZX+azIxg8+sdjx1ZpdyE7n0p8lGwl0hjT+z38UHwcxvn7SHAP p+U1MRoUATLI1nBX7MGHqUPynHEm/qQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aE0XYUOc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678916633; a=rsa-sha256; cv=none; b=kHJUtO6xrNQN6t1ytwcww5mPJH6clp1I4FCwS5SKLQbWellTKnMrNaXoNxA5vVaRdXCJAI vJ3DZTKTSu2B17J4RiVUjE0G+Z8kCZsqW9e4JQmKONS987G1FhRNWaaTnexoXW3HOYMxaF iaEdBQkY38AmsV6qi9yZCCIuOR0cMOE= Received: by mail-wm1-f44.google.com with SMTP id ay8so8228467wmb.1 for ; Wed, 15 Mar 2023 14:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678916632; 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=GhDkz9cygAKI6omptYlnjhp4nG7oC/xwiqYxOhUgxAM=; b=aE0XYUOcNXfXFpaLBC++6d3u8Kk2RlEEz6Y66yRnKWOVYhoUaN4wmFtWUcdjvaHJxQ akQVx4kr5UApgcHzP512dvIqexA0xTwkSOmkXlXOgaVFYTiGM2iMmsuA5ydb5L/heQiE wQPEYWtpnGhSWRFInFQ/Ky4QJZZQ1Db4WTCS8SWEYoSuaGR/hPsFs1WHaKkfikUDa5p2 RE7rjXwTiHRBt5kax1WQAYa61eVWM2u5eQ0dMsB/6rDBGuB9X7yevBG4HZRAN2C/PJYQ yU6DeltiLiM9sYayTzC/PL6HvhTuxbqiMkhphooapR8nSS3L29diLRg0Mki1KQZRNTWs d18w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678916632; 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=GhDkz9cygAKI6omptYlnjhp4nG7oC/xwiqYxOhUgxAM=; b=Enq+cE7wVMa7cteKahAGU7nMjo/VAfYPBL7r5AatfnkGwO7deiGdBevWs4kZUyTjWx zy8+RJ8RgnqTwM1t+Ghvnf38qbGdw5B/tLD0T0zX9NBAP/uosyrXyfKnjP1ZTTTQy4Th 8/s0xoNCK1ricpb8p85e582yrhrBHikEM08IZ3R1EM8VHMfUIEt9tFIW5ol8HwefbQk+ +S1Cceb8FP8COqO+0RDZaDzkRA3gSv+uHv3ZC0betb2V8jWYNh7fiH2QJR+sa/LIhKrq XBBZQgHWP65Qw3UZYIDeOscPCVJAjytQUPmgmE0fsm+ZjMLU1X2UgCSa82mwDd/C8Gaq oEiw== X-Gm-Message-State: AO0yUKV9vPGaX49il0qsXGdLnd9PrLIGCg0MnRkx8L6tO11EMnYAUUym TMBEhlO3S351tVxhUiChJCxROeaBZ7U= X-Google-Smtp-Source: AK7set86HOVQ82UwG/kVRuAVCpV3DYDglhRDXQl7KOgfCK+DCRVtD1aXn6D8jDqb+r3VGL+ykb5a9A== X-Received: by 2002:a1c:cc06:0:b0:3eb:42fa:39d5 with SMTP id h6-20020a1ccc06000000b003eb42fa39d5mr19470523wmb.29.1678916632156; Wed, 15 Mar 2023 14:43:52 -0700 (PDT) Received: from localhost (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.gmail.com with ESMTPSA id d12-20020a056000114c00b002c6d0462163sm5587695wrx.100.2023.03.15.14.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 14:43:51 -0700 (PDT) Date: Wed, 15 Mar 2023 21:43:50 +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 08/10] mm/mmap/vma_merge: convert mergeability checks to return bool Message-ID: <7c7f9045-feda-446c-826c-5061534afcc0@lucifer.local> References: <20230309111258.24079-1-vbabka@suse.cz> <20230309111258.24079-9-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230309111258.24079-9-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B402440004 X-Stat-Signature: p1oqyxnd3un3n8164s9qcjf6zyciegab X-HE-Tag: 1678916633-521314 X-HE-Meta: U2FsdGVkX19DFGFFsH4C7SX/tRVj62em+HcyYya5qspvB4PzNXihX2QS8DMq/ue1fuwejjmEBm+XHG67BcceGrKlgeVfeaR83mROcud92lRTeKnMeFbLOHoL1nGq/9wTlM2MlbyKRLQXrn+l1f4MsUBbpc/V32OWhHFXiAO9upYAducEvMWvGiZqh5qjdZkHv44A43A74pfCgr7mdKjzuwu3Nw+SzChZu2NPGmai5/vt0L1ZOjOsSN7e1yUj6aBEjtq/E5whqG2TXWguvZRikJC7ul+GjgnVjxnpHqztfo5zxIXWm/pwAK1pBDAbpUN5VujJRR3wI/qzRRUGBlIjQWSw8sp/CEe6rd3kChEjQl81AsCsWf7ILpisq6yZc5yMk+/Qk5bV9uVqKa3pUxApefTZSEyf3VF7vEDM4jPm0vV/RmmrHP2AdfTUbp9xaCMyXOZcOoSnjAzMWd3/lPf/GG6tKDAxw/q6uXyfI2OP/EMmft7IgWlUS0RJySbO1hKReGnDmmeQbhBS/FvIIAlGpC3f6ogeZgpJw/fi6vWHcWCv07WFzjm4iVW5weBkyXRDEaXIYetb2RS90djvUj0PZjEb7FpUVHLTReTor7/Y3WKUprhV4O/9gToiH9kGdXsyz3OwiUfuxDwQGh5e4fXGg42rIrkCU4QffN6QazdgKG7X691yysSPYU+xBowS9O49tkNjL61TEmKKibsy4QHDlvuevlAUywcCEH8ihbGEDhQk8VFBLsLguUQa+bpGJqc1LO0c5+3Bc2XBymAdHSAucaeT0IyxdfDb5AiTqqpMpOGY5wPu83Sk7LyFTUbwbotluyVKhBKU5Nw7jhAyy6eW7d77b+2Ck+BdpOhjN9YvptrLEI4BNURqdsksMILtHctKaQK1wnoE6z+9X4IVggbqHNl4NaRBb8qHfld1oRRLFA5kaTYr7togctP0+17vQ386yVQ3/XXFP8zEiVjs499 +k/zYID9 H0CZtUl4BpsftCvHS9tjbW+62kLLs3TSeHU2lAfBTIvlrwnp59NOh+cnfmeoUW6jZtpZns0ADuyLKKiTRXLDRK5iCfFuWKV9lUWa9cE4hv49CAcBV4TRJTuAp9RsIXbLTK/2LnaVl69DyOiJ8tCReYpG1shVFkADVgGQ47VttF7onG4gTROky0KHQzyCud2kk6uozdIP9iqd/N/iL7+36o5IE9jO/njZrnkZdiw6eKghI+6Vup1ym1yRBmzn3tGq0OkaSLnm3ixQ/Tw58H/Y2l7AYqinRHGnxF+YqBlG9t/gx5qrucIWV3o27y9eDSwLGfPRJ6WDuSbJGGte0AjG4U3sVH/YXYFqBWaGS8if3t7fIEfbwzxUavLiHSjehQ9BOTDCdT329Ax6jIWp9QI/NAC+5CD2SUyF1FXf1XnpXcjkS4I1Sp0vYaHeGh9NPH5ZNl6xwg8I9TOmRMESVVZJW+SOg2UGScFlFZXmH 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:56PM +0100, Vlastimil Babka wrote: > The comments already mention returning 'true' so make the code match > them. > > Signed-off-by: Vlastimil Babka > --- > mm/mmap.c | 53 +++++++++++++++++++++++++---------------------------- > 1 file changed, 25 insertions(+), 28 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index c51d69592e4e..d20bbe9ec613 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -744,10 +744,10 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, > * If the vma has a ->close operation then the driver probably needs to release > * per-vma resources, so we don't attempt to merge those. > */ > -static inline int is_mergeable_vma(struct vm_area_struct *vma, > - struct file *file, unsigned long vm_flags, > - struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > - struct anon_vma_name *anon_name) > +static inline bool is_mergeable_vma(struct vm_area_struct *vma, > + struct file *file, unsigned long vm_flags, > + struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > + struct anon_vma_name *anon_name) > { > /* > * VM_SOFTDIRTY should not prevent from VMA merging, if we > @@ -758,21 +758,20 @@ static inline int is_mergeable_vma(struct vm_area_struct *vma, > * extended instead. > */ > if ((vma->vm_flags ^ vm_flags) & ~VM_SOFTDIRTY) > - return 0; > + return false; > if (vma->vm_file != file) > - return 0; > + return false; > if (vma->vm_ops && vma->vm_ops->close) > - return 0; > + return false; > if (!is_mergeable_vm_userfaultfd_ctx(vma, vm_userfaultfd_ctx)) > - return 0; > + return false; > if (!anon_vma_name_eq(anon_vma_name(vma), anon_name)) > - return 0; > - return 1; > + return false; > + return true; > } > > -static inline int is_mergeable_anon_vma(struct anon_vma *anon_vma1, > - struct anon_vma *anon_vma2, > - struct vm_area_struct *vma) > +static inline bool is_mergeable_anon_vma(struct anon_vma *anon_vma1, > + struct anon_vma *anon_vma2, struct vm_area_struct *vma) > { > /* > * The list_is_singular() test is to avoid merging VMA cloned from > @@ -780,7 +779,7 @@ static inline int is_mergeable_anon_vma(struct anon_vma *anon_vma1, > */ > if ((!anon_vma1 || !anon_vma2) && (!vma || > list_is_singular(&vma->anon_vma_chain))) > - return 1; > + return true; > return anon_vma1 == anon_vma2; > } > > @@ -795,19 +794,18 @@ static inline int is_mergeable_anon_vma(struct anon_vma *anon_vma1, > * indices (16TB on ia32) because do_mmap() does not permit mmap's which > * wrap, nor mmaps which cover the final page at index -1UL. > */ > -static int > +static bool > can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags, > - struct anon_vma *anon_vma, struct file *file, > - pgoff_t vm_pgoff, > - struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > - struct anon_vma_name *anon_name) > + struct anon_vma *anon_vma, struct file *file, > + pgoff_t vm_pgoff, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > + struct anon_vma_name *anon_name) > { > if (is_mergeable_vma(vma, file, vm_flags, vm_userfaultfd_ctx, anon_name) && > is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) { > if (vma->vm_pgoff == vm_pgoff) > - return 1; > + return true; > } > - return 0; > + return false; > } > > /* > @@ -817,21 +815,20 @@ can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags, > * We cannot merge two vmas if they have differently assigned (non-NULL) > * anon_vmas, nor if same anon_vma is assigned but offsets incompatible. > */ > -static int > +static bool > can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, > - struct anon_vma *anon_vma, struct file *file, > - pgoff_t vm_pgoff, > - struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > - struct anon_vma_name *anon_name) > + struct anon_vma *anon_vma, struct file *file, > + pgoff_t vm_pgoff, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, > + struct anon_vma_name *anon_name) > { > if (is_mergeable_vma(vma, file, vm_flags, vm_userfaultfd_ctx, anon_name) && > is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) { > pgoff_t vm_pglen; > vm_pglen = vma_pages(vma); > if (vma->vm_pgoff + vm_pglen == vm_pgoff) > - return 1; > + return true; > } > - return 0; > + return false; > } > > /* > -- > 2.39.2 > Partying like it's C99 :) Good improvement, feels sensible to move on from using return types as if the 1st edition of The C Programming Language were still current! Therefore, Reviewed-By: Lorenzo Stoakes