Received: by 2002:a05:7412:40d:b0:e2:908c:2ebd with SMTP id 13csp545208rdf; Tue, 21 Nov 2023 09:18:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHx/rAyC7ZLsY6A+A6QhhvEiaQpL0CBDoMuDc3+A8XjfVPNwRQebqSL450aO0iZEP+mbSdN X-Received: by 2002:a17:902:e543:b0:1ce:c27:665b with SMTP id n3-20020a170902e54300b001ce0c27665bmr10519687plf.47.1700587130243; Tue, 21 Nov 2023 09:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700587130; cv=none; d=google.com; s=arc-20160816; b=LiBjZqUdX9qHsUSMOUf0ahr5rLJUQETtVzDd1VrOuxVRe8vAIOBmB6HnhkVTjTltIi ejkX1WHkfWYWwMfOYWsVKD7o77GhKlb4+4QwXR8d0AZd9Udq/rtDEXH23XeTZqkLh1L/ QTfvhbFFk1NrSXSSCbVSwsIu2QtjK0N8Ku7feRUQuA4OJUk+zSbMG1eo9L2x+Ec0gTbQ CAXT6H+6iPOqhhSy+DFUjwUskPW8USBV1WXoe1Tff8//yuVYPlaxGUrsrUx+vMI6ffkB 5B7b9v7SE37pnw2bQlLPUin6TnCSQ5gVRUzdSJn2acltpshC1rmapmkKIIH93g3Xn6/j M7Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=He74YIcSIwOjGCEm7bMpO/TfFvRAcUHKo6jbQtwLQrs=; fh=vBLx0KH+vftfPuCKolEKY+MKbAkCpwC5WBbaBlSuTXE=; b=Z+kJUT2gpsz007jwz4l5VK96CxS0UzUva4cjSoYx/j6idPGX+nZYeygy8quu+i7vS3 51lhkUIxaRryx6XTt1/jE7t/9YWDX+46EpKKbCoXgy9JaQsWYNeCKqawrjmCbyKbviYK C2Ib4mYJQNqYJoMAFOVCkGkzMaSugLNDzGTDq1uUEJyZseEPWP/xO2a2FcsYnUQv/4k1 q3uJd6bsR2wtsRHlXbGrGkwGfNg+ZF6v0Wv0NK5TthQwLyXz31eS1dXvDtBQKGbbA+wS 9s3u0cVqG1jUySc+s2oltudL+qkIzFuiYEzuYQ2qQp0H9Kp7VQR2oHTq/krG/cn5I199 pFlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BSIvjtf7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id n12-20020a170902f60c00b001cc55bca838si11467161plg.576.2023.11.21.09.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 09:18:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BSIvjtf7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6B6EB80D31C2; Tue, 21 Nov 2023 09:17:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234084AbjKURQz (ORCPT + 99 others); Tue, 21 Nov 2023 12:16:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234037AbjKURQy (ORCPT ); Tue, 21 Nov 2023 12:16:54 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42B7C18C for ; Tue, 21 Nov 2023 09:16:50 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5aecf6e30e9so84856317b3.1 for ; Tue, 21 Nov 2023 09:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700587009; x=1701191809; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=He74YIcSIwOjGCEm7bMpO/TfFvRAcUHKo6jbQtwLQrs=; b=BSIvjtf7YoJbXznZ8LnCyXvILNcvkDvUcum+/teq0c+YIp8orZBaU6eMyJ8KzFzKTZ jY2sLFhHtP+WjSBQgS14EgfE9PxXK445diIgv0xqP4ELqx/lNyMFSOyB+/8y7BH/wsiP XRMlg2i7S80zbEFtEVKB4grC/+Yc8lODbua3ArpMoTIbvvfg8DVV0+h7XDfRT3umzd2D y8Fqes0KH7OW94OU4KBNo6uHziVHgidqwslwSh28eBuLjX70Rtm42Hdr76dpP+Bj+Ya1 SbmQMGiPrdoHhzm0JsRGcitlDkPq6l+E7BWDtKueOpzepc0K+h8tUZwxcvQ/k/wWnbtN bstw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700587009; x=1701191809; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=He74YIcSIwOjGCEm7bMpO/TfFvRAcUHKo6jbQtwLQrs=; b=Yhxu7CwHeP/M9x7/042a0X00h/FdEaSAc4V8Xiq8oDl8QICo54ZxOM1o0bseqyCTqH PzfOkvqHIhHpe+4tMvzVnCI1l5YiAfLO88pQeH19c+KEbtXuEAypU+v5SydUuz5wxDdj 8Bm/uMyy9X4WYvLM3K5Dj7jbgqcXh4skpPEHW/WrfpAWjwwFXiqPFjXqIqD8U2muy2jp R+lKfwdYFPtl7oiDJFVZtfOEz0mEFnyNpj8Vq3nR5OELwA3+M3lO+w2sKOpCjHIF2stp bExBvR3xtxHsw1aLfOcbGrbhoQicxn//dd3oKFNJF1cic11cpYaSeXOVuDjmUw6hc8Bd disw== X-Gm-Message-State: AOJu0Yx8qcfHVF+8QxZteWkPvD8vAtHUGf8B+eA1PVTs/6TqQw8NrEug 7YEoBQCIUWIdSMIb+m1I9ZFkCYcStcs= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:2045:f6d2:f01d:3fff]) (user=surenb job=sendgmr) by 2002:a0d:fb03:0:b0:5c8:b756:f3af with SMTP id l3-20020a0dfb03000000b005c8b756f3afmr330699ywf.4.1700587009501; Tue, 21 Nov 2023 09:16:49 -0800 (PST) Date: Tue, 21 Nov 2023 09:16:34 -0800 In-Reply-To: <20231121171643.3719880-1-surenb@google.com> Mime-Version: 1.0 References: <20231121171643.3719880-1-surenb@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231121171643.3719880-2-surenb@google.com> Subject: [PATCH v5 1/5] mm/rmap: support move to different root anon_vma in folio_move_anon_rmap() From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, shuah@kernel.org, aarcange@redhat.com, lokeshgidra@google.com, peterx@redhat.com, david@redhat.com, hughd@google.com, mhocko@suse.com, axelrasmussen@google.com, rppt@kernel.org, willy@infradead.org, Liam.Howlett@oracle.com, jannh@google.com, zhangpeng362@huawei.com, bgeffon@google.com, kaleshsingh@google.com, ngeoffray@google.com, jdduke@google.com, surenb@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 21 Nov 2023 09:17:15 -0800 (PST) From: Andrea Arcangeli For now, folio_move_anon_rmap() was only used to move a folio to a different anon_vma after fork(), whereby the root anon_vma stayed unchanged. For that, it was sufficient to hold the folio lock when calling folio_move_anon_rmap(). However, we want to make use of folio_move_anon_rmap() to move folios between VMAs that have a different root anon_vma. As folio_referenced() performs an RMAP walk without holding the folio lock but only holding the anon_vma in read mode, holding the folio lock is insufficient. When moving to an anon_vma with a different root anon_vma, we'll have to hold both, the folio lock and the anon_vma lock in write mode. Consequently, whenever we succeeded in folio_lock_anon_vma_read() to read-lock the anon_vma, we have to re-check if the mapping was changed in the meantime. If that was the case, we have to retry. Note that folio_move_anon_rmap() must only be called if the anon page is exclusive to a process, and must not be called on KSM folios. This is a preparation for UFFDIO_MOVE, which will hold the folio lock, the anon_vma lock in write mode, and the mmap_lock in read mode. Signed-off-by: Andrea Arcangeli Signed-off-by: Suren Baghdasaryan Acked-by: Peter Xu --- mm/rmap.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mm/rmap.c b/mm/rmap.c index 7a27a2b41802..525c5bc0b0b3 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -542,6 +542,7 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio, struct anon_vma *root_anon_vma; unsigned long anon_mapping; +retry: rcu_read_lock(); anon_mapping = (unsigned long)READ_ONCE(folio->mapping); if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) @@ -552,6 +553,17 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio, anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON); root_anon_vma = READ_ONCE(anon_vma->root); if (down_read_trylock(&root_anon_vma->rwsem)) { + /* + * folio_move_anon_rmap() might have changed the anon_vma as we + * might not hold the folio lock here. + */ + if (unlikely((unsigned long)READ_ONCE(folio->mapping) != + anon_mapping)) { + up_read(&root_anon_vma->rwsem); + rcu_read_unlock(); + goto retry; + } + /* * If the folio is still mapped, then this anon_vma is still * its anon_vma, and holding the mutex ensures that it will @@ -586,6 +598,18 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio, rcu_read_unlock(); anon_vma_lock_read(anon_vma); + /* + * folio_move_anon_rmap() might have changed the anon_vma as we might + * not hold the folio lock here. + */ + if (unlikely((unsigned long)READ_ONCE(folio->mapping) != + anon_mapping)) { + anon_vma_unlock_read(anon_vma); + put_anon_vma(anon_vma); + anon_vma = NULL; + goto retry; + } + if (atomic_dec_and_test(&anon_vma->refcount)) { /* * Oops, we held the last refcount, release the lock -- 2.43.0.rc1.413.gea7ed67945-goog