Received: by 2002:a05:7412:a9a8:b0:f9:92ae:e617 with SMTP id o40csp26429rdh; Wed, 20 Dec 2023 14:55:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IHy2nWjm9N/Rdn0Vx0Y96nOT3CAFABh88XNlG6pUD2zmOk2agayovlpIWP/kGpuWthIt5fi X-Received: by 2002:a05:6a20:1611:b0:194:f984:75e6 with SMTP id l17-20020a056a20161100b00194f98475e6mr470682pzj.105.1703112901436; Wed, 20 Dec 2023 14:55:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112901; cv=none; d=google.com; s=arc-20160816; b=XrZE2i56+7TjBH9pC7iGYBa36Yc/NMKV7yD3xb1vSvNH4tIcoCpxdt7mNwpcobQTz+ JqKSmZy0LhVKzrQlUhlxBI/2edJTU9vaLUSIhhJqefbZwchKVzfxbTcKzbxLsGsEQd69 bIUt1PRnJhAGCe3r4/F9r+aZZC+SugEA6xOeHTYAt+cTb9lRvkL+/aQdz2XtBRoR2fqQ GXZEv7FoSHuMzTQIIBGifjTqlqxqcIIHDbA/ThIgY9kwaza3Q35nP/TQYfCpGzlzVk8t 2EBGoesoGPn2hHIJArVGQtHfT/U3wMXzKhqnm/A4uI3lA9iIFJqlqUPsTHAMWJvJbFtu qicA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tVk0EEeLHw3+o76tswuza0N9QDfjbUBpt28VqO6EQjM=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=qTIe6b/ixMD6bMbNX0CoERgf1yL/j0EyzsF7fjXYvnZC1suZBEF/gIeBY0D/SHkoKb R5cjfLsoNYuN5r4mRYOdAcS6LNG23s1tFweBNCE1twWwo1/3NkhxN5xRDc3gNrbf0Rhd 1wF23ImsJSqOuWRD9OMB2BemQansfgsJi7XWsgeRdOWB9kT/YCUubDwvdDoEqQukrogY f+8xBZ6OWc1jEYSz4FNu+bCGj+4DkrTi4+ps+1/GrcyPSRo8za8K0C36RWsMoFH/i12z 4sLireiEmLxA02CrKMAtXtfpPx7TuNJ6L0L2p8UpvqoAqH7hviKSvxHC1QBufk+0S40S tn+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVnQMLjg; spf=pass (google.com: domain of linux-kernel+bounces-7553-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7553-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id a2-20020a62bd02000000b006ce54dc2d09si409206pff.254.2023.12.20.14.55.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:55:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7553-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVnQMLjg; spf=pass (google.com: domain of linux-kernel+bounces-7553-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7553-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 1A7B1B259F9 for ; Wed, 20 Dec 2023 22:52:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E5DAF5027B; Wed, 20 Dec 2023 22:46:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PVnQMLjg" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 178664B12D for ; Wed, 20 Dec 2023 22:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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); -- 2.43.0