From patchwork Mon Dec 4 14:21:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13478501 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 2CA8BC4167B for ; Mon, 4 Dec 2023 14:22:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5C206B0150; Mon, 4 Dec 2023 09:22:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE60B6B0157; Mon, 4 Dec 2023 09:22:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC2606B0159; Mon, 4 Dec 2023 09:22:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A5E576B0150 for ; Mon, 4 Dec 2023 09:22:15 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 87EBE1A025B for ; Mon, 4 Dec 2023 14:22:15 +0000 (UTC) X-FDA: 81529350630.04.F390B46 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id AE59B4001C for ; Mon, 4 Dec 2023 14:22:13 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ik7hIMgf; spf=pass (imf07.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701699733; a=rsa-sha256; cv=none; b=lrAMpI0yRFrXmyYpqzxIpF79QVb+x5+F/HcULO/q5vFJVsv94GrOVvBFluyVz5b3KH42px mqGQKtap7UDmFlJwXl6fZB4eedfIWCjL6iFu4Gq6g9l36f8R0l3MNabMB40E2w/fwfoqKz qiSfMnk9bgbPKQgTPO19Wd+H/X032DQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ik7hIMgf; spf=pass (imf07.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=1701699733; 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=DcozSwix+76TtkWexeYoWqf1En6dAEapeBtTC2bk/5E=; b=FQohPufz1F7o8w6seeblBL4b5avS4lYoq5JnrBf3PcBJgNLAyhwgkUvioM15mU9fuzkxPT luY0fqvr047Z7S5wnG0HUnC84k8fjUgeF1W9BhpxXhZT+8eqQbvEIVMfm23Nts//MR2U6W 6KJ9o+PjaJKt9YNX8KeeogpIgLKBxec= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699733; 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=DcozSwix+76TtkWexeYoWqf1En6dAEapeBtTC2bk/5E=; b=Ik7hIMgfP2ulxvd0KMg8QH8/0DOwV62IgmkUV2kR2mPnQ/lO+OnYPxxgM/5wfKsrWacWzI AKSBnE3owc78rHYAgPQ/iQtblRFSgXmwYjZuAemD9tIoSwEoBkPZbm5ciX1eAy124w4jcA agMJ280xg8/Xwjvgw3BH4KmWCnnwgcE= 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-261--TlKEsHfM9OY2J5oZszMwg-1; Mon, 04 Dec 2023 09:22:09 -0500 X-MC-Unique: -TlKEsHfM9OY2J5oZszMwg-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 290B08F9206; Mon, 4 Dec 2023 14:22:09 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BF132026D68; Mon, 4 Dec 2023 14:22: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 RFC 11/39] mm/userfaultfd: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Mon, 4 Dec 2023 15:21:18 +0100 Message-ID: <20231204142146.91437-12-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: rspam08 X-Rspamd-Queue-Id: AE59B4001C X-Stat-Signature: ein865gofp74nej189b184z6exkzs6pz X-Rspam-User: X-HE-Tag: 1701699733-99883 X-HE-Meta: U2FsdGVkX18FbQJZaZ48RGTdVgrI0Cm+iXh0fLBz22SFVc9MPGypa/iu/rLnxZ34RoDmc1uzfa/1ZevjEchS1LKwlC2CUsUfpM6SBncQ6nXQmPdbXCxD0Bc9XYfG8t/3G5qIsPnSPc825yHzg1OYOFpMM4gyAAYdl0zR5zTNAXtr3MMhsqE4DV9IWrygpbFOB0TV+7tIoKypU4HdpB0z6Po81FJgE27da7GrSzz4zuBbEX1zMk+1ohxrVo6097Uy531HWA3zec9ekdIRpLenBQvP4COC8pmrETdgHNodRlj/sjEpzT6igJPGAsBwv3lD7HJfb0XMt8ABEqMf5Q6qoJQCdrs9QUBPcd0Wz3kZi4WSFrv5ME42cpyctxx6KhLqDGaPnYobvzINEVREV4np2M+HU9GjMpDZi+IHhkapFRVKnn6XVjHhZv+h+Py/omvIFFkU9JII41IRcih0mZxUB2UtT/h3v+GVH5vGEPfApD3wBLowosLidFqWwtgv/hacf2VrlecDVaZxYjENfX1XqwC8cOetdt/m8v3ttpIrZnFLXrg0dwDmWkuu2KnE8piyH2pm5TBMTs3Aq/USDQo7HH6Hc+tRCEByKpyMc9IoIJ0xZbv+GQrq4yPoLUa0oW56FWMU8RRgEQG72EfXUbs07s+09RTKAgEdSCIl0nBeTrHmLOBvsCcLfQ9ORDFb/IfPxHOR3el44oRmF5dzoJPNxQdN+s8GKH4k8H4PcGgfO1P1n/wnSwVKQn7WGFTxsGoKiNK/pPwGpd7qUNrZ15/XUKHbJhLC2kdow1lG4HkH/w4YI6oayair/CpZyeqBOgfm8umpn81l5tLq8L9I7XMP2f/+WFTxcJHAbgDElL5AQXzhxCaWOiPJxF5hdEdRreknBoTAxDSqSEfPT2IsOdEe91i9HPZQ9FCbq82SPBODHySgY9qDwxAiEMyiOPJnNj2fDjVzv8dDiznn8MapLaa kImr+sta mJ6PYJI5YRX8qikg5jRRU5v+uXltRp22YXgdZftIqaTGGHmkV10wmfQLUtDxuz+atINZV4rIFef0IAX73KR3KQlpvwGXvWDWr3OHypKKfe2WGaFPGP+O9u5UbR02KOeNv1/MxzjFYwIbS52Tq/dpiU0G9RniHUWCf+ghLJgEVNaqryWErGKY2CTTxwmnTEciZwau+VDpvIyPcMcFSvZJHjezK4g== 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 mfill_atomic_install_pte(). Signed-off-by: David Hildenbrand Reviewed-by: Yin Fengwei --- mm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 0b6ca553bebec..abf4c579d328a 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -114,7 +114,7 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, /* Usually, cache pages are already added to LRU */ if (newly_allocated) folio_add_lru(folio); - page_add_file_rmap(page, dst_vma, false); + folio_add_file_rmap_pte(folio, page, dst_vma); } else { page_add_new_anon_rmap(page, dst_vma, dst_addr); folio_add_lru_vma(folio, dst_vma);