From patchwork Wed Feb 21 19:40:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13566190 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 1412FC48BEB for ; Wed, 21 Feb 2024 19:41:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FC4C6B009C; Wed, 21 Feb 2024 14:41:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AA876B009E; Wed, 21 Feb 2024 14:41:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D68A6B009F; Wed, 21 Feb 2024 14:41:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 662E26B009C for ; Wed, 21 Feb 2024 14:41:21 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1818014055E for ; Wed, 21 Feb 2024 19:41:21 +0000 (UTC) X-FDA: 81816829962.22.524005D Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf15.hostedemail.com (Postfix) with ESMTP id 7CF9CA0025 for ; Wed, 21 Feb 2024 19:41:19 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=R5pFpkTo; spf=pass (imf15.hostedemail.com: domain of 33lHWZQYKCBE9B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=33lHWZQYKCBE9B8v4sx55x2v.t532z4BE-331Crt1.58x@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=1708544479; 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=RtUIa2LF9EHhDqysRu/yxXfpC6tMV2p9GldnGdUYEsQ=; b=qA6iYgwFNN49w2XjpaidtRGq8qk85eLklY3s/hwsp0P2ZMwU1xw53Lp8XMnr2btF0kq49Y PldQGo8sNVbdXJs01PI3Fy658QR14sal4YPSgHULdN+GsqbaqEBxG/pMPCocKXavAmNia4 vgx5P4bzfDB7s3V5yhDy+OaonqWDcOM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708544479; a=rsa-sha256; cv=none; b=RDnMYCy8asZoVZ5/5jKEfi/QIItedWdLxwHymMxIREg9XMPEYSejqKb9xwGdO9EIEE35qB 9+B+kcGH5mmz8nn1nIo2f4vmfIefnjcu0TwyA/DdXcYGbJZ8TOTjNe2A6uASszGdKHhWuE jjaAjLP+XMrv7BQ1rW4vgQ2ziX+NNoA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=R5pFpkTo; spf=pass (imf15.hostedemail.com: domain of 33lHWZQYKCBE9B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=33lHWZQYKCBE9B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b5d1899eso213355276.0 for ; Wed, 21 Feb 2024 11:41:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708544478; x=1709149278; 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=RtUIa2LF9EHhDqysRu/yxXfpC6tMV2p9GldnGdUYEsQ=; b=R5pFpkToUvDYKzCGWrWXng78mzmO1rCg4gGp6+3eRvmulaK00BG/zzeOuDyemhxnit 6I1Lz2Yt5f2D6E75z5NSul3ZTZTFDhazuPK+JyQCE9jHY2rePfpLRF1cT67vR3PKM/z5 hpJifbbqT8o6OlS85mQGKB2jZvoriWHCPamH0kq/tOwMY3WGmM8X/kr/01Bd5QlVApaE iA3o98qrQn4wfCIHTpIoBzLqQZLOO1R3fgs8CWG9vHSyv2ZiJURKz/PjfO49KF72P6Zz DZQmORZbYV7z8SJMLnbi2XxGQX7XVEKpJOu5cImYIDrH5L6f1Xsyp/ivNIcD4ltsu+mA iUIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708544478; x=1709149278; 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=RtUIa2LF9EHhDqysRu/yxXfpC6tMV2p9GldnGdUYEsQ=; b=eu1od8zuHGWNqZjhgfG3E4L2oFmIyAmsBFNd/tejNVQt45dxu5mubF5WYlY//dkuV2 73gOIffvxIire4qN0QfGhgPY6aw3PIirW3aQw017rTMl1VLZMTQ3YoTukPOMsuShcOE5 s9FewWPrqm76XgHT1bdQE9GYx+q8r7T+cfrLOH1hkQ+qmTqeVylq0hxrwPcFmgOxQzpC fyEPeehJL7yJ7r6mT6gZwVwSuOuWtxjpHBX6c2ZJ1YWkLR2NUd5zMsLdRsuq/RfuDYEn gQNRdFOmhl0I95xXhxD3alli+dhJDAPLIFLYKEfXZn7VoEuL9QMt8Y+CeF291g0XfRrC D9vg== X-Forwarded-Encrypted: i=1; AJvYcCUfNNxxtXGxBCTCH2zJ+7iPnF/bcLkmocZ1svcERrye23sbKyzvsCJFfV+KdCaqRuzwqVea8o1T6OqKHb2d+OTGXOU= X-Gm-Message-State: AOJu0Yz2lLcD7R0SV1Ktb1H5eDGYk7Nf7q8o72T+JGpih3hxucfItGsy w1/OF7K0ynk0DXtjZKGkB4sDnB9m/wX9B7BNlQ8T+jUZf1r3SP3fcMCuM5GbXs5UIxjO0gmouZF bkQ== X-Google-Smtp-Source: AGHT+IEwwSNQL7Uk2yZ0VknWIStJpVKOxx3COiSHNCEPyEAxFFFoBLgf8pA7JP3oX0B0ao2tWkEzMtP+Sno= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:953b:9a4e:1e10:3f07]) (user=surenb job=sendgmr) by 2002:a25:3f06:0:b0:dcc:2267:796e with SMTP id m6-20020a253f06000000b00dcc2267796emr31950yba.2.1708544478455; Wed, 21 Feb 2024 11:41:18 -0800 (PST) Date: Wed, 21 Feb 2024 11:40:23 -0800 In-Reply-To: <20240221194052.927623-1-surenb@google.com> Mime-Version: 1.0 References: <20240221194052.927623-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240221194052.927623-11-surenb@google.com> Subject: [PATCH v4 10/36] 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, 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, 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-Stat-Signature: 1pb3kuxj4sew3rry3fucxdzaw6eqsggx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 7CF9CA0025 X-Rspam-User: X-HE-Tag: 1708544479-808199 X-HE-Meta: U2FsdGVkX184D82xervv/PtkUOlYHOEqD97otgj2LIAAthpB2fLSUiyiSFQB0LxIXUvyxA0ExbcXdxcozp423une3EehTTST1SIH9HBA1hPgp6JjW3pvmakW2Y5TdkMQdsusMkGs3sej5ttBHp9nFr+WndCjWoLegX+pY1pGgEagjYxE3iTc68l8CL5nOP1HPzfOp+p87P2kLUpa9suShCS3EGsiXsUoyO78w3d69cJ1F5+f7j2KrR9Dp9tPIYXkEQ9EZWEG/lincB4kXAJL2In9hM4JNSuWgt1hWN49rVHLwF6QnsaDQ0tbpe7zKd/CpzIqoTsTxBizyliZCTt14EB5uUHtDBJJkYDoaCugtcgNYpJ6d6eIQa2jDWvDqUMBpMRZXN4y1nt6rFTivjbpCgyn+XgLvIRAhb5G3Z6WC09PX8pcgmKU7Ikebsw65rnPReQWgNmb64bPtNjAsuaXkj+eUm17PCQ9B6IfFpEHEeZ0EpOmrvoQh+YaAMIjwoyFeVosWqeyshJfX8nFxt/wOYX2fBSQZuIBRE1axw7vL0evFZAQXRmBCySJKRbVqiLuQGGgpwAFZSeSuNJcl8FBou1QNuQO5B1vgqUxXS8JuROcxXXhBnT7hmbvCWNL/KEW/xe/E08Yq7HSK5ivZ4fx4JFZ5VAHACVL7j6Y6jD7/UXps/sYWf/uCniLoH6z4kfRUsBIusrVlz+Vuk9BMKPFwh62gVaG9MXcghTKuASVZSCJinUKyv9lS1Re+KGqMWmFOq8wC3iyedaXYiw01A5qpVt1MH1WAnfwSoHSccTgfiQ0jANxzlV5nljU7/qrOdIkqJ6d1sJ1IhbNq54SpR74FHwW/uYxxAjMVeIq8LSgsxyffSlwbtucBvvIyoA7uHsvFI2oQrIml4RTccW81RyShxWGm1mbn7HGgeurrv0ErHKHQlDcVwW2O5i7xQpFpsAcL7ePQCXaPyuRoA9iwCb 6/I0JUm7 35PRurbpACIF2N5RpKBF7oyj9KuJQMHOtSv3K5i5h0LKQ9DPAObcYmQ1zNkRBtj/DUVjawAJy5FuHR+culu1XIBzkgrEw+WNt7Ds/m3NjQG3m7bF1/a2s0wDvsT4/uCgCuw+l3HiF8xXhP+//rC5z+rlkseSwi/OxO8zVySMdmwIqLvhcMbhiOXe3IljB17YSKpphsmizp0UDZy4E0LVDWgAiircEDYzgq9P/HEDU81QHfg4B7V19FZcye4lc3dg1lptzqT4R9jm2ludfKGPw649FthTIYD8EyZkcfeOWrSZ9js2wRD4Dkk8fxztpb3pPO99P5QtmBSqbDzNXEbrWrnpC2KDKgG6BtoSKlRMxIGC1afuhzvoKU4pyJuSgtR99tLAokBTPrd7SSJirO6CededMvsyprBC4vqwur/cdjW3OAu0q/kxHSKVfRynsyGIJQvrmnuuAl17zZ3GjgaHJbKQRMg== 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 | 4 +--- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index eb1dc181e412..f3584e98b640 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -356,7 +356,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); @@ -390,7 +405,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); } /* @@ -411,7 +426,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); } /* @@ -468,11 +483,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); } /* @@ -511,11 +526,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 7f19b0a2acd8..13b6ba2abd74 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -560,10 +560,8 @@ static inline struct slabobj_ext *slab_obj_exts(struct slab *slab) 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); } int alloc_slab_obj_exts(struct slab *slab, struct kmem_cache *s,