From patchwork Wed Sep 13 12:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13382962 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 8B3BFEDEC49 for ; Wed, 13 Sep 2023 12:51:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC4CC6B0185; Wed, 13 Sep 2023 08:51:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4F126B0186; Wed, 13 Sep 2023 08:51:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC63A6B0187; Wed, 13 Sep 2023 08:51:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A8EDF6B0185 for ; Wed, 13 Sep 2023 08:51:29 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7B4FEA039E for ; Wed, 13 Sep 2023 12:51:29 +0000 (UTC) X-FDA: 81231560298.05.49C6CA2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id B95D1140002 for ; Wed, 13 Sep 2023 12:51:27 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DHIrp70E; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694609487; 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=Fi954WhfJTlnxfu/yTjvI+IMpqyRN+5DQHmUbjacTd0=; b=GzAom3y6rJLJvtUvTf4asQIrXRonWlXtkn+ujk9sJx8bKdJ6qPDq4WyvzxLkblYLDCZZgp MVrRyJ19wYVMCJBnOExI4gbLpJfO3RKPvn8IbK0TRtPh1b+v9MzH8jdd3fe4Xlhq4jDoal MNxKMjm9hAg6lzWI6hf8BKpc+lC4cco= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694609487; a=rsa-sha256; cv=none; b=zTaLnRJgxyX6CgQrVcHQ2AD+lFASG6gvPdr/6neVGdMttTpQhKYKak64wGsGbayrnB7H3S L5SayyYBD1ro6POHwXGPNPvjQlf207iuJsoT3h+aHJWBWtDKVjIW9mOJEzxaNVkHOcqiIs y2aQT4jy9LcgQycmyisLpZxDQjLAa6g= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DHIrp70E; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694609487; 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=Fi954WhfJTlnxfu/yTjvI+IMpqyRN+5DQHmUbjacTd0=; b=DHIrp70EoDQ6DpyaD2mSvnjle614u/b8rDJyXulYt/coW7BEf6xiQcfBC744IpSPtlK1RL /pCbXZzYhXLZln7/c4BmdeSyUJx8Y8H/aPrF7Cq2+9hjFMc8wXlHUD+4OPPhHOZZQGuWBt X2Fyg/evVIltzpqfvxr7C0blENC0nko= 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-60-IQGL421PNvK9ZlO5bNgMvQ-1; Wed, 13 Sep 2023 08:51:21 -0400 X-MC-Unique: IQGL421PNvK9ZlO5bNgMvQ-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 4CBBA101A550; Wed, 13 Sep 2023 12:51:21 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id A48BE2156722; Wed, 13 Sep 2023 12:51:19 +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 2/6] mm/rmap: move SetPageAnonExclusive out of __page_set_anon_rmap() Date: Wed, 13 Sep 2023 14:51:09 +0200 Message-ID: <20230913125113.313322-3-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: B95D1140002 X-Rspam-User: X-Stat-Signature: ftimi37it98d1kxpud6gm4arcpfx83hs X-Rspamd-Server: rspam03 X-HE-Tag: 1694609487-222045 X-HE-Meta: U2FsdGVkX1+P3fOos9oXvj1ZuPJAXEPvhMueUSIR0nOhgG3/RkiqpNMMUI6F/wuSJYbnY8G3UIxDMmCdjI4M/PF+C+oKKZPJejIOjQUFKf3OTzyUKJXUzOv5H/QCEipIlXU63Gxh4ki5kEHlJRoOqxVBMGcFFOE09v2DgslQ/c6U3qKTtuZgDYo0a3Tgl0RZAG7OjPD6X1wa/BdAhdljG1wwAz+vYXmQL4xSGBhPd9uVW+SgU/dxw1jIYKwxFSDccQ4t4RsAoXzcX7lOLa3AvQI+D8oTx+eiIbxyefR8StMviLZ6Z1yjFKxvx7rV9SCl107J8rBjSRM5I1u/wkKu1VRrBcdHG+ApvUvDBH9r3y0gVGYWkVS0ly224/GGez0cOPpMeOd8JnzQEYU4Qb7JDL5uydFILGtjI+NJ+V0XhngXlLw1QtIPBQa3j7P15sOplJI0Ck31DB9aGHSQ4rfAAy4A8Lj+yjDKPnZSgPw02JehGvL/6N53xi514FV3gIX3Yb2TA8yWdze5ozF8oArGAwxktd8lsKKTJqoEQ8E0rNjNQYwDfY4q38OmCs+m18nPr/hE4cWjzPghrxhcNxLiKDKtJXoOJgX6N6N4rI1Y3P99OqMV759x9Lbef4OcdDdvyfpj9Xd8cORCaJBomlFw8HSYX98u9yReZ8cMBwlKFBvDcbTqBv3GUfNeMRt4B0eDfkV/IiNdb4abrhNYzPM4U4kooh35cIqL5zGcjzU8dhcAeToqKV95YYtmDoM6VeCUSTHFsBFsUYsdthHJq0dSmXY/99aug6Im0doT0gLjekZS+71ttTEE8raF0lrQrqlhqo6Ef5jOz2LXwfZVnokwAybL7XnETEscAAM3LRr/BVis7ByYAOe632dFylS7uPH1cgU3QAhG8kaRUMNkjY9fCBT4aPRIGDmE56UttH1WTAtg+rNTB/XXwK+cJePAnEEH058ClSpr7EUQrjD+WGI bJDJm761 m18Da5qWZNBeB5ALOkONMQv4cdTyQHysx5dcd/PjmpJscZmvC0lHNntpLCrCHrIhzRQ4n/6giCfX2XkKYKd703TXA/DJdG5EtbQvw1cMN/yS0cKsrCwZPkHobFxs8VybdKKsDPUmtCKene1wGxYrRt3cXN1Gg1WUv11hP7uQbFwfHB5kpyLKHEYpy5FxbtKyrUbvEjrCLyflrmuLFZPoXtyBy/w== 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 handle it in the caller. No need to pass the page. While at it, rename the function to __folio_set_anon() and pass "bool exclusive" instead of "int exclusive". Signed-off-by: David Hildenbrand --- mm/rmap.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index ca2787c1fe05..ab16baa0fcb3 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1122,27 +1122,25 @@ void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma) } /** - * __page_set_anon_rmap - set up new anonymous rmap - * @folio: Folio which contains page. - * @page: Page to add to rmap. - * @vma: VM area to add page to. + * __folio_set_anon - set up a new anonymous rmap for a folio + * @folio: The folio to set up the new anonymous rmap for. + * @vma: VM area to add the folio to. * @address: User virtual address of the mapping - * @exclusive: the page is exclusively owned by the current process + * @exclusive: Whether the folio is exclusive to the process. */ -static void __page_set_anon_rmap(struct folio *folio, struct page *page, - struct vm_area_struct *vma, unsigned long address, int exclusive) +static void __folio_set_anon(struct folio *folio, struct vm_area_struct *vma, + unsigned long address, bool exclusive) { struct anon_vma *anon_vma = vma->anon_vma; BUG_ON(!anon_vma); if (folio_test_anon(folio)) - goto out; + return; /* - * If the page isn't exclusively mapped into this vma, - * we must use the _oldest_ possible anon_vma for the - * page mapping! + * If the folio isn't exclusive to this vma, we must use the _oldest_ + * possible anon_vma for the folio mapping! */ if (!exclusive) anon_vma = anon_vma->root; @@ -1156,9 +1154,6 @@ static void __page_set_anon_rmap(struct folio *folio, struct page *page, anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; WRITE_ONCE(folio->mapping, (struct address_space *) anon_vma); folio->index = linear_page_index(vma, address); -out: - if (exclusive) - SetPageAnonExclusive(page); } /** @@ -1246,11 +1241,13 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, if (likely(!folio_test_ksm(folio))) { if (first) - __page_set_anon_rmap(folio, page, vma, address, - !!(flags & RMAP_EXCLUSIVE)); + __folio_set_anon(folio, vma, address, + !!(flags & RMAP_EXCLUSIVE)); else __page_check_anon_rmap(folio, page, vma, address); } + if (flags & RMAP_EXCLUSIVE) + SetPageAnonExclusive(page); mlock_vma_folio(folio, vma, compound); } @@ -1289,7 +1286,8 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, } __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - __page_set_anon_rmap(folio, &folio->page, vma, address, 1); + __folio_set_anon(folio, vma, address, true); + SetPageAnonExclusive(&folio->page); } /** @@ -2539,8 +2537,10 @@ void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma, VM_BUG_ON_PAGE(!first && (flags & RMAP_EXCLUSIVE), page); VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page); if (first) - __page_set_anon_rmap(folio, page, vma, address, - !!(flags & RMAP_EXCLUSIVE)); + __folio_set_anon(folio, vma, address, + !!(flags & RMAP_EXCLUSIVE)); + if (flags & RMAP_EXCLUSIVE) + SetPageAnonExclusive(page); } void hugepage_add_new_anon_rmap(struct folio *folio, @@ -2550,6 +2550,7 @@ void hugepage_add_new_anon_rmap(struct folio *folio, /* increment count (starts at -1) */ atomic_set(&folio->_entire_mapcount, 0); folio_clear_hugetlb_restore_reserve(folio); - __page_set_anon_rmap(folio, &folio->page, vma, address, 1); + __folio_set_anon(folio, vma, address, true); + SetPageAnonExclusive(&folio->page); } #endif /* CONFIG_HUGETLB_PAGE */