From patchwork Mon Dec 4 14:21:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13478527 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 68614C46CA3 for ; Mon, 4 Dec 2023 14:23:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77CFB6B02AE; Mon, 4 Dec 2023 09:22:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7050D6B02B0; Mon, 4 Dec 2023 09:22:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57ECE6B02B2; Mon, 4 Dec 2023 09:22:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 44C8A6B02AE for ; Mon, 4 Dec 2023 09:22:42 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1185D12022A for ; Mon, 4 Dec 2023 14:22:42 +0000 (UTC) X-FDA: 81529351764.17.B1973DB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 63B5640017 for ; Mon, 4 Dec 2023 14:22:40 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HDd3xvCh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1701699760; 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=nwrEIToy0DTNusea81H7rc7vo5MP+ocGWlNPVi4s7cw=; b=FVNMiG90//uqtr14tZINWF6Z7HWLJYxU5wICV8U5MZnsvDRPA3ybuwoc212FfiBFd5b97b 4MMePsLQPUwle9FliO0m/e1i+T6HksXcDNybs4z+CoVa8SdBoG8n5AfL/JkCNel5d23rnB XaNCiZ5DFMajU0CB6Qu2tHKBWp6uUEc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HDd3xvCh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701699760; a=rsa-sha256; cv=none; b=2Kg+2fk+x8tBIjHq0D7CwrSzpO8rRBMCWjo1AOQmcp2YFxFJSRGjqpvdjwu5QgGcFNrgzU KV5SwPZwPOpgEh4UCZvfkSLDKjBz9LaLjrNstuHOsfWHS3qe6LdsNFcrOXJttL1Ql7yZWf J6yLb4QXpDDGo9VA+x78LTNilppq5aQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699759; 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=nwrEIToy0DTNusea81H7rc7vo5MP+ocGWlNPVi4s7cw=; b=HDd3xvChATM5xm8cy7xtV6/7AE4wrbW/0+2AnUs4zNIxKDe7QoMVmRXqJHw2DkOkh8S39e X+VAo7lKFg6IW3RH235fsgaXGOkC/jLxBPDQD8T3Rx5y1s7SALWuyyMXO05YSBhyFDFn2z A0WWj4xMhrTNVJrFiQtITHOtjAZn2rA= 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-135-DF69DVHUPTOZMJ2zvuPJPA-1; Mon, 04 Dec 2023 09:22:34 -0500 X-MC-Unique: DF69DVHUPTOZMJ2zvuPJPA-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 290303813BC9; Mon, 4 Dec 2023 14:22:34 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87D722026D4C; Mon, 4 Dec 2023 14:22:32 +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 24/39] kernel/events/uprobes: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 4 Dec 2023 15:21:31 +0100 Message-ID: <20231204142146.91437-25-david@redhat.com> In-Reply-To: <20231204142146.91437-1-david@redhat.com> References: <20231204142146.91437-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 63B5640017 X-Stat-Signature: j5xp5mi68asjwuin7iuozfhgrqxx1hrb X-Rspam-User: X-HE-Tag: 1701699760-88946 X-HE-Meta: U2FsdGVkX1+kiiGdcdkXwfUHXpDySaLafyqh+pCfEaTzRHRfYBKo60wPJV+LwDH9LkT8JTUI3Rnl6hNTbxhdpVriPecwm5XUbnTFypUdlHXBuH1Y+DR9OvypMqpMXL/OTImAK3MADni2Y3yEr6TlAVdhe/Yld4wqIYC+iRtgQ9G1SxckF3seSg+B4EhzLLWlY/fFzjn9AJxteUXq/2u/4yp83skjTjpXBWE0ydWbvKTZRJwpPN1MDPsIOoWqhfSzDeQYc93lNQ6HCiEGUnZum4WdTk5ajHg1blmsz7fTiQBgyeiWjGjLf2yDp9hN7UbJTqZT9TE7M3mtmVilsxjwg3Nz9ocgxUXLO3doBosv9MhXMLsVc+RDsyE7MCw5HBl2VQiX0fZ0ecEaCouJIyRop0YJqCe809HpwDad7odv+IXjOxWbvxmbw+jtKGX2ib3Zg/dsvNkZliEMY9vIKF/EhUr67ETvmI0lJc9BQ8bpPS8MNQhZgDHZ5zed9ahlxasTc7N02jBlCrJR1WkEL71GV6Nn9+31pD2K0wrf46rSKMcvYU7XDdV4aDHo7rBJ+7srPAPBt8s15+lmkRKWfsdZwaHSaAayUdY15y1/65gGtattUkph9VvvnMzlOgOqfN1zH6rs0G56i1FfzCkygW5KKy+VOMU/d3PIGsw2WaTwQ0KNubnO6xdLFCVG61d8aUrMDbBGfhHiBw5Vzcp+VCAUtdf6vP90yYg5afT2Plsk8cFQ6y0zRoqjQe4O65E14tL5WkBDiMJ6617lk4pCRrySBjgGr4tezdWsQrZKnp2PlZU7lWoCKjbpLvGYczwQ58vkpi4wq7B3PDzhvtbqw5PdbzWELNB6WAp4MYhg9unF+YHFJD8aAhnhYnYYElqNA0NNOV1a26ul0xYEoa1abTZoprjgNXSs6EhffFw6lJXV9oqIcl++O9GOj6Ww1I8XdQoWkX886Fw8n/mPZFuqZNf AXtHF4S7 AKLh1OVcVQUIWNANAeWiN3KR9NHBYRfRSx8b6Uuz1kOMzOoH3KAEedFhtvzqyKGYYddo6OHe2+vqH/iNFpQxUJPJsOvI5XXbcC8SGHfu5fnZOXEhgvpZSCRT6GMDHZWQZJeRZSGjHnYSD8j88hwXBbzH7r4BGPes36rIhI9+lflSBWL/+9j8PlOO5oNf+pbXHc7Aw5Miy2ap5po8Aj4ILcB304A== 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 435aac1d8c272..16731d240e169 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);