From patchwork Mon Dec 11 15:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487466 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 D390CC4167B for ; Mon, 11 Dec 2023 15:58:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCF9D6B012A; Mon, 11 Dec 2023 10:58:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D80A86B012C; Mon, 11 Dec 2023 10:58:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD1756B012D; Mon, 11 Dec 2023 10:58:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A115C6B012A for ; Mon, 11 Dec 2023 10:58:12 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 77B2E120466 for ; Mon, 11 Dec 2023 15:58:12 +0000 (UTC) X-FDA: 81554994024.20.09FD23E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id B204A1C000A for ; Mon, 11 Dec 2023 15:58:10 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TMVEKLFK; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702310290; 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=QtgFnZdp8Ufq96QYGYH/M8uGtDulU5aA6agoBTCHJ/U=; b=MVm7dnADQ6tezGZEVcVwlZBBYx6xdSfjPhLBC+5KX3GYMPM3hmMlCs5xDyV8xhQNy8sO6Q J+ulA3Ibj6KKR7Z6fNvVc9xIahr2XSbvXpOx1fkAc+EOKk6UhQIsphefGU8O+QRg5hbbQ2 jAvr673BGwTJoXtA3tURrNKAH8e48dg= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TMVEKLFK; spf=pass (imf20.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310290; a=rsa-sha256; cv=none; b=Fo12AKeyXhO2iwwgJXDE5jAYSinUVJq+F6pXfBvWosSivCml53OBlyGCpRhtS4rW8PN8q+ YNWXL5HZ551vugLvgb1csPtICAwUaaiydxuEx205TCqMWYpxyruPAq0/0M3AidYDTep/a3 vhEJInkTlty7vMVmBMORKOZSwxatdbM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310289; 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=QtgFnZdp8Ufq96QYGYH/M8uGtDulU5aA6agoBTCHJ/U=; b=TMVEKLFKA43o5hs90V6x6wjP9YIybRoVe50r8+33MlRr2A1cME23YVbaPfWXWBwnDx8k80 BOciUwhaEmt+OLccOQ6Nf9jsI5wDBOeTgQJ4ky/Q/PHWQ00TqAILQ8HyUlHDQRqf6vTMNn MBq34SscSGetf19+4C6YeHsQVCP1DpM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578-Q5gG0FfpMgG6qcIyHy9Eng-1; Mon, 11 Dec 2023 10:58:06 -0500 X-MC-Unique: Q5gG0FfpMgG6qcIyHy9Eng-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 763472806408; Mon, 11 Dec 2023 15:58:05 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id A56501121306; Mon, 11 Dec 2023 15:58:03 +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 v1 27/39] mm/ksm: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 11 Dec 2023 16:56:40 +0100 Message-ID: <20231211155652.131054-28-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: B204A1C000A X-Rspam-User: X-Stat-Signature: z17fk9ykqpf8j77rpkiaoxbyyt93nyhm X-Rspamd-Server: rspam01 X-HE-Tag: 1702310290-233267 X-HE-Meta: U2FsdGVkX1/NKh4L9P+X7fDZz72lKcA74Zsx+J5icjvBCXx64DMiYM/+JX9er2pEpxXw5pqHSoqusll4Y3Abzfnn6sXraPBbwHKe3qHPBPzj3/Tzol709fsEHcPB5RKu+R8le6N+rnuhE5yTUIN4TDeJNEf/O+g4NyVPY+Pq4X/OgBYCd30lP0YRk6mQjls8LsUxzxFNP/1lMlhmdutw5aU8oFnK1YzyWpBBNf6zE4aCG7lFEB+4At1dxcadnoyhu0ji8ji18D7vRTDy8Jxgbp78f3nMB8Y7cLjaPkHvd+VRWL3tHnfxE27uZOsSRhKvkrKoOtBESTGX/dPrXr73a9KXhHfDvl62MZ10EzIoSMnmHkrxQVGU2t3WfgzxGnOEMuZKMoYfzhsq9VpYkiXvUnaUxrI5amrD9xZBa9cQt/WjPrwPmKy+QzSwG0/L+whaTxLrBD7G1LveEreRMIh72rMRai24TDBNhR+GeiDdrRzisV7uS88Mmf/EVcGF+IhfYU1Rf3NG0e6Ow7001XxOu4KaAXvYb5vifXyq1fRiVpm+t9423s8tSzZkAZHlIN2wmFwxtMzGZyNpH5Pk/M0H+gyx6zUocoRopqUNtUViAl7oDeKQZApOExWTzkbQI4Im/GCL8qaibjTgrldMHRXHNPN2Sz3Ktum+WMfI86h4Oqus2tXyN70nxjEVHKIZnAPpaeaeABda7cE0Gw9nZcX2NzCrut4ps13ulzYlpQJu8ZZbKfKRmGO4B/Jz4mx7V4nFyjS3US0xX3G34WeDkYEfc6t7QfMcel79y5HhzBvyQxRLN22V7j+pWZa9C3SXjfrkHKs96XoDVhCYhvyegn7brqJIOW/xGetcwRb8yrfTnUZ/VgfGwD24xMg/rR83ePKfERGVY4DKoCnzYXAm6FyNqVUw9L+YybhbROZNWrLIWBaKOEuIjYOrJJVQ946MSu4vo8q3Hs940l4lqnQYCFG 9IOnXHkW 8/3OxE3AeQ/MHAS2mDF5u7GXokfz8Kau6dYEOiii0yKyhDF9szQFO69aG41Q3sGQ8J630dEer5DolXNBz2Pf41A/0r4UFC1Y6rpt/+N/C2suNgr+PsfNMwKXvdiRhaQ4gBHOxwv1vSQCMGTIdzKrxSvKYTsu0m2NatrGXafmfjKaXvSDVs942iX4o/9ZUgSdqsLyuiNER1pr4D0t/TYQtIi1LPQ== 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 2b6888ad1470..b3d0cfaa2533 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1279,7 +1279,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);