Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4065309rdb; Mon, 11 Dec 2023 07:59:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkn13J2FIECpiRUFbSf8/cSMYgDoDkptGjDfei/brG/Enc2tc2WnVOhsSrQodwfRk8jJBi X-Received: by 2002:a17:902:f544:b0:1d0:b4bf:cbca with SMTP id h4-20020a170902f54400b001d0b4bfcbcamr6954054plf.3.1702310351024; Mon, 11 Dec 2023 07:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310351; cv=none; d=google.com; s=arc-20160816; b=KJWn5beyIhz6iri2ZmFCQbXm1sSDvuk2t+ZEPDEkNFuIuI2iSP20B5/pSBJKBAbAHS E03+C2AMMj7CRAzGEVcL6ba9mVPSnVZPA439QJOIavK9GSk1gHCTEC5sI1NI0REtBtzN prBvVVbNyrevQ553qYI0+9h3HIYp7hSrzBwHXJW5WQOHDXWQtG9DWWB2xxpfDFtRi5FS wTZ2kRx2wUNgqAJDqx6CZV9LcV6LISRnq++lljvSYK3HIuWZHI2EN3L5Abl12yszCJv9 9Fl2YS3xjT1wbOxZgF+RXu4PDScKCqtGDZKE3dYdxIByLfFi+dnWMBDvzjwfxVM6uVSg x7eA== 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=jBiuDcFai57ywCoGHCEF1oxPQjyCBa6ek76+fUhJDqY=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=syTIA6zLdipKQldGYn1F0dWulUkpS96a5tzpA88z0qJ1rVk+OwBPF+c80kRYK18Bs+ EfGhnSN1EpdmAsSHAPuzzhRQ/aEM8v/H3UKB+eLVZJ7tBEz/cq7bTpX85JgbeKU/RStu D1XR3Lilhx7Xi3QiJvzyF4YvGhknX19GQqGqFaLj4hiicZ8x6PltE158RPKU1qz+Y7pt FfBbfkA0s57RJxe/bg8769IBHJi185v2UePWhk0nPIR7GIcckS+3EEO3zE5L0yipbi43 zC+CDyuWR+wJ3/h1sKRpgdkJ1M6DqUKfxwO/gJmwDPk369I/oTe1ol/NEn4viwvD07zP pv9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QZZooX0l; 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 Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id n2-20020a170902d2c200b001c3411c9b83si6355573plc.454.2023.12.11.07.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:59:11 -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=QZZooX0l; 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 D4A25809E8D5; Mon, 11 Dec 2023 07:59:06 -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 S1344404AbjLKP6s (ORCPT + 99 others); Mon, 11 Dec 2023 10:58:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344569AbjLKP6R (ORCPT ); Mon, 11 Dec 2023 10:58:17 -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 57858123 for ; Mon, 11 Dec 2023 07:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310288; 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=jBiuDcFai57ywCoGHCEF1oxPQjyCBa6ek76+fUhJDqY=; b=QZZooX0lnGE/RHF7aLRiUS4Vp1k3Kql7J+gSEXg/Greoz6L6y8Gx3yv44vCuo+mwHMgv/+ +VzEisip/hCPZacm2GtlKFAAmIbc5uDQqab4abGGfpPfvEsgc3U9epfh+lm8ZbU21QrnOX 8DaXS9iuTfDBGJQ2+h2hxk6sNXVImiQ= 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-252-kgGExcclMx2ItCIeuAt4Eg-1; Mon, 11 Dec 2023 10:57:57 -0500 X-MC-Unique: kgGExcclMx2ItCIeuAt4Eg-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 F102F1C08BA2; Mon, 11 Dec 2023 15:57:56 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E1691121306; Mon, 11 Dec 2023 15:57: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 v1 24/39] kernel/events/uprobes: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 11 Dec 2023 16:56:37 +0100 Message-ID: <20231211155652.131054-25-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 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:07 -0800 (PST) Let's convert __replace_page(). Signed-off-by: David Hildenbrand --- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 435aac1d8c27..16731d240e16 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -198,7 +198,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, set_pte_at_notify(mm, addr, pvmw.pte, mk_pte(new_page, vma->vm_page_prot)); - page_remove_rmap(old_page, vma, false); + folio_remove_rmap_pte(old_folio, old_page, vma); if (!folio_mapped(old_folio)) folio_free_swap(old_folio); page_vma_mapped_walk_done(&pvmw); -- 2.43.0