Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2739842rdb; Mon, 4 Dec 2023 06:23:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHS02tFvE1lBJv6MHJxc2A3FvOhEg5JrwArZvOJG3aEaedwouv4Wk9TgDxXcXBG+nnZp6HN X-Received: by 2002:a05:6a20:7484:b0:18f:97c:8a2e with SMTP id p4-20020a056a20748400b0018f097c8a2emr4185906pzd.89.1701699830705; Mon, 04 Dec 2023 06:23:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701699830; cv=none; d=google.com; s=arc-20160816; b=xmXJqQLFgT7l2iyGmPPsz6PXaoTVX9HjzdILvqMIGORJfgl7+nKMfA8XWFbIsMD85T 7Dri2dilh7qWLHxsGuYBluxKclC4F9EkY3zNaPoSOLyeSRNzZn/we0DQ2qeT0wtZMrJx N13t4nXhGwYRs8iarJJ2Cx2fmFyTLAyNAetCI9Ajol7Gu+l1damxWMpyQAdcYkJSY2Bd WMNRp60ZzTZ4yUGW20hkp1yPIN9qWPxY5KIoE0XfPWbTIH0bVGzyyUsGHxJcHnRtR/uB 2NSuJo2biGg/180utN9ParmZrfk3XlBgsYmLAjBq/ycy8aGglEQhgpDmwMqRmAYBZlyb PjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+HQj3RQXy3rfd5XJOTyn9grirPLdYd+avDtLGVmo9F4=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=HX5eFKbLx9ozkz8PMpDgT3uIJU1BvMgDFgHatz2v61aIgy83r0D55H8dfyb/NbZjJH bR97Zp2mq9tZzAtqbty+jZqgtQa/J+FpJBNmke0B2v9tKxD8gc1hROO4200KJx2awYoq anH1J+q1JlESPOcsgHVMJd1gQ0Ld46kcCuAMeZW4X+Cg8cEVk48/eMCuw4D1p5skZwG3 jciusCGh04djcnje/QurS7DFWrolwECwttr2MKRTrVGea/F52eBdX8Dgq0LUw9p/jKb/ 01aA1Q2ySfqdJRzAWsQ/p0LG4dilfQfVzCdCLvtug8RFVrn/gVeL7V8r4RK/m+o2jP2z 795Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P/Y3ewnK"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s5-20020a056a00178500b006cbfbb699bfsi7972331pfg.156.2023.12.04.06.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:23:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="P/Y3ewnK"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5489180A7E74; Mon, 4 Dec 2023 06:23:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345573AbjLDOX2 (ORCPT + 99 others); Mon, 4 Dec 2023 09:23:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235866AbjLDOWy (ORCPT ); Mon, 4 Dec 2023 09:22:54 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A1F9DF for ; Mon, 4 Dec 2023 06:22:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699750; 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=+HQj3RQXy3rfd5XJOTyn9grirPLdYd+avDtLGVmo9F4=; b=P/Y3ewnKOduZ3IwpUZpgzvJbXVEYRjc26ORaCJniyscFMCENyhnL6YARTI7JS/3PdMRSyP J/baf3cxnsf30r7TbJ8fR5ZvSqQKEw+gzUWTNk3uXhOMEh6oQj5reu+tNcH7f11FBtuff9 A1txQpg1Meoz/7/1cIbsshJ7/ZzTGZI= 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-695-AG-JYXFCP3KppGdqheHrmQ-1; Mon, 04 Dec 2023 09:22:24 -0500 X-MC-Unique: AG-JYXFCP3KppGdqheHrmQ-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 6C7CF831506; Mon, 4 Dec 2023 14:22:24 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id C88092026D68; Mon, 4 Dec 2023 14:22:22 +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 19/39] mm/swapfile: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Mon, 4 Dec 2023 15:21:26 +0100 Message-ID: <20231204142146.91437-20-david@redhat.com> In-Reply-To: <20231204142146.91437-1-david@redhat.com> References: <20231204142146.91437-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 04 Dec 2023 06:23:49 -0800 (PST) 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 4bc70f4591641..1ded3c150df95 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1805,7 +1805,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 */ page_add_new_anon_rmap(page, vma, addr); lru_cache_add_inactive_or_unevictable(page, vma); -- 2.41.0