Received: by 2002:a05:7412:a9a8:b0:f9:92ae:e617 with SMTP id o40csp24055rdh; Wed, 20 Dec 2023 14:47:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/VZbcuSbUgnYV5MMpwQsuzzGJW3t1IQlT7b7HaUaAN5Ut1jFQibo0+OYWa0KG5Td7uFdQ X-Received: by 2002:a05:6e02:1c24:b0:35d:6835:817b with SMTP id m4-20020a056e021c2400b0035d6835817bmr30793565ilh.16.1703112477632; Wed, 20 Dec 2023 14:47:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112477; cv=none; d=google.com; s=arc-20160816; b=Svz6CLSySOITZtTHpF2+1rFzvCmAjd4+oGej7qUiSMWxCrPchWP+eKmeNb+Z/Z8zdH oAT7+Xeb1Vywy6Bl+5uj3r0nAO1EVkYP3r4/mHamCKah6grUGjXIa7I+7gizcHEoyttQ jXWdDReKpg5AGjHVsXiVu/znqFFGvKKAJEBVu/x5z6eRJICcHnhnViWHlewE2vsX9IpJ WmVatf5cGYrP71bLCQ81xAX+M3g9Ir3BSoWmFAqjiyBPs1mFhYvf2sh/kJO76DDQSByI O8wmpPiq8QTBtqG4k0u1EiSrH+Urh780NmVIFxwef7StNKldj8bC7+O4BbrGrH1djmXM 70hg== 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=8A5dFtRO86PFrUgCRtietWW+Q/OHDectiZ99Zg/AfEE=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=fRObEuinknCxZRyS4ZlNq8Gpi6H5mZZZCMJYnUJ89wdePP3197REr+dyaS8fq2Wjqh KEGTZsL+j4X8b1sTcQJlRuek7kPRMDyC7qqzrHGB2jyjjwKA4paTqBcs/VfJP675yTPt P1Yh+KeeSPLbZZtBHlJtvjaEb93XQ/j+xN0/ILyxNuJdDvLsL2vyLMrOuzDxqfvsl/8G u63GrDxT9jGqlG7/Dk1dQnJWMtoe8hQvDoW7VrelfAhjQt+OoiJHN+xeaCNOqH2a5IJV Xj2t673DFVvlH/PmI9go0Xky8OhKiK7YYgheix/imGdn8RIblDlksGnxhSE3hDjxOEJ6 d/qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XPDEPmEh; spf=pass (google.com: domain of linux-kernel+bounces-7536-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7536-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id f29-20020a63555d000000b005cdb499ac69si451143pgm.53.2023.12.20.14.47.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:47:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7536-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XPDEPmEh; spf=pass (google.com: domain of linux-kernel+bounces-7536-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7536-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 48BB6284886 for ; Wed, 20 Dec 2023 22:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F3244CE1D; Wed, 20 Dec 2023 22:45:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XPDEPmEh" 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 30F7A4CDE8 for ; Wed, 20 Dec 2023 22:45:40 +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=1703112340; 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=8A5dFtRO86PFrUgCRtietWW+Q/OHDectiZ99Zg/AfEE=; b=XPDEPmEhvmby8o7XEUgETQxyeKkzWygB1e6hSb4ekZN+kj83ngXAx5T7SvoBKrfKv0iLgp 5IcQ/3x6fOm0avqr9uiURUJ7UYxwmM5RPsN9Iyoupk4v69gR2R5C6UwlQpUbC1JalCX7oy ltBPeSfMiMiqaaMn9+LjvdDF9e4bqRM= 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-137-HwopZXaBML6m-AFz0tciBQ-1; Wed, 20 Dec 2023 17:45:36 -0500 X-MC-Unique: HwopZXaBML6m-AFz0tciBQ-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 0F9B8848C06; Wed, 20 Dec 2023 22:45:36 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id C16A240C6EB9; Wed, 20 Dec 2023 22:45:33 +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 11/40] mm/userfaultfd: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Wed, 20 Dec 2023 23:44:35 +0100 Message-ID: <20231220224504.646757-12-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 mfill_atomic_install_pte(). Reviewed-by: Yin Fengwei Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- mm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 203cda9192c29..5e718014e6713 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 { folio_add_new_anon_rmap(folio, dst_vma, dst_addr); folio_add_lru_vma(folio, dst_vma); -- 2.43.0