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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62FB5ECAAD1 for ; Thu, 1 Sep 2022 18:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bNTGF2k1Hk3s6woWfNpqxwa76HeC72g9z8y1D4sjWoE=; b=IM8xWcUV3zf2X1hKYnxzObMDbE ZuHoU+P9ZVd0SAw4LoWLHisl2iuX4WG+jCjVte5gVwq1CO7Xt11OBdWF3NJ90miF0YAIoKek/ULZM Ft71zOeEX83ADIT8knpfS8x1x+9BgyTwtyRa1hJVVxIL9cDItmATFj3m3bO1xfj90+YOuYHEmNsik tzFB0cJck6F50xxSOkuZaD0Us9EG2llgA5Z6F5YghmGH8auFPJ3KCA66wVOMa6o0V4G79wfDVMynV OCtarq6JCH7Tqpe2BqDFktWKm7TwGtQnkIjdBL0Qbb5EWFpr+KiNFQ7XqDbfN+hPsjkFWwWpRVXR/ yc+InTxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oToaQ-00DngB-4H; Thu, 01 Sep 2022 18:06:42 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oToXT-00Dm5L-Vn for linux-arm-kernel@bombadil.infradead.org; Thu, 01 Sep 2022 18:03:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=IUrOZBQLzZPUHaSf75EcaCRmzwc/1Uln8Bhr3CCRW40=; b=eaLQCSL5U1Y43yS4QZelMBtpTX 9/UsjpShi9VTIbOl43Lwm6bENN5gtlABXMcRe5C1YOW61NPLJMGB2zUYeAKiXW1wp2gbhgYYxfRYr ZQI64PIvYEdqts20rFUWgZVZ5DC808Qva7BQHqghbcu+Tpw0JIPRKymmBps3ht9miXRZ5dA6tWkbP ZG0DceRSka2fe1b5NCuI1OhWaebOR+bfl44tPthdBbyQ95xXNqtoXW8ylL11yRbMDFdnbtYdvLN5k Wo8mis/facWGlGi4TLGQv6sx/znUC/AHoetUgAym5f6A6YwTcQaH0JhEblrzDrtGdvxfY/dW4inAV mPwXIf+Q==; Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTo6Z-008RdZ-B8 for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 17:35:53 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-33dce8cae71so234417047b3.8 for ; Thu, 01 Sep 2022 10:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=IUrOZBQLzZPUHaSf75EcaCRmzwc/1Uln8Bhr3CCRW40=; b=RqTxEDKmKz8lQ9e4qoEc4uYxV2l6ZaYMJyNDEM2PccdKcjIk6CnRCwBsEF2cj3JFvG j1vM9+I5MFJ8Y28kW9pfnzwXL/sLYGBlEyABKHcApM/RmMkSzapOCNpQMv7qth5lMe9Z r4q/GOZemPIxyE1pZ9TWp0QmyjLs2nHHEkPOAyS+5ktrUUhx4EO8hL8MjHB9ieBIjUIm Yg7XSf+rAL+v2NSP5NDXERvFs20Phv4/bhur7fMLyFA6L2AN5XBQFKbc4pQ3AuRWkJ+n hhBQmROSc08GaGFWWbM/WsNha74+z1T1INvujKYoiSdnjlDI7QzZLxl1fThOa82IPdUF 4lpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=IUrOZBQLzZPUHaSf75EcaCRmzwc/1Uln8Bhr3CCRW40=; b=Q0Sf7K2RvcX0vGHprC3QHTx0dSudOjGrNo3TdLYnOvWL+aNk/2ADC1CAjfPm3abftf 0Nw3NpBrF7eKu+OC+Pdrb2QDEafAOAAm0yEZt7kp5XcXTWkGrlwXdU5EA3+y35mzE3GB 2oCVt7nB5wk4btJz7OFzpkPK1WprSU80u7LnhSdiRWcDJCYkLf/YlUsC0gAJ4xmGHLfc lKgxon135yl1CSMcFwhPnDep6sj8EpcIaFRkBlYXZ8RZn49ufpKmrEEVF9hVdM9QGwUL tFebMkCYhdzTcZ2VzPZ0FkJbu5UhY8P1JVsiY5SM7Q9MMeHbsJmMIElqX3JzWPgxOecd 53PQ== X-Gm-Message-State: ACgBeo1Wk7pGfSbp5o+O+4PZ+GZDebXmhOBxu6Z3APIFkMKkF7AyUg9s jklBvtnttFcEn3pI4E7XS4Ts9HcZ3OM= X-Google-Smtp-Source: AA6agR7hyHeb8khg+/3ZoJp3oFVauMFyBSatbGnIGl1CpSfGDYZylUwLzf/LZXvggze+7Aght5uln8kJbB0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:1bfc:e7ee:6530:4449]) (user=surenb job=sendgmr) by 2002:a0d:e083:0:b0:343:2928:867f with SMTP id j125-20020a0de083000000b003432928867fmr6902464ywe.467.1662053750534; Thu, 01 Sep 2022 10:35:50 -0700 (PDT) Date: Thu, 1 Sep 2022 10:34:59 -0700 In-Reply-To: <20220901173516.702122-1-surenb@google.com> Mime-Version: 1.0 References: <20220901173516.702122-1-surenb@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220901173516.702122-12-surenb@google.com> Subject: [RFC PATCH RESEND 11/28] mm/mmap: mark VMAs as locked before merging or splitting them From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, laurent.dufour@fr.ibm.com, paulmck@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, rientjes@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, surenb@google.com, kernel-team@android.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220901_183551_488912_54EEDD2D X-CRM114-Status: GOOD ( 13.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Decisions about whether VMAs can be merged or split must be made while VMAs are protected from the changes which can affect that decision. For example, merge_vma uses vma->anon_vma in its decision whether the VMA can be merged. Meanwhile, page fault handler changes vma->anon_vma during COW operation. Mark all VMAs which might be affected by a merge or split operation as locked before making decision how such operations should be performed. Signed-off-by: Suren Baghdasaryan --- mm/mmap.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index ed58cf0689b2..ade3909c89b4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1147,10 +1147,17 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, if (vm_flags & VM_SPECIAL) return NULL; + if (prev) + vma_mark_locked(prev); next = vma_next(mm, prev); area = next; - if (area && area->vm_end == end) /* cases 6, 7, 8 */ + if (area) + vma_mark_locked(area); + if (area && area->vm_end == end) { /* cases 6, 7, 8 */ next = next->vm_next; + if (next) + vma_mark_locked(next); + } /* verify some invariant that must be enforced by the caller */ VM_WARN_ON(prev && addr <= prev->vm_start); @@ -2687,6 +2694,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *new; int err; + vma_mark_locked(vma); if (vma->vm_ops && vma->vm_ops->may_split) { err = vma->vm_ops->may_split(vma, addr); if (err) -- 2.37.2.789.g6183377224-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel