Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4064974rdb; Mon, 11 Dec 2023 07:58:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJVoMMN+xmokUggjOCyj6vqk5iiTjt+yy+JW+41p+ykm4nGEt6Z1jQdrU+yNqzYIhpmzpR X-Received: by 2002:a05:6a20:639e:b0:18f:97c:4f58 with SMTP id m30-20020a056a20639e00b0018f097c4f58mr1473042pzg.100.1702310316284; Mon, 11 Dec 2023 07:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310316; cv=none; d=google.com; s=arc-20160816; b=zkAveMHWfi+AFkMkBUx65gIWKDZJTXAOS9F5Q2v6sDYFULnqy0nRIQrd8dABLDhkXi Jwl6ptWYrQErlV1VHOjQTPPJj9A43KKBUAFM3dwr7gjuxT3ZNByR1FqpoXt1eciX+tuR 3b8iNpJSlcRQkMqCu03m+qNni8SEY0/Xi7YmwPO36SAaiW43b4j5L2Um9Z0/8ZfWM582 m5OyfuuEAj/JE0+vQJ5SxeK8RLJArxWu+kHcwWfJ1kaLqTLj1zsymoDuIM8DAZ95iTWj m41sF6x7GIN7XmOIn1L/+Mm1o2cmgWxV4tDRWeNxLgUGTuVjxDGosOqanmwcTNdDcIqf aQ5w== 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=g4JhnXoUG0c2uPae4pqIp1MlWaLrLx7AL/tRs/hDXm4=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=LXSZUOd4YB+/A5PnjQw8xxHHMPyqzIXnM4mqkgG/rlFR8LfVzp1DV69VOuhw1Ay6Nv 4IFvdvgg5ZgDdQ+1+FHGbWB4tUzLsgjbWYgC5huI7sej+q3y3qBaC107wNiC1IRILZ0V QVjZ+n18K9KURcIxO8evV5fxhqY5nZENRzYo2VkT3hi3w5noa2Yw3ELf9bA+ppjfCdt9 gv7Tl1XbQLLMgzAp6HShg7dJZKbUu+R+HdiZVdoULUYLZNp1TOwwOqFoTXREfc0ITosi 6SpN0MaR7XN/uLGxLZDXXCyQk/B3ka/DDWDXxlOHX1R/wk1IngpM+65DzdHqTircSVtd ++lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="aOzALQX/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id g13-20020a056a00078d00b006cb901a8775si6003823pfu.396.2023.12.11.07.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:58:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="aOzALQX/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 0A022803DB2A; Mon, 11 Dec 2023 07:58:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344607AbjLKP6O (ORCPT + 99 others); Mon, 11 Dec 2023 10:58:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344602AbjLKP54 (ORCPT ); Mon, 11 Dec 2023 10:57:56 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8704130 for ; Mon, 11 Dec 2023 07:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310267; 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=g4JhnXoUG0c2uPae4pqIp1MlWaLrLx7AL/tRs/hDXm4=; b=aOzALQX/mrlBwXGmBW6nwpSZdZ3iCOloKmuf6bFZnVshbj4+pEf+8m/JeoMODPY3yKWJ7C X2geo8IGhdz4WIjkpCkSLSiLbNpwwDiE3nUOKUhGeTAEViAKNF8/6ibceRHl5S2CwUH3QZ S6YvN3rfpmhedIpsjpqyarJl7M9Vxrs= 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-350-BCpQV4YyOqmsm67nADb-VQ-1; Mon, 11 Dec 2023 10:57:45 -0500 X-MC-Unique: BCpQV4YyOqmsm67nADb-VQ-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 918BA848A64; Mon, 11 Dec 2023 15:57:44 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03BE91121306; Mon, 11 Dec 2023 15:57:41 +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 19/39] mm/swapfile: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Mon, 11 Dec 2023 16:56:32 +0100 Message-ID: <20231211155652.131054-20-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email 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 (morse.vger.email [0.0.0.0]); Mon, 11 Dec 2023 07:58:31 -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 8be70912e298..25f53bec5097 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.43.0