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 2C32BC27C4F for ; Thu, 13 Jun 2024 07:30:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CED16B009D; Thu, 13 Jun 2024 03:30:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87F9B6B009F; Thu, 13 Jun 2024 03:30:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 71FEE6B00A0; Thu, 13 Jun 2024 03:30:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 53E446B009D for ; Thu, 13 Jun 2024 03:30:28 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 01639A2F77 for ; Thu, 13 Jun 2024 07:30:27 +0000 (UTC) X-FDA: 82225042536.08.30C66AA Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf20.hostedemail.com (Postfix) with ESMTP id 328F41C000B for ; Thu, 13 Jun 2024 07:30:25 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="IVM/yLNA"; spf=pass (imf20.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718263825; 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=QYEMCH0QqsMPrWp6539hun3wM0yE8591R1LW+PVzzXk=; b=K9JPKBdipcLNiLlYy+EA+Y+tumzQc3xlSJ8bcK1YjXfLimR3wN8p51FiiMkfQZQv5nOZpH laXKb/+V1yhmdSn+rWL6Xe9HYznH8bswS0Lc/QLh9C1xrsiu/MGrcHL6d/1jMB24YivIbY +CZNEfHAeTcQBR3LsS3GstSJ6tahWlg= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="IVM/yLNA"; spf=pass (imf20.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718263825; a=rsa-sha256; cv=none; b=iwZ/RkoTnNGyq4/VmokXAljeomxbVXlfiVdrVrB0G3UosdxyKcqpJmavCL2ajy3J3C0olb ByRwK8XtSEj9x/nBhQ62ZklFkAlpwnL8tYbLw2afU7nF6YOHh6R7Q1DVfQBnG0EedG8yg+ P97VRZVFNf38jNx5B6Jd5AcyQaEuElw= Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-70436ac8882so530520b3a.2 for ; Thu, 13 Jun 2024 00:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718263825; x=1718868625; 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=QYEMCH0QqsMPrWp6539hun3wM0yE8591R1LW+PVzzXk=; b=IVM/yLNABvDJJXiK5IEkr3TrGvacWbPMFHtVNPti2tdHCl56zQCO4YMyNs98tC8LSK B685++LKx5L84ZatMLejfZiHvDEmcsBPn9XvtBxMGI09W1RQX1SaskCm4q11URGHD1A1 eFEjjaSst+/e3SQpSDzuKh/s12EusULWCPTVgsX00rdb12ndsshhTrDdV2D9atsD/3Be huLz6vnXLONrvP2UGKWcC7v0zVFFLaf+Q9BqcsRTk8dV53Y/URPDWgEe/O6erJ9PTmcl RsqG6sYOgudYw4v7haCU8h/EReHDoOAsZv/iGADhNDqLES8XUSDGMhuk2y40Veng1zzG oehQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718263825; x=1718868625; 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=QYEMCH0QqsMPrWp6539hun3wM0yE8591R1LW+PVzzXk=; b=fUGADQSrklcBieQOEKV6K+2r5AqAuzHPKZPp6xmKLbFPqQSqJF6NFOs1Qhq4wELvZ6 0f/StkVX1mUqbGmjRhst+TXFHM6mHYbhiLIvchzlpE84ZoFV9iGpf8r9GXUk2N+PLVIc ejeuGqSCe3+91ek8ZQJNgtf+tpTAH1DGVV0e4aJxug2ee1SmCzKrg0PK9YW1HibkNHb0 7y2A761YEuCadtH7WGeCHsEd9ceT2uUYBFHYsgE2MMOWGqzB3bpEU2jYgxwV355PiQFZ MVix57/Pz6PI227kc9yM0FdzdDrWMKcQaIfdexSdWzhhR3ef+Gw4lNqH2goG+6gzFpxZ 8vRg== X-Forwarded-Encrypted: i=1; AJvYcCV0RJo9IQV5CZi2bsDazFkbrHV4AYVY0tKfV86N/4Ehnznq9Zjc+CewsfWltUNnmXBbve/+UgLouKlAEIU8bgUvD+A= X-Gm-Message-State: AOJu0Yys+yKpYK96SZcq0PSbIT3JTudhA1d2qC/E/RyVW7rMbr9bUq6m LOp/WAB/+ZiKc1rc0cRWQ3NGfMfatmbyA21gF4lyDKDkIUWD9oU6 X-Google-Smtp-Source: AGHT+IGh2gLllxUfXYa80RxX3JEI/Q+HKIcb5idXoXfLmVLeRMcnSs7RHtWsRrfb6ENTjfuKahekhA== X-Received: by 2002:a05:6a20:3ca2:b0:1b8:6ed5:a8f with SMTP id adf61e73a8af0-1b8a9c64774mr4723525637.56.1718263824902; Thu, 13 Jun 2024 00:30:24 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304e]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705cc921b41sm714868b3a.5.2024.06.13.00.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 00:30:24 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: ioworker0@gmail.com, 21cnbao@gmail.com, baolin.wang@linux.alibaba.com, david@redhat.com, fengwei.yin@intel.com, libang.li@antgroup.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, maskray@google.com, mhocko@suse.com, minchan@kernel.org, peterx@redhat.com, ryan.roberts@arm.com, shy828301@gmail.com, sj@kernel.org, songmuchun@bytedance.com, wangkefeng.wang@huawei.com, willy@infradead.org, xiehuan09@gmail.com, ziy@nvidia.com, zokeefe@google.com Subject: Re: [PATCH v7 4/4] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Thu, 13 Jun 2024 15:28:58 +0800 Message-Id: <20240613072858.16512-1-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240610120809.66601-1-ioworker0@gmail.com> References: <20240610120809.66601-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 328F41C000B X-Stat-Signature: pcgx73ucjkuxuterbn5a49pp5odhcs1w X-Rspam-User: X-HE-Tag: 1718263825-405687 X-HE-Meta: U2FsdGVkX1+DaAwuYw6dbWLsh9LTHfDPhUBbETxFiBPlk9zf7SmladeujfjzlqKWTHFQ5jSgMHRSYVSd/okC30ZcujLaNfEUWIlIwpfRzWATJjj7qPzGTRzGjGdyeIbz4ViWJYYCLWqFStm6JHrFmRxrozk+pwpAN0zim2qwuZFnHChAHVC+NvI8+uJP8NssvySPOrdmUxGpZUJd9dZ13TsIkp+GUwiqLZWp4JBFxICyWEScvFt/U+nInNBC7opEHkT7kzvyhxgnW0kZZUY35TIhrQs9vVDCm54u6eAkKGTyjnLKOGWbiHzpCbrc56QFHgEz6u34Ds5UQiEJ1M9PMCNZZU94/A47tDUfi3NRQobxy0ntwho65FbmRTlzpsjHfs12SNzN9dW6VRks/h6VFr6smyAmYtATzBuKJ1qxu/6gVg+ksZf7gN8fcosNG9lc24WId7QRaQWlhtjnPFiZAyh1Vde0wRW5dyw5mcaLJUyWY0/XE211208CZKpKfPe42SvWQ7HOjXWbxRS/VtUk+GQwLs2VzDuN4FkApD3aYqE691Bzx4RqrM2wGtVeVM96hb4wWzSpr28MlT+XWnYpgAWQjTdK+bCa2bsyiyBCvldHj89sCJp3jB/WK3++5N2uXxmvoanQbiFQ8Y9jsOueQQQzWw4Sunp9In+Mm5K2z6OlBSoSPUiLNRtDsCsrLoX0kmHS/VGFKgLk7Jpc2+dbE9i6SWNG1xNCgrsa/i9pnj6yWwFjqyrKB61xF1fxDM7/hWwl3SYLmaCdi65EcduY4cu2x7rGfVacHTpmgTGp6rUax6/qjeGGC9EDAMbKY3RNQ5/uow8BlFrAhyPf5Hc28GVnHO8Uy539IGdrD5iJUooNBaNCeKIiGc/O+7OxDirau7l+3btHHXZ1tEQACjBb8v9foi0EZnIvCQJlxbF1+ya7YbxiPRlT22FLJxa+Kbz85LOaeDveLyzjfz9fE5f DXu+5RuF pWqFWNCFZEnBWrN3sbJyLY8NojcV9Hui53nD56GchjSGrVN7/NQvo3r9MTTtV2YjksNw5ixvsFfvmvTZbXqbZaboU6K65pGi6tS9naeDl+8jaeXPOQ5gLUXRpOSnH+E7ghKcGdau0mnrtGXUt6vhqD0VTUI63CyBupnDzwnDTLdhkOH7LwUPPVZFyxxPzW5ryETXlgMutyGxZ4cXsMr6oZtoSJzJfEzw0OlAPWlaNdTYQ7fh8+LP6seDQ2op1tKCUXj1h9osvVPLfRZxX8PPjPUslEGk2WgNzn9eEtrTwKwu75gatU50DJodmXBDbYkQJjdm7VbssGvZwmYUhfrln7jMQSBHrqIhu25AJsut5Fg99bVw5BvbPsQwuOKoj6kZiEYI23f8XEEwfs8T1yIIy0k5neCLqdRfP9/+GJXPncOz9nHlFVz5ynQAKKgVBGd4KUFrq+ZdfRiRHxaUbgNE9DCkbIg== 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: Hi Andrew, I'd like to fix the bug[1] I mentioned previously. Could you please fold the following changes into this patch? [1] https://lore.kernel.org/linux-mm/20240613065521.15960-1-ioworker0@gmail.com/ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f409ea9fcc18..425374ae06ed 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2707,10 +2707,8 @@ static bool __discard_anon_folio_pmd_locked(struct vm_area_struct *vma, if (unlikely(page_folio(page) != folio)) return false; - if (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) { - folio_set_swapbacked(folio); + if (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) return false; - } orig_pmd = pmdp_huge_clear_flush(vma, addr, pmdp); @@ -2737,10 +2735,8 @@ static bool __discard_anon_folio_pmd_locked(struct vm_area_struct *vma, * * The only folio refs must be one from isolation plus the rmap(s). */ - if (folio_test_dirty(folio) || pmd_dirty(orig_pmd)) - folio_set_swapbacked(folio); - - if (folio_test_swapbacked(folio) || ref_count != map_count + 1) { + if (folio_test_dirty(folio) || pmd_dirty(orig_pmd) || + ref_count != map_count + 1) { set_pmd_at(mm, addr, pmdp, orig_pmd); return false; } diff --git a/mm/rmap.c b/mm/rmap.c index b9e5943c8349..393e2c11c44c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1824,12 +1824,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, */ if (unlikely(folio_test_swapbacked(folio) != folio_test_swapcache(folio))) { - /* - * unmap_huge_pmd_locked() will unmark a - * PMD-mapped folio as lazyfree if the folio or - * its PMD was redirtied. - */ - WARN_ON_ONCE(!pmd_mapped); + WARN_ON_ONCE(1); goto walk_done_err; } -- Thanks, Lance