From patchwork Wed Dec 20 22:44:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500637 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 40D01C3DA6E for ; Wed, 20 Dec 2023 22:46:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0042B8D001A; Wed, 20 Dec 2023 17:46:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF7938D000D; Wed, 20 Dec 2023 17:46:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4BE38D001A; Wed, 20 Dec 2023 17:46:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BBA468D000D for ; Wed, 20 Dec 2023 17:46:17 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9C59314055C for ; Wed, 20 Dec 2023 22:46:17 +0000 (UTC) X-FDA: 81588681594.28.A201948 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id EBFAE10001A for ; Wed, 20 Dec 2023 22:46:15 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PVnQMLjg; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703112376; 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=tVk0EEeLHw3+o76tswuza0N9QDfjbUBpt28VqO6EQjM=; b=THM6SzxIwpgRfj3LkQ29Et7tneLi2gvFi2ARzlz1RzqhZa4l7Qtn7Kf+9oO6264tRc0U+Q y3/IYZaRCQUHTGDH7YJ/fhAeZab1um2OGxnoSeYppYCtmYCJPQH3OmTO/UGI7t00VyIF9V 1y/PDjmhOCk14RF0l0UNrFO6hNZaMZI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112376; a=rsa-sha256; cv=none; b=70lNU6bD/0t2OjDAv1olk2ZBw0k0reKQ9udNS9cbNtBj4nV9fxCFBmU/hiZqutDwEAqdWw 0RG4nn1xO9EUj4PC8GWv3Td97Uf7u9RtsZlQl+XpwIhiUsHwbFvkibPLJFSI9t5PJbb4lu kk722rVCaUWLEtSRVhYXQq7qczedHs0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PVnQMLjg; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112375; 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=tVk0EEeLHw3+o76tswuza0N9QDfjbUBpt28VqO6EQjM=; b=PVnQMLjgR0K2aR9IRiLHuITcihax27LX/imexNqtO1KofshwaJmjevWoybPvfaNdkVRsVT ZdRPLa3xGbmtP2uqoH53WELjMib2/lzv1wZL2VBqbsvCM+5eyoEoSoSGzHD6Bn5SOxw1mV /cXF38ebCU4c2oVfiuFp70+F6qXmUeU= 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-447-W2MzE-l6OeqzSGd0SCRvqQ-1; Wed, 20 Dec 2023 17:46:10 -0500 X-MC-Unique: W2MzE-l6OeqzSGd0SCRvqQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 437B786EB20; Wed, 20 Dec 2023 22:46:10 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id F294F40C6EB9; Wed, 20 Dec 2023 22:46:07 +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 v2 24/40] kernel/events/uprobes: page_remove_rmap() -> folio_remove_rmap_pte() Date: Wed, 20 Dec 2023 23:44:48 +0100 Message-ID: <20231220224504.646757-25-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Stat-Signature: gdq1mow6cpn3xirdcw799yd7c6sybk6i X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EBFAE10001A X-Rspam-User: X-HE-Tag: 1703112375-93142 X-HE-Meta: U2FsdGVkX1/9LbYL30iBgUhLeGUBL1WCjXMvl5L11H0TH9E/2ESyxmEmFVj7gRVvSsdEw/tmWJCo9SMIeeSVNnv3Aj9tyWmGJ3MHboJEzsSlju81W8DlB9NvR+hdHzDkhBmaC/Cdj82FRD+kUPIqJjsY7RqdFvJvbtpN2bn2wyxp5fZLhM6vI+PYY1JLulXBQQ9wlMbuGnkOFTydpToRfpZA9ULn4aQhMSCN02PaBsJRr+aFPkjsT0VWooK5h6AA2fn5aHwvc4eO9nkOMveirx/6IuHejeWkjvZqcsQoMPaZeGwfvABQurK4LwsoNjcNA9XJbALgRk7lwooboYL8bZU7nDFhN3SSffe3XSi3rYXrvGPrrmycKrwZXV37szrXdoDhq+eduHOp1CK4oaSATGBGRLRTFrr71+UWWqqksukoK0jO9TT82rNpIeqcLrH56/3JgbalUV/VICfM00bg55jQ1ZG0CD4WGNhCH1GESUTCnmqoiOheqrCYdV4Y6Zn4pdkd1psDBlqiAwUh+OYXQUThKUnLpQUYPjyuhgJXKnkdmVQSIXYfHt8RwaSjZQujUdQwC2Xc1eqXXASl7yqlC/I7pCGkTvqrvUGbX7yrd5D0zhqier0ZeooSNc9a+5YJh6P1ZyANZlbWLxABmHWZUg+x9FAF6SDzFXlZ8YmJX8SjlCDDqBjeKipM15pZXMjPnNWnaX7+VRogvtX/d7vYPRp7CfZbPVp35NFF7uMQQd8ue0qTpucKzXF/EWvKtkRzryfVBEeR9Vi5Ktm8/vCA0W3cCtSbsasKM5lxnRVZQTmJMq02veMC4M3ceUVy+bjPZBTw/diSoHnD7waYqgpl7U5VAm1tZkRkPyMdzyW+1lCM9VWMpd/Iz3W3Iqg7UGpMKYCn3vrhtUEYzP9WDNt5NGPAKJGUMcbkjuLdE4LUY1l7yn3moAT6YYFibgXhRnY71BPKm3LOlgvkiFKVxFA 8BvYDmha IIn4gg6l4e8/9d1CHKHGosdELmMmyo32Qv1iHbL4XppAbMaIhfanP39BViGv5sko0NS4q9eQRq65uiEjBPUXsY/l16EoL4z5w8D2Dpd5VpbQ/Swi2jrsvcUfbIlRkA6+D83oO+0KRmjhlu8QDVt+M8vYTq6reSUTgJbveiIJ/m7t6E7UOkPQx9bMnH4ldMyMjirpp4iO95WiAncAU5k9B8+YBmw== 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 8b115fc43f041..485bb0389b488 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);