From patchwork Wed Dec 20 22:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500632 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 3B58FC3DA6E for ; Wed, 20 Dec 2023 22:46:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3628B8D0015; Wed, 20 Dec 2023 17:46:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 310E48D000D; Wed, 20 Dec 2023 17:46:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 191878D0015; Wed, 20 Dec 2023 17:46:07 -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 0274B8D000D for ; Wed, 20 Dec 2023 17:46:06 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C88BA1408B2 for ; Wed, 20 Dec 2023 22:46:06 +0000 (UTC) X-FDA: 81588681132.02.A580855 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 19702A001E for ; Wed, 20 Dec 2023 22:46:04 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VYiJaVPa; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.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=1703112365; 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=QIY4woM6QT5vXKPOcZRD72sCPk41egGwN4b1+ampIqs=; b=3q+AfiEjfXyTt9nJsNYfEtwsrGOYqCtnpY3mktN0bYHDxSYZPCry78CyNGZsT2sYvis+Vx S4NTnO9IHVvizeSNTVlhd1Y6vcZAib1KnKdhX1Bni6DUkzNHEHRon0F76K/rXSvc2lOcZs gPAw/7ZryTfSZGqcSh6vB8JaBBR2qbM= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VYiJaVPa; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.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=1703112365; a=rsa-sha256; cv=none; b=p/hzwoEUI4JRlwaZHRSZwbPGuPm7OnkTlqt0UAqNNNLN01YOfW3ln3jj/r11RQbffD5vIs HnlVacTjyaMNYlATpR2aRTCDl0T0mS4QoZw0HN//su7Xey+UuYBtQIcsSnkx3if6ngPZC+ db8hbL1fgItLxXBgxlpinULHV2ns800= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112364; 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=QIY4woM6QT5vXKPOcZRD72sCPk41egGwN4b1+ampIqs=; b=VYiJaVPaF/JSi4lx1vt/2OVKZW22LcVkW/+gOZlM/FLfq4uKtxbKMNtBkLz89PGjbnLd2I TY2Tgtgnd62R9nVZNYr0SaugquWSYqvB7bR7X03wLgK7LMDiVNCGQC6lkDLyhDWkpOqH/I x5Nnk310/zV1j4cZlDGK6xfPX972Jxg= 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-340-u30R_eRpM7yzGggrf7qJug-1; Wed, 20 Dec 2023 17:45:58 -0500 X-MC-Unique: u30R_eRpM7yzGggrf7qJug-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 708A1848C02; Wed, 20 Dec 2023 22:45:57 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2EAC40C6EB9; Wed, 20 Dec 2023 22:45:54 +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 19/40] mm/swapfile: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Wed, 20 Dec 2023 23:44:43 +0100 Message-ID: <20231220224504.646757-20-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-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 19702A001E X-Stat-Signature: adn19d83okubk1rcjde7kc7wypfn7tkn X-Rspam-User: X-HE-Tag: 1703112364-875111 X-HE-Meta: U2FsdGVkX1/Hq9xPe3k9lUlVrejD0XpBWWqCVTGxlTj8RzSZL6mUVIHRfOiGpaWnyoAqrkw8ezUnekDqIXUrQLOa5OhWCJPsdYsqVJvdpMJnA4T7xskHL7j727uWtoBJ4mrcNxvrgHwsul2peTdYqzxGPTNOYHkPFfI2/lwZ4+RB0DKouL1vIFsLIbzxzFJsk8/1GoorvvqUi2nHzJefqYEhsrbKCg66pm/BunZZVhj2rgqK2iveK/edf1yxqw3/tq++PcCmE09H8c7tewut6jgIRJ3f9XOsv4/JKG4pjz56BN0VvL+y4TI8aMmFE5BehcCQA9782ivs0LeafTlq6mxUSO5CkP7RkGqL04BGL2eVy8U1RagteA6AO6vy9bilfnvtYJlKQvUBQaIZlTPAmX7BNFeZFX4Fw+dGMb/PrcPSGfHDZQB3GlJCtnW/295zWbm9iQXJVV7UwuNUFctz4LMK2JQIkUwi6CCYpZZrqmbUdINJ3PZ6IjSPUq0UcUnk97ZvNzfu1b48cC4R5kVSPsaSDIVP6otXvQkKPTcbX5ptUMt3kMWSd0D5jA/GYvFDOrizv9P6iUxmNURcSWEAJClYafOAIuscjNB97unoE+zaApgi4VmXGEMbsnBBR2t8tlX43urYEV0hDgXxiWayoYpAXDYrZfkooGAdncDahlXKhHSJOq1mwqK8Cp4yd+E1mQ+IkpoERmIuTdGaJXre1CoC8Rc1vURh84fvL1iH0a+D7avmzcBEPXkSFuserxic4UiQ7iQCEI6UOqsmo8PwbBmgP9O1GC7ftlcqQS4SVS0ax4epO2SW6iADMS6qcRBRcVq/e/7SeyS8wvcAtTWmkMyChRu17ZsMVLKlrGTcY01Wt46yXcQRzT+XUOpSLtjquS2wP5hYMXnpZEenfY5OJJ272Z0UdpgUieB7fxskO35FEgqg/RD2vcCTXBquP9dYPkMX+ppKwCiSGtY661t YV7IIy8r isugCi3fM1CillLMUk0PiMNwc50MAyNSnbPDG2u050cRO6QyNLidazXyyidLF4nTkQ++Q+abgIAjt+oCFPY8M68c4lsaAJ2/fGy410ehoVG2jAEihw33V3dkJn95jdWRsDBuJk17Cutlj3kaupGh+Ome2dTQqVDDRoufgWz34sphr6YDBQRagqkqatU1p4rEu+Zpf15bk9kEhBuPLTJsnjDrqtQ== 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 unuse_pte(). Signed-off-by: David Hildenbrand --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2f877ca445137..3eec686484ef5 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1806,7 +1806,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, if (pte_swp_exclusive(old_pte)) rmap_flags |= RMAP_EXCLUSIVE; - page_add_anon_rmap(page, vma, addr, rmap_flags); + folio_add_anon_rmap_pte(folio, page, vma, addr, rmap_flags); } else { /* ksm created a completely new copy */ folio_add_new_anon_rmap(folio, vma, addr); folio_add_lru_vma(folio, vma);