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 C3141C3DA7A for ; Sat, 31 Dec 2022 21:46:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91D308E0003; Sat, 31 Dec 2022 16:46:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CD028E0001; Sat, 31 Dec 2022 16:46:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 794738E0003; Sat, 31 Dec 2022 16:46:10 -0500 (EST) 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 6AA558E0001 for ; Sat, 31 Dec 2022 16:46:10 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 36888AA964 for ; Sat, 31 Dec 2022 21:46:10 +0000 (UTC) X-FDA: 80303934900.08.8C64A03 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id BF23920007 for ; Sat, 31 Dec 2022 21:46:08 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rjiLnuPN; 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=1672523168; a=rsa-sha256; cv=none; b=pQpuHr9qYRBG4Po52APPsgAQrcbwqzw8iD56lgH0ujVe2tIVNt4g4/H/Coflk2r7impNFz SK5Z+kUEU1lN/ar4dVU+1Y2a9rn6SghHpa4kAahrvgNCL8bf5ueqQkwaGBYV7NB8hZbYXA KdP1o1gWfWKrte7W9Q0WpiK0GbNpOzo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rjiLnuPN; 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=1672523168; 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=+ZRkO+vnNX+/fzNe9v3qqpyopTcHnBSMjfRq+BW6PaI=; b=2YKkZWNGpCp0xHJaqyjyVm3moXFJjC7hD3wajYNCOrVgtxcFntTFnY2taTI0+pbMIMCRAK XcRu6CqsbtwNpPzx0YRa2/+Vq7s1nc9JYo0b9tYteoZmdz7MvDAYkLjyO0HBfJjsYn4oa2 NHETP241UNMD8mB+jWBLzy7RrNLBSpY= 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=+ZRkO+vnNX+/fzNe9v3qqpyopTcHnBSMjfRq+BW6PaI=; b=rjiLnuPNrBSsoxS/oc5v2FwAFk QbpqRk+baL7uMEgY5jNXwXqdCbIxIexKBuUeC1d3vyoYhpN+XqulemeWaCT6IvhrnEJj73DUqYmZE hA5pgzLo1X6I5p8+dFJZjQzYfH34eVBjzwwCkU9laHykwNpSAyOXZopDs2lVEDcOCh7Mw5TXWxmZZ shEpfROffr1QOBwkFxe2A1A2dDPiB/yGh/nd7wdTvTowduVGgrVotBwI02UnTquGQ8q/7/ZE4iMQ+ CiE78NKruOcPLVyrU6Kl6c/3D9rUHoyUmDCSE3ir1uUt8rJmimCRL9z70GL4qx9N12i0ZyMVWnl9M k1XIAd+A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkaj-D8; Sat, 31 Dec 2022 21:46:13 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 09/22] page_alloc: Use folio fields directly Date: Sat, 31 Dec 2022 21:45:57 +0000 Message-Id: <20221231214610.2800682-10-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221231214610.2800682-1-willy@infradead.org> References: <20221231214610.2800682-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: BF23920007 X-Rspamd-Server: rspam01 X-Stat-Signature: bay3qqmpcz94kbdfmx13uh8zkamynuya X-HE-Tag: 1672523168-46314 X-HE-Meta: U2FsdGVkX19663uiKBoQ2REl9q7p69K+YSFPjlRXO6m5sWL7eTmUKDZLbD6F0e97fbErmc1YR/gxKRc0KJNNHT4vK7UIdIj2YD/rUoN+CXXLYHZojjdJwd0AuZsUXefYJdd4iuC4O5Pr1x8kQN45w+Smd/dMXqQshYrlrujKLdaHTATiM3u/5ptDXKbp4CRiAkTA/pfA03tXN679JXNv4bZXG0GlHHatCdV43KJDd0MT623Uc2VflABSZd5bpY894/fEn33s9rcmBQAynif7bFzkJ3b7Bxd43rnETkjUHX8sSYEehKrkGtTQxr2D9bqDVFwqjTJi9eJZJQHpkDqIPIc6hUG50TqHEfez2p0TtudeT4EnCezF3GlG0YVx1U4uwA5QWVIE3MbUgKvt6MvlDlzl9By7PFEvi8AKIMkXpG8gFF+GMXhSHObPOHMkfnuIKi/6xFndbqJeMQs5Ch/CQ6AtOjVzXyywrArjC0DEG2BT/YS/QLdupYWlUuvwJWx3p7l3e8oQ2Mhjlay20ImEJdVrZQ12cosZ7t47/grX/ZnntghtmTLR+UI6IqKSx167GQUcU+vFXdq3+2y4QvtGdu6XIOZxlwke8dZQklWF8befjecYFwa30bneW9aV3TITRgmYxDJYOb6G0PEknDih2wTD5CmHJRYNXQVrGp8ioJxSLuaDNPwtqEOvzPy7qe5e341THqWa6+JPdZu4m9odWVd+ntbaJpNI7ITMvN4j4cEphNHD8NG7rEUAnMhztvlcX0bJuFV37x7P4nSA/IGRsvFLIpEDlyz1Zf0YEoy/hADl3oZwNvoDKKq8qHYUnjsDHzB68WhDBPEcF711t3vgE46op9GYno2c0onn0x9eBX/B6CZDKbPZLNuj9/0HfDkjBlaFZWAy+j+sj3FvG+mziP1ljsapC8+eRnXRFJ734JbAA6nViq/0gA== 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: Rmove the uses of compound_mapcount_ptr(), head_compound_mapcount() and subpages_mapcount_ptr() Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_alloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a04ed7f72b36..d309c48afc52 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -779,8 +779,8 @@ static void prep_compound_head(struct page *page, unsigned int order) set_compound_page_dtor(page, COMPOUND_PAGE_DTOR); set_compound_order(page, order); - atomic_set(compound_mapcount_ptr(page), -1); - atomic_set(subpages_mapcount_ptr(page), 0); + atomic_set(&folio->_entire_mapcount, -1); + atomic_set(&folio->_nr_pages_mapped, 0); atomic_set(&folio->_pincount, 0); } @@ -1309,12 +1309,12 @@ static int free_tail_pages_check(struct page *head_page, struct page *page) switch (page - head_page) { case 1: /* the first tail page: these may be in place of ->mapping */ - if (unlikely(head_compound_mapcount(head_page))) { - bad_page(page, "nonzero compound_mapcount"); + if (unlikely(folio_entire_mapcount(folio))) { + bad_page(page, "nonzero entire_mapcount"); goto out; } - if (unlikely(atomic_read(subpages_mapcount_ptr(head_page)))) { - bad_page(page, "nonzero subpages_mapcount"); + if (unlikely(atomic_read(&folio->_nr_pages_mapped))) { + bad_page(page, "nonzero nr_pages_mapped"); goto out; } if (unlikely(atomic_read(&folio->_pincount))) { -- 2.35.1