From patchwork Wed Aug 28 09:35:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kanchana P Sridhar X-Patchwork-Id: 13780969 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 6B420C54795 for ; Wed, 28 Aug 2024 09:35:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D4CE16B0095; Wed, 28 Aug 2024 05:35:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD6086B0096; Wed, 28 Aug 2024 05:35:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B03CE6B0098; Wed, 28 Aug 2024 05:35:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8A7BA6B0095 for ; Wed, 28 Aug 2024 05:35:23 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 242AE161D8F for ; Wed, 28 Aug 2024 09:35:23 +0000 (UTC) X-FDA: 82501146126.10.5B051A8 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by imf22.hostedemail.com (Postfix) with ESMTP id 149FDC0007 for ; Wed, 28 Aug 2024 09:35:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=F+cUprlN; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.10 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724837634; 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=vGbt+zm88UsOZri9YFcjRa+V/L3WuFrEf9oMyrgaGj8=; b=nQeUMZufpjkRyTs37akGOqzTioQwnnBiD3Lkzk3quDFpYxOm5nkfiqeRcj6bg2eElU3jhh Nm+5yQMKeMY4QP97ffdZJ3ZMcKckL5k46twMOjS3JNFxSGjcXWRGecsD0Xgs2K6bkU54kf YKuf13fblBh1djYzCL1SeYAyIRQKA7E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724837634; a=rsa-sha256; cv=none; b=zDxJhONvcC6sCG+1Gf+T1iWVUZkY53nbNqoInj5o1j/yGh9XOQ7axUJu8STwEYcvVq8Fv7 x6T6Os3oQmGDM5sLXIjgSQ82ZXh661qaPiiNzZ569Y+GLqbb5oEgWzEOG7vCn2XcRan9sY 6Q+WLJ623NGFFms1qBQuqjpZ4ZsP2+s= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=F+cUprlN; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.10 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724837721; x=1756373721; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AeqSRk7TDyGPqnrVN5BCXf4W+HLcFRFHZnOza8fR2pk=; b=F+cUprlNZRTKEOp7ARSbuD73Ta22jN4qSZ/NBJsC1Fh/2ReJWNZ6jLF5 Zoq+3ySzO5WMKXJkdDGSKX2b5TO/QhywT38ygftZIy0WloO0R+HtP93BJ pI5gGnL2c+AegsOxH0xkwYXrrZCgiUyOPHHUH5m+EuBjKMyKFGeTYaZET mw/4cJq8r2Zlug77e1de/3VpxbAbi9k28bBqpTmbPgGJYWC3YCeykA1Iy qowcfT1rSbDaCRw4wJKf4NW/MR8mG/kfh5MGNwTJA8XYX6FPtbRI0jYzY kfpqgYq/gkFIBWpVin6iS69fLMfb4KIvoS3UWVYvOJ7vJ9gc6N73ax3DU A==; X-CSE-ConnectionGUID: iamQzEFrTCi5bs7JQLoi9Q== X-CSE-MsgGUID: k4Lz2HWVQN2vKoKkaR25jw== X-IronPort-AV: E=McAfee;i="6700,10204,11177"; a="34763866" X-IronPort-AV: E=Sophos;i="6.10,182,1719903600"; d="scan'208";a="34763866" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2024 02:35:16 -0700 X-CSE-ConnectionGUID: pxwLaIv9QNKK2iVMFyiFEg== X-CSE-MsgGUID: ToDHsLGZRnyyoT3XdFWnww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,182,1719903600"; d="scan'208";a="100678971" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa001.jf.intel.com with ESMTP; 28 Aug 2024 02:35:16 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v5 1/3] mm: Define obj_cgroup_get() if CONFIG_MEMCG is not defined. Date: Wed, 28 Aug 2024 02:35:14 -0700 Message-Id: <20240828093516.30228-2-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240828093516.30228-1-kanchana.p.sridhar@intel.com> References: <20240828093516.30228-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 149FDC0007 X-Stat-Signature: d8j5yxjuesnswonodd3khzhaqphnmrag X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1724837720-181305 X-HE-Meta: U2FsdGVkX1++mEKhbqHaJHjtSVxlwpBgfmnDc0WCcHLwsv2jp0KZvqRSfN2QVqim8wJvuQPBqFURk1SH5AJ5eduPe2mpbrf7unOGD0wb6rtrrTnH4qNOmfbB2BMQyf1ApT83MZS+JForBeRVGXwEBPBlHBnoxxlr26JA0osllZRyvFnN38o6HpoIeXSNc6Cg1VpMIwRiKQuh/9qkvggtepVbbgXsFmtWyjQEfohOcBY9zcBEEV+D/wigGZ7K8u2BmbeLS2OkvFi3ibApg7OZU2uVXJ2hI+N1ZTstRvb79LeXzsdroKU6VpRZqVk/pYzlj3IhhgHDdetM73jbEXIVjwPVbzwI88RNI+Z0e2yuYUTqphqZusD7kHLdH1Oxr9GqmSPKhhlqHc4tHxeDUcFgNWj7O1hx5/fgvZJvwUN+t9xFFRJ/pppmqatvt9LaL8LqALVB0PMMaue/t7CjiBsuANXvRCwRvfkBGY8cUxOkcCxxr//82XXDHqY62DaXz8o4hbcGQgw73QIxT1kPx+41IBrWGIeJr/Gt8Eu5Zxg4og1hBONT7444xaWXVZuQivw+wBaY4PCkbx9Yq7Djb58jGhZc96Ifmz+aHzS1VMOSwsgsPmjEVpsdC2D9UcULt/pMU8xecZ/yQCa4VMJwRSV8t8mOMFN7wEZJGCiZr8QY0U1Uv4k64rfKQYYLdy5EoBbbKMCl3CajNsYZWk1JXQQMeDjXngBPiZGV04QS11kM5qH7smOJtbkTL0ls3b5Pg9U5hHK1cfQ+7gFJ/oWWWu85uIi/CJPtq2joOrg+yTABgWncwqmsK1GVEIRZ8SCVyS3LQf3lDcCZCOqy8Rui1NHqYUvIKU+XeG3GIdt/vNWwoe0KvERelocLquCV04O71vxTkekULICZJuP+CAiCUp4/0dp29c1NNhuvx03MUwWH6Mc7Lm2KuW/GpG1QI63Bw/OwyIxOuOKt4XdBw0It/rX Ck5wFgMr xZGf6stZ5dh/DQNNqjd+wsr27ugsGUPjXOTQmYkvsZdVeZiGDlfWMytEBS1F7TaDU5cBvZ0hOh6L4DTdDixRVS+occP5P5a72GIvfdliqUj4VVVa30lM7FpMuzpzsDDPa1SZeWNIV5/e31DWCaeAyEop5C+a+3djUCMMuSG2Mh4X0p6EhOyapo6+ziz1ptgcq/cd0tQCvWdEjjDdEfJIiiWZTFOJj09t8pP7kLR510dFWCyY= 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: This resolves an issue with obj_cgroup_get() not being defined if CONFIG_MEMCG is not defined. Before this patch, we would see build errors if obj_cgroup_get() is called from code that is agnostic of CONFIG_MEMCG. The zswap_store() changes for mTHP in subsequent commits will require the use of obj_cgroup_get() in zswap code that falls into this category. Signed-off-by: Kanchana P Sridhar --- include/linux/memcontrol.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index fe05fdb92779..f693d254ab2a 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1281,6 +1281,10 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) return NULL; } +static inline void obj_cgroup_get(struct obj_cgroup *objcg) +{ +} + static inline void obj_cgroup_put(struct obj_cgroup *objcg) { }