From patchwork Mon Dec 4 14:21:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13478529 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 026F9C4167B for ; Mon, 4 Dec 2023 14:23:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A63C26B02B2; Mon, 4 Dec 2023 09:22:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A134A6B02B4; Mon, 4 Dec 2023 09:22:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8663D6B02B6; Mon, 4 Dec 2023 09:22:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6E9D36B02B2 for ; Mon, 4 Dec 2023 09:22:44 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4E1DA4024F for ; Mon, 4 Dec 2023 14:22:44 +0000 (UTC) X-FDA: 81529351848.22.CF74379 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 8A803C0023 for ; Mon, 4 Dec 2023 14:22:42 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DwPcIE8x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.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=1701699762; 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=IO1sF7V8N+lGKeYvOYG0Xi/4CGC4wNOlZZ1+xeF2jmE=; b=PBCZmlaemxyhzIEQIY9bTcAtqL+r2tyMJAvgnW4I610YnlauB29M/jDK4sFAtKMX+Ejvky caXL+MbA9K5XVHbI4eRjgZz6Xy1fh8MfNj4el2BW2D0OdmVCbduufCEYPPvnF5fQbUSt0g o39JrBSTqPLnRXAjDp+nuPcPeAelMkM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DwPcIE8x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.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=1701699762; a=rsa-sha256; cv=none; b=0dQ/NJ8ctgS7akIOKBGOCNWJ9OGDFK0OofEAUBFAZRlySR855xWoMrG8o5SILUT45I0maJ 4s4jnFzXtCNotUTZKVE4Vh20KyTYeK65xTxwOdh/JMr/ucVklrqd5YbCK+uebTuoJuNSlm ILHeJ9K3khtNA72xYCPgrybVtyEbT08= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699761; 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=IO1sF7V8N+lGKeYvOYG0Xi/4CGC4wNOlZZ1+xeF2jmE=; b=DwPcIE8xsjcy/DbfLWnubn4gYRGzNx4n+LHPKQEV097WX2cFmuQX8k/eCdNqdnpwkfBYeb sFOevmEqE+T/1gYOPvKLxHFZGFXakzZQvv1l7RdS5uwQR2cPeZQf2X/iMZe/XjJvkksmAm nJgX/1tpRVqNToRFp/T63a1PO8fHwkw= 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-662-EsHpcshiPLKnjsrxEa5ujA-1; Mon, 04 Dec 2023 09:22:40 -0500 X-MC-Unique: EsHpcshiPLKnjsrxEa5ujA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 C3E941C03D95; Mon, 4 Dec 2023 14:22:39 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2055C2026D68; Mon, 4 Dec 2023 14:22:38 +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 RFC 27/39] mm/ksm: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 4 Dec 2023 15:21:34 +0100 Message-ID: <20231204142146.91437-28-david@redhat.com> In-Reply-To: <20231204142146.91437-1-david@redhat.com> References: <20231204142146.91437-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Rspamd-Queue-Id: 8A803C0023 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: g3j5wxpuzjicxpac4h5e5o8ymeqmj7pn X-HE-Tag: 1701699762-840435 X-HE-Meta: U2FsdGVkX1/6RjsIuxOJg0fI7uBWuxnt0CSqfA5Qgs3jVckXC2xbfA5hz/iM9yas27LPBf7ZdBi12sMR0XjDPYBxafHBxNb1kgq9qzYsSs8CkaHb/jAKI1eGamK6jZAph88MUA9VFboADkKon+8pUDMh5oRvo9Ely7D2dTaBVr0eRQ9gxhpyTO/1FVPDT3U/OKHx2N0c7rV0f//xFmiL4nF3yk/zRcyZUX0EjsDnjXoxknpAmZK8z0kwlEKmEqyGkY9g1qCfOB4/iem62gfY914vVGLTZ1cXofLghmA6+xAxCYcwJW8ThiCdbwwaGOClA1+D3m1xwZ+SL48+3/MFI+1bNmHHC4GUtpidu5LV401VuEY741DnhOi4HEhTrggKy1lwcDERxNk3ojJHQrA8bIwBJ6ghAhnsKfQbxQyG4iomHewfCQY7/DjLFakk2HKw6HZfiahGfXe1LA1fmvcmYcGKejzElp/EQQP0SbhNZ0M5REd8lYCmaaJZrqVnVkvrKv7FFygUyVrvuds7ZhOEe1IDhHRj/hyq6fCzLbWaroOSK6jX1g8PGeUFvtgbe/51KEDCzhhKaatxIbQ9iHMijbxelOTd4b2NMUE6Y6eYBSlgwLKZTSG/aHQZp02zzKf+lzg9P57tWwxOflVuB0isT/wxTguVQHuEfmchWoheKgxGBGhPAQ/FYm96ahj1t31OGZKsj17LL5mrViTvgqf/FHDXZlevnqAiwqaTOhtS2KkLL4YD+TPkLnS9PN+7wPEmSHN0mK9NEK+X2HOF2QjopjwkzcuNn/LYLf/yp1i84ry0EDOD11vnFIk5Nh+8o9q7ZB3gog9PN/SGMjVaS+Ja+wFWn6FYNUYkIEIqHxhceLbMepYcSsDtl8BTSYkOqVX8eknHh8j1dvWwjkZ7S75mFdVjKqgQuxFHMXIorBSQyyycy/TzgqVMQ5/19oPusqlGOf76mufPj/iYOytUZka YcYVT62R Pi823Bi0xJ3tdRLOwhjM3iPyn6F226XGpVORtMEHtg6O3ovF0yZ7IUzzjb55PL/zahI7JdZ6H+U3JA9ktY/rR//GwHGf52D3HKYF+SeKQGm1Z3ZW0i/I0yYw0qQnjj2JLCdzRoftFqgDj6HvXPCSS8na1vwvCBcLF+FcOqK9K7gMIedcoazf2UtBMaTm2XlOCXp0qP/KEt54JKweF24ypt8vZcQ== 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 357944588a9a9..c23aed4f1a344 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);