From nobody Tue Dec 23 16:25:10 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 33927208CA for ; Mon, 13 Jan 2025 03:39:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736739570; cv=none; b=HVix6VXh0/NdUSJjVkld1ETXKI4oDYkvxSZcPbqpPdfDQpMOAYS7ay7yyJlgYg8vqR9t2hjmjJ/mjjbSNnizFdALJemESHFecsIgZhCBuTxwEpzMCeh13/b1MrFdjoGOfFpu7MZJeaN+8s/sKwK9pCVdw8TQxIpw6R8+FLTXD4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736739570; c=relaxed/simple; bh=JuX9sUjxhlLR+w4P5J+xhwIOfjgzGbmZzuuWbH6Adl8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tveg2RqNc7zN4ylJVLqWUpOXqFYRRm6/+yk90BIEM4FbjhfrSHglWOmDKRDOQfqq5ozh2PkHu6BMHX6rG14aFu3h8VeYB4iC3DtD8TYHfFX4VKum02n/PwQ4Z4aFLDTZbV8NPKAMXsVdkSqYmv40MaMwNvqXFXeP5ouUVCZL60E= 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=jpnr5/8s; arc=none smtp.client-ip=209.85.214.171 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jpnr5/8s" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21649a7bcdcso62730155ad.1 for ; Sun, 12 Jan 2025 19:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736739565; x=1737344365; darn=vger.kernel.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=IPcqXqaTIBo3x10L2Zu0olCr3NMK/mAmrBeyqDgRKcc=; b=jpnr5/8sk3e0AUYo8hPrsW7cVIuduQLaAQGeccF6VRxR0DAnTOZa5462GkHvx9weTs iyIkSlt16l4+LR+7FH9KiLyKlya3WgzzqQh6Tl9PgJV4L0NVZyi0YwJ30HSEAadaJphu aa5ptDvZFUA27y8X8Kd+lB9eBhbzG/lJ3qHvKmzqZvYH5Zo0dE2fszP3v09dNZ1CTi33 mXtDWpWvRKuXx3KDZQTicZwlJ33mEvSJZ2aBplG3seqBftJ4m4h9Wmh/1KzvAxWzuCp4 /j64ECmphDC5XpbXazb/IFJHUVBDvlaWViI6J+L8Qx8ufSg/NEtEK3vznh/ef1waQL7h dmcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736739565; x=1737344365; 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=IPcqXqaTIBo3x10L2Zu0olCr3NMK/mAmrBeyqDgRKcc=; b=rPn6f34wic23ZtV65x7XKbLr0/sYCUDbHl38OvNelMwVEGdXn/csD49HeKhizqGCmB x1lRqe3CdDDv3LRxiaZFNmYKePtGQr2Eolkmz6maNC142bnu0b+Sc+Ef+3QzfApR7luf cyHbOPyTaudNAjS9FsvjMs2RMWzwFoDAtJxMUzxvEFBYeInWcXi7Wsn7sOBp3J6ZWVFR yJgx8WP+KOW3hlUsSNHK7TZpBLq6qA+N+6EvBmcR+ZmrKUDDHAu2XnHMDkoYLyApjKY4 Bp1gM2Kwbmpadml7XxVuUl6EiZnwVmf53JTwf/FGG1foA3JekR6hQOW/h/uhiDg8Zsd5 pI/Q== X-Forwarded-Encrypted: i=1; AJvYcCUpRtZ7P8BxhbOfF94Ze6SxC00PWdf1h8dnvvF7Vgvt9IYGnkHbymU3VVgIAzcqg24kwKaFBViMJeSJUSo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1yGF70Khs1bKwV92zs2rVslz7ZHYSTAF4lEfEFy5/aMOYcFgs G6SE28IvQeYLzwFCW3NsHIPtbcRMJE0NYk8372ZdCJwEe5XBAOeM X-Gm-Gg: ASbGncspCKwMlsy3ACKI/BJaJRYtRVEdXNQLXCQ4kMQjt/DVYv+S/lgnrow8A5tR49S AHQ8o2+FYTk07AE+Bs4MWnz77/PPet4BvbR0eYcmfIE0LsI3yiSlxVfbsQdz2QxmZXcXXZEeEex jAwW0gQnPWOO50KgjBPU3JgzD0r1biuvWHhJFkz0FODtMYGT6P8XF6osd700sbkcGsRQFrFnKaE LYoEbeenzhtU+cn/USallYC32odaGoC9xFxTyoNf5LUrp68bpkhn4ZTZlpemKem36xryiNTiES+ MMK/5Kl2 X-Google-Smtp-Source: AGHT+IHhm0qTbSZrWVTQXUqJ8k0+E+zfqHExh6ZNZDkVUuwdyBd3fwtM3FFGJhBiv45zTGk0mUeVsQ== X-Received: by 2002:a17:902:d2ca:b0:211:8404:a957 with SMTP id d9443c01a7336-21a83fc0619mr292344105ad.41.1736739565411; Sun, 12 Jan 2025 19:39:25 -0800 (PST) Received: from Barrys-MBP.hub ([2407:7000:af65:8200:39b5:3f0b:acf3:9158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a9f25aabfsm44368405ad.246.2025.01.12.19.39.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 12 Jan 2025 19:39:25 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: baolin.wang@linux.alibaba.com, chrisl@kernel.org, david@redhat.com, ioworker0@gmail.com, kasong@tencent.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ryan.roberts@arm.com, v-songbaohua@oppo.com, x86@kernel.org, linux-riscv@lists.infradead.org, ying.huang@intel.com, zhengtangquan@oppo.com, lorenzo.stoakes@oracle.com Subject: [PATCH v2 1/4] mm: Set folio swapbacked iff folios are dirty in try_to_unmap_one Date: Mon, 13 Jan 2025 16:38:58 +1300 Message-Id: <20250113033901.68951-2-21cnbao@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250113033901.68951-1-21cnbao@gmail.com> References: <20250113033901.68951-1-21cnbao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Barry Song The refcount may be temporarily or long-term increased, but this does not change the fundamental nature of the folio already being lazy- freed. Therefore, we only reset 'swapbacked' when we are certain the folio is dirty and not droppable. Suggested-by: David Hildenbrand Signed-off-by: Barry Song Acked-by: David Hildenbrand Reviewed-by: Baolin Wang Reviewed-by: Lance Yang --- mm/rmap.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index c6c4d4ea29a7..de6b8c34e98c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1868,34 +1868,29 @@ static bool try_to_unmap_one(struct folio *folio, s= truct vm_area_struct *vma, */ smp_rmb(); =20 - /* - * The only page refs must be one from isolation - * plus the rmap(s) (dropped by discard:). - */ - if (ref_count =3D=3D 1 + map_count && - (!folio_test_dirty(folio) || - /* - * Unlike MADV_FREE mappings, VM_DROPPABLE - * ones can be dropped even if they've - * been dirtied. - */ - (vma->vm_flags & VM_DROPPABLE))) { - dec_mm_counter(mm, MM_ANONPAGES); - goto discard; - } - - /* - * If the folio was redirtied, it cannot be - * discarded. Remap the page to page table. - */ - set_pte_at(mm, address, pvmw.pte, pteval); - /* - * Unlike MADV_FREE mappings, VM_DROPPABLE ones - * never get swap backed on failure to drop. - */ - if (!(vma->vm_flags & VM_DROPPABLE)) + if (folio_test_dirty(folio) && !(vma->vm_flags & VM_DROPPABLE)) { + /* + * redirtied either using the page table or a previously + * obtained GUP reference. + */ + set_pte_at(mm, address, pvmw.pte, pteval); folio_set_swapbacked(folio); - goto walk_abort; + goto walk_abort; + } else if (ref_count !=3D 1 + map_count) { + /* + * Additional reference. Could be a GUP reference or any + * speculative reference. GUP users must mark the folio + * dirty if there was a modification. This folio cannot be + * reclaimed right now either way, so act just like nothing + * happened. + * We'll come back here later and detect if the folio was + * dirtied when the additional reference is gone. + */ + set_pte_at(mm, address, pvmw.pte, pteval); + goto walk_abort; + } + dec_mm_counter(mm, MM_ANONPAGES); + goto discard; } =20 if (swap_duplicate(entry) < 0) { --=20 2.39.3 (Apple Git-146)