From mboxrd@z Thu Jan 1 00:00:00 1970 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 ED425C5479D for ; Wed, 11 Jan 2023 14:29:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7AB098E0008; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F0A18E000D; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C503900004; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2E6B28E0008 for ; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EFF2EA0CE0 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) X-FDA: 80342750376.05.5BFB569 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 340152000F for ; Wed, 11 Jan 2023 14:29:06 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SRBWuAZr; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447347; a=rsa-sha256; cv=none; b=YZTU+FdEbDE8ezBuDZ1OYxXqYqfgHSOQxP2XkbVSZhB37nclLqBX2yf7asvx1M+00xR6xV D/Qw9BrweEVK+DOHkFrJaGPQ2/enncOpBaiLTO3bHafvMDYiYO/k6hf105nN+vFJLIz0uq owlRg6UThMYPDc4J3ySK7jq74od2FXs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SRBWuAZr; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447347; 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=2gT3v7v1xMDlHHMu0m2jx4osbPSH8IBycrujL01k8Zc=; b=xkROCtB4Zc3ko2usaVmLM0lvoyjmLd1/Oix6vIAo3seJXjyiYigsXX9G8dtZOIxl3Lh85L TZ5xojVD0A95aD/sF6UIxszkPCi7wWve0QgfuoVSrnPVSnE2TUkRu8uv2v5wFyNw7hC0Te EvEtvd5nSGKQcmog56U5NGSiOdQ+bXc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=2gT3v7v1xMDlHHMu0m2jx4osbPSH8IBycrujL01k8Zc=; b=SRBWuAZrAjQGkXq1XmS4D8PJA8 R8ZONMPB5yWb/VarORzV4HvDppIp3hqyW1HAIIAxOdEfzTw/LiiphIvN4MgC31SZaR+uOxPhvkLav tHxoqf4sekXd6JPmpAat9SD6kPnG0+71f/zkm/rWdNqy+1GF/j/hnAnFoBdJQ2wDlBqWQARyxwIx8 oNy48vhzdYGKORuoV11hcAQOVMKJ1kPHjPQn+OpCRmwm1NTQWVdTMDT/q8LLvpTPUyW/MfbwpmJY3 T2Brv1TC9sGLdgsupAmzeaAukFdF5rLDbIE0l0iHeBQ5lWewj3UAJpMW2ESUe1nYq96WrAX5C7VxQ jvfCKpOg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6P-004CYZ-UU; Wed, 11 Jan 2023 14:29:17 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 10/28] mm: Use a folio in hugepage_add_anon_rmap() and hugepage_add_new_anon_rmap() Date: Wed, 11 Jan 2023 14:28:56 +0000 Message-Id: <20230111142915.1001531-11-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 340152000F X-Rspamd-Server: rspam01 X-Stat-Signature: 9o9awdygnrbg4got8fx4xgzpyjg36kw4 X-HE-Tag: 1673447346-594784 X-HE-Meta: U2FsdGVkX1/bNPu9JBX9o1I479nlja5fXS2vP3a/zTZjbK0k6/RH82C/7mY7RfVIogUdlbNy4HYzDxYwAs1TqBwJa35/UsulWEWtm0TmO52WUx+I7RQQ8qpMM8N6VFDIie3sCPvjy5z5HOv6SN8wCpjYRmdm6CIE3VLKWE58hxGFOuoQaVEH6mUlt4PUpKG7LODqrIlH0Z5DSrr0D8RkE/EmK+jxhLxaUT5wiSPih9zZB1K56TWbAJ9f5h73D2rSLMtXrTuisQ/7GV8FVYexFmAHIbsiFpqrTDc20wEK+8WcbsNWMpsxFi/Mf5D3AXgn9ynUhjmMRww+Lvgb49c7uQipBWNr1CefeIbbtKvXTWzlkW6XPnm1AFfuuHOFh8Rg54r+2p8U5rhHYc6+9nDyuegtOczAopm3Z5klFRXG98M+gYBJj1dsZtX2B2WuD91eQ72hE3zL+s2XCSc4xQvOdQ/H12VxCWzfCJqaCB9mV77r6A5v4j8SXGqXRMDSiMNvyTmdV/2+4fJ/FVr0vx54OMU4iYOT3l63Vo4nU+j7wYgJ/8BmHKA38Orv71Pej8Mr+mmRLAZtdvugRrrzH+mabD3hfTY29FM6Utdkif8y5lUIeOa+LlGXM0/MtiRTeycBXO1zFGzJRvxC9RhwcgqvwlN7eyglQ0Nlp2t+bkwJeH366uacw7a6euXmKEaTgx3HfSurStdWMAm2jPZbWiw6JzRYdy+q8X8SsB75g2W4an8rnxt+OF0KwNGxSDHzUqrvG4UuL5et3z388tcnFQgDZtc5TB3PI6oofPXBZ4GRjxmNYWnBQBv01WfjxyLlqeydRPRJ7nZLKwBFmIc9DFlryf4ZhzwXIAfNT6tHM7a3RmsaFYdjJB7C74H92BJh+wj7a3wvwpdKEzA82BRDJTiaz8V0Y9xh7ScH5XbANUKMO5T2/qAkslZTHA== 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: Remove uses of compound_mapcount_ptr() Signed-off-by: Matthew Wilcox (Oracle) --- mm/rmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 2749e1466b09..462b334d6842 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2542,13 +2542,14 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc) void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address, rmap_t flags) { + struct folio *folio = page_folio(page); struct anon_vma *anon_vma = vma->anon_vma; int first; - BUG_ON(!PageLocked(page)); + BUG_ON(!folio_test_locked(folio)); BUG_ON(!anon_vma); /* address might be in next vma when migration races vma_adjust */ - first = atomic_inc_and_test(compound_mapcount_ptr(page)); + first = atomic_inc_and_test(&folio->_entire_mapcount); VM_BUG_ON_PAGE(!first && (flags & RMAP_EXCLUSIVE), page); VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page); if (first) @@ -2559,10 +2560,12 @@ void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma, void hugepage_add_new_anon_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address) { + struct folio *folio = page_folio(page); + BUG_ON(address < vma->vm_start || address >= vma->vm_end); /* increment count (starts at -1) */ - atomic_set(compound_mapcount_ptr(page), 0); - ClearHPageRestoreReserve(page); + atomic_set(&folio->_entire_mapcount, 0); + folio_clear_hugetlb_restore_reserve(folio); __page_set_anon_rmap(page, vma, address, 1); } #endif /* CONFIG_HUGETLB_PAGE */ -- 2.35.1