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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF736C433ED for ; Thu, 8 Apr 2021 03:46:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 48673610C7 for ; Thu, 8 Apr 2021 03:46:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48673610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C47346B0080; Wed, 7 Apr 2021 23:46:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF7866B0081; Wed, 7 Apr 2021 23:46:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A71016B0082; Wed, 7 Apr 2021 23:46:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id 8DEE26B0080 for ; Wed, 7 Apr 2021 23:46:46 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3F3038248047 for ; Thu, 8 Apr 2021 03:46:46 +0000 (UTC) X-FDA: 78007813212.12.46FB141 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by imf04.hostedemail.com (Postfix) with ESMTP id 93C613C5 for ; Thu, 8 Apr 2021 03:46:44 +0000 (UTC) Received: by mail-qk1-f169.google.com with SMTP id g20so931288qkk.1 for ; Wed, 07 Apr 2021 20:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=ZGuQPhmksKIfK+1ud0oXVetqL+60ICFAvNW99vX4aRU=; b=aW2TyGRtgZ7beq74J2HDukPxAmE5s1LDhCI4W3q8veZfqxdSiB0MjkSTgn2l2JexBe /2pKsud1AKPslJbKXD5UknvMpFuFcQBXrkyU1nBKM4rLOSh1a+XDO3PK3itJ8LXULS7a f+JND0FudJ4SS6ezxsbzTDmW4Qytu6DEmVWX1uMgn94ul5WuIEQ3hKxXRSbNmuOxcJmj F5WGdfr5+HS5SEPyeSJ5RiWFcA7a7oorvk/3ib20oqQJG+GW9GBtfFvQ4h0584kENeyK FhtrZNEjuSLW+bqVTD5Br0lxg+8IUXE5SUUACHjBhtclEEzfFgVy7r2PGIJpU9EcJWUm 4QRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=ZGuQPhmksKIfK+1ud0oXVetqL+60ICFAvNW99vX4aRU=; b=WdOglbihoC+TxR4v6VZU+tNFvh9pEcTwBljrY78df5UA1neqiUBxYOsjUPMqrktijJ mESQIllkUPXYk2Q4WBciTMDRp6aNan0tEVuKJyvM3VNHU8XUuoCQHQgs1PerQ2UK/Sd/ 0TFDo3LvXXGRvdokI6AM/D+UiAOY1RgmRzPURuaTW7LuVYUqDvAxPzZXBET+ly++S38k CuKBsntGY/LMeGxJzZ5TmXuIP6CX++tcuYL/ePjoe6e1EurHS3qfGDQe7iOJlFzY7SbJ OvOQKf6pNGNj4SS8ZPRJGFdO7pbbjlDIqh+FLSbS8nBPJe3TvQrsHHMHE/hKclIs/v/k WlKw== X-Gm-Message-State: AOAM5322v7xVYTOVQZOfRZOXfyEXZkcAZUhDFGHgW9MxQYVG670sY2I0 fBHVxl5F+MRAs0yVBEbPSf8= X-Google-Smtp-Source: ABdhPJw9/WGuIWsM/qP5uwjuqsln5iXGyi7bGjOG9UKOEsmn0Gl5oa15A4snJpR+1QimKpMPl76MVw== X-Received: by 2002:ae9:eb58:: with SMTP id b85mr6531317qkg.168.1617853605235; Wed, 07 Apr 2021 20:46:45 -0700 (PDT) Received: from monty ([192.141.93.162]) by smtp.gmail.com with ESMTPSA id l14sm17361234qtp.4.2021.04.07.20.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 20:46:45 -0700 (PDT) Date: Thu, 8 Apr 2021 00:46:32 -0300 From: Gonzalo Matias Juarez Tello To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCHv2] mm/mmap.c: lines in __do_munmap repeat logic of inlined find_vma_intersection Message-ID: <20210408034632.r5nor5akqo5o3aus@monty> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 93C613C5 X-Stat-Signature: ejirnirpn8ngbbrmi4horchcqpdg8tuy Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail-qk1-f169.google.com; client-ip=209.85.222.169 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617853604-905833 X-Bogosity: Ham, tests=bogofilter, spamicity=0.139174, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Some lines in __do_munmap used the same logic as find_vma_intersection (which is inlined) instead of directly using that function. (Can't believe I made a typo in the first one, compiled this one, sorry first patch kinda nervous for some reason) Signed-off-by: Gonzalo Matias Juarez Tello --- mm/mmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 3f287599a7a3..1b29f8bf8344 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2823,15 +2823,10 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, arch_unmap(mm, start, end); /* Find the first overlapping VMA */ - vma = find_vma(mm, start); + vma = find_vma_intersection(mm, start, end); if (!vma) return 0; prev = vma->vm_prev; - /* we have start < vma->vm_end */ - - /* if it doesn't overlap, we have nothing.. */ - if (vma->vm_start >= end) - return 0; /* * If we need to split any vma, do it now to save pain later. -- 2.31.1