From patchwork Wed Sep 13 12:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13382966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DE63EDEC49 for ; Wed, 13 Sep 2023 12:51:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 932436B0189; Wed, 13 Sep 2023 08:51:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 894C96B018B; Wed, 13 Sep 2023 08:51:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70CE16B018C; Wed, 13 Sep 2023 08:51:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 559DC6B0189 for ; Wed, 13 Sep 2023 08:51:35 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 36E291A0DAA for ; Wed, 13 Sep 2023 12:51:35 +0000 (UTC) X-FDA: 81231560550.09.44D6F30 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 70778180005 for ; Wed, 13 Sep 2023 12:51:33 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XjRh1VaH; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694609493; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=t7xwwUMm6Z1sTtxTNKBbcilCnHU1Bmn/mrplLkXOKnQ=; b=k+bWJRMVbsi5yl0+o1bko159uAZL75re/uONfWLpCxluPkK5PyHZZWpoBzR8b4KgVHYZ6Q pKj5T1GU0jiVaRSObjTC3U83EiKYo6ElkfXX0etmCU85TjXtArgL6YLfaLCVPWaFyMKXsw gwej0OL27HkZyHTPnYZafmKKqAlEJwM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XjRh1VaH; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694609493; a=rsa-sha256; cv=none; b=34y4sKVwc/6Udd37wPVdnwzjB5XRkS6jBh3wPvyXD31Jg4SI8kBqkK59p943a6l4kSXAYT +4ZOIE7TazpNsUEg/uC6QMDORqEfYwhSZQcXHKlWV6hddZRPHwegxBA3Wu9AiKau9+JIol /atHLohWVa17+vNgLGuPoinGJWrJLbg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694609492; 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=t7xwwUMm6Z1sTtxTNKBbcilCnHU1Bmn/mrplLkXOKnQ=; b=XjRh1VaHkxphM4qrtl5pZCD5YZrVeBkTtuXJ2mFaj7A0cLGZEDtzoflWtxzEYyJ95oxgxb sYWJJoIslHmcWZcvuF6wWJhHpPS/q0H5uScJqP2hesramQf7thyUMIUT9iHgfqupYBcucn KpQku2qKfrQD+M/yRcYGJvtu5G7cPZU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-389-tgr1yN5WMfuxKuox-CRlxA-1; Wed, 13 Sep 2023 08:51:29 -0400 X-MC-Unique: tgr1yN5WMfuxKuox-CRlxA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06B9A857A9E; Wed, 13 Sep 2023 12:51:29 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD4432156722; Wed, 13 Sep 2023 12:51:27 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Mike Kravetz , Muchun Song Subject: [PATCH v1 6/6] mm/rmap: pass folio to hugepage_add_anon_rmap() Date: Wed, 13 Sep 2023 14:51:13 +0200 Message-ID: <20230913125113.313322-7-david@redhat.com> In-Reply-To: <20230913125113.313322-1-david@redhat.com> References: <20230913125113.313322-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: 70778180005 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: zhntjzgjccheabnxfoopmag5deapzy5q X-HE-Tag: 1694609493-64509 X-HE-Meta: U2FsdGVkX1/xSHL2hOh0ByufBo19NHHtRXh4MvHwlLAmcT/3mnSEQESPq/s+ibuwD9evUN09IEiF2BYL5Ym5mpyVn8Dm7OIqSHyl5XCC1FlTKhr/x+94kwQUryKRH0WgCOr+pwuJf/oHBt1Dl3oBo5TFbkIH2gtGXV/g71LV6vcgIT+rfE9DT51NV1J8QV8gWGDVVtPtziINVXSN2SH14mVv48nfXVcKvhRJBS8XX4PDmZ49U7u22wL+bhanYmnwBsx01zlWQzIvjHTrb5Z/KN99TIX+wrS30SHnym9l0PwNvI1bWwIB8XnagMRh3l15lCtSa5MN/QPBwthVNGjM9lj9uI6lKl+on94q+E1Sz5bA1bhOV2/TtD3WelXzO1zHK8tRxcs3DAbyzDydlM4Yc9N5t+TOqcWLeG+TkLRikgUzWaq20O6u6PfNQFVkmcQt2CJnvlNG5rCAGWOraBoAP+0aHb2ufT+lhkEgj7BmUwbFLj2PUZrc0YDSjp868Zm1BJYT3hLnKiHclntsROHI40CIQUgCTsB9FQn+7RnRjOIvjPjPUAWQQrZQJhPYjfpqgVnwSsTKclMJEly+7VOh0S6k5QZ+8b31WnozasT7PDLvpE2SXx3S/uJ8VN6evREWU2PtbI+Q/DwCuc9pYxv2IXuBwvNyVOInS04oPpNvJU8CEz3lk1gjlMtw0E94JoRtrG4cmc+oJnlBBiKVjYv5k080Z37k33+FpRSnLEOQbDtOTLPd+q1Usr3vxeIqHiJPmQdqyuPs40Lb30EAN+2vRG3Ph/IMKFKQ9h+PO0Qlpg/0yajlXanBfm8p3NrJ8IXPKuf0ceJPUVKHcPH2nZ2166vCyQ2UuTAAmnXbvn9lm0qPkC/gWfd0gj07RXzzeIk7WfZmyekELUsX0gnjOwxdDtfsUe0vuoXyH6rbfDHFBGFd1inNG9EzDxdA5Nno8ZHJw7VzIWhUhl/bVbovBTT jeXnqOgB tL7+aM4HzyIPvd7dDhhRI1MgA4MEPpTeamQylB+/QE8/UCkw8MhtDVwGrBuH5dEPyDGwDdDzOOftKUmnSe4W+aPmTs9mquMJ1LDVXt4dpAPkoEIQJhtpkfX+XUnTztyn8iW8nvppQCUtEAOPQ1oo+HcDA93uJMfZpaTTLw0RcEXMVR4FjV3Hwz8Lr7FSvMJfXwiMvslX7qz/+3YxVU2cOvNkpeQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Let's pass a folio; we are always mapping the entire thing. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 2 +- mm/migrate.c | 2 +- mm/rmap.c | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 51cc21ebb568..d22f4d21a11c 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -203,7 +203,7 @@ void folio_add_file_rmap_range(struct folio *, struct page *, unsigned int nr, void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); -void hugepage_add_anon_rmap(struct page *, struct vm_area_struct *, +void hugepage_add_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address, rmap_t flags); void hugepage_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); diff --git a/mm/migrate.c b/mm/migrate.c index 123fc4dc0bc4..d4e8cbf0a704 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -247,7 +247,7 @@ static bool remove_migration_pte(struct folio *folio, pte = arch_make_huge_pte(pte, shift, vma->vm_flags); if (folio_test_anon(folio)) - hugepage_add_anon_rmap(new, vma, pvmw.address, + hugepage_add_anon_rmap(folio, vma, pvmw.address, rmap_flags); else page_dup_file_rmap(new, true); diff --git a/mm/rmap.c b/mm/rmap.c index 10d477a0991f..789a2beb8b3a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2527,18 +2527,16 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc) * * RMAP_COMPOUND is ignored. */ -void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma, +void hugepage_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, unsigned long address, rmap_t flags) { - struct folio *folio = page_folio(page); - VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); atomic_inc(&folio->_entire_mapcount); if (flags & RMAP_EXCLUSIVE) - SetPageAnonExclusive(page); + SetPageAnonExclusive(&folio->page); VM_WARN_ON_FOLIO(folio_entire_mapcount(folio) > 1 && - PageAnonExclusive(page), folio); + PageAnonExclusive(&folio->page), folio); } void hugepage_add_new_anon_rmap(struct folio *folio,