From patchwork Wed Mar 22 20:09:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13184632 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 AE01DC77B6C for ; Wed, 22 Mar 2023 20:09:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2577E6B007D; Wed, 22 Mar 2023 16:09:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DEF96B007E; Wed, 22 Mar 2023 16:09:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07FE76B0080; Wed, 22 Mar 2023 16:09:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EE9AC6B007D for ; Wed, 22 Mar 2023 16:09:34 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B0F0B120412 for ; Wed, 22 Mar 2023 20:09:34 +0000 (UTC) X-FDA: 80597624268.18.9CB99B5 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by imf28.hostedemail.com (Postfix) with ESMTP id D4D49C0009 for ; Wed, 22 Mar 2023 20:09:32 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=heTwx97L; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.52 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=1679515772; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=HCgva6Y3OeTabS/M9KyDqAlOgeyNpGW0N58dthTzkbaeFtqg7VOdrVfG9DT3/b3KpU3JDo kefXAgLYejWWYj6fGFO/8jxHIdcr/x0up/atEJ9HcZ4ww9fqUIIKrBIGfEi0zGaoDlzaM6 7PLdBWE3NRbFTfBYnU47EP3NR+oI0Ws= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=heTwx97L; spf=pass (imf28.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.52 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=1679515772; a=rsa-sha256; cv=none; b=I2muX83btculzc7UEs0uCSuUo8qNfDfi2sJejgfKlPo6qJvdNvQNdHxCrtp8Kx7tndXFd5 H4g44vc8iNQNQZc2sagM92dng+KPahq5XERlP2MZ2pN+5ZL6MFNPEf0iDm9GOoZBbYGYQs 2iE/Fl7XhzmSKjNQlFIiB1AnWSzdPNw= Received: by mail-wr1-f52.google.com with SMTP id l27so10011468wrb.2 for ; Wed, 22 Mar 2023 13:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679515771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=heTwx97LsAuGz+zH+hB+ONFmZkqLMAfFgK6EkCn9Lc5rvPLphCGmRxHfrBHvldZIhN 6nIp+q/EMzTSmk2NqTn706651dldDJgV6mY13uVCt9ZBZawk7f4L87JOr60Ayc49k+A7 FF4qB1JiVSm60DdnQUWg4YH9w8VEVxzt3m0GYd5uQgrZgxJD1zP8+eEScWx06xz9BcyO 9GzUOxRz1arIvgRGWGI4gi5Yyl7BnZS7DiTyl183vy534DHMcI9c5tOP9GZ8QGSKkIF3 iHCou4d5uH0sXYHAO1mb/yHVarH5IO7TvWWrx/L55yzTNVLWV7ZvNPFj8W0b4ttIL9KG 4IDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679515771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=ZUbdfMrWTvykbIBx3NO2YQAHULEXyi8Owf5mlnT9rKDrdtoD9n8RvjH98c2WeNuEaA NJyQV1V0xhj+gL20PVf2rlcJQYlCaQlqgpcyVaQnPCcAbtaR9cYAwDzqN2MWFcoao+K1 xttpU8EszULaBXWDRARQpFVlntichrlFVvYmTjwvNMMYCHhiPldrM2Hktvo7y2se4OIt G1TOE0naUtGcAK+wBTwGI9oVlASI/QENkwn2NkogbWOb2IRbXQ08/Eu4kBfo0UOjAPhU MZH1YPUtNfrjlzGs9hr5LGC045O28M+ZyHI+p89eulJiTN+hBQDStRsFay11HLrmX5wv 9SFA== X-Gm-Message-State: AAQBX9fJgCEEkosy43zzW3SNr1cwu75yIRW2YmF2RrXPj5ualuwiedMH HTbyJTy79kRkh1K4WRiBUB//GmXp5Fo= X-Google-Smtp-Source: AKy350Z63sSn+tcLJv9yQVGsamu6+bIn2KX6NdJ/94Wwl7SGKmy8kFxAFDAfxsovQe9a4fYAkbTCYQ== X-Received: by 2002:adf:f5c5:0:b0:2ce:aa73:4960 with SMTP id k5-20020adff5c5000000b002ceaa734960mr806288wrp.5.1679515771219; Wed, 22 Mar 2023 13:09:31 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id a7-20020adff7c7000000b002c70ce264bfsm14664342wrq.76.2023.03.22.13.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:09:30 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: David Hildenbrand , Matthew Wilcox , Vlastimil Babka , "Liam R . Howlett" , maple-tree@lists.infradead.org, Vernon Yang , Lorenzo Stoakes Subject: [PATCH v4 3/4] mm/mmap/vma_merge: explicitly assign res, vma, extend invariants Date: Wed, 22 Mar 2023 20:09:21 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: D4D49C0009 X-Stat-Signature: jdjxk1jo98ijx8g9mbbqx7moeen3c3ms X-Rspam-User: X-HE-Tag: 1679515772-82380 X-HE-Meta: U2FsdGVkX18NdZaPJlIzotpoUWdX/QpXnB3yFz5bWbgiVhy8j3ngI7ILGIyxTRlCNI4i1Mugf1Ts5mNOHuOi0Foe2nKRWwzimqhfFx/qpLm76kpD6rkDtPafkuSDSTnGB+A582cdHJXjFLFeZwewDar05peFl/+J6Vi+hMrfzFX9bYE0ed1K9agqnSSkaN8+fOFNSedmL8V8iG2B6IAYj/t9eZR82jNI+QJfYBzxEZEQQMGX1C9jVkMNXTD1yVmTi/XHG2z6HaLOEEyueFAj4iBzOpMkJncL8FOep7EFgdTdeXCRprvO1FvLohV9/QWVc38z2YF9PtYIil3TzBfiFMq46v1Hng6rkaOwow1oODVfG9OK4jKaaUdxPiKMGO4FxJwIrWNEPCFYmXAwBlk9fSAfqWd2R3DeIX8AZZx2wk7HMTA/sdvMmWsQgVw4qqH2Zn+b4P1ePyJgFn1n7YAzQC5eeU1wDa10RrYsXlydOPhS1tQkIOlUj35tVGNqsP/Fxb/OPC+AVEzgZPf69PkzNHUCXqx3rvZW4GeCFwAdfLbnxbgC3RGXJih4cXxavPD1btm4yMxEODbLC27vOnddf2jEl99wW024WefNZPh29SEC3FN4xPLHvXafuHFYDfCipXvxYPF/347GxdOG7o7hPUZ1mN7RoewZSAESw7/DkrKCb2oO+HnA2n3mBg8Dp9C0EJ6MJl0AS4fTn4lLd0kzJjeqXeVYP57hR7eCc6VcwfTHzvyDweMepmFZP9FHrWv8YcnZG0sDqt9VZojsXcjff8Tnt0eXl2zoN3+8OuxDnWO5T3UY5m4M6MjWQ78uGVme4PqZWxBR6J/TYO+VaDCBE3945+tq4FxdqG7iHSUwb8WVWvkTM/WBnjulLmsMEiHW3OQ5x+nFU27ie0GBtxkJWHtbv+KD8njBy9kwF/0orpfrb9z/IaH5138Kfizy18h7yVB55xt11VWDF6en9LT 173MRHf4 ohYxny7t/E+nz5fcJuJOpgLJAYwlMTfjtU7nm/mXrB2THAPVtreLXT3cKe74RyGmws49mup4IrKdW62MWlt/EsgLcpsHJxsFH5VrumOpwfxAyIWrsUi0Mt+Dlti8TZlkGYXuqqFTybdY/1RjD1in/PAPExq7WT7fh2X/klXRDWocSxVvyy6faDSySWdbbNT0LPQe6LwVNy4vnF4QvMxhD1AYe0+NMINefMoA/JwEq0TKXV9OOFtnHVTb6CQOGkbTq4U3h27vgI7ke9qQhkeUBNJ3oMUz+q80laVa88eIwayIWCKv+P/HduCI1eR7rDrsPFxSnZ57X79L/dhXrvBjuZO7M33xfrA23LbNjRliH8OzYBVkHr4ATRjfIzBw5NpO+HMSPu3bnzBpi9Cgcy7CWXsMBiywerLfqPbYZB9VRmHQBOZb9OVt2WQyfoIPWTwhgrlrkVyl89Vkia1ELcxyh4YBE5qmng9gI4PinPMO9LB8pRfWLL4/MrKUoZJsUOt0NrhWi 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: Previously, vma was an uninitialised variable which was only definitely assigned as a result of the logic covering all possible input cases - for it to have remained uninitialised, prev would have to be NULL, and next would _have_ to be mergeable. The value of res defaults to NULL, so we can neatly eliminate the assignment to res and vma in the if (prev) block and ensure that both res and vma are both explicitly assigned, by just setting both to prev. In addition we add an explanation as to under what circumstances both might change, and since we absolutely do rely on addr == curr->vm_start should curr exist, assert that this is the case. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka Reviewed-by: Liam R. Howlett --- mm/mmap.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index dbdbb92493b2..2a4f63716231 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -911,7 +911,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, { pgoff_t pglen = (end - addr) >> PAGE_SHIFT; pgoff_t vma_pgoff; - struct vm_area_struct *curr, *next, *res = NULL; + struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; int err = -1; bool merge_prev = false; @@ -939,14 +939,18 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, else next = NULL; /* case 5 */ - /* verify some invariant that must be enforced by the caller */ + /* + * By default, we return prev. Cases 3, 4, 8 will instead return next + * and cases 3, 8 will also update vma to point at next. + */ + res = vma = prev; + + /* Verify some invariant that must be enforced by the caller. */ VM_WARN_ON(prev && addr <= prev->vm_start); - VM_WARN_ON(curr && end > curr->vm_end); + VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end)); VM_WARN_ON(addr >= end); if (prev) { - res = prev; - vma = prev; vma_start = prev->vm_start; vma_pgoff = prev->vm_pgoff; /* Can we merge the predecessor? */ @@ -957,6 +961,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_prev(vmi); } } + /* Can we merge the successor? */ if (next && mpol_equal(policy, vma_policy(next)) && can_vma_merge_before(next, vm_flags, @@ -997,6 +1002,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, adj_start = -(prev->vm_end - addr); err = dup_anon_vma(next, prev); } else { + /* + * Note that cases 3 and 8 are the ONLY ones where prev + * is permitted to be (but is not necessarily) NULL. + */ vma = next; /* case 3 */ vma_start = addr; vma_end = next->vm_end;