Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp881278rdb; Wed, 6 Dec 2023 02:38:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMQs9XYCLbw3cWE6txTlTqVrOkFBLHu+tdT+GkH41zm3Wv43E/tdLb5msCyNXHyAd1VLd+ X-Received: by 2002:a05:6830:14e:b0:6d8:7a82:c1c8 with SMTP id j14-20020a056830014e00b006d87a82c1c8mr777353otp.43.1701859098803; Wed, 06 Dec 2023 02:38:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701859098; cv=none; d=google.com; s=arc-20160816; b=JZxfdwTUcaoQQSV0yuhFfX2JCAwNeOpnE+4lespTTDaM7etklk4Bmg5eJubu3pgZ2Y udsGrN4lONKywMl4YrT7agE7O1/vKi0AxfzzOXP7lRWDjdXQYZ1q+Jb1k+xILQC2wj+I +rZtfEKobbVYC0acGLHlinYsvqYvi7l/Rpgw9VcE4ZdsxR+D6Q/0PIejSend1yNrbAYl MMvnCS00X5DrupNETNqGnlthE0KhzOAsnMkDCDyCtVvqtkR6R7n5iuFbxsjn0Q3aX/Tx yBqZLUnCP2aI2YPlIE1FfqzlssSjSgyfy6swXN56EIXAWGlJ6/G0zqoFl4glF4RNho74 LmgQ== 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=9XWOv5VjGfqn4Ye4rb6vL096BWUdHwApYaIgHelXwhw=; fh=L6siCmr5CdjcZAdYDK1kJZ2FvgUGOQXFZyHc5IS56hI=; b=mPLIgdZb4kjissT9JMNZVnB5DAdza/BvhiaMDMBrESo2BVFaFr9311sGhkUKerDLMG ecgvS00A9h9ZmbtalRL5zC7pQkS7h3dYI3twIZRsDRHM3W8IBDIkX5k8Jvddq1U1Mr2l ubUXegJk10sDSfHfbGSTFukOZ7+s8irfPPuLQTUgpHVbp/mzcQaXRwAXUI+DGwhlTkOV dGVcybZ6DVo3YABd+UFF0+NFOoJ3TOwti86SX53RZT4Yn9NOYwzzMJ34hQA/Z5gzpRtI DR+2KmhI/IbAC6/wRMoSzXa6TDDpNRmz7ZtzA6N8TpgBqwqWjt0yKMLH78sq+SFnpOFV hyOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=2Z8Ojc3+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id c6-20020a6566c6000000b005c666769668si6809179pgw.200.2023.12.06.02.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 02:38:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=2Z8Ojc3+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 8949582DFD0D; Wed, 6 Dec 2023 02:38:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377575AbjLFKhT (ORCPT + 99 others); Wed, 6 Dec 2023 05:37:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377478AbjLFKhE (ORCPT ); Wed, 6 Dec 2023 05:37:04 -0500 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 AEDCA10CE for ; Wed, 6 Dec 2023 02:37:08 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5d749e4fa3dso62203507b3.1 for ; Wed, 06 Dec 2023 02:37:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701859028; x=1702463828; 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=9XWOv5VjGfqn4Ye4rb6vL096BWUdHwApYaIgHelXwhw=; b=2Z8Ojc3+f1h+IDCp5TfrmeRF8GsigP5YQiSIY77l2jHvzg0Q/CSwgB8/u/W+SR0+SN AtBv7CX4I8zATdAILvO+i+uysAG2HJP9Kgxg1PgpxNm4g2NWOwKSX9S5i3ECOzCyB7KG Jpe9s3g8ZvsyrEhpE6jNB5PVMc/88Sa2/ItrmTsSEhdYsoh4EBaVyLFP3mpQgMridE5I on4mjyLL6IQlgpjQG0mG1dk5AdXC/BJr1Zr7snqx6RoDAm94qPB24kVBf/tySg4V+uew 8Hq7QA00cieb7ItkltuI2Jd918dEv8PWWzFgwAhnwR/Z8T0QLuj+x/t4weatrcLu+Usi f+bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701859028; x=1702463828; 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=9XWOv5VjGfqn4Ye4rb6vL096BWUdHwApYaIgHelXwhw=; b=rGAPCiuBfrMqaUURu4k1MuL752eiRutdGH7H/e4ZjZVMQeWgEt8+7WUzwzb7VKZeHa 9VrOO8kqRQJR3v10Ae9M6r8jt/Hzd9apL5mfSynQI26747rHyv0syB2O+EVZazlhMQat CVolQW8N5XELJAWMxUpMTHLB2PyruRtoN2pj38bDwbp7vuOikshIIaR1Jbi8qoIyUfdJ KTSo2h51ZQnWZnCAGtSKPI55ruTffFSIkAp+JGCXISmd46nihcrvWSIbko2Y00FcW583 KnvLTpiywgDl2uM5ZRuGwLRzoBFp4gNSjrhlnqGmNhk74nu54xYZYFGOVMJ2t7jIcqP8 mMRQ== X-Gm-Message-State: AOJu0Yy/ZJTujwp5fORdFhs/u3WtgouCLiEFRPd3uMx4E2tqQPcfM6N5 2kHoVimzEtB8CmmETRUoJAGMHtlpn60= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:73f6:b5e2:415:6ba5]) (user=surenb job=sendgmr) by 2002:a25:7690:0:b0:db4:6936:48b7 with SMTP id r138-20020a257690000000b00db4693648b7mr5580ybc.2.1701859027736; Wed, 06 Dec 2023 02:37:07 -0800 (PST) Date: Wed, 6 Dec 2023 02:36:55 -0800 In-Reply-To: <20231206103702.3873743-1-surenb@google.com> Mime-Version: 1.0 References: <20231206103702.3873743-1-surenb@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231206103702.3873743-2-surenb@google.com> Subject: [PATCH v6 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, ryan.roberts@arm.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,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 howler.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 (howler.vger.email [0.0.0.0]); Wed, 06 Dec 2023 02:38:10 -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.rc2.451.g8631bc7472-goog