From patchwork Wed Dec 20 22:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500640 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 08BCEC3DA6E for ; Wed, 20 Dec 2023 22:46:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A1488D001D; Wed, 20 Dec 2023 17:46:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 051BF8D000D; Wed, 20 Dec 2023 17:46:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D98148D001D; Wed, 20 Dec 2023 17:46:24 -0500 (EST) 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 C705E8D000D for ; Wed, 20 Dec 2023 17:46:24 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A31FEA18A3 for ; Wed, 20 Dec 2023 22:46:24 +0000 (UTC) X-FDA: 81588681888.25.B72280D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id B5A31A000E for ; Wed, 20 Dec 2023 22:46:22 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CvypeodO; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112382; a=rsa-sha256; cv=none; b=DwJrawsq4rXGXn+cMh3Ct1MfSHDN9swsHhp2u/IjzqHPUTderkWKUXIBQpMOsjiQRtaQ1G JJPKk2SLDyTb5XGNsZJdhQBwAPthWIya0y26eMjcQuuRis+65BTI3EPMuv25EGU/FO4G2+ BfmVyrta8MHFCPubAidYNmNvWZNQQtA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CvypeodO; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703112382; 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=XNLi/aVY5jwoALWpPAveyLrvuNqr0potAPprV7oOzTs=; b=w2laWPm8BDe/QBlLleZyjpWAxaYDvKgVfhf/R9wzIt60Ea1uKY3D/WZ4Q0NnvTWCfXBKBq Ry2J+3G9rtlRC+V0A9ghQIv09GGvQXMu9gumqO473yuir1N3TrRwgiqV+P1xQihukch4cG vcxEYdZDYNwLyg9E4AKxr0eZl3P39kE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XNLi/aVY5jwoALWpPAveyLrvuNqr0potAPprV7oOzTs=; b=CvypeodOrgL3GQl8dPsatuxmVTlbX2OTWkfmOazKzBkHu1kAQrHLgrRW+Ra6kqEK1YYnYg VRDbsDUP78x8JWpG8JHtw/ltyLZlV7Vb2N7wKew7NrlSwNhf9lzXyTF7PtLw7Hnj0izBjb xH3jAyFx1+xoo754BHp2GkTHKmpAJVs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-JReApqYgOjavD14OGWY4tg-1; Wed, 20 Dec 2023 17:46:17 -0500 X-MC-Unique: JReApqYgOjavD14OGWY4tg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D9391019C82; Wed, 20 Dec 2023 22:46:17 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5947140C6EB9; Wed, 20 Dec 2023 22:46:15 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v2 27/40] mm/ksm: page_remove_rmap() -> folio_remove_rmap_pte() Date: Wed, 20 Dec 2023 23:44:51 +0100 Message-ID: <20231220224504.646757-28-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B5A31A000E X-Stat-Signature: 7q3fhs14qte6r6txzrp1akfywnxj1ibs X-HE-Tag: 1703112382-91608 X-HE-Meta: U2FsdGVkX19Px2JcmwOZYE5W7S69mU7He5zErujDA4gejwbPPgx+ExZkOVw+7PXJ58vXCD0Cj+VbUqchoe1OLAISexI+8PHopw8AF7NqoWDKBu/8agJagKE0PWQ1wdDADgHUB5MxpgELnf8ab7ux10QcCduT+ZBc3gxFe8Ph4ErCVaXQWoEPB/4KMEqgQKXoi8YPDWLV43Kv8XTkGC5+6rZOWls3XVHWkKdrSc/mvT2ShcZAbOb0xxubROqW+3KvKEdFz2Pebdb4aBRoENMfGVbrVojyB/Bkvqp3H2VNKXPvveWGHUapFM9FIc44Ck90rWdI3ksjn7fBC/cjHWLzHT1grht653/IVmiB7K2QgAuKaIUGGLYYFSWJMYr1efyC9dKq/8OYBMy2wwcZDR+GZZ9ZJYDbqIvUcfpfl3gLI6eO3/80+soGsRqxjHoIVZ1rsiAzi1viV8P9njVph5v/JIBChhYXqso19/aNeUnIO6xQltFXL9BdXQv896HjMtUHjrNOUTV36drMpy7T5IWgFqJLOqaKoF5fs8jcRqHTGZCJQGkKaVmgsRbkud+rSd+o4l2xZ8LFVtpg3Yc3K5+Zkl+tkmZhuN00LhceVQGl+xdW9FqTejyLmG/MomaxSONh7sY0873jNmG1qkGKORBDmdkeyoeBi5yWJspGkJ4cP1myBwxqOHl2pTJBqkiahB1zINo5mSUjux7185uTEmeDo7wb7btbD7yz8U4vAzioynWZsa3QjyMviNbXYHV6svh9CR/WMex0ZK/LG93psyePnT8b62lPYwefUrtvjHAzW4MnT5E1Ur0WWaw+1q7liizLoCOt/jbNn76/oxPkhZjLmoU5YiGLzkZpk0ozCCYhB/h5ucibflkKtk80Fmofwtz7GxwwceD/Ux1Eb+2Rr19rF+hqx77GNvimEZ1QFsgwuryAegxEGsvyuKw3Yip+km6Wz5yaXEtsVSNG363Sgfg D43MR8eB zWi7M7j7OtFrYzeuVk7MiZQ1zDbczMVSeGSoKxP3PzVKUcrnURsSvxUK7DQpFMdiXhLnwwTGcG7Yp7HbLfarjsDaIF8Ev1xLUgfKe2Jxy0LI6pybDgbbLdLHHmixEXoCukgS2lr/iq2WWMyuoIdIfNcfkGEC/4hMtAJ/boSW9T+/g+2cOCXK3ecYDWGsC9sk/b+AirjDEV8r9TuWAQu/nH87XALg1iBgQfDY+ 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: Let's convert replace_page(). Signed-off-by: David Hildenbrand --- mm/ksm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 146aa75fa6ff7..716e2f87dd795 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1449,7 +1449,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, set_pte_at_notify(mm, addr, ptep, newpte); folio = page_folio(page); - page_remove_rmap(page, vma, false); + folio_remove_rmap_pte(folio, page, vma); if (!folio_mapped(folio)) folio_free_swap(folio); folio_put(folio);