Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2740350rdb; Mon, 4 Dec 2023 06:24:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IELTV0Yr0iXl7s0AHMJgGZQ2+BtVUxpX8IyFXbgqTze+NY9DNSOuhUZZOAi3PKp6Pgn/rfN X-Received: by 2002:a05:6a00:1f08:b0:6ce:2732:27d with SMTP id be8-20020a056a001f0800b006ce2732027dmr1666678pfb.44.1701699876877; Mon, 04 Dec 2023 06:24:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701699876; cv=none; d=google.com; s=arc-20160816; b=vmKJADGNriPqrnQD0vITpT1+mlyzw1s4ZCpquvKB5AjmiJo9djU2nuQ5WEVaqIBT5g 97jNdnLyKp9gbOuAM4OyeuECJsXUlWOAVd1/egClU0ALkNc27Xj7Rbh6fG+kQGWTXUfh rHAkzCwLGpALZqxPTYn5dbpYQN+/cxVN0JbyglZJpusZxeYhuCB3Gm0CvpEL4uPZ+ZM4 CkjI47m6OOEoD2HdLhpVcSCg3+bKi4r4qHrcCM4SWUostwr+52YNVKUah+ENyvNr/AHk tlMzMdi0U7LjXg4i0i8yiuggk3dvPFwQP6TCr5r9sgDpmBD6RqkYkI/Fj7IxgRKP+Jac vATQ== 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=nwrEIToy0DTNusea81H7rc7vo5MP+ocGWlNPVi4s7cw=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=ZWBZf0hal34IAA00rV9fqmKl5FDnlSePjG+3LnFdUn5wnz4VDHbB8HqSUZGRggFG+N jIKLfKBj9/DiVKLPaxSjJMZD9ngPkzvsmdyMXEuQH5w23XoUGaW1933Q0JlsTNYoax1G ylig5iz0EWLAYLdm8QLwUAGig9HyW782dA0NOrTkVAfmPF042mSFrf5v/lnVs2iQUKPj Z5FLhOf16upfA43OcJgHcnRYB1Mzqo7m+T5shbKv2IeDHaZEtYwJ7O2A1im71kGwAdvV 5zrSUo0CVCq80J6Lz6wMM6BzXg9KUGwjCIsXm2SNU3BEuwsNIugt4475K+Vmj5gGogKI ZPMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M7hYOejb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id f10-20020a63de0a000000b005c65bbc794asi4209010pgg.53.2023.12.04.06.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:24:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M7hYOejb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 60FEA8096A55; Mon, 4 Dec 2023 06:24:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345069AbjLDOYI (ORCPT + 99 others); Mon, 4 Dec 2023 09:24:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235869AbjLDOXQ (ORCPT ); Mon, 4 Dec 2023 09:23:16 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AC071BF2 for ; Mon, 4 Dec 2023 06:22:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699760; 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=M7hYOejbkpOsNJGOtZjun0/TXZKWyfq7Lh2HCiH53JpCTLLiQe67nD9ABg2MJKLOOk21jT TZP009cltp4k4GxBeV+0zZDVAPnLtNWee35d1kB/+636Me/iRJSHDjHi2z9mHU5yCVbxSz YogfYVELWtLcji0MAVfD9UdCXAYbsKI= 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 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 04 Dec 2023 06:24:34 -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 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); -- 2.41.0