From patchwork Mon Dec 11 15:56:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487463 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 9BD3FC4167B for ; Mon, 11 Dec 2023 15:58:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 599A46B0124; Mon, 11 Dec 2023 10:58:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D2826B0127; Mon, 11 Dec 2023 10:58:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14ABC6B0125; Mon, 11 Dec 2023 10:58:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 010FD6B0124 for ; Mon, 11 Dec 2023 10:58:01 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C70A9C075F for ; Mon, 11 Dec 2023 15:58:01 +0000 (UTC) X-FDA: 81554993562.13.CC74FAD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 0DDB240020 for ; Mon, 11 Dec 2023 15:57:59 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G9uy7rYT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.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=1702310280; 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=jBiuDcFai57ywCoGHCEF1oxPQjyCBa6ek76+fUhJDqY=; b=4MWwGtP0nv8x/ZK1P3qJg8p/4dpfcjUM9GRBEjLN3+zge3xfAW3gm8aDDLPiUMARkpnc29 jBwOtCxFiwcKOTHjYg+SUy8kKvVsxabPINTSYlc8nVmAoySdMZUikcArsyWORDjAb6reES bWiVDOePaBhYWVCh+p7NvRTxizd1riA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G9uy7rYT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.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=1702310280; a=rsa-sha256; cv=none; b=DbbSOY8ORNbRk9rhTYjJLc9ZkQo/7KbAM7JxIRtzN2UKH2lJ+/EvDjwTjbBfUfDXTz9dCw jOMJswrnzXsJh4FMBBGeOEDPc5Cwgi/k/bBWQwwtQ4wh4ZO5oqrDqYADXOauseNQSNSQw3 j3ApF6Q/6MdUAOTLxzzwaGZiYUh0ubA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310279; 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=G9uy7rYTZH+avbvJQ7RhMYsrMvZnpe6JgDGWHTKjpuOpwAQYRBgijcVnPj96RU2XNXrZF3 zQX2il/bvXUF9lMsg0321gyYJaGpDmTdNhg0qtGmNJiPB3R/+iA5B5DNiy/Qw4BbCY+yb5 tbKLsTJ3VP/t2JxUC7FrC6Lp9nGarT8= 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 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: 0DDB240020 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: y4semquceqfhaypq5z5ib5i89wqsdza1 X-HE-Tag: 1702310279-66176 X-HE-Meta: U2FsdGVkX1/+H7GFr7HE8cHWuduPOjPgRNJQ1cYRyc95RjaIfFBA+SPtWeNdWinEX3Ewm7XXtaJjfvD1sIor6l+tHZb48wCt1m/utCQEgqJx8lW6tNlxQBFlGW7UpldkVOple4+5vB3CRADL0h2Tt9zzTgogwEZyRhJZGHyhZkVPaEsMzbgjewviIObGtxLGnqqm+QPy91n7N68XOmFiluh7y4HdQYqYMqYhl8jKxq0mWkXIYSxXhEk5AIFcgK7bcCYwY93Y2J10vcYWHIvWzFSLrAylVFhCipK4jGRZGhBCIehPkCoyEpfhN3Sprve71a8eAD5gUWxKI76jK8/mIIZCJzskrdWK2TXdXdhcImtBlLmEAQwl0fettN00mruAp5kBZHsUcBKD3oCt8KAnUUGLmO5eyYinmUVBOlTrNx8/AyF3lxYOaP5rkAiHZCIFebw7kPyaFSMcfVAnAlkELv5yZU67sU5/x5RVrw2lnjlUtFPzFMO9UU8XwFLHR7WMjjuwcjTJV0/XzgfASjSn6EOsdGGDpmkJI2yg5n49e0Ai+54l38sPd5YDzvAzzu6XrIPQcxWbO6kukUBDRtxqber65r3wCMyV4yG+d9XYMiMcfvu0PdJVxJfA+SfQ7iZC/IkRRmjxc6iUT1YkhQjCbSDiwlIF324fjhC/58Yu+xpjXoPOgXtnQe8OQd4GCp+mm+aViwGWSSHjR7cyNykr9LQC8D2tQTNmq+fb1oDw11PzJ+B8kNrqv/v0E088t0W4b084xMqoBAoPPAwwID7MzZvwuIbtZYbMCsRtKo0SzfH+oXnHbwY5LTOYjpjY2z9Rguuu5wrYqQYsI4O2udJlfPD94QFRRqqufUOAVl5iIjLx4gwrL7Wfytl3v97LhWYHMtRL7sGjL3B5m1Q4kHY3LXrlYPozMC+xeu3ff0FMLgVlReRhr2OLs/rBntRTBlsAbO6sJ/e+ODFOY3tAc+P eQdqFE3m dbBOtHlfTrdStETgGVI5Gg5PuOobbVGbWonyWKaH6DgsoemcAFRWfiaJd9YTjjpOzt/I0wBPM0sa55Ckt+dgDumanLc4VQGEUGR8KMRFzcuk+XKPpfm6lJLkuHPcka1slBJ2avmg0BZixHf2JpvE4pOsjBaBVPPvoEsZ59wd72HoXO5TycMyuNv5PTrqrLsmspoAB7xZIhozuDSyuF9MwKlT8VA== 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 __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);