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 8E62BC3DA4A for ; Sun, 11 Aug 2024 09:08:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E423F6B008A; Sun, 11 Aug 2024 05:08:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF2F26B0092; Sun, 11 Aug 2024 05:08:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1D4C6B0095; Sun, 11 Aug 2024 05:08:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A22EC6B008A for ; Sun, 11 Aug 2024 05:08:36 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 12F1241B00 for ; Sun, 11 Aug 2024 09:08:36 +0000 (UTC) X-FDA: 82439389032.06.E74AEA6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id CD49C40003 for ; Sun, 11 Aug 2024 09:08:33 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WtehQag1; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1723367223; 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=/BO4276c7I58BMeDMcO4G1/nD1xrRDfJkSrBVd0aYeE=; b=oYHeElllRjzsZESncY7Aamp8F3i6TwfGbkqhiHn2zz2gOiIazDEn9RZSOiO1M6xXgZirHp VDAphrcko0HosR9qaTLILOnkqD2tBd4BeXGjyb6pBFFN0Oi8ls+vnOMeKHxSXLfQzSdQwa GkzW5r4kCtW/ePLpTSChFtdtwnw+n1c= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WtehQag1; spf=pass (imf04.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1723367223; a=rsa-sha256; cv=none; b=xz6/XWQQUn/uFeIcHXYzia/zgGTBexeJC8XMY/49t2/rHk/jBZYz7oeppxLLOWmMYUJoSN yUA5nhXeXdocb0A7SjnVjxn+LLUAVbKSrEQ3eiU8Wj0BvwYf85bpCpHmzkivC/5UkOtaVp ssTOFYk9GQRsqc92OCsb+RCN+zbIy80= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723367313; 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=/BO4276c7I58BMeDMcO4G1/nD1xrRDfJkSrBVd0aYeE=; b=WtehQag17Y6jJb/U+Rs17Lfh5oMQ8JwKCTes4+PymUsbnmbhxaF4Wv+JLCzfYEVR47AGTY b0iHyF6Fyz202DUsNRSjaL2cb2khcEvOcmyQ86wYXiUkA+DkSxgJmTJEbuWc3QdL+NRPJi axyzXRl02isFaEWTuVt3hxLUaIL4UUc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654--d9pKqugOT2LQ6beDHh-WA-1; Sun, 11 Aug 2024 05:08:29 -0400 X-MC-Unique: -d9pKqugOT2LQ6beDHh-WA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-36835daf8b7so2617068f8f.2 for ; Sun, 11 Aug 2024 02:08:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723367308; x=1723972108; 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=/BO4276c7I58BMeDMcO4G1/nD1xrRDfJkSrBVd0aYeE=; b=Mh7JucjILmootQGca8wUtd+NLDj87VE1SYDJDxPD3ow4ABV6QJr/N0hW9gaa2C+OOZ lAbd94Mg5EkrJcmo3S6Ieyr1HUedTk3b0InItcB03ynJztu/qDkaqtM7mQzoQHIBnswg 3/Ebi6e/bZIORFfCiHUnsvda9X0hmlGT/rJLpn6UErhhwPsc0pWJgEb7HsxjB4kzJ+10 +MK+HIJ0FlwIo/0QLEen0Up7T04prR3D+TFKqSn+BWvfUM7h3ixhAqeDRa49cBm+vBtv moAg6htHml9O4AXdaW88LdE7W8zDr+a6Q+L5K2YcY+wjoYKO8pVYyS8VAmtghV4fxs/b 1EUQ== X-Forwarded-Encrypted: i=1; AJvYcCWu+ofYuS8xIRgYIR7mp8XYt57B9tGHUYFyU/y2YNSvdZzX1DvTZ/QK/+E7S99Tn5n9e3Avqljs3cGF1UMqWV/vCwY= X-Gm-Message-State: AOJu0YxDk32MnzBs3LTfdZdtU+W0YJ9j3FFJLwervCkmzRugNxOvAsql KoeAkiy98TBOlqvGluo3Cf20NABJfjC0+BQO5n66qjeMQpk6LxCYht/zxUNIV0dkjWDFsqtyYky gJq3OI47vLXsiI2518y9UvbRIb9qz4UTcQzLe25W54DHGlugt X-Received: by 2002:adf:f451:0:b0:36c:ee8c:a323 with SMTP id ffacd0b85a97d-36d5fd7e9a3mr5063628f8f.44.1723367308040; Sun, 11 Aug 2024 02:08:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZX0gPPxgnWHSBD3WY4CAFgzeaOC+op4r/wizklP6aMT7VVQuXXIW35LfWV8ZYiJyzmb1ADw== X-Received: by 2002:adf:f451:0:b0:36c:ee8c:a323 with SMTP id ffacd0b85a97d-36d5fd7e9a3mr5063599f8f.44.1723367307492; Sun, 11 Aug 2024 02:08:27 -0700 (PDT) Received: from ?IPV6:2003:d8:2f09:3f00:d228:bd67:7baa:d604? (p200300d82f093f00d228bd677baad604.dip0.t-ipconnect.de. [2003:d8:2f09:3f00:d228:bd67:7baa:d604]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36e4c36bc92sm4365353f8f.15.2024.08.11.02.08.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 11 Aug 2024 02:08:27 -0700 (PDT) Message-ID: <04e12698-8f83-4033-91b2-3a402c59c17a@redhat.com> Date: Sun, 11 Aug 2024 11:08:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] mm: Retry migration earlier upon refcount mismatch To: Dev Jain , akpm@linux-foundation.org, shuah@kernel.org, willy@infradead.org Cc: ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, osalvador@suse.de, baolin.wang@linux.alibaba.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, ioworker0@gmail.com, gshan@redhat.com, mark.rutland@arm.com, kirill.shutemov@linux.intel.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, broonie@kernel.org, mgorman@techsingularity.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, ying.huang@intel.com References: <20240809103129.365029-1-dev.jain@arm.com> <20240809103129.365029-2-dev.jain@arm.com> <761ba58e-9d6f-4a14-a513-dcc098c2aa94@redhat.com> <5a4ae1d3-d753-4261-97a8-926e44d4217a@arm.com> <367b0403-7477-4857-9e7c-5a749c723432@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: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CD49C40003 X-Stat-Signature: meb8gtg3k1ri5phxmmjos7nmbzoy5a8h X-Rspam-User: X-HE-Tag: 1723367313-631722 X-HE-Meta: U2FsdGVkX18m/VEY+389TNsJgkUgL4iH0Rp/4UhZcVtOKllfpQfTlUShEHGmVMHBx4x4NNvR5BPnxCOePvJMJO6969S96bTWYUMz728D4fIy07ODgzG7AY3srHGKJYZMHyFjuaYBg550U8DSSAPmgqqZHPO5Q46XuTYznqu6I7GQJ53iTzGy1FtTIdh9QhVa0bxmsBqRnneg21lq21lWtfBvfnQAHnp43S+DxtyIPFogBGCfztBLMqCWAKFidBnpgTNgj9c80wATWFyySqb7uKdxK/TwCc7MR86btV21FEV9RgaIZbPjqA2b7wg/njClxWNJJKUbeqFIY6h/andS/LFgRQKTbEtINmaX02F9zxroxRuMaevimmn5Vt5cgkYantCq5FprDzwZHj0X4rbvT+PmHoFLKbw1Gb29Dwd+cY0WuZoT/8OnOV0kN32BuLAEesQ9rbMiiapRipprmyCy132o7EiJPAJ0/b1+cYIg2IR53gWY6yw62C97boTw1/fM53Xj/Ih4ilSRv5BHsIMAbKulvvMFQADwfJMxro3rRzezkhewcBkje+pgqAvRWU50eAHbXXqwmeC9WZyAsinpeySfambW8Z3adn1bVCHQkco+GZb6A8xVM1Gz7GOgY1vCZteMWD4SN8D2QcrYrhkxMNnnoF+ASg3lVuCqlIo6D+Ml+rN3oJtR2kokG/BmAVXKWlSuA1FcJlCxiBPwXCey4R3cB3XPPxA0l31xuINeog2FiYwibXfad9AXlN/J9bwGI/5wKx6mrdXN3LzcsS6vcb99mkBWF6xiiycU3E9wrO+5J25+cdiSS4MKtneCCh11N0Fxw2BOgvbgqukJKZu60KI7pB2+XNDV+QZqHQbmnJSzHbvFVwKClBp0Njv1xSUE3Ybcx2RYYfac4oHdGubl/2ZG6v6bBJpXwkN7a9jJ1kf+cGg4p7S8yeCEi/Z0p8/aiExUSI4Vw7YS3YGxQOv x2Lah4AL z4a/os9++q3mXE084Ar3iw3re6mMpftxK15MZB0VNRfVe1kuIiy7/ueZEYLxwXVo4f8/fPGHg3almIziCf9zv9XA89RZuis3ldWmOjzYirJ5mlhQL4jVy/btKo4/ZhzGtxUiSYTWUoFb+rvxAU/bGPb5poNl9m7QYO805snpo7sbqQ9Jd2cxm/dz/vxYHDG1VG23L63uED7ddQoGStwukTwyYZoH3n/kKvIbkXorJucUhhsRSlJT7nE8f+KKoXlFiwmE1z3nk6VCck0QuX0mthQ5wHRfEyXxbtMb9+C47oe1SKJIj01/7ZFmrxxJp02NFJY2iEpZPnyhEzCt23ev4KClU6dWHGKkc2r9N7iD8CApaaxvRbaVdVHEacIZVg1avvbKg4HhBQbYc5hXWt/RQFvJOa1aUxc+2Zgn8lSfrCmQR1yOj3iA+L2cpfs7TzPPXkPqFj9yddcnvHJI= 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 11.08.24 08:06, Dev Jain wrote: > > On 8/11/24 00:22, David Hildenbrand wrote: >> On 10.08.24 20:42, Dev Jain wrote: >>> >>> On 8/9/24 19:17, David Hildenbrand wrote: >>>> On 09.08.24 12:31, Dev Jain wrote: >>>>> As already being done in __migrate_folio(), wherein we backoff if the >>>>> folio refcount is wrong, make this check during the unmapping phase, >>>>> upon >>>>> the failure of which, the original state of the PTEs will be restored >>>>> and >>>>> the folio lock will be dropped via migrate_folio_undo_src(), any >>>>> racing >>>>> thread will make progress and migration will be retried. >>>>> >>>>> Signed-off-by: Dev Jain >>>>> --- >>>>>    mm/migrate.c | 9 +++++++++ >>>>>    1 file changed, 9 insertions(+) >>>>> >>>>> diff --git a/mm/migrate.c b/mm/migrate.c >>>>> index e7296c0fb5d5..477acf996951 100644 >>>>> --- a/mm/migrate.c >>>>> +++ b/mm/migrate.c >>>>> @@ -1250,6 +1250,15 @@ static int migrate_folio_unmap(new_folio_t >>>>> get_new_folio, >>>>>        } >>>>>          if (!folio_mapped(src)) { >>>>> +        /* >>>>> +         * Someone may have changed the refcount and maybe sleeping >>>>> +         * on the folio lock. In case of refcount mismatch, bail out, >>>>> +         * let the system make progress and retry. >>>>> +         */ >>>>> +        struct address_space *mapping = folio_mapping(src); >>>>> + >>>>> +        if (folio_ref_count(src) != folio_expected_refs(mapping, >>>>> src)) >>>>> +            goto out; >>>> >>>> This really seems to be the latest point where we can "easily" back >>>> off and unlock the source folio -- in this function :) >>>> >>>> I wonder if we should be smarter in the migrate_pages_batch() loop >>>> when we start the actual migrations via migrate_folio_move(): if we >>>> detect that a folio has unexpected references *and* it has waiters >>>> (PG_waiters), back off then and retry the folio later. If it only has >>>> unexpected references, just keep retrying: no waiters -> nobody is >>>> waiting for the lock to make progress. >>> >>> >>> The patch currently retries migration irrespective of the reason of >>> refcount change. >>> >>> If you are suggesting that, break the retrying according to two >>> conditions: >> >> That's not what I am suggesting ... >> >>> >>> >>>> This really seems to be the latest point where we can "easily" back >>>> off and unlock the source folio -- in this function :) >>>> For example, when migrate_folio_move() fails with -EAGAIN, check if >>>> there are waiters (PG_waiter?) and undo+unlock to try again later. >>> >>> >>> Currently, on -EAGAIN, migrate_folio_move() returns without undoing src >>> and dst; even if we were to fall >> >> ... >> >> I am wondering if we should detect here if there are waiters and undo >> src+dst. > > After undoing src+dst, which restores the PTEs, how are you going to set the > > PTEs to migration again? That is being done through migrate_folio_unmap(), > > and the loops of _unmap() and _move() are different. Or am I missing > something... Again, no expert on the code, but it would mean that if we detect that there are waiters, we would undo src+dst and add them to ret_folios, similar to what we do in "Cleanup remaining folios" at the end of migrate_pages_batch()? So instead of retrying migration of that folio, just give it up immediately and retry again later. Of course, this means that (without further modifications to that function), we would leave retrying these folios to the caller, such as in migrate_pages_sync(), where we move ret_folios to the tail of "folios" and retry migration. Maybe one would want to optimize that retry logic with such "temporarily failed because someone else has to make progress for us to make progress and free up a page reference" case. These are different to the typical "speculative" references that we try to handle via the existing retry magic. Please let me know if I am missing something fundamental. -- Cheers, David / dhildenb