From patchwork Thu May 5 11:33:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: CGEL X-Patchwork-Id: 12839405 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 0AA21C433EF for ; Thu, 5 May 2022 11:35:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74F326B0071; Thu, 5 May 2022 07:35:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FEEF6B0073; Thu, 5 May 2022 07:35:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C9B06B0074; Thu, 5 May 2022 07:35:04 -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 507A26B0071 for ; Thu, 5 May 2022 07:35:04 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 265D62DEAC for ; Thu, 5 May 2022 11:35:04 +0000 (UTC) X-FDA: 79431482928.12.53CD4B3 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf28.hostedemail.com (Postfix) with ESMTP id 13802C0086 for ; Thu, 5 May 2022 11:34:48 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id t11-20020a17090ad50b00b001d95bf21996so7773958pju.2 for ; Thu, 05 May 2022 04:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H9AMjgQBvCmyA1ePp0ugTHXhdA/KV96TGy2zDZ4TeDc=; b=gD36s46ywn5cBGjvq273k7r3M8UfRfELRbCviW7Ne+LrL7zlIWk0V338EHrG6xGBrp sDTe26YWMOut0oJD/9j+3uYqD8Z8PGi7t+jHqUknfzF9VHuari22j3iOf12XGfDuF/k4 mAzOcUoi8hC91Ra+pX8P5uNb9MJo7Xk7xFUR/HSIh6RSDIir53VVqAnzqX/3G0QzhcDR gAeyQLQJaxNhr0KRDX7w3HJwTe+xMmM+KGnenXa5vEJv0d2PKkeZr3bgG2uqeerWKD42 BmVE8Fd5Xw3SlRDrpfaap452zPwvX24o/yoGLZEjXi9pTUXIf0sClpxEdVRTO5/ZHBJj z5Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H9AMjgQBvCmyA1ePp0ugTHXhdA/KV96TGy2zDZ4TeDc=; b=pjEIdlFEXbMEJxbCdqU/618mx2DDxDc9BGIkRw28vls9TmWGLb7hQHcxtbdRmJWD1j 8qKni3Zkl88gW0sDguuTKjlk0Hvb6MJrxwQ8XgbxZ6IACpbOJVSnmwRJqEll+1fsYgBG FOhyhwc1eJC5hwz1vxwiWSKg9infCf+2PMpV/pcGbRMrQu4QmtZZEHD/cCn22hEQ6TYN cGEpWwrWEuIP7j880RwfUAmkX/Hq/63sZtOTiunUTsEyUem7eTmFWuTTQnUKmjpC5+Am 5dlSfd2GH4k2CB/lkaiCuQ5OAT8d6P4JS8QtN10l3pD1vCv7gKSk+C+x73HV+TxMuZid ZWzQ== X-Gm-Message-State: AOAM533IQ2JTIWAE1tQ79TMjbb7FW0aS8/ltUIovPbu5ZyqLMrznY8Yg qnOvJQkRngbe43BT/S0FyI8= X-Google-Smtp-Source: ABdhPJxMOL/XuysWiausOaNMSrSxhKUgt0xkWw7NL/KHtJve6nExj56tez+jTxZWPMa0ircZm7qBPQ== X-Received: by 2002:a17:90b:3b4b:b0:1dc:5ee5:19ce with SMTP id ot11-20020a17090b3b4b00b001dc5ee519cemr5569473pjb.234.1651750502755; Thu, 05 May 2022 04:35:02 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id l17-20020a170903121100b0015eaa9797e8sm1330856plh.172.2022.05.05.04.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 04:35:01 -0700 (PDT) From: cgel.zte@gmail.com X-Google-Original-From: xu.xin16@zte.com.cn To: hughd@google.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yang Yang , Zeal Robot Subject: [PATCH] mm/shmem: fix build failure when CONFIG_TRANSPARENT_HUGEPAGE is not set Date: Thu, 5 May 2022 11:33:55 +0000 Message-Id: <20220505113354.202979-1-xu.xin16@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gD36s46y; spf=pass (imf28.hostedemail.com: domain of cgel.zte@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=cgel.zte@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 13802C0086 X-Stat-Signature: fbzsn1wazeb4m3311gj7ombcprmej4i3 X-HE-Tag: 1651750488-832554 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000004, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Yang Yang shmem_add_to_page_cache() use THP_FILE_FALLBACK even if CONFIG_TRANSPARENT_HUGEPAGE is not set and triggers this compile error. Add ifdef CONFIG_TRANSPARENT_HUGEPAGE in shmem_add_to_page_cache(). In file included from : mm/shmem.c: In function ‘shmem_add_to_page_cache’: ././include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_327’ declared with attribute error: BUILD_BUG failed 352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ ././include/linux/compiler_types.h:333:4: note: in definition of macro ‘__compiletime_assert’ 333 | prefix ## suffix(); \ | ^~~~~~ ././include/linux/compiler_types.h:352:2: note: in expansion of macro ‘_compiletime_assert’ 352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ ./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) | ^~~~~~~~~~~~~~~~~~ ./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") | ^~~~~~~~~~~~~~~~ ./include/linux/vm_event_item.h:148:30: note: in expansion of macro ‘BUILD_BUG’ 148 | #define THP_FILE_FALLBACK ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ mm/shmem.c:721:20: note: in expansion of macro ‘THP_FILE_FALLBACK’ 721 | count_vm_event(THP_FILE_FALLBACK); | ^~~~~~~~~~~~~~~~~ CC arch/x86/events/intel/p4.o make[1]: *** [scripts/Makefile.build:288: mm/shmem.o] Error 1 make: *** [Makefile:1997: mm] Error 2 make: *** Waiting for unfinished jobs.... Signed-off-by: Yang Yang Reported-by: Zeal Robot --- mm/shmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 107f1e4dd0aa..f01ceedf88c0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -717,10 +717,12 @@ static int shmem_add_to_page_cache(struct folio *folio, if (!folio_test_swapcache(folio)) { error = mem_cgroup_charge(folio, charge_mm, gfp); if (error) { +#ifdef CONFIG_TRANSPARENT_HUGEPAGE if (folio_test_large(folio)) { count_vm_event(THP_FILE_FALLBACK); count_vm_event(THP_FILE_FALLBACK_CHARGE); } +#endif goto error; } }