From patchwork Fri Jun 28 21:03:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 13716629 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 02B77C2BD09 for ; Fri, 28 Jun 2024 21:04:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CB2E6B00A7; Fri, 28 Jun 2024 17:04:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07A0E6B00A8; Fri, 28 Jun 2024 17:04:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9B466B00A9; Fri, 28 Jun 2024 17:04:04 -0400 (EDT) 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 B045C6B00A7 for ; Fri, 28 Jun 2024 17:04:04 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6BF0A407AD for ; Fri, 28 Jun 2024 21:04:04 +0000 (UTC) X-FDA: 82281524808.02.EB82467 Received: from out-175.mta1.migadu.com (out-175.mta1.migadu.com [95.215.58.175]) by imf12.hostedemail.com (Postfix) with ESMTP id 5897D40013 for ; Fri, 28 Jun 2024 21:04:02 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Ed+Zv3p6; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.175 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719608621; 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=7SlGJox9o6WayxiPYLup7HEpqh8S+qxFa/JeE0i8vpE=; b=n0ri8D6fx4HvMezySmpX7ugZlbgzk9HX+p/2UTD96dqd8jWXTChirrOlxKL3NKhh9nBdfy +UgTMuvhkF3bFlYM2ZI4K9/PIqKlqOO3WFQ6HrLCI1bqqTSLz7/g8Z1eVkzQNNW+R0EbWa VBl0zSGRpcGZKJ/kKe6Z1fuWUR93UIY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719608621; a=rsa-sha256; cv=none; b=CgJRpfw7Q5+tAGwAFMld8O9ENwnVAgXP1tLK7HGwTPE9J6s3HmUPZqsYL0bSIAnfItJDIr 1OqdDaS439kVM3nGdTkVIDljOVTWSABK2EfX7jt2TWC1CqDUk/9f8KYczV3ceByj6wod2m OywyLDBre+/xy8N+k44jaVLzln+KMqE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Ed+Zv3p6; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of roman.gushchin@linux.dev designates 95.215.58.175 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1719608640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7SlGJox9o6WayxiPYLup7HEpqh8S+qxFa/JeE0i8vpE=; b=Ed+Zv3p6n3UBjF4sV/5LuICPBPcAFb8qH5jp86026JaxfP594YrwBi2dcypRMGgQFg8Mu+ c27SEgkKYtawry059CYJABt50s2pFEjK5BW0m5whL6fa2rAn7uDZBhJ2lbl6T+/4052ttj zSrycuARVaEHJzpFWNaLgkje4URL5+c= X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: shakeel.butt@linux.dev X-Envelope-To: muchun.song@linux.dev X-Envelope-To: roman.gushchin@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Roman Gushchin Subject: [PATCH v1 7/9] mm: memcg: guard memcg1-specific members of struct mem_cgroup_per_node Date: Fri, 28 Jun 2024 21:03:15 +0000 Message-ID: <20240628210317.272856-8-roman.gushchin@linux.dev> In-Reply-To: <20240628210317.272856-1-roman.gushchin@linux.dev> References: <20240628210317.272856-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5897D40013 X-Stat-Signature: gc6nou8dyxxpqehb5g91mae3ju9mendi X-Rspam-User: X-HE-Tag: 1719608642-508830 X-HE-Meta: U2FsdGVkX1+nCOMj4Rcj5t5EPu1YIYlNBl5ras2RT+KFCnRFxE28MCMsBHtbK7uYRSM15Q554vZ7EiP/lQ3n0dcMcXr8VatiBXvr1fqLZVr63fPeEdBvZ2DEly1TS4KNeOY8HDuDcBRmKR15tHqZ/j+cXZ0k7xH/GDRvEpPIYBGWJHc8N5Y92PLItz706AjVlygSqzM/7HPWb/G6Exkk/PqXP9tN8zKlp4vQ0l58UAraHebj+xpYNca8PaqKuywXzpNhsrS4mpkGELLyLqpzhksAwiEzztSC3dsd5UEgZLaB7UDV6f/xGItIgyuNr88Aw1wdivKCoSXo9mTICCz4po9Stt6WBMDOAcVFb2QeUse9t9zPoED2wQTSWRcSPKWCT1/77xpz56r7hFgCBzSfcbQlw33EJG192VvXR+FPuEl6/fM+qOv0r8Goo33dXRkQLp8811GjHQW+WqQe1Io+5KyrtQqWn67nULtCRLTfHrcF51tlxpVm3q9Y+pvST4cQwR0E4oqU6JPefebxoFNg9sVdKso9NnVZdzR3GQ81BUNj9pyoh7ktMVrH8OP6Cy1eMxql7zHlciU1YgFEb3u35807X/5Uv7QyulmnDYrYza7E1rHBdehV48E0SHJhO+gss5lQKSh5LyBID+4hL5JzQxrxD4nRw/IiZ3nI2rpy5KC36OKXIPsFJi7+1APDRnUhDWeXb7Ie8w14uM1kV5DR1XeEPs2VoSe5haIyKA0MtmtgM+BXe2ByXBw8zh7L0KACTXr8603DND08iIrljG77slnn3esmrQOLBbbIQnv0iPxZdPOGnb9FjeNIzPIOZOGAAa+F4ah+rMxrdhN6W0ECJrLZjZRI469agc/tUes1/UTtp8kE2cDwVbtjhPHCOdVzFyrsMq39Y3WW/aPePF+qnqUXG5l4WUPAq2ue6UJWiUzwTNzrM1R6VdjMoKZlqBBlnn8Y5qI7mprtkbvGlnB Z59lbsoc weHwcQfkohhhUzzB7nEhCo7Ue+xp1Cppliv0TCgcAb2Xvtf5g0EXaztwVFJiAxmKJjVI0Zgihcsfl4YCgQYu3WC1pwDP9JUdjk8E8P8pDg5WzfqL0S46a12YNURH9rhmodlMzV2MlgvvoSMJXclTnA8+eG3Be7JUlMih9fxTRVBvEVAczbdfm9gzDGA== 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: List-Subscribe: List-Unsubscribe: Put memcg1-specific members of struct mem_cgroup_per_node under the CONFIG_MEMCG_V1 config option. Signed-off-by: Roman Gushchin --- include/linux/memcontrol.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 107b0c5d6eab..c7ef628ee882 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -92,6 +92,7 @@ struct mem_cgroup_per_node { struct lruvec_stats *lruvec_stats; struct shrinker_info __rcu *shrinker_info; +#ifdef CONFIG_MEMCG_V1 /* * Memcg-v1 only stuff in middle as buffer between read mostly fields * and update often fields to avoid false sharing. Once v1 stuff is @@ -102,6 +103,7 @@ struct mem_cgroup_per_node { unsigned long usage_in_excess;/* Set to the value by which */ /* the soft limit is exceeded*/ bool on_tree; +#endif /* Fields which get updated often at the end. */ struct lruvec lruvec;