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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 820AFC2BB85 for ; Fri, 21 Jun 2024 20:18:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 177618D019F; Fri, 21 Jun 2024 16:18:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FF628D0190; Fri, 21 Jun 2024 16:18:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EBAFF8D019F; Fri, 21 Jun 2024 16:18:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CCD988D0190 for ; Fri, 21 Jun 2024 16:18:36 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8206C140690 for ; Fri, 21 Jun 2024 20:18:36 +0000 (UTC) X-FDA: 82256008632.10.E9F657A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 20F2C140014 for ; Fri, 21 Jun 2024 20:18:33 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d4N8NKqD; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719001109; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xKdPnYoDnRcC5du1K7lkE2/k6eZ8tx7TTMzF6cVycUU=; b=iiHEd4Iuw3rWKnvrb180dLim+KxSPTwF4tWn8jvrcbfqiq050L04h1hw7+8aiZDc25NGe9 D4lbCy+UnB7J1V3S5y/kvfJCeiD9NgTq9gb6giOA5k55WhKFZRV8Ey3Odiw/5r25llHipM LpcJGDLzwBHiTyyZW9SHCbqoMUECfkQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d4N8NKqD; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719001109; a=rsa-sha256; cv=none; b=M+bvXNDaxmlVzchN5SAZc5Z69SpDrXJ2mcoMKMSbFZTt2QDt/aUBUC69bxtgZ/Ch5ZZeIv X1mJ87XS5J6yeDtbgrrR43FoMlJ1Cj2yEDqJU1R7oC53ecbhJX40rt/EUOJFyEdbtu+Pf3 /XVMLtFjXS194ae5wFfsRWxP6E4iv8c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719001113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=xKdPnYoDnRcC5du1K7lkE2/k6eZ8tx7TTMzF6cVycUU=; b=d4N8NKqD81oN4jl4wlIj+ULpazVe09g8gnlULTsCGbPXM2F3TofVJ7Pp0MW2XgFyTEC9Qg A6DE0chGEQoCnnI1bkluM/2MvSv0Jjgyfw2WNVJhCMW8p4AX3RugfC+/TTojLTSGYOwrvJ 7fogX3vHmuxZJIlqVWTHLIH4Nohp3gw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-1-B56OtGkMMd6WnP43VmwxlQ-1; Fri, 21 Jun 2024 16:18:32 -0400 X-MC-Unique: B56OtGkMMd6WnP43VmwxlQ-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-421805fadadso18272535e9.2 for ; Fri, 21 Jun 2024 13:18:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719001111; x=1719605911; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=xKdPnYoDnRcC5du1K7lkE2/k6eZ8tx7TTMzF6cVycUU=; b=Yb7pHFNolugiAuYy4z4zg2GKOJTsVcoNRqlClZQrVHpSNfOzACVU7Qzjpcz7+c/bwj xI9r/Ejbn5Ctn9zDeEPx1mx5+DytcOLOFV991rIHvYQz285Z2d7PDq9sI70cF0nc0Z+R H+W8k6i5D/VqgPCprJAcToHOVxtd9pdv0S0WsV5+n9DWJX66RwxC6KdH56gyrQMucRQ8 lpC1c8u1xP/90fhoyZVT7zIhsN3kGSd9ilI4rDm5bHdUqiKHrbl6FnihYWYpE6eLIohd qbgL4YoCPAI/IQvGJ9D24dGr9a7E/jThuhVETQhifGY3MdkBSV3XmgFdXZ/ZZyQtRCMK UjsA== X-Forwarded-Encrypted: i=1; AJvYcCWNHhB5bYVZ/SZNgcLAvRMv2qgx9XSAHqdhvBQmZCeHBV/aAX4SQ/mg7JhHqb/GM+rL2VXfDO4WHdpx28Aw+nkwtJk= X-Gm-Message-State: AOJu0YztyAS+nBHIBke40CYenN1N8lyyXQ8pQ+v3kGXVttAlDv4lpz5r NU+vPnBc2cbXU8QtUacei6yGDF1aFS82Z/HsHM2g5ZBA9td+YktIDML6I5lDxWJHkk/VPaUmGjO oyB0amoIIt5Fhk1ZrOKS1UlSotyET+xwCx8d/663Bsn1vDjfJ X-Received: by 2002:a05:600c:4b27:b0:421:78c3:9d11 with SMTP id 5b1f17b1804b1-4247507938bmr64105265e9.1.1719001110831; Fri, 21 Jun 2024 13:18:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHcoUFnLvfF5KuGJpCNEtoSnHrYWkmGFczjaVFbyD68dnyW6nOdl942zk7PbBgsPsk8Ye29og== X-Received: by 2002:a05:600c:4b27:b0:421:78c3:9d11 with SMTP id 5b1f17b1804b1-4247507938bmr64105095e9.1.1719001110360; Fri, 21 Jun 2024 13:18:30 -0700 (PDT) Received: from [192.168.3.141] (p4ff2358f.dip0.t-ipconnect.de. [79.242.53.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0b634asm78962685e9.1.2024.06.21.13.18.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Jun 2024 13:18:29 -0700 (PDT) Message-ID: Date: Fri, 21 Jun 2024 22:18:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 2/2] mm/migrate: move NUMA hinting fault folio isolation + checks under PTL To: Zi Yan Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton References: <20240620212935.656243-1-david@redhat.com> <20240620212935.656243-3-david@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 20F2C140014 X-Stat-Signature: tkheb5rf8d6pamqsqx5nu97bqhgm8p6h X-HE-Tag: 1719001113-949169 X-HE-Meta: U2FsdGVkX1+JzGFlfIEV6pSuvCjy69RanGohSkFowNIAxi9D+fg3S8fX5Q83CO+yDpdYy0eWDFamOq2DfnhVOQ+tsgxDwlJWDobKdQz5UZx3MPV4ZzX7TiZmJieIULwWgpkHeMxV3+NA6doUY8wazR7VPRB4iJ7iPjY5EsE3ghaFscCL0LOMPhxMjcC3eA0SbYYsXfaHttLWmCVqQTuu/VI0b7zKW4YFJ2mKrygrhRQ/EiN9/RjnBOyGPjYlv+82yLMCHgg0XNmLFLtLq/3gqLxlWD9WM34nLd1P972iuzAlxq3spUrODQQimigYVPRxHF5JBoa7QCif55wX7uNS93RBBAvYV/EtutUnt4+GZ9BaDqyDqADm8XBA3nX+IcBFYDgtELKT54UdT7oaJVkvTmvrq9JZpnt56BnaN7BMWa1b0r1qfekrw+APj3dvcEQsSkQjz5n7G8M0PaUCVzf3QWstJUx/RoAPtf1UwZ1YjBRvhqH8idUMICzygc7+P+xcJWwDX8ZNRUGNsNmulLcxJBg0qLWGyqoUDxAGMXokng7qdee0n17NXpUZifB1CQqWREVRLUTcF2FnAUO8ykVJFBkXwo1Rc3rkt7LHIVJLwaDJX2MzQpgyLyuGBe5+EauokkmeKC049QzsCghw0pfOVGgObf1wTeq/AeO3NzSLfNouWjgA20ErB/MHfMCt8UD2njYT/sE75mvxBn9rVZY6nP7TWoIlHSCatKkZHm7eoGLng4gP+Fh1YE3Aw2t3ONNo9/6a9qRW5GEugJAxu+jT/REJv9QVzPqljMXs6D9jKIRwHpU/em4IxXy3xdVXb+ZqMyXfITUVXOH5vWfDvbmSfImbX9KxdmPQm5Hanf/w5Iq1btWSbTbxGKjStVjh9UZseW0FjgE6b/xjFzIS9lJA4nPdq/6GOpFpCrLM/AnsuoZs6mCRP0NP5ANKC7NO4AHVtjEVPhh6GeVqxJ4bSYc D4wKwDMh MPA3kUj+UtE6ssgfXTLLo39QVHUzb5RGUTdW2NNuflJ7IRsYFwTXXNz0hYyMKdgZw+gLk5xU2Hweaij5lU82RzKjoKY9ImifXYyj36EFZYHzXJIF1dgK+y+snwJ5wG4R//gceK6Z5qlroc8JCxOc63blTTg42Gc0CLvFMvgLAYRBxySRo8thILoQNZRgbybmSErady9nOwUNLzOSd42ftTZbQP3xQBgk6vZZV8L5L6dc+q8ZgEQNMXbeSr+i65CNwqwoq4rREuGfl4dQjOHcFW++WCSKatybViFXWmzN7NJC25kb4doc+soFCcdKhMpl1fQEQSp/Wpq6TV2AdvXBnW7qQ12nXBisM+dpiFjTVBrXtQIquB/ZlCQuPUGwCxFL0NAoRuCTD1BFN+zMwNMU0Xu1yyvKYV3lQKREfwQLiQLi/rXd++c874n/jZw== 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: List-Subscribe: List-Unsubscribe: On 21.06.24 15:44, Zi Yan wrote: > On 20 Jun 2024, at 17:29, David Hildenbrand wrote: > >> Currently we always take a folio reference even if migration will not >> even be tried or isolation failed, requiring us to grab+drop an additional >> reference. >> >> Further, we end up calling folio_likely_mapped_shared() while the folio >> might have already been unmapped, because after we dropped the PTL, that >> can easily happen. We want to stop touching mapcounts and friends from >> such context, and only call folio_likely_mapped_shared() while the folio >> is still mapped: mapcount information is pretty much stale and unreliable >> otherwise. >> >> So let's move checks into numamigrate_isolate_folio(), rename that >> function to migrate_misplaced_folio_prepare(), and call that function >> from callsites where we call migrate_misplaced_folio(), but still with >> the PTL held. >> >> We can now stop taking temporary folio references, and really only take >> a reference if folio isolation succeeded. Doing the >> folio_likely_mapped_shared() + golio isolation under PT lock is now similar >> to how we handle MADV_PAGEOUT. >> >> While at it, combine the folio_is_file_lru() checks. >> >> Signed-off-by: David Hildenbrand >> --- >> include/linux/migrate.h | 7 ++++ >> mm/huge_memory.c | 8 ++-- >> mm/memory.c | 9 +++-- >> mm/migrate.c | 81 +++++++++++++++++++---------------------- >> 4 files changed, 55 insertions(+), 50 deletions(-) > > LGTM. Reviewed-by: Zi Yan > > One nit below: > > > >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index fc27dabcd8e3..4b2817bb2c7d 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -1688,11 +1688,13 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) >> if (node_is_toptier(nid)) >> last_cpupid = folio_last_cpupid(folio); >> target_nid = numa_migrate_prep(folio, vmf, haddr, nid, &flags); >> - if (target_nid == NUMA_NO_NODE) { >> - folio_put(folio); >> + if (target_nid == NUMA_NO_NODE) >> + goto out_map; >> + if (migrate_misplaced_folio_prepare(folio, vma, target_nid)) { >> + flags |= TNF_MIGRATE_FAIL; >> goto out_map; >> } >> - >> + /* The folio is isolated and isolation code holds a folio reference. */ >> spin_unlock(vmf->ptl); >> writable = false; >> >> diff --git a/mm/memory.c b/mm/memory.c >> index 118660de5bcc..4fd1ecfced4d 100644 >> --- a/mm/memory.c >> +++ b/mm/memory.c > > > >> @@ -5345,10 +5343,13 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) >> else >> last_cpupid = folio_last_cpupid(folio); >> target_nid = numa_migrate_prep(folio, vmf, vmf->address, nid, &flags); >> - if (target_nid == NUMA_NO_NODE) { >> - folio_put(folio); >> + if (target_nid == NUMA_NO_NODE) >> + goto out_map; >> + if (migrate_misplaced_folio_prepare(folio, vma, target_nid)) { >> + flags |= TNF_MIGRATE_FAIL; >> goto out_map; >> } > > These two locations are repeated code, maybe just merge the ifs into > numa_migrate_prep(). Feel free to ignore if you are not going to send > another version. :) I went back and forth a couple of times and a) Didn't want to move numa_migrate_prep() into migrate_misplaced_folio_prepare(), because having that code in mm/migrate.c felt a bit odd. b) Didn't want to move migrate_misplaced_folio_prepare() because I enjoy seeing the migrate_misplaced_folio_prepare() and migrate_misplaced_folio() calls in the same callercontext. I also considered renaming numa_migrate_prep(), but wasn't really able to come up with a good name. But maybe a) is not too bad? We'd have migrate_misplaced_folio_prepare() consume &flags and &target_nid, and perform the "flags |= TNF_MIGRATE_FAIL;" internally. What would be your take? > > -- > Best Regards, > Yan, Zi -- Cheers, David / dhildenb