Message ID | 20231220224504.646757-19-david@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-7549-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp57366dyi; Wed, 20 Dec 2023 14:56:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcKaTLk7hkBPI3lhVmm/q/uLgLVL6nUgadivWrtFEApyWcGCQBQN8PvZDlUrbi/D0GFhkV X-Received: by 2002:a05:6358:c118:b0:172:8976:49be with SMTP id fh24-20020a056358c11800b00172897649bemr441938rwb.34.1703112991484; Wed, 20 Dec 2023 14:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112991; cv=none; d=google.com; s=arc-20160816; b=rtUkr8QD58cyHZDgE89f7KjV+cPdYURwMERggftf3DJDhj2EXc3zJMUycu3EUCwYWj d0/lhbdGwUGwqPrQdppo5XTtRY7odpR8XoQ56ox4xnvlu6S2Tfo84iFc2Ily3G56L8n/ 4xiHX9qwjHFOqNA1/oXnWOV0eMdhKGiry1OXmXE2VwoxRyas82rvNElOTO6Doxjlh3wu TeMHhGUbLKvrcL2BqMTBvPSf8vuQuMYaS1477bcKq8UjRT2KE7Wf/eOUBkrjRzHJSG5n FPsu8sc6x2NtK2GhureYyPSE3DtDFEs7gg5Wk09GSXM2vcqGJJRNOa8g5NATUpd2R+i8 EMBg== 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=I1ebH8KFDZAwQmMcpL7CVfnw0D0yWryPChREMd0TJrI=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=g9+7q8bWBXl1CSRZB83KlVWdZxYBzS4o07zcefsHDnkrx6GmLkEPhRNnqJTQvfVIaA onBoyKq5XfQBPGb7t7K3kh11fngh+n9tCkyJWA7lQMpVrgIySkpCOMvJJrHbfoC0WXOa Y6Uv6NmiFael6UzQZfuMfrUOVUKQ9VPykw27iyClMZE1cqMqkibLY/DrBt0OtTDcmJHp sdFGXPKsvMIh+eaQ2k0WcajLG6ShSqkPOD3Ed+KLDVOS2C/bq/hBkBDFw1QRvlKE9wPt 6wf9IGVQZllQ5JfLNPzzst+eS6w54XJM7Jkt3NszisGmBgwN5RI9bf2KFIMdg1vGfHm9 rX6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qzx6VMY9; spf=pass (google.com: domain of linux-kernel+bounces-7549-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7549-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. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id o26-20020a63731a000000b005b92842d469si479962pgc.62.2023.12.20.14.56.31 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:56:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7549-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qzx6VMY9; spf=pass (google.com: domain of linux-kernel+bounces-7549-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7549-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 85289B2355E for <ouuuleilei@gmail.com>; Wed, 20 Dec 2023 22:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B50A53E0D; Wed, 20 Dec 2023 22:46:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qzx6VMY9" 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 651624F5F8 for <linux-kernel@vger.kernel.org>; Wed, 20 Dec 2023 22:46:15 +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=1703112374; 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=I1ebH8KFDZAwQmMcpL7CVfnw0D0yWryPChREMd0TJrI=; b=Qzx6VMY9tescPO2U+WA1J5JTpUj1KyWwlVb/yOuneqg2Gz6TXVSe0eYcJwjIPMdNo/HREX u4UXWCKRyaNJH/V+TBYhcb5yU4u8hcgrVzRqMlbLu2Ul/+4OJRQxVmkmK3/FupCxHsNZcW I/zuC83P557ziqa5pPnaj4qYwjsCZTA= 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-102-rl_PLPfaOFO5EtohbY1EwQ-1; Wed, 20 Dec 2023 17:46:10 -0500 X-MC-Unique: rl_PLPfaOFO5EtohbY1EwQ-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 AD8D4101A52A; Wed, 20 Dec 2023 22:45:54 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D45040C6EB9; Wed, 20 Dec 2023 22:45:52 +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 18/40] mm/ksm: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Wed, 20 Dec 2023 23:44:42 +0100 Message-ID: <20231220224504.646757-19-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: 1785843408178007079 X-GMAIL-MSGID: 1785843408178007079 |
Series |
mm/rmap: interface overhaul
|
|
Commit Message
David Hildenbrand
Dec. 20, 2023, 10:44 p.m. UTC
Let's convert replace_page(). While at it, perform some folio
conversion.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
mm/ksm.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/ksm.c b/mm/ksm.c index 8fa6053a225d9..146aa75fa6ff7 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1369,6 +1369,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page, static int replace_page(struct vm_area_struct *vma, struct page *page, struct page *kpage, pte_t orig_pte) { + struct folio *kfolio = page_folio(kpage); struct mm_struct *mm = vma->vm_mm; struct folio *folio; pmd_t *pmd; @@ -1408,15 +1409,16 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, goto out_mn; } VM_BUG_ON_PAGE(PageAnonExclusive(page), page); - VM_BUG_ON_PAGE(PageAnon(kpage) && PageAnonExclusive(kpage), kpage); + VM_BUG_ON_FOLIO(folio_test_anon(kfolio) && PageAnonExclusive(kpage), + kfolio); /* * No need to check ksm_use_zero_pages here: we can only have a * zero_page here if ksm_use_zero_pages was enabled already. */ if (!is_zero_pfn(page_to_pfn(kpage))) { - get_page(kpage); - page_add_anon_rmap(kpage, vma, addr, RMAP_NONE); + folio_get(kfolio); + folio_add_anon_rmap_pte(kfolio, kpage, vma, addr, RMAP_NONE); newpte = mk_pte(kpage, vma->vm_page_prot); } else { /*