From patchwork Thu Mar 21 16:36:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13599166 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 4B470C54E58 for ; Thu, 21 Mar 2024 16:37:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC5D06B009E; Thu, 21 Mar 2024 12:37:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C74576B009F; Thu, 21 Mar 2024 12:37:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA22C6B00A0; Thu, 21 Mar 2024 12:37:32 -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 8C3746B009E for ; Thu, 21 Mar 2024 12:37:32 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 690A31C07D8 for ; Thu, 21 Mar 2024 16:37:32 +0000 (UTC) X-FDA: 81921601944.06.A0B7FC1 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf19.hostedemail.com (Postfix) with ESMTP id 8BF0A1A0011 for ; Thu, 21 Mar 2024 16:37:30 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TuhvuC3X; spf=pass (imf19.hostedemail.com: domain of 3SWL8ZQYKCDYkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3SWL8ZQYKCDYkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711039050; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dkdT2DGL8QlDQh+VA6yRS9pNWPbAmDPXuEOr3/wpZDQ=; b=0apeidMRx5Eg4J4hUG3Mz5EH8ScQF+P8rS+bwd8cTkdaPRFWEcyoxri4X3E9EamehmGloq weNQDiOEZGMkKDdqj7p6TVN6T8B+XqBbO9RvvX3CDKNGA8mu+kbKWVMFy180MWqNPgGkcw p23UEqxs9YkVcKefmqw1iQnF5j8OjhM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711039050; a=rsa-sha256; cv=none; b=X1wSAYqLKP1tTMKSE4pKNgnvGDnWw8vhmcmLTozn525iU7fOpVQtE19TXKLXLVnJ1olCV2 Yeuw0zjopmxzCMhOeGrkWuK1o8p3fZfrmZHozDtFUD9zq8gIwpku/8hYloa7T4M9ZxU9vX L0o4Etkdfgm3PEmefsB7tZ9+IVgNKbA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TuhvuC3X; spf=pass (imf19.hostedemail.com: domain of 3SWL8ZQYKCDYkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3SWL8ZQYKCDYkmjWfTYggYdW.Ugedafmp-eecnSUc.gjY@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcbee93a3e1so1860050276.3 for ; Thu, 21 Mar 2024 09:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711039049; x=1711643849; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dkdT2DGL8QlDQh+VA6yRS9pNWPbAmDPXuEOr3/wpZDQ=; b=TuhvuC3XC4+a6CPAxaPy7Mp+ZvcTcc1I7Wnwj3S6kyvjH4lJNBFYcxy8I2KLad25Ni IBcleImAblgn739OWXanqHpKXzoE+namnYw1a2gKVyQBesgP7acdA9RMKRIA3WxuDmoF 5+/JrgnFNI2uZ8heamTfvwJv1UlxHhD+zCIoULaKUsPka3EAVyBlDP5Uzpj/fjVmi3nV Ii6vWSA7LCxrkhN84wAVWpkGQoaa7aV3z68miSYxzpER4/sk/7V7SOffq6zOgPQvq0uP 84cJA5X9jASAIgE+6Ev66UIkwDPg/Ot4uAROqdOIpreyS4Jargp3uf6du5eJJcLIDc0F bdHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039049; x=1711643849; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dkdT2DGL8QlDQh+VA6yRS9pNWPbAmDPXuEOr3/wpZDQ=; b=I/mq4Wff4QUHqyl8NaVKganDxvcPusdM89QQB/1LLtesnl2jScbt1D6f5WvYCD+qjE qJb3rkN4ElbAPPAY/O2HnGW3pPYIYjjthL9Zv5C6OoesBu+fUsXpXL9M4MSW7UKs71FJ cA5exqpF87FO408Ny4XqAw52UF3yLu4YjSD5pMHHdWmVqr6tsjuFnVDvhxIz7QvUOcjU lEJfOLSmJSO2HXm9CydJ3VLf9lY3Z8wE9HOWsFw8dCnlDNAL2YSXn6r/dWeu2WB9xTi9 xgqfGw+e1tFxHftOr2VGiUGHpypEV+P3zW+HQDliPBK78BCF9N/VamFeOnvReX4VQTA9 rB7w== X-Forwarded-Encrypted: i=1; AJvYcCUtWHvDVhy2M2gelZO+FQUiXG0/RegQdJ1zazSmmDZsu5TYhMPSOGe83QGvzNb2Q8owJBt/MRLny0pxOoJuw6LQYGo= X-Gm-Message-State: AOJu0Yz92+s2AEY3DoKx+EZHbh4wVnXEDiINA+SM1O3o+AFygZYF1R34 fNHX/I/T5slqaSSA/Hcx3gbgHVFkarzgpge1SRxrYgCMxBotMjG7B2Eejn0og6Su8Lgny/PjSRE vcQ== X-Google-Smtp-Source: AGHT+IH5FL19hotlByvhDCzXe4teRPXoOwhKIdyfBan8YOb9XXKYaMuIFalLgecMbTUkzippyEaUxzmEK2E= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:a489:6433:be5d:e639]) (user=surenb job=sendgmr) by 2002:a05:6902:188f:b0:dcf:f526:4cc6 with SMTP id cj15-20020a056902188f00b00dcff5264cc6mr1142116ybb.11.1711039049407; Thu, 21 Mar 2024 09:37:29 -0700 (PDT) Date: Thu, 21 Mar 2024 09:36:31 -0700 In-Reply-To: <20240321163705.3067592-1-surenb@google.com> Mime-Version: 1.0 References: <20240321163705.3067592-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240321163705.3067592-10-surenb@google.com> Subject: [PATCH v6 09/37] slab: objext: introduce objext_flags as extension to page_memcg_data_flags From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, jhubbard@nvidia.com, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, songmuchun@bytedance.com, jbaron@akamai.com, aliceryhl@google.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Rspamd-Queue-Id: 8BF0A1A0011 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: f664n3sb98z6swd3sdcm5s65b8yfqk3m X-HE-Tag: 1711039050-595418 X-HE-Meta: U2FsdGVkX1/K7JDNs1ch6SYiWsEpQ8tBz7uI5/lArNLBNJbLznqhKSOZvp4dd1U+SKCwwGH+2mbs91oS+DKqRRmh0WEZh+qQ3H/6luMZIMH+6RFxV1aGcgnWZOg6sWLrY1h9A/dk916M0FE4K1QC4a7z0cwK8NRkP8pl0Fa88xUzU2s6AiNcwaG8OvoQ2YPwPfFe/O+PrrzZ5FVtzg41QA1r/rGfr/BkorjfsJ9Pg4DMo0sVAaA16bDNjRZg9JrMbeJWyKRctNOqRjsFQ0W6ndsxpJrbVvnrIFivuxyGpCVrlAfM+Vep/u1/ERPVCIOyUf3GVf/wvH4Irn9BpU76j7HYytrvpqU/ZzljQLolRoje4fi3is+09cXWwfekOEXD93pm4gPrZN4p9uebjA0AZ8eM0NCv+CZFUT+rcXX1T2AOodUb3nmHexxMhMdqjkuAWNoL6IrWR0Sm7SXxCLEAKVqUHgcDW7l5EX+fUkcaY4jUbp4+jbFUJbUlagUEVhw8VFnMPqWioIrvZoyw+pFXyB+TDri5DIrcUhbGuos6nHaK5511deykvVPnRjBSCIPzDnNDZHVnL9sD3e0YQircUuI+D1CZH7raMstVdB11yDW1wFjqE2ftcCqb0hW8pvuHJmZJ7J1pQs7KccpjXpBO9g3xXTBlA35nI2oAt6Fl58QYxNsUIutHpPcyXM2KBE06fzfaTnVKmiPWCFzOSj4XZ4n+LnL4ynR/IkEHTQeWfYZYmOyrF5s/Rv4sm9LrgrX2t1zyob4EzJveViy4Jh+xAQm4r+0bRm44uWh2z2Jj9f145cUADdi40MLq3l+xL16OEG/3aOIt1exVtIx4h7G6aeyOUW1MipaH/LI0I9o/GspUYZhKP0OW2QX+09ifpiXFqZsoS0bgBhpyn0HfUeIJytnfnCudqmyvBEkAE9LhY1Wy95k5GsskYcQ65BxxPK4xXkxJU8tpjncfxK45OHf dM585gg+ gyVKsZERLOA1Yz154G5peoSyRJsQraZcViF79oC/zaKypV15gSAwt5zRSKxQyAkvHL8UAonYMGo8gSxtt1NWuEfipGB9lCbZMRzG9g/KT423n91TbriUVKzyM15mVF6XaXCBllRZ64f5h8ZCBPqkkFAqfGU+3K+Ca8M+1zJBIiMs9pFUh49DNI0qwmcJ3NfiEfCbMGbQL15u8BPSn5FL+6KgWP5htlKBf3XPHdWW5PKyCAXae6/IOQOsR+1h0W3FYmm3Kns5InpStBUOdsqiOtW1nMoQvq8RqlftBh7nflVSuIpS0/N4N9dlYO7pgJSq+cb7rZ2w8jBJGO/8v0pCn5EqPpC4l7Y3IjRshsr3/x2LZn+sBIfmOpRuxt/jm9zAIJUrGOvElXnsnHM95dK9ByhpbR9PcJt2PwxWL3fF0g71VZYDQkVH2Yy7U2Rm9ALCpkr4bZIFUJfqugEFzVhJUnL1Td0xcMrqMgqmmpn1/dWtk2J+rNszCYAkwZfJy+Z3NXL8Zev63FDTU1SdBjAgKnG3VC4EI/ut7VAW6RL9nT29js80Oz8ADpmffT87X1RBxvGyBbO3jtauHedaaCizgtmIPo+7B/xtwq5fluSul1+K/WGhRT3U7tSJI3vmZg26sxrcqPRmqglRk3/NMOI7jejaL9BrLC523IDAy1yx/dPFro9yxrBkv8vEUN6K9z3wRJ6jot0pn7FpzaxCVuUyqTeY8EoNhcref6T4PYBAFo13tFGeDN0SZKI39wcoPj7m/QPONZnk9oZksOrdtvVm3LO6S88sbDAI3slbx2tnXwp+x4Y7+ueg6mcVGY3yYkyukIYQcze0jp4gXvzcWuehhx3O/wg== 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: Introduce objext_flags to store additional objext flags unrelated to memcg. Signed-off-by: Suren Baghdasaryan Reviewed-by: Kees Cook Reviewed-by: Pasha Tatashin Reviewed-by: Vlastimil Babka --- include/linux/memcontrol.h | 29 ++++++++++++++++++++++------- mm/slab.h | 5 +---- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 99f423742324..12afc2647cf0 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -357,7 +357,22 @@ enum page_memcg_data_flags { __NR_MEMCG_DATA_FLAGS = (1UL << 2), }; -#define MEMCG_DATA_FLAGS_MASK (__NR_MEMCG_DATA_FLAGS - 1) +#define __FIRST_OBJEXT_FLAG __NR_MEMCG_DATA_FLAGS + +#else /* CONFIG_MEMCG */ + +#define __FIRST_OBJEXT_FLAG (1UL << 0) + +#endif /* CONFIG_MEMCG */ + +enum objext_flags { + /* the next bit after the last actual flag */ + __NR_OBJEXTS_FLAGS = __FIRST_OBJEXT_FLAG, +}; + +#define OBJEXTS_FLAGS_MASK (__NR_OBJEXTS_FLAGS - 1) + +#ifdef CONFIG_MEMCG static inline bool folio_memcg_kmem(struct folio *folio); @@ -391,7 +406,7 @@ static inline struct mem_cgroup *__folio_memcg(struct folio *folio) VM_BUG_ON_FOLIO(memcg_data & MEMCG_DATA_OBJEXTS, folio); VM_BUG_ON_FOLIO(memcg_data & MEMCG_DATA_KMEM, folio); - return (struct mem_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); } /* @@ -412,7 +427,7 @@ static inline struct obj_cgroup *__folio_objcg(struct folio *folio) VM_BUG_ON_FOLIO(memcg_data & MEMCG_DATA_OBJEXTS, folio); VM_BUG_ON_FOLIO(!(memcg_data & MEMCG_DATA_KMEM), folio); - return (struct obj_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + return (struct obj_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); } /* @@ -469,11 +484,11 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio) if (memcg_data & MEMCG_DATA_KMEM) { struct obj_cgroup *objcg; - objcg = (void *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + objcg = (void *)(memcg_data & ~OBJEXTS_FLAGS_MASK); return obj_cgroup_memcg(objcg); } - return (struct mem_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); } /* @@ -512,11 +527,11 @@ static inline struct mem_cgroup *folio_memcg_check(struct folio *folio) if (memcg_data & MEMCG_DATA_KMEM) { struct obj_cgroup *objcg; - objcg = (void *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + objcg = (void *)(memcg_data & ~OBJEXTS_FLAGS_MASK); return obj_cgroup_memcg(objcg); } - return (struct mem_cgroup *)(memcg_data & ~MEMCG_DATA_FLAGS_MASK); + return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); } static inline struct mem_cgroup *page_memcg_check(struct page *page) diff --git a/mm/slab.h b/mm/slab.h index 1c16dc8344fa..65db525e93af 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -554,11 +554,8 @@ static inline struct slabobj_ext *slab_obj_exts(struct slab *slab) VM_BUG_ON_PAGE(obj_exts && !(obj_exts & MEMCG_DATA_OBJEXTS), slab_page(slab)); VM_BUG_ON_PAGE(obj_exts & MEMCG_DATA_KMEM, slab_page(slab)); - - return (struct slabobj_ext *)(obj_exts & ~MEMCG_DATA_FLAGS_MASK); -#else - return (struct slabobj_ext *)obj_exts; #endif + return (struct slabobj_ext *)(obj_exts & ~OBJEXTS_FLAGS_MASK); } #else /* CONFIG_SLAB_OBJ_EXT */