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: 176774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7153350vqy; Mon, 11 Dec 2023 07:59:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiUAmTeJwyIvlA2AVEqC6alkCOEOzNyscJ6Rmg6mOgw5dd2RUuSV/mi0ekedtDRDy451YY X-Received: by 2002:a05:6a20:918d:b0:18f:97c:384c with SMTP id v13-20020a056a20918d00b0018f097c384cmr5872570pzd.38.1702310368292; Mon, 11 Dec 2023 07:59:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310368; cv=none; d=google.com; s=arc-20160816; b=WH0Ct6zyeLMfDW5SLc1ApeelQ6Yta6X+Bu8G2YPTXYi+0qglR45pambM1ZwTraY+3q a/kChaOpkjn/uKWMTyxMwv0gtsERmzJX7NNMtYPmU/wiN62DOuzq+dq/FFOCi0vZ89Y0 oE4RdxBMUVoMRMB2x6NRPJQOGs5Zbmm0wZfZC0OF6Eg+zp1OMUH8J9z6X+/zbK1TuW8Q 8r8q8xuE0LBL4/zzgnUlVHSDwpkepfhcdSuseS5WpqzNykv5N+RzBLW5sl/dNe9+VFV0 aQgdTsT2arkZpiCg+Rkihre1MU0KLH2vT3ISbv5ft1N2KhmgSQHuPGKOKoNTo45a01qY aUXg== 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=QtgFnZdp8Ufq96QYGYH/M8uGtDulU5aA6agoBTCHJ/U=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=nOx3w3mdCJWlsj6Rv1OTxKl+YrTTWvkuCGUl5Vsb9YgIgpD7YtmIbuc26ynoGHbrQY i7hW/2z6kJeCy+rHV2ankRi+LiADoZGo+rB4r6UyjHFGQz8qCUJ/a8Rjz41Evxt/nuAw vKqir4qXy//CPKreyppvsZcDoR1prVf/Os2v59ZFwZKysb5er4HwNzUa3tcv2oQ7SptR 9dNjF1WNL6e/PEYDZGMDQDqQ5aHMheK9R5/YXmnziTuCNxbh67/w9rM6h2oBH8obOEEa hcBnvl65OYbNXrGvLnKhV2wPRgfCn3YLVqPsLr9ppGjz/opFC+kYphmgpNxF7yCUPyIc pNsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ft72nQ3S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id jc26-20020a056a006c9a00b006cda012bf20si6333322pfb.264.2023.12.11.07.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:59:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ft72nQ3S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id C2735809E8EF; Mon, 11 Dec 2023 07:59:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344678AbjLKP7B (ORCPT + 99 others); Mon, 11 Dec 2023 10:59:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344675AbjLKP6X (ORCPT ); Mon, 11 Dec 2023 10:58:23 -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 91E98D64 for ; Mon, 11 Dec 2023 07:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310291; 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=ft72nQ3Se1iosYYxXxQwwUec2mj8WdFs9jlsx7pmbKArZdpz7Qr7HosB6r0+p/PqVTqx39 LxVzavZnk5jjj+yEeGsahqaPH5RF+TjXGDYAP2TtNWCACkWxHbfUqAAYkS+59n+YmsrWZm V5zgDSwPxffg9kE4wzQ5exWO/8yaJEw= 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-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Mon, 11 Dec 2023 07:59:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785001796955328578 X-GMAIL-MSGID: 1785001796955328578 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);