Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp1508710rdh; Fri, 27 Oct 2023 17:39:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEtkc2q9kciX+Yekej4VTk1O7lSQuwqHr8UuLhYPEkO33sDRelR5UiSPBOQDhwbo8fH36CA X-Received: by 2002:a17:902:904a:b0:1c3:c687:478c with SMTP id w10-20020a170902904a00b001c3c687478cmr4170457plz.8.1698453539920; Fri, 27 Oct 2023 17:38:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698453539; cv=none; d=google.com; s=arc-20160816; b=a20RK6cRHD/Aoil2wmoQIPFbrNZTkPYHxlGyuUbyTtaHwoHlm//lDMbLKjYvMXkTd/ n8ApK5djQ1Dg8X/ksPJGuZXJA775X/oOwe4DWT18F2AFFwEF+XNjpGLZFh5NLH2PBLza mfr4RqUTs7QpUuVQXK3OMwNF6/wwwOY+ELL5OPGApDnFDALfaSQWMakqDZUFxZ/z+p9S GXKxAq7pmoIHJwgAWHMM7L0kZt3I/Yl0N8NR1Z8bsMFrlWAcWE/BmKkm8Tff2Jetf5V+ hyeNtYwucP4APHtBFP0uyMfG5s+3nSq01DZB8q/eTDgrExAY1QXBTtqpeeg4DpNmUCJW hruw== 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=Hd9WkLbC3/9tKbDr398vMG9sjKzgB6769/dIszrNtnA=; fh=vBLx0KH+vftfPuCKolEKY+MKbAkCpwC5WBbaBlSuTXE=; b=RV/y7Lg1xrXmSCpmdFRkFvRBbPn/75aZ7nBzoXKfGCwt7P3+KIqTT85Uim8rhXfyhE BmTIwmAZ/hAIBk/iWrhGvorhjkryQ+AOvaM43tu3lyKSJdniH6teJFaCoCWYVb54rQO2 CLYVNC2M55VhzwD5DFdkH879ZSo1ECAcjyV8ZThy4yQs6OvQCxCktjwmmMkbTUaSTon+ QkcLledypm2/P7QpwvLaa5UxBL2eZsEIz+cIKKdNDv+r/xZc8Otzw5usrrPX42nmxHWw Ma5t4ZusddwyDGtJRgAVC8oNJRniQw47rl39CsX/UimO+SyCyoJXgHHVtNXOajSx8NVP MLrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=0WMvlORC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id a1-20020a170902ecc100b001ca4ad86358si1821399plh.388.2023.10.27.17.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 17:38:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=0WMvlORC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 47106802A006; Fri, 27 Oct 2023 17:38:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232828AbjJ1Ai3 (ORCPT + 99 others); Fri, 27 Oct 2023 20:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229712AbjJ1Ai2 (ORCPT ); Fri, 27 Oct 2023 20:38:28 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B484D1BC for ; Fri, 27 Oct 2023 17:38:25 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7b9e83b70so24976807b3.0 for ; Fri, 27 Oct 2023 17:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698453505; x=1699058305; 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=Hd9WkLbC3/9tKbDr398vMG9sjKzgB6769/dIszrNtnA=; b=0WMvlORCh5eNdKteXyjztoAPal+jeVc94WtxFTyTPkacbGB6Uy7qO0oopPVCMS9Kd1 R6uAt5fpwgyCJTj6v7zu5LWroSrxw7hWH7F/AskFMri4nDXpZkTWBMaZW5AVkZQ0Eb9T jaDFBOuWJSii9w/2Cm/unGNPKIB8qRnOenqt+O5DWva8wHHvYiCmxo9awZtx1LPi3Apq LPrhLrbJ/r3UdBs9s+lelrfO58TjmSAnP3SWoou9mSBNB5lEebCs5TllNteyXojSprgu a6rNx+UM8kpYJMO1nM1Ty7iSYJGeNOx5rsG217WxbZEvhhW1P2LLKscvERjDHj3XKy3G /+Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698453505; x=1699058305; 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=Hd9WkLbC3/9tKbDr398vMG9sjKzgB6769/dIszrNtnA=; b=R8FhnrC2iSMEzYO+aBMqK5uNvMJ2aCv9xIcf6upkyxx39EgIXiohQmXDcbSeTyQuBL TeUj941Lt0WyAPBQY2vzHlTEnvi6Rgz/tqxuGVe14anr3nk/EBP2Mp4wU82BlAD6Ol7E jKb0BgUqzWoDMO5tw1RHqLFgqs+ZaOXqS9VmBdaUeQMACstCGYo67RX6OEFMjzKkOJ/9 Np84MX7nYit2m9C7bLIuJLnDhQhwvDDPpsXUfSzdsDTvYX8wBxYLDJFPX8AZj/ZT/Kj/ nx6/SkpZ41GOjVBqhPiGIoohldqo8aC9FyfYFQKDwYN2uzIut9t35z6Sk3DF3cMoyWMD 6EvA== X-Gm-Message-State: AOJu0YwwzliLmNIoibFycm0cVPFZwhpQuqNfYZSDIuOAuGY/HYR2heNQ aKwW0Xejg4oKFi8vBtPTwnS86UbzW0k= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:cba3:7e7f:79e4:fa57]) (user=surenb job=sendgmr) by 2002:a81:7648:0:b0:59b:b0b1:d75a with SMTP id j8-20020a817648000000b0059bb0b1d75amr194570ywk.4.1698453504908; Fri, 27 Oct 2023 17:38:24 -0700 (PDT) Date: Fri, 27 Oct 2023 17:38:11 -0700 In-Reply-To: <20231028003819.652322-1-surenb@google.com> Mime-Version: 1.0 References: <20231028003819.652322-1-surenb@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231028003819.652322-2-surenb@google.com> Subject: [PATCH v4 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=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 groat.vger.email 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 (groat.vger.email [0.0.0.0]); Fri, 27 Oct 2023 17:38:44 -0700 (PDT) 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 --- 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.42.0.820.g83a721a137-goog