From patchwork Mon Dec 11 15:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 176778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7153676vqy; Mon, 11 Dec 2023 07:59:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKTwFfO+P3mh+p+Cvn5tJP7Vj8kKzhtSlvYF7yeHa4cE9awpw9dn+DSR0+lbSIL312Hz3+ X-Received: by 2002:a17:90b:108:b0:286:cc10:f2c6 with SMTP id p8-20020a17090b010800b00286cc10f2c6mr3468292pjz.20.1702310399107; Mon, 11 Dec 2023 07:59:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310399; cv=none; d=google.com; s=arc-20160816; b=zzb2aUngz8JaeOgJn/RguHkOnQn24FLX+K+RPc/Bub6YpBS98JfsaN7qv6Jv5vQDSZ 5VEV+a3rTWjGSeDjCmIdtCbb6TYJV3E/cZ7ETNEo/k+AOLF6xF+srcdF2/yu3y4WlBt4 ox81z/0LUbvPSQNRBm1TVDbpfwDakzlK3Pw3iyXIxtYIlqkjTwLqIuXLQkbl2tBN2BT4 +WJ2TwEnJ9dC9Twcrn5ECPWNe5H5ftPBaBdRjGM5U02kIBl/kgxI+a+8AXkEwv+5MI+X sMjbLHxLzS+fj67ED/mE/QdwqR4KqSLf3ZtyLwk8CTiwLWcAAXwZnSN1qEWzE4M1CJVL G/1A== 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=XplrMRug9dV6L5N0sR7KY1Q40igMgZePuFWGdErJCwc=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=qzbbtUR3PeS1T2naVBK//f55VnRLynXzeWVpPnFjb7jq+4otOwAsaUnPWlWDvjbGff /7mJgUJeO9PSxuPF1RkcH6KTpIFgWb9Eub90g/rnRKgFnv0886Vlm4m5J1BnSq7PgEAx O0RfejWhGj3Kxw6dIzpB0wpj/X2N2qsltzSsKvsb9DSnUKrboDFA3xuNwTLl2M6Fu+5C JL9Js993dP09gzESwIxSwpN36LmqAtjOTAAiudJC0dc8xDmd5vN0jezrhcM42pdZ1V6K +mGk2oHcZB9QWjoeJTtmBQtmsXl/yDC9ehWBM04AWuhII73GnqQr+fTMeCj2jp6WYXFw /vYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TI6m4AFd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x23-20020a17090abc9700b00286c80ac075si7680282pjr.177.2023.12.11.07.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:59:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TI6m4AFd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 9131880620B0; Mon, 11 Dec 2023 07:59:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344795AbjLKP7e (ORCPT + 99 others); Mon, 11 Dec 2023 10:59:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344701AbjLKP6b (ORCPT ); Mon, 11 Dec 2023 10:58:31 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3100198 for ; Mon, 11 Dec 2023 07:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310311; 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=XplrMRug9dV6L5N0sR7KY1Q40igMgZePuFWGdErJCwc=; b=TI6m4AFdzJn9HmI4z3Vb9JIPzbkp1reE8zTCuMmmGfDFtzrKIISkTXmJL5OdvvhGo1YQHo Sn0noarObFdXfop3Nclbx8lkLxGi0kZUCHrdeeB4ubY+AA1dlhuV/O5TIoFpsCalW2z7QT wBTY63qUIfk5ZHssbmEdOLe21Olf+4s= 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-94-z8fIYRY_PHalWsMPzvXDSw-1; Mon, 11 Dec 2023 10:58:28 -0500 X-MC-Unique: z8fIYRY_PHalWsMPzvXDSw-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 3551C185A793; Mon, 11 Dec 2023 15:58:28 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BFAB1121312; Mon, 11 Dec 2023 15:58:25 +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 36/39] mm/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte() Date: Mon, 11 Dec 2023 16:56:49 +0100 Message-ID: <20231211155652.131054-37-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-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 groat.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 (groat.vger.email [0.0.0.0]); Mon, 11 Dec 2023 07:59:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785001828948477265 X-GMAIL-MSGID: 1785001828948477265 Let's convert copy_nonpresent_pte(). While at it, perform some more folio conversion. Signed-off-by: David Hildenbrand --- mm/memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 42a0b7b41b86..caaf4add6fa2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -785,6 +785,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, unsigned long vm_flags = dst_vma->vm_flags; pte_t orig_pte = ptep_get(src_pte); pte_t pte = orig_pte; + struct folio *folio; struct page *page; swp_entry_t entry = pte_to_swp_entry(orig_pte); @@ -829,6 +830,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, } } else if (is_device_private_entry(entry)) { page = pfn_swap_entry_to_page(entry); + folio = page_folio(page); /* * Update rss count even for unaddressable pages, as @@ -839,10 +841,10 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, * for unaddressable pages, at some point. But for now * keep things as they are. */ - get_page(page); + folio_get(folio); rss[mm_counter(page)]++; /* Cannot fail as these pages cannot get pinned. */ - BUG_ON(page_try_dup_anon_rmap(page, false, src_vma)); + folio_try_dup_anon_rmap_pte(folio, page, src_vma); /* * We do not preserve soft-dirty information, because so @@ -956,7 +958,7 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, * future. */ folio_get(folio); - if (unlikely(page_try_dup_anon_rmap(page, false, src_vma))) { + if (unlikely(folio_try_dup_anon_rmap_pte(folio, page, src_vma))) { /* Page may be pinned, we have to copy. */ folio_put(folio); return copy_present_page(dst_vma, src_vma, dst_pte, src_pte,