From patchwork Wed May 4 20:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 12838474 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 4083DC433EF for ; Wed, 4 May 2022 20:08:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 984AC6B0074; Wed, 4 May 2022 16:08:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 969356B0078; Wed, 4 May 2022 16:08:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B5C96B0075; Wed, 4 May 2022 16:08:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6D7886B0073 for ; Wed, 4 May 2022 16:08:12 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 50662610AA for ; Wed, 4 May 2022 20:08:12 +0000 (UTC) X-FDA: 79429147224.11.735668E Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf13.hostedemail.com (Postfix) with ESMTP id 4607920086 for ; Wed, 4 May 2022 20:07:59 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A5310B82834; Wed, 4 May 2022 20:08:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E35D0C385AE; Wed, 4 May 2022 20:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651694888; bh=hP6DONQx8HT3ciq95qC7cLt2aYlwi23SKeG+VbaD1mM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TF4t+dOV6Kb8lkG8GJVR1PoreKUgXBn1VlnhrosNyEUKEbZ2MTsmJ+gYBjVpiXxzU Co9ZOCrpB4hXv7plOP34gvW0o7zI+bFt5qo+Kskv+ZtZ6fDPkT4zuVAUoZ13hS2C8A daRPV2DIU6FPf6wqxyGgAuXWGDR38+AXruvoORNQ6F1E1CMLT3NgiKbG4grAT2zfe/ vNue9Hrsixh9TsMHC5NUd7vzr6d5IbkDzfWWDDd7i2oWheN23VVKbNuHBrMRzFcGPQ f4+B9l3P20s2k7J2aADAwQ274Q1C3JV1HceRzSzR5qJkUSRgiB0yLf5fW9z9LhLAqu Ta725knLj9gDg== From: SeongJae Park To: akpm@linux-foundation.org, willy@infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, SeongJae Park Subject: [PATCH for mm-unstable 1/3] mm/vmscan: Use folio_test_transhuge() for THP check Date: Wed, 4 May 2022 20:07:56 +0000 Message-Id: <20220504200758.314478-2-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504200758.314478-1-sj@kernel.org> References: <20220504200758.314478-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4607920086 X-Stat-Signature: n8a4aomfx79q4ouaj1tukfgif1kgt3oq X-Rspam-User: Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TF4t+dOV; spf=pass (imf13.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam09 X-HE-Tag: 1651694879-668532 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: Commit 22bf1b68e572 ("vmscan: remove remaining uses of page in shrink_page_list") on 'mm-unstable' replaces 'PageTransHuge()' with 'folio_test_large()' instead of 'folio_test_transhuge()'. This results in below build error when 'CONFIG_TRANSPARENT_HUGEPAGE' is unset. CC mm/vmscan.o In file included from : In function ‘can_split_folio’, inlined from ‘shrink_page_list’ at .../linux/mm/vmscan.c:1719:11: .../linux/include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_178’ declared with attribute error: BUILD_BUG failed 352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ .../linux/include/linux/compiler_types.h:333:4: note: in definition of macro ‘__compiletime_assert’ 333 | prefix ## suffix(); \ | ^~~~~~ .../linux/include/linux/compiler_types.h:352:2: note: in expansion of macro ‘_compiletime_assert’ 352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ .../linux/include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’ 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ .../linux/include/linux/build_bug.h:59:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ 59 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ .../linux/include/linux/huge_mm.h:351:2: note: in expansion of macro ‘BUILD_BUG’ 351 | BUILD_BUG(); | ^~~~~~~~~ This commit fixes the issue by replacing the check to use 'folio_test_transhuge()'. Fixes: 22bf1b68e572 ("vmscan: remove remaining uses of page in shrink_page_list") Signed-off-by: SeongJae Park --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 40cda196d802..5a0f081a7be5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1714,7 +1714,7 @@ static unsigned int shrink_page_list(struct list_head *page_list, goto keep_locked; if (folio_maybe_dma_pinned(folio)) goto keep_locked; - if (folio_test_large(folio)) { + if (folio_test_transhuge(folio)) { /* cannot split folio, skip it */ if (!can_split_folio(folio, NULL)) goto activate_locked;