From patchwork Mon Dec 11 15:56:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487445 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 0608DC4167B for ; Mon, 11 Dec 2023 15:57:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC1256B010E; Mon, 11 Dec 2023 10:57:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A4A2E6B0110; Mon, 11 Dec 2023 10:57:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C1E46B0111; Mon, 11 Dec 2023 10:57:33 -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 78AC06B010E for ; Mon, 11 Dec 2023 10:57:33 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 44B0EA07B2 for ; Mon, 11 Dec 2023 15:57:33 +0000 (UTC) X-FDA: 81554992386.01.D5DDBC0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 771EE20013 for ; Mon, 11 Dec 2023 15:57:31 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N2+9Zq18; spf=pass (imf13.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=1702310251; 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=L2Om8DYO6IhDTMNBMAtiLk55MQgBXdIwfXJDSy3Kty4=; b=jwWQ9VOA3IWjLU7mld04JjzFv3pz3hJxOXoTINN6fAxMV23nHwXWUHpYE59kkHZefn7Poy /LWANkXQvXPmQW/uVH3+zWOqg5KApl0O8g02+NtyMcBuKEhh0t3S1hJsKi6qA+xiHitvIW OANsvi8K31pUnoqJh+tSKzNxh3tEhqw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310251; a=rsa-sha256; cv=none; b=k4gyAg04HHAI5UnVF2CRHeGpn8MBL9XopQUWEzOu0Fj8z0A78wolciPsAeGET0NgvekkpS RWRGuBYFxCIDMvS4yFsQm26pY7bEQK+0PRMOix7DvrgJjacYkYmHJ9YBGNJHMyBgD0CwQB 6hhHGx4QfMDknqvTTkiaNol6AMZ0eQI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N2+9Zq18; spf=pass (imf13.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=1702310250; 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=L2Om8DYO6IhDTMNBMAtiLk55MQgBXdIwfXJDSy3Kty4=; b=N2+9Zq188uDWOMUQfwFCFm1srABQs5EZoIChGdOc6kC0vEWlVEHlxTw7mjNR1CXEdP+faB tmXXelijASB7rviUqG9UFha86Joy08g/PuxzsPv8g+kWUj7KEAUZZCW7+mel4L+asfP1Mr qQDHzXjnMlSlahw9cein34l5uXRmSrE= 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-203-TS2p9d5tO1ihFJdn6GaxsQ-1; Mon, 11 Dec 2023 10:57:24 -0500 X-MC-Unique: TS2p9d5tO1ihFJdn6GaxsQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 30A73870829; Mon, 11 Dec 2023 15:57:24 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 900321121306; Mon, 11 Dec 2023 15:57:22 +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 v1 11/39] mm/userfaultfd: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Mon, 11 Dec 2023 16:56:24 +0100 Message-ID: <20231211155652.131054-12-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: 771EE20013 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ij8fihaykxhbezud7gpqxnrkinqqzp4f X-HE-Tag: 1702310251-684355 X-HE-Meta: U2FsdGVkX1/Q4HJ3azTNMDeqVQ0arsQ+dihHWBKWSXZJot59w+8mst3aJuADTNYJjK9OJpH2oTTwKinzBsZUS7x3GKerNlzQjXTOgwmUL08XmZGoFQDnHWYDMphYBdvvwR5wCUE8BmjYd8dO/fJYxZohk+7zbcjiwvOqp5vXaEj/4PzIq4ZhmEwBmEftJydz0zVxDnTd52hvIoXltvNvJ6mSliWLUq67rh9TybZ56YQSxWK5mPf09HTck6Cs2aHfttOGCC5K6sERG2P4qPpewdmE3+7oR3bosIVJL51vK6FbFC4zMaeS0OUgVLuqf5iAGLKBUL11pR+yaNqbBr+oSwv4mEJhRbqJgkih70U/YjSQ6sbrarMbs+3T5hs5wCNSarRAp8yV/XlIxHZKKYqdBCLW2aY9ewq+6G5FP6t6hOFhETYxYrUY4FI7v8fKk1P1xOgHqIjHlOTdbVFAXOFv2tHPCCpWn3jQ8DKMvHrjrU5dvAJ/vjgImJNEjCi/SFZEZVPCmfW9D6YWomLukW+RYuC0yQbqnNjU3kc5XkFdWVQfnW6n8fxbdOhGzUbJOMzugrgPcmt4YAANEvXAqEqVsfLHmXnUDoDJ2TVwf/fdXc1mImhAqvyEZtAv7NT4Ksrzreu3ABfqtg+2ENufFNycUuuk7hC0fEL+kueSvcebkgCO1Kxdf2rSATYYT7YhHSQa2q9k9w0tD+o9lURgkrajbBozSriUhRWokEvOjPf2tEgSx/LB7I/6E33BFCFGmVgXsjV93BWoJX18+wJguk11+9J5ueKU7t9jE5J3rNkpGuR3ILfscAy2M5ypm82qOWGHr9y20jkF374R1dP8SiiIO8JZN87pCY/Tt37kWKmIgSw8Cf3dOqY6PeqDGb+S4i6VwuBq02zIh9463CcoMgOGPkEuSTAVOZBIPaQOvIDUiElhg+abRXk20V0mmBVAMNfG5ZzZDk831BsIYQjJdMR vUiEaDJs w+ScjA1A9nYMTTrofaNRaG6YSRs0zGae2KfxoqFGobJDnaEEU2ZmHTDL2l+1fqLRXtypKa8xyfvRwxYFBYo5DvZ7GeOog0HYQggpfdgqGluXb3aaEKA5PQCV1STWHXolIA3RDj/PUcW8g+OvpPdGUJPjbEXGmiOezdFbS1Txg1cFYf+jaO3Kllyrsald/haUvnGtgcAGXPN0+ZIzFuoG9FDGPah/KiAikeL1J8u8t9plmfgHvHqvutxuLQw== 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(). Reviewed-by: Yin Fengwei Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 9ec814e47e99..330a481a1654 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);