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 4C9FAC54EBC for ; Wed, 11 Jan 2023 14:29:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5B228E0005; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3154D900003; Wed, 11 Jan 2023 09:29:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B739D900006; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 405338E000C for ; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D6FFA1202B1 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) X-FDA: 80342750376.08.BD57899 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 61C87A000C for ; Wed, 11 Jan 2023 14:29:07 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lOa7QyLO; spf=none (imf15.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=ycXSiJoWI/lF9j0Dw/rloCkv+MQFVpe8mAFmHL2ravtuiwLAVrq7UEeI4LP1ySxHJK/iF2 JhZTwC24CH3qrGIXBr03VwHnQ68x6S73MTu4ri511ukHs3wKm2Wn6BXmRrE07rycW+9pOZ UqRrDUFusKEJA2JvUeFYgLLXWdnVkQk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=lOa7QyLO; spf=none (imf15.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=7dSp84UZ0ULVEnUK/8GfgUxk5eRD63Nb9UCo8eq6tck=; b=5gzJKZr50+Ifie2z1sSo//Eqqkc8l51FZwS4KFhV14Daxepa2qCupkMiO5oJbMrKjJ/WZL yahjoH7MoZ4ViHUyvIl2GurbiPMyxTw69TZ/JM/nPGJ/s9QqKBTBg8CU7dmfAbPMNmuMKW z1FNykLrOfw1EqtuU/MtmVlixUqeQhc= 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=7dSp84UZ0ULVEnUK/8GfgUxk5eRD63Nb9UCo8eq6tck=; b=lOa7QyLOd2L6Dp/uQBISmjFY3L n+N+NOQuYEYILIXv06FPxR3z2BsEPwXxtUOdHsZsT5THBTwOT/B8JbxxKOqLQampLB3Uxnf5MaN3t eZ+Jf1O7iJDnPWhfIDD/Y43NBoL4inP4clotLqSIaylJVctK1iSJI/zCM0PR0Pl/WhyZ05RxgC8RY M23TgSwlRi0Em4awfVO94zttvkQvPUY/cFyYPIRa/D1L3cOvw+7YFYSTbRW4BSKMqAeNGHq3WbYTt zfMHNb9B8lP5Kdy423AB5msNUsvdW6cP6SXOE+9NcokDDaQa1ILDSKH1LlC1xIK7hSbeQ0o5Lxqbq tSocZqMA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6P-004CYT-QX; 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 09/28] page_alloc: Use folio fields directly Date: Wed, 11 Jan 2023 14:28:55 +0000 Message-Id: <20230111142915.1001531-10-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-Server: rspam03 X-Rspamd-Queue-Id: 61C87A000C X-Stat-Signature: xitqx9kndjqfjbcrrpusan9b7tw3f6zt X-HE-Tag: 1673447347-742591 X-HE-Meta: U2FsdGVkX18jo8hLvM6hhvb12kWULu9zATWsKMl26hCDkwU2MaGogyjHLdZbTwFCN3GpQV44HQBGAlRjqtUbx3TTn2cTmPfjw7hg3qMWF5M7rN8L0LWaE9e0CZrayJf8tc8f+BGkxbXflr+xqLN3Qft//QvjnwrvqGxDPv4cUx242WerQoWZqhbdw7LSzfRQhaTT6ySyzG24DEjpwk9RkLQr5u36stwObAXyy0rBnxMnscVnf/Hjh36kLg/+rzE/3HTFOsyVoXqykomYrioef9qTnj4yAaXxkNgjctJQpJ/Lexf20T+7mqkvh9nBHcm5ppgNWCVPJuMUbxtL9MyaqwiGo/qGDT8pfTgtUGA7/EQB6g31e2o2KRGrZiiPScN4r5eXrfAawIuqHiMCqdE+Kb3z6yuY0M/B0GFquBjghvQywbKsX3XJX0FMjZaHJyYMznm/JImrVP93WGtdoHDBARTeNNyMECmttMBMs7j5WuE8HZbavLHHMsA+jh74WdmqOqivG9Lf1CbGdevSIkSAQMUCTohu+URCp0K50ih7SY+i6BC54QGr7aF6YKH+bfyRzumSRJRs1LyeYLBKHfzAyqvVgfs+VAhivRr7/tqhbaEyty1sv2RVu2QWRjrn4p3HgM6v3I/MO2u3XS8H0mAET29zgfVjbvSu8pvnXAow1Kk6OT8o/kfG7b2fvT4/1WZ3lfKl223mvpn4a8xuyfldxePS9lYK/zTiD662fZByNx5qQ67CmokOVd9fkFoc2kjdf+x8SuvmGpF64NW9T323wtwR/HfHMY3NRVKe3OY8CPlm3sucM1FBA5Qc7USfft8oelw3JtN5NKBMyc5Zw4xNjtt+Wjk4To8TL6s/z42AJTg2pSIKZ3ymelVY3cxTBDkX5w6yv/emuzFs1QC2+WkRqFtmCOtKggRSq/ETCXfdVeoCr7A0G2r9nA== 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 d1e5ec875fd0..946a4ab7b278 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