Message ID | 20231220224504.646757-37-david@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-7603-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp69511dyi; Wed, 20 Dec 2023 15:21:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCunu+Hv0GEdnHDWNkv1ZdlTvCdjDPUkHP8C8SXzRbph0VACiRr97ZHydpEmCdw3JhHmQr X-Received: by 2002:a05:6358:7201:b0:16d:fcf8:ea7 with SMTP id h1-20020a056358720100b0016dfcf80ea7mr506581rwa.16.1703114503969; Wed, 20 Dec 2023 15:21:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703114503; cv=none; d=google.com; s=arc-20160816; b=GUKVySZAIYUxDiT7fZUNRNRwYljTZU8tvhmb9JyEMRNCK0QdWwIYK0emyFMH9BEUiW myFtjYFQlxKSEPChptp6pFjXFF68cH+nfHMnWYXO0oyaSfQWVh8xtCwJ23yPGZvDMDNk GiUqUFxzY3QE+Ue1sTpxvvXsYpQxnitrTElavzbVKHGC7FBMU57bwB+nbK5MyfH+To0f gWor0GLXg6F2D21KnXh3ftjlQ8X0GIX789kyImcktjdHWROiY0LQxxStIdph6nAb8RP/ 5GYePoYOw8uHD0lPfV43hP0vGItZ5pFqZvhNGXDyrvo25J3do4MXcJanpEZ4OVMxGzGC LTkQ== 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=fTcpbW98US35msxaiX+BCXxL5QAKVhrGk2lkGfrSlfw=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=OOSLYKHcOO18TYeEGzSKOujYgEEZqhIqyEQPN2nSW+NEsScaahiDhxlj/lmsIujjla OwA4BzkmuEiM/3+IQoxuEBpSGJw63wyxAJqnqdLbFLwSSoXDzXUohAx7TA0bEHfjEq9C JhA6SoPFj7c7RAsq2kPqFRqeZspkRAXPG/0HGAJf9jCL/Op0gnMxgV378W0R0ewB0596 VDHKxSyjXY5h1qWKIN71VEkp3wSY+zPKXjG/yatLLK6IGtsljU0Zxh7buu1/EkGCGwUK dBz1wOoQNRs0X34G8lGIxu0RdJqQLjZQwo6XZCdQdaxVeqipuTTPN8JRxVoMnL/hE5Ig Copw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RWtcPZMO; spf=pass (google.com: domain of linux-kernel+bounces-7603-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7603-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id k36-20020a17090a3ea700b0028b6acef394si581121pjc.1.2023.12.20.15.21.43 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 15:21:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7603-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RWtcPZMO; spf=pass (google.com: domain of linux-kernel+bounces-7603-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7603-ouuuleilei=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 9BFE3B25AC1 for <ouuuleilei@gmail.com>; Wed, 20 Dec 2023 23:08:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C8C097996E; Wed, 20 Dec 2023 22:46:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RWtcPZMO" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 E9E124A9B7 for <linux-kernel@vger.kernel.org>; Wed, 20 Dec 2023 22:46:49 +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=1703112408; 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=fTcpbW98US35msxaiX+BCXxL5QAKVhrGk2lkGfrSlfw=; b=RWtcPZMOs2ViklG1qKmVeBaCJjxoLP1zOd2tbhDo4FwsPb4HAUv1AC8L860z8OQzQ+leqj FcqPdnBbFXeFAUKBCYoxnngEWhC1oowRUKyKWIDBj7yXpufLM8edW1ATCDs7OSN7pDDToM EiQbFoZ5V9g5jVn0+Vc0hD/W7fd/Ht4= 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-612-7CmBAUaHOZWiWfdpU_xHgA-1; Wed, 20 Dec 2023 17:46:42 -0500 X-MC-Unique: 7CmBAUaHOZWiWfdpU_xHgA-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 034AF85A58B; Wed, 20 Dec 2023 22:46:42 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F08C40C6EB9; Wed, 20 Dec 2023 22:46:39 +0000 (UTC) From: David Hildenbrand <david@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand <david@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Hugh Dickins <hughd@google.com>, Ryan Roberts <ryan.roberts@arm.com>, Yin Fengwei <fengwei.yin@intel.com>, Mike Kravetz <mike.kravetz@oracle.com>, Muchun Song <muchun.song@linux.dev>, Peter Xu <peterx@redhat.com> Subject: [PATCH v2 36/40] mm/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte() Date: Wed, 20 Dec 2023 23:45:00 +0100 Message-ID: <20231220224504.646757-37-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: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785844993822847584 X-GMAIL-MSGID: 1785844993822847584 |
Series |
mm/rmap: interface overhaul
|
|
Commit Message
David Hildenbrand
Dec. 20, 2023, 10:45 p.m. UTC
Let's convert copy_nonpresent_pte(). While at it, perform some more
folio conversion.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
mm/memory.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c index dc2a8e6858179..d995ead7a3933 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,