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 62829C25B10 for ; Mon, 13 May 2024 07:48:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6B736B0279; Mon, 13 May 2024 03:48:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B19A16B027A; Mon, 13 May 2024 03:48:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 992C56B027B; Mon, 13 May 2024 03:48:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7861B6B0279 for ; Mon, 13 May 2024 03:48:10 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E9AC3120CF6 for ; Mon, 13 May 2024 07:48:09 +0000 (UTC) X-FDA: 82112594298.16.A7BFC3D Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf08.hostedemail.com (Postfix) with ESMTP id 25A2216001D for ; Mon, 13 May 2024 07:48:07 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="XoIIRTS/"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715586488; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d2aMd7RSjLCt9aorWWhiNJrgbBDqFo4vIbYySyvRoqM=; b=c75u6SszD0PxMnEFnjJlxC6ex5qAe0ADoK4xlOgZg8v67jeHIpw9IOY6lvqZZkgjiE+Kty Ft/w1iY4F6zahJnrYJe5abTw9/71GCJBpgFNp1jOtbXEN/N9NLCj9Z6+gGxpUzrZJH6obi p5NcuKgbLe10aGAKFZEDHyFsXdTfmLk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="XoIIRTS/"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715586488; a=rsa-sha256; cv=none; b=jnUgTrA9TNHdmXUXtz8eEenSpmyx/dRXejuqLcbQRT/lk8/yHPUkMOvbChPXveB2xDtQMx s1QsvZhZ4OxJEapuGXUREsCCRsxLSkwC1XIX9cLrF9QC5Cn3Xfa8jZJAKZNuaZtheit9xx 7NG0wN/rVn3JAee0/hwB8OAM29VF5wY= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6f44ed6e82fso3628207b3a.3 for ; Mon, 13 May 2024 00:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586487; x=1716191287; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d2aMd7RSjLCt9aorWWhiNJrgbBDqFo4vIbYySyvRoqM=; b=XoIIRTS/4ZsKKQseHQVuNr6ejHdMUf18DOzyzgHEjzgQKo1r7fDVtuqmDineLatgzz BdVeFsHHWOFWR9q7X2VdMBduR5M1hfo897yUaxB3gBf8CNGNIM+4TuyKzaoEJ4RQ1mIY YrALwx56K4bkIu4iLZDrX1WcNmhxFGkkW3xPcTaxnsN3eDciPs5AXd2dMy4kM7eRptC/ sKVb4T4YZUNl9hkBQURQdINLiBm8/PnkjTrrUIE0+Rk96os49RC4uMoZxl6UfNlrXYXk ofJQHmO/NizFKm7MBkbPFtOLvnAujMIgREv4GfCifNR7po4n8oj1lqNKuk6McDJttXKR T2Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586487; x=1716191287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d2aMd7RSjLCt9aorWWhiNJrgbBDqFo4vIbYySyvRoqM=; b=X/VoQz0Ax5LFh7mlkKVNh2f2zWTZ3p6ByUfNKRYEH7F2OZ595X8hrUl9ORzhwVCGik mQMXbvGfF4WXJQggHb6vjkBxqhxesB3txCFeBeXSM23AoWAkcvs93BmBrfT3gpDeUu32 rGTCUvJsq1cjkRlMuweo8jIC4lgCZMqQ4UyNgTpLBp4oTpFNngkelt8Y1FRDHzAJRfsz BHWwGJYa/n3KYH//aO4Tg34zZDTWopt6BJRySDuxKk+PNNAPAn2ZHnlk9Gtg6Qxl284G S6632xAu7j2SncpVlBidcrVP9AMD+iQqMCVuiIyD7PI0FUvpeqEhFC2MHl/6MHKaWPzO nnjw== X-Forwarded-Encrypted: i=1; AJvYcCXBf6nfae8vrRoxiiUSSwADSVwu+FEejt8PZu5lsD0rmMUe8xcoCWbcAX7bN5Iw2x2oOBr1v7JvCQkFMTnQQJPlnwA= X-Gm-Message-State: AOJu0YwIG80QC3OgwtQ0L+Uw/yXWvM5beFglplqffD07Ri/MHxUc4dCX xNu3CjILq4RtZ5LHQofOoeL+/YbgYlVx0/H4H4qImKWKMgvVudpL X-Google-Smtp-Source: AGHT+IFpk9hHf0b9JsRoNRMxoqauhjaBA5WO539N9iC0llVow5ZRKrgoRxRAavfqAmqPSX2Tdv4EqQ== X-Received: by 2002:a05:6a00:2195:b0:6ec:f28b:659f with SMTP id d2e1a72fcca58-6f4e02988b7mr11861591b3a.3.1715586487009; Mon, 13 May 2024 00:48:07 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:48:06 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.org, sj@kernel.org, baolin.wang@linux.alibaba.com, maskray@google.com, ziy@nvidia.com, ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, libang.li@antgroup.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH RESEND v5 3/4] mm/mlock: check for THP missing the mlock in try_to_unmap_one() Date: Mon, 13 May 2024 15:47:11 +0800 Message-Id: <20240513074712.7608-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 25A2216001D X-Stat-Signature: zj961szexrx6b4ngnd7cyua9h9q4cnho X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1715586487-963576 X-HE-Meta: U2FsdGVkX1+ZykHAwRo47lxGuQx2QWAk9GF3iHKqYybzx6Qi5+aBExbLON8Uc9ZAoMp7kpAJVij6rTiji/f0hQnVID2jUjRfdjxoloKZ8S+tHA0+cfCpAaxU+E40Omm8wrk72oKHkrfqBkHd8U8H61vWJ1HIZFHIVoHFlbUz8oOmacTRSmT22+WdZ/sT6TK+NKktc+2TNaIHOblMcbTDQ3VqYDYBa1ZjZ839h8YvLfz8BPbJHutvK3Yq64JTH74RsMxOO5jb+pO8Aj+nZ5hCU9qWwd5QBIc1JwXGiL/eM6RdWtK89OMiwTleq6ROmfI4C/QZeS1Xpu6Ah/v98auKggYDI6kbv2crJevoYFGX77ksceeokgRoHpPppQm/AehOMimunypsb6cwC+/NZdXAp2/VV9BmDnsqCB0OjKpgxqzlEO/R8uYT/AyM7v7oj5tQMqIN1LGOYiLMFuII+HnRIBryHFl/Z1w4OaSBrNLATrRUOmWKgaP/tNENi2rfrNS1xOlyaMo6ABAhGZObbE0EEUXaZ1n7jdoF/DOEZNKFDKrjNAtwzMmGB76yiVjl0nFrAI6kRjkdsqE8P6EWe8v/lqMifGPUzB4/o5y1035nwLkg/90p5vG/rOMb6gTaBNgiTas9Gc978d1NSZ1L5dRFRsFEJRalr9iddl0KVLA5X7GicnP1LxeI3+jOsRVpF0gabcDnVpGtP7rY5hztNEz+ae/mqWEVc+3IsBrQczYJl4/UyFoapkvnqxCPddrJ/e2zEGU8D2RuvtvCD6O7Y5VD/bwDwjRjNBdfz6IuUiDIH2rWoy4eXYunz42B+wwLfHqHnDwamHnsPyzjuK0BVIXUf9dJC7LZOgQhASwXsv6LdcU16IoXijYA7gQjTGy41SoUXHE40MRxT3r743jH/bFxYw6rFQd4bSJbZxNK5eqf9+JCscvdDSY2zUG4d9Nae0mZhmxAoODYlNsrjQ//jn8 etvyoPdR lz8f3icEE3AjvxkNzLBm56KZCYma2GH7xBY/FaeoJBwgfXgq1Z44nvibZlpaiRh07vCa+JE2r+9rmYyUgIbWhBDb9g8Ut8U3UJYfjZKhiLz/28yiXMMTP8rMj6GiT8ZGk1iWM+pafexMImZNhvgRbPeIZBir3nCHlZzgwWriJ+/tnrhrhedzBVh30X4wAUC1w6ztAVSxNzrtKuHVR7nqzQ8JK0SmHVqe3eVsQBZECzQcluwYaCpI2gmnEQMi41qMMX++Ewfi5gnoAbZKVqwVDRve9MHg27gSpvdrz+Hd/SZBHdo/xCvu1+TjWnwUGmAcHCbBIJHinL3D++gHaWeqIqfhoQoUuPFQwH7FzBPpRWyQnFYiCA2SEggmYvf0lpFDV6NFpiYrBoxjs21ycZ6xW8vtaekps1nhkS+2WgTlRreBQDarZBhQeUyjmq1hkbzDqAIDKOkrHLg1Xzyas1N0tFihU114S3GydbA54KIfVsyxzVju0nhHJeVlPmIdlGjSjXlhUc4CxqCHg7y/lqXt0hos4wP5c10c46pZXz82slhy/iA8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The TTU_SPLIT_HUGE_PMD will no longer perform immediately, so we might encounter a PMD-mapped THP missing the mlock in the VM_LOCKED range during the pagewalk. It's likely necessary to mlock this THP to prevent it from being picked up during page reclaim. Suggested-by: Baolin Wang Signed-off-by: Lance Yang --- mm/rmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index 4c4d14325f2e..08a93347f283 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1671,7 +1671,8 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (!(flags & TTU_IGNORE_MLOCK) && (vma->vm_flags & VM_LOCKED)) { /* Restore the mlock which got missed */ - if (!folio_test_large(folio)) + if (!folio_test_large(folio) || + (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD))) mlock_vma_folio(folio, vma); goto walk_done_err; } -- 2.33.1