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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3606C433E0 for ; Fri, 19 Mar 2021 16:39:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4B61F61934 for ; Fri, 19 Mar 2021 16:39:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B61F61934 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E44C48D0015; Fri, 19 Mar 2021 12:39:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1C5E6B0092; Fri, 19 Mar 2021 12:39:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE30D8D0015; Fri, 19 Mar 2021 12:39:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0180.hostedemail.com [216.40.44.180]) by kanga.kvack.org (Postfix) with ESMTP id B4D0C6B008C for ; Fri, 19 Mar 2021 12:39:26 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 67257180284FA for ; Fri, 19 Mar 2021 16:39:26 +0000 (UTC) X-FDA: 77937184332.24.C558344 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf26.hostedemail.com (Postfix) with ESMTP id D22E64000F50 for ; Fri, 19 Mar 2021 16:39:17 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id g1so3213875plg.7 for ; Fri, 19 Mar 2021 09:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2a1Q2yqghil2SSuBrZCKn/WKXtEY0qZpSKwUUGtGYmY=; b=ts76DRlSUdCqKznHIFlxmkaJlHr7i6lQtNzoO/RMbIkr50NiOPe8TQWRN2ixR3V33V MSo2854BMApkQb62U5JW9wkPsfPYtTGC2w0eNR2VJcDOkmI0OCxK2tskqXLpMsQo5k6D I+9MF+0de3Cbo3B/emGkSQTZ9b8kytzbLLh/j7hBjH3RSTOab9/HOsEY5k0TVE2bTxrT HDUz3y6thtT6ym4M39vfRuGNeMWpbqVXC+l9xBR5ds5TgAFyMxiHBqq/RqrWxutVnF6b 1EMyHafpSTsTHBvOaC6bx0muSqlYD9s4rvl0E+dFySVF/yoosEDrBi5U7q6ke41gt9lS 09FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2a1Q2yqghil2SSuBrZCKn/WKXtEY0qZpSKwUUGtGYmY=; b=eIB/00ckOC8YlidhBpXupu/SqmpCtcwkI2NhepLJtiHQa10UCarHTp+6Lhnrvgy/7u vgVTCaYjm+blzd1qohXoNwCKp30ywuconAXdZJvUS0lkUafRPSDWMDe3E9EbAkIw2JQ3 BCKT/8MZjHhXmpIeoGi3C/UqumlxsuQuR+lXN0MdHdDZu+QRYNzrVFKuu8QS953Uon+q WTs7TreSkMmkv0LHEVxTVkdVpwogZ7baXVkeEpk3Tj2QLj6TKozCyV1cAFhBf5YP1N5F XtDNN8QxMkcyOjd7P5lviSDLZD1eMHQMr515NKnKkIt7QgacP7gUNLrEa2KZBbzJh/QB GpUg== X-Gm-Message-State: AOAM530UKjYOHUziU9OYw2mK58tVKLzgGbo32AItl6U5mdfaNSjXPXwp 1kFglkcPeSgutSiH52EO2iU+gA== X-Google-Smtp-Source: ABdhPJxLMtY1/YANoUnuBedOZOnF4FLQqQRkWkg4E+mDOLjpNusqnH6PFcwrpTUh62KkTCQDt9cozA== X-Received: by 2002:a17:902:7682:b029:e6:2bc5:f005 with SMTP id m2-20020a1709027682b02900e62bc5f005mr14814810pll.32.1616171946396; Fri, 19 Mar 2021 09:39:06 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.231]) by smtp.gmail.com with ESMTPSA id z25sm5860239pfn.37.2021.03.19.09.39.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Mar 2021 09:39:06 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song Subject: [PATCH v5 7/7] mm: memcontrol: move PageMemcgKmem to the scope of CONFIG_MEMCG_KMEM Date: Sat, 20 Mar 2021 00:38:20 +0800 Message-Id: <20210319163821.20704-8-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210319163821.20704-1-songmuchun@bytedance.com> References: <20210319163821.20704-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: qrorkx37e6zqij4m7uur8ru1okqrb1ge X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: D22E64000F50 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf26; identity=mailfrom; envelope-from=""; helo=mail-pl1-f170.google.com; client-ip=209.85.214.170 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616171957-485663 Content-Transfer-Encoding: quoted-printable 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: The page only can be marked as kmem when CONFIG_MEMCG_KMEM is enabled. So move PageMemcgKmem() to the scope of the CONFIG_MEMCG_KMEM. As a bonus, on !CONFIG_MEMCG_KMEM build some code can be compiled out. Signed-off-by: Muchun Song Acked-by: Roman Gushchin Reviewed-by: Shakeel Butt Acked-by: Johannes Weiner --- include/linux/memcontrol.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 395a113e4a3b..7fdc92e1983e 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -510,6 +510,7 @@ static inline struct mem_cgroup *page_memcg_check(str= uct page *page) return (struct mem_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); } =20 +#ifdef CONFIG_MEMCG_KMEM /* * PageMemcgKmem - check if the page has MemcgKmem flag set * @page: a pointer to the page struct @@ -524,7 +525,6 @@ static inline bool PageMemcgKmem(struct page *page) return page->memcg_data & MEMCG_DATA_KMEM; } =20 -#ifdef CONFIG_MEMCG_KMEM /* * page_objcgs - get the object cgroups vector associated with a page * @page: a pointer to the page struct @@ -566,6 +566,11 @@ static inline struct obj_cgroup **page_objcgs_check(= struct page *page) } =20 #else +static inline bool PageMemcgKmem(struct page *page) +{ + return false; +} + static inline struct obj_cgroup **page_objcgs(struct page *page) { return NULL; --=20 2.11.0