Received: by 2002:a89:48b:0:b0:1f5:f2ab:c469 with SMTP id a11csp731346lqd; Wed, 24 Apr 2024 15:32:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUhSpzoLxN4HTkV3zV26ekLMkpceLuOWu2lYUu/sr5OfE2DYJgGmUh0yRLRson9FIGWeQuSk0oX07venUVlJMW/NKuCs2J3aaYmVgfQsg== X-Google-Smtp-Source: AGHT+IHsmvjPcQAoUuL/PJistc5GJ0DJVcAqU+1VnEHFFZ3ip0oi9Av0bIJ6cSvjCwctY6t7aLSx X-Received: by 2002:a05:6a20:d428:b0:1aa:2917:4b79 with SMTP id il40-20020a056a20d42800b001aa29174b79mr3742337pzb.15.1713997968961; Wed, 24 Apr 2024 15:32:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713997968; cv=pass; d=google.com; s=arc-20160816; b=Hj1bKaLctdT3ObCYQ/rFi5bAj3w1ggJt1fR5wpUmrgeVB/CxVABoNJ9gHwQYgH9YrJ 0ZzjJR7N678qFL2Y4RgFoS4CxEDC/JQd9yehoml1JrPNgjr5dJMh66F4pDxho9KLgP7+ Kmi2cUmyf1CcbCDiXsviJijTahJfc1BdpoimCW4eSp1KIknuxKEGaaQcrWU5tdoHjV8l rVk1SPmpg92dH9eZ6BTsSXVA+J06mz1tCIi+gdA8B4KIE0uwX1sTCKk/eJzagl4iM3xV SqpRmxhT31uY3shTQN7LHanThAAu1QOR7/Bw2g+U0tG4zLtua6sLqDnNxX3H/gArN2wF ySZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:dkim-signature; bh=a1VSqOGp+cTDD3FwVgodoOnkI+tY2YGNCkhcEt2wmrs=; fh=j4Sb+b1i+LJGASdqYhEHGcnobG15gB2d9zzZIkz+cWc=; b=m/GPcDHOsxzqHBALR0gac4jdIZZxVEQCSKGi2+ZOD7fPifWvsYQrkwwPUOdLSPzRW1 qIAKs3MpQxlLG8OtzF4d9rBxfxREKvaU0oAOUQamhOt+1rHPSR4ILqf3A+K3Y8Du9Hr1 DLaFwtD5MJpsLw7WSPKYATQrliYjMHnpqsi4mPveF2Ja1X20wJz/nj1+psqMNQQcQ1Rw tNWlx62ugDTlfXlYX46Y5i+ZVej0hWGQvEoiI7Z8eh/ZMfnU52QD7bI32+CsmAOP+zv/ aUf1qh49gL1gtOzI8u+wshZpJLv9dMjWMb54etotywCRs9a1iGZyHnlwy/yKm4Y7pguw T76g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K8SXI46o; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-157788-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-157788-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id r19-20020a62e413000000b006eaab856030si11649147pfh.86.2024.04.24.15.32.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 15:32:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-157788-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K8SXI46o; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-157788-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-157788-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id CE464286192 for ; Wed, 24 Apr 2024 22:32:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C21E1165FC3; Wed, 24 Apr 2024 22:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K8SXI46o" Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD97523BE for ; Wed, 24 Apr 2024 22:32:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713997946; cv=none; b=EP/PYZA/BpxNveNDaFnBo5gODhS9nEft7i6QTzVjIHVymyzbNRRjpzAM/Z+AmZWbX/ku+KYOdKAQXJ2D8ozEbqupWllt615EiIBwauuThbYmAc8KKHZbmkjMekIpBCJxhyOBxQzAFUmAWb6K5TfVwo0SJSiN6xSCavyJ2tU/RYk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713997946; c=relaxed/simple; bh=EQo+zGC16IkD24HLaYmrTErmXONgg+WietHKBFzN8Qs=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=OEeV3ZsJqGpj/D+CbSPttzOh/XzZs0AcqpEkd5EFO8jw9yrikeD5TeM+DRdnXqYXeIoZOuaCd3Ez5r869j0o2R0cvtzbFV8kTTp+a2V3eLKX/zhoUIeP0R+RDWnizxHUkLsuDdNv1KSO+/lJrOg0pNWrR+WjDxX4MNtbUD3nkmU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K8SXI46o; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a55b3d57277so43267866b.2 for ; Wed, 24 Apr 2024 15:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713997943; x=1714602743; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=a1VSqOGp+cTDD3FwVgodoOnkI+tY2YGNCkhcEt2wmrs=; b=K8SXI46o5GhTsTsE7YEEvqvJpA6hSALvNY9H9s2XVc9t4yon0eL4Cf5+74A8AXZ6AC 37UzEn4NO9hk91SFvcFg9hLRFqWtXtBMGyZBWnuGKnOYFKrHLCiYR6eBXayiTljD7oPZ NSCXfCJAkBiVeId8FjsXhejgM1ciLtEJUCXu0RZofwQk+nY9kchpPL/H79EAOQPqrpQo FTAlt4XuN4H0O9+yAoqOYxTzvKnpFzRUbqnar4mxZUPz12O81p3uXQA+73EFNkg2RSIx 8PxyyGvDN+27mybS+RY0Avec8F4bJr1ZThJm+9CYs6oUpMXCoyJtC6bMZ2G/Z5lhSRCo j3fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713997943; x=1714602743; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a1VSqOGp+cTDD3FwVgodoOnkI+tY2YGNCkhcEt2wmrs=; b=J7Gchfn40szjyiKjeSqQuYRuAFzUK9IFohuIjCURK++E6Ah+GrXjg70EmZs2y7szSE ncqr1Usqfk/XQqfx45vvl/0nDfsW7qemSOmWUNVhWQbtaZYolp8Zqs5zU5OBfbW7VDBq QyejNH7nRUIgaRi/omsgVFcpvvh0RP4lryio3/DwrXArnVYFd59G14G7d1glyZF7Hs9z 7OxIzXnvIUCHDwEAVLAiOaWOgeOfnEV7TDHgl8PDArpU85s1z3ZjjFD5qWYGc5WydWeo qCSS+dQfzhJOtf9sdtTadVs59Tx8j9epY3YN3k+Bu0Xe4YOrCo+FP5HGNMXozCcyWs6G bLpg== X-Forwarded-Encrypted: i=1; AJvYcCUx1WBx4XGG9X+pTclBiw86NpAPfqJJVtycIwZkGw2WMmUZH7g1a+4coX3bxvWXuKgka4sDVQcsQVuj09WyR/Neu1NcDD5OMWZsZDqB X-Gm-Message-State: AOJu0YwIkoAV6EYKXOqPlFBlHM98ijuXDJGbkIYW+NUnmylYimg1qpzZ jWIGNtEM1E6SV4IkJZ63IVtiP8drUUzm/6EG4DgboCV+Hgqlo26YSbKJIGLYdvCev0YVr4KLZJr K8CLT+laHbXs1OE+cO72fCA22Cx0= X-Received: by 2002:a17:906:f9d1:b0:a52:5d89:5f27 with SMTP id lj17-20020a170906f9d100b00a525d895f27mr2602963ejb.14.1713997942903; Wed, 24 Apr 2024 15:32:22 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240424211031.475756-1-zi.yan@sent.com> In-Reply-To: <20240424211031.475756-1-zi.yan@sent.com> From: Yang Shi Date: Wed, 24 Apr 2024 15:32:11 -0700 Message-ID: Subject: Re: [PATCH v2] mm/rmap: do not add fully unmapped large folio to deferred split list To: Zi Yan Cc: linux-mm@kvack.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Ryan Roberts , Barry Song <21cnbao@gmail.com>, David Hildenbrand , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Apr 24, 2024 at 2:10=E2=80=AFPM Zi Yan wrote: > > From: Zi Yan > > In __folio_remove_rmap(), a large folio is added to deferred split list > if any page in a folio loses its final mapping. It is possible that > the folio is unmapped fully, but it is unnecessary to add the folio > to deferred split list at all. Fix it by checking folio->_nr_pages_mapped > before adding a folio to deferred split list. If the folio is already > on the deferred split list, it will be skipped. > > Commit 98046944a159 ("mm: huge_memory: add the missing > folio_test_pmd_mappable() for THP split statistics") tried to exclude > mTHP deferred split stats from THP_DEFERRED_SPLIT_PAGE, but it does not > fix everything. A fully unmapped PTE-mapped order-9 THP was also added to > deferred split list and counted as THP_DEFERRED_SPLIT_PAGE, since nr is > 512 (non zero), level is RMAP_LEVEL_PTE, and inside deferred_split_folio(= ) > the order-9 folio is folio_test_pmd_mappable(). However, this miscount > was present even earlier due to implementation, since PTEs are unmapped > individually and first PTE unmapping adds the THP into the deferred split > list. Shall you mention the miscounting for mTHP too? There is another patch series adding the counter support for mTHP. > > With commit b06dc281aa99 ("mm/rmap: introduce > folio_remove_rmap_[pte|ptes|pmd]()"), kernel is able to unmap PTE-mapped > folios in one shot without causing the miscount, hence this patch. > > Signed-off-by: Zi Yan > --- > mm/rmap.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index a7913a454028..220ad8a83589 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1553,9 +1553,11 @@ static __always_inline void __folio_remove_rmap(st= ruct folio *folio, > * page of the folio is unmapped and at least one page > * is still mapped. > */ > - if (folio_test_large(folio) && folio_test_anon(folio)) > - if (level =3D=3D RMAP_LEVEL_PTE || nr < nr_pmdmap= ped) > - deferred_split_folio(folio); > + if (folio_test_large(folio) && folio_test_anon(folio) && > + list_empty(&folio->_deferred_list) && Do we really need this check? deferred_split_folio() does the same check too. Bailing out earlier sounds ok too, but there may not be too much gain. > + ((level =3D=3D RMAP_LEVEL_PTE && atomic_read(mapped))= || > + (level =3D=3D RMAP_LEVEL_PMD && nr < nr_pmdmapped))) IIUC, this line is used to cover the case which has both partial PTE-mapping and PMD-mapping, then PMD mapping is unmapped fully. IIRC this case was not handled correctly before, the THP actually skipped deferred split queue. If so please add some description in the commit log. Otherwise the patch looks good to me. Reviewed-by: Yang Shi > + deferred_split_folio(folio); > } > > /* > > base-commit: 2541ee5668b019c486dd3e815114130e35c1495d > -- > 2.43.0 >