From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A064C4167B for ; Wed, 6 Dec 2023 08:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbjLFINb (ORCPT ); Wed, 6 Dec 2023 03:13:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232500AbjLFINY (ORCPT ); Wed, 6 Dec 2023 03:13:24 -0500 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABE67D67; Wed, 6 Dec 2023 00:13:15 -0800 (PST) Received: by mail-oi1-x22c.google.com with SMTP id 5614622812f47-3b842c1511fso3845373b6e.1; Wed, 06 Dec 2023 00:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701850394; x=1702455194; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ZKizt4iTnV9cayPmYedMVcEI9nEBmDM8KpDsNPl1XzI=; b=FWvQECv9J+jmrIK0lpq4xVT79Gri2fy7DWg1EYCXZ/HPxR8e2jsOK5IyTCjUvYphTk 4sOViRUYdSA/tN/X3m8bWWUR+vwb3y/wkDH1cX9r/uAByikzBkasj4wuq1bjQsR9WLP5 TLQLDvGL+158yqxdAN4ZEkPtSiKqwQ30Amgfine7/Sxj/OexXU4N6XNjYQ1kg9tD+Rwi jph5HIeqhOcIughzzHJnNvJyZg5BhRIOjfeXiCNPykLDLyuFx8ffWZy8SFuy9alv8OUL O4qGK3TGOAuSefN7IvwVZTysG/+fNOAGZYQdjlpFmsyWp6Nt6oaEGuHC+MeM5KyVEOsg A3xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701850394; x=1702455194; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZKizt4iTnV9cayPmYedMVcEI9nEBmDM8KpDsNPl1XzI=; b=WQvlhlBi/zEOaw9z+22V4xoWUlegOBvOlAl2j+jOxEF5hj0Pw3nNpnKSkj4T3+TuAX Att2XrJ8VOfLzIxfOjc3CeKSoal11eMb2EhLPKsxJ41PTR7nPO7lEpD79itJSbH80kO1 ysQZiLUV5VqpDMd2fOt5e9umv8pu6MwoEAReg4lB0FdiLerBWYlTt4zlUrTW1pj0Grdh FoqSwNI9MhHoI3b7DHbDAQ54z2E9/RLv53GvUD3U0/PYS6nRYmIvv6us9sUbBon6vTtY Ud8vKKoCoqs4RUOp6LomxOsG/BRC9IuZ7WnEgdmNwBrb6cjxpcvPWmHP1sbUhoUPAGXw PHYQ== X-Gm-Message-State: AOJu0YxUf9U/XIqjwDGFVrny2PHZpW7CGdgoWUa1Rj1wdwO0lElgzLm9 kyjdmcFSmzKVx/AR/qbuVTo= X-Google-Smtp-Source: AGHT+IElRqPaTCMRS95WPb5zLIvYTqxmbJ/Yepyjh+gda++IHaQn/3mO1oXx/4ZEu1UGLiI+FuRVCA== X-Received: by 2002:a05:6808:2e4a:b0:3b8:b063:9b7b with SMTP id gp10-20020a0568082e4a00b003b8b0639b7bmr906780oib.109.1701850394310; Wed, 06 Dec 2023 00:13:14 -0800 (PST) Received: from localhost.localdomain ([1.245.180.67]) by smtp.gmail.com with ESMTPSA id p12-20020a62ab0c000000b006ce7c28be72sm1455066pff.118.2023.12.06.00.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 00:13:13 -0800 (PST) Date: Wed, 6 Dec 2023 17:12:58 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Andrew Morton , Roman Gushchin , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org, linux-hardening@vger.kernel.org, Michal Hocko Subject: Re: [PATCH v2 05/21] mm/memcontrol: remove CONFIG_SLAB #ifdef guards Message-ID: References: <20231120-slab-remove-slab-v2-0-9c9c70177183@suse.cz> <20231120-slab-remove-slab-v2-5-9c9c70177183@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231120-slab-remove-slab-v2-5-9c9c70177183@suse.cz> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 20, 2023 at 07:34:16PM +0100, Vlastimil Babka wrote: > With SLAB removed, these are never true anymore so we can clean up. > > Reviewed-by: Kees Cook > Acked-by: Michal Hocko > Signed-off-by: Vlastimil Babka > --- > mm/memcontrol.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 774bd6e21e27..947fb50eba31 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5149,7 +5149,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, > return ret; > } > > -#if defined(CONFIG_MEMCG_KMEM) && (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG)) > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) > static int mem_cgroup_slab_show(struct seq_file *m, void *p) > { > /* > @@ -5258,8 +5258,7 @@ static struct cftype mem_cgroup_legacy_files[] = { > .write = mem_cgroup_reset, > .read_u64 = mem_cgroup_read_u64, > }, > -#if defined(CONFIG_MEMCG_KMEM) && \ > - (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG)) > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) > { > .name = "kmem.slabinfo", > .seq_show = mem_cgroup_slab_show, Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > -- > 2.42.1 > >