From patchwork Wed Mar 6 18:24:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13584419 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 6ADFDC54E41 for ; Wed, 6 Mar 2024 18:25:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 902FC6B0099; Wed, 6 Mar 2024 13:25:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EFCA6B009A; Wed, 6 Mar 2024 13:25:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68F9B6B009B; Wed, 6 Mar 2024 13:25:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 541386B0099 for ; Wed, 6 Mar 2024 13:25:07 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1EDCF80304 for ; Wed, 6 Mar 2024 18:25:07 +0000 (UTC) X-FDA: 81867441054.01.6BC4E4B Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf02.hostedemail.com (Postfix) with ESMTP id 4ACDD80017 for ; Wed, 6 Mar 2024 18:25:05 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1M55IW1o; spf=pass (imf02.hostedemail.com: domain of 3ALXoZQYKCEMxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3ALXoZQYKCEMxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709749505; a=rsa-sha256; cv=none; b=5cxbI9APrcY+C/deeys33MFoE0gRMLclzCbjpYhPA6ZqihCOVsIAO5tco2CrLCWhRx6R1y 6c3LPf0g2tINxQu0HsE2R5r+mSvGAi8Js2qaYeZkzuaq2P1GfutymzYlSQALbNGZYQXBdO db2V/HmIYqiNrUZD/80dZWnhVW7m7c8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1M55IW1o; spf=pass (imf02.hostedemail.com: domain of 3ALXoZQYKCEMxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3ALXoZQYKCEMxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@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=1709749505; 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=WRHB/CGZyDTcWTfW8LE9qYpRlSe4g56CTtmfKB0L28A=; b=MGrla6XsjweLZEN+g0BmZk6ryKSpizFa44eOOz9ldxJ3iWJ2IfQgigtmXauai4eiObOryC Z36exWdjMTB+w/OaVaYSinIINMfvcViCuO0F8u3PZaO+owGYGK+l/Y1VbQHTEqakU9Ifay N/5mjYHn0fvGyPJgNg9yU505SJKoEWE= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60948e99cd4so379087b3.1 for ; Wed, 06 Mar 2024 10:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709749504; x=1710354304; 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=WRHB/CGZyDTcWTfW8LE9qYpRlSe4g56CTtmfKB0L28A=; b=1M55IW1ozSfUndAxgbTjIqGjIODEZtkIwLMPvblshUEEeQo7odsDiENNLi+2MhMEVu qSQnWDZoUOslIQEc0cuw/jqm5sIygHhOI08QWhmDUJTKKTzMnF1rFAYqcKI2SfjVBAta VTe/EdLGISUDvD5Xt0u6XHqfM0MjKaLAqZSGw8Zi4fXE27DVR9Fo5fg3TDAff1MAGBQb KFD3SWs4ncBn71F8skTgC5OMFDU9J0kAFnJLPlszgXe350GRp10l2zDZQBHMdlVrHtdF WnFmUrfco+cxp86udg6F9eCI7D7S9AQEqVm1T313xbkLxoKlSDhG6DtPgYfGetL0vUR1 UiXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709749504; x=1710354304; 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=WRHB/CGZyDTcWTfW8LE9qYpRlSe4g56CTtmfKB0L28A=; b=ZFO7IilXK5YeeEMHmdfAM+BxmJCy2MW8IrwFJcpmq0Hi2HrmcjAgp6iKrAgVcKspwx 6+/9gjos7b7sDFa8q1gYVx3T/rJWJPjLR/mbP+4QpzyPJbx10ntXKv1e3KRfPrRhLZN7 jvhxctaiFW66i11yPMZuZkdGnsxu7FB/aGMIq/0LmvtzKRrL8cwrN+UW2Kx1gjAmW1B2 Wh0iA7WX/oFZXb6nAzM+E/iaVDFlFTQVTR8ydVW6RfnG28MGCi5CZWtc9qMjLGPx11pZ T+jlf2NwxTwwQs5z4eFxzSbVIMCrvND8D3t9K5YLRaotz5mcS9w23my0CT2QWhAzFVBF P/lA== X-Forwarded-Encrypted: i=1; AJvYcCWFfFTsac1BNtUB73vOQW03XfV/yoU3qZ2djjW82tONNR+zNmsyreXwpbznlArZQs+y3Mavd2GU8yMGICeiW/gKca8= X-Gm-Message-State: AOJu0Yw4Eeu+bK66V9mrVmaj5p73rQToypoYAxIy9b39bVrBI0kAuIIW DF/+BJuyuUh9DORVfiPsaBAjXuWUMEiQQHcnvfgpzurLsA7wkNqInjcM9Hta9NoHlbfcLlcX8mL /nQ== X-Google-Smtp-Source: AGHT+IFUSmekR0M1FVWzKb1jjXcJpGUE8Fd5c5LGEWBTD5HNNgZzfSlizaoDyWgDdYfuybzaLrnil2CkymA= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:85f0:e3db:db05:85e2]) (user=surenb job=sendgmr) by 2002:a05:690c:ed3:b0:609:3c46:1885 with SMTP id cs19-20020a05690c0ed300b006093c461885mr3528012ywb.10.1709749504202; Wed, 06 Mar 2024 10:25:04 -0800 (PST) Date: Wed, 6 Mar 2024 10:24:07 -0800 In-Reply-To: <20240306182440.2003814-1-surenb@google.com> Mime-Version: 1.0 References: <20240306182440.2003814-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240306182440.2003814-10-surenb@google.com> Subject: [PATCH v5 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, shakeelb@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-Server: rspam08 X-Rspamd-Queue-Id: 4ACDD80017 X-Stat-Signature: mxwx19jbn4pseu4jun7b363q4qokbu4e X-Rspam-User: X-HE-Tag: 1709749505-707062 X-HE-Meta: U2FsdGVkX1+lFguJMHoBi8R0L4HCWMR0eM9L7TJBV5VSObhHx30qMOkK1c03g6kfkbPMGgVubpRi1ZWPKvE8dHgHq4DyWv11+r3e9pK8+1x2s5IMHwsAUlOuM6mcvQSEGhxtWXMQNz6eJd16TN+gf2a3oN7dntt+1fg8+Sxahl5hhMHQiK3rGq8bjjlr+BymsL0eTV+1epNHXtb57VyfMln7B2TYWSA+Ru8mzJO6BS9Lgczq/nPLt7xJjAJVHyynLJ9JmyulxBNgCaObMNOJX9wai0LnZmSr+oNWtvBFs2dKA0EEBjPeStd2prJ41ut4aklLUYj1ZGjIQo/rtgc+g01E5g9DArjpNVBefUmnCjHQDgISMNq320j7uf7GrxoyYCmTmBX4QkCTGKW8FZgqhA4mTYaKECzxTQo+ZPejcgAF2xxlgNZa5pKy7mrcj00HRMmNPZAR37gkVo4Ox0v77EfxU0lKO2yCkMEv48hHhNdpFuPR7GRIzrmUEoN5SgbcFp7Ml91gF5Wt7QkNEPi8zwyjNNsfOw3xoQpl7/3QLhuE2AYKvIBJtzLd14715ROCSr4APOWz99CSI61sjg7RuqKy6x74f7rPrnaHOMOaiKSNTC9Fi+aTwa6wH0YWqHa+YKQiQwCVCB7Fn5TbSOLT34BUD0VYJhdyRBviDnhZjCF4wNPRxRUvfRxQ9BD64ukZzgqLg7PCNqwyNtLaxJPpVGN8Wq2B+ctObtupOa1F8n9y4BmdmfkF2qrwf7K9ofmcvaSETSjhI5ZQiuF7dO4crh1TDtNrctcKxbUKkhW//2sTQ7lj62vSyF6vJNMmFcj8LluFt/i1gWE1XlZleId9iQ/Qfo0GAfSX1dB4vZZRulJ5o6/H58L4OlL7IXiC2E8qtbzDMUf0X0Qk2TOl3Zt7AiArCQBzlnwW/nBg2dLpns7yG/mbTX0sGjS2v/Lstr0/9XyJNZNItBNBGIj8Kti fajRcWph MzsZn1Ob9R2Q9r93Y8TK5mPV0rccFX3GGephtCEgMm4BrMV4b9W4QXKodUNjhuGhmVOgwGN5Wuh0dpTuLWe4+L1KxSiKIX1Pex/WSXeW2XOrj/aR1YCv6srEpg6kNB1OHXVF2FOoe/iQT/NDvfNeyqYa5jtKacmKuX6f93ueAxQTZEKpS+NU46CtercDKi2rnu76Ook4ADniEXCk0OpHY6bfKR9I6R0SHcRvs/PWBXmzcrJm5XrO3lf2uDsZop2yU/juXOIHYANhupSIVP/ZUTNvm9SC0Q3eeX8uCZrlZ3My+uygHA/pfCsroD4u8jjnnE/Zt0hK1pv7/YQlFe9yYmRekQeGjuQYFVULvbovPq86DwcxlVhUwmtbFX6JhTIpBam5A2WKrkWlMo9xaC7859jLim18DykZRcC4caHxI6YSm6JvLZ6HjQ1Yv05NynrdnT31GN6PFn1bgna5SZdP84gg36fnClgXk1DwMFG1T74EvlwNSXnPdX7ukn9L0l2b2aaBmOA2JHo+wpAO4jhSPUQDc+5adfQiLN31ZTgCcvs9W0fZyOxm332/7zppTqETPS/chv8ZH29virG6RSHCFFRcRXbH/zNOGP65IbnbF8ttf5Ke5Po4tWu6eFE19lMhlnvYw+UCQ6y8fLoL3wK8DDIY5IjZ8DDATJzMJAGz5X50/Qjg2KjzZXz3qhUN7FPeUStdy42L5YK+ba1uMSHhoUpEolqOhwoctGtXckjwwindAX8XCDn/ETYxbIBqbLb9YenSm0Cg1on/KM8CoqC5ZHEU4HFjKzqdPkzg38vRg7IkDkrPJf6LTO44ExnPsij6ckqJVJ5AjOx9UozXNZ3sQHbsCkg== 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 9a731523000d..7709fc3f8f5f 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 0e61a5834c5f..c8504574f8fb 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -559,11 +559,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 */