Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2739172rdb; Mon, 4 Dec 2023 06:22:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhbBRD8FUQgbsk+tSkA3koF5L70+Gg8rqCmEtxyoWcYQmEgXaIEpr7DyYIcnSvWwN3JzZj X-Received: by 2002:a17:902:e807:b0:1cf:ee3a:23a0 with SMTP id u7-20020a170902e80700b001cfee3a23a0mr1577668plg.6.1701699774738; Mon, 04 Dec 2023 06:22:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701699774; cv=none; d=google.com; s=arc-20160816; b=p6WPIzowOQuLdpJNuBhhIHrDDDHahHkuDGNE5Y/MAMkVubfxEfUED225A/PX0LZ6Fs Rozv3u0qvhW4Pv6jg9CDZxTHc8DNmEPAsSgLJlhRYhjMSGxqE+Nl2swCMwG64agYghuj bVuH2rds1ehUQX9I24s81+PL3CaxZt21hdPZpbrbmiG/yl7HCfVWmg/Z3CvDw/SbMy5P 58DdWi0uGJCxmlkH1XzaZD6NLxFItoyFOW8N1/gJ67GX9r/ToD/lhQwywuwtEDdn4xPk JTJIfq5PAyYQ8OsdJTnEWWy58r59A/rLf+M/RLn7Ti9O7jIQ5joo46Lx94sWNCtFBaD9 qvAA== 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=DcozSwix+76TtkWexeYoWqf1En6dAEapeBtTC2bk/5E=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=L5jHF54uNjQu9dJpQeFSCtEUp6xQ6+MtJQEKo8JJNhPPagRAme3QERNaAx9ygOBrLb uPB00pogXddn5SVrB1OsG+R7ohLBKDtp4GKoFTtX78DCn+1n0FwgvXN2mFhX2PyCh2l5 j0C2f+k5IukubfnMaqXtDwwpC52tCx9aYxetrd6uZR+gy4sVSSVpI6B7Ip1gTecPprsn 3RQaDNduRb9zwVCCklllVrtpQjV9ZSnjj+xUGN5CkbFgd48eVgwyYmSd5NQpvxGol3N+ Adh3LoFHpocR9R5YF5bs3Xew2d+NYIbBFWAqZ3wZsVGhl0zcCULUswLt/vwS6ptOUMbl tiYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ik7hIMgf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id jg6-20020a17090326c600b001d07b67c54asi3489834plb.335.2023.12.04.06.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:22:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ik7hIMgf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 61E02803B3B0; Mon, 4 Dec 2023 06:22:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345226AbjLDOWf (ORCPT + 99 others); Mon, 4 Dec 2023 09:22:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345142AbjLDOWT (ORCPT ); Mon, 4 Dec 2023 09:22:19 -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 630ADD50 for ; Mon, 4 Dec 2023 06:22:14 -0800 (PST) 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 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 morse.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 (morse.vger.email [0.0.0.0]); Mon, 04 Dec 2023 06:22:52 -0800 (PST) Let's convert mfill_atomic_install_pte(). 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 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); -- 2.41.0