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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0D1DC4332F for ; Tue, 14 Nov 2023 04:20:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AB9D6B028C; Mon, 13 Nov 2023 23:20:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 235646B0290; Mon, 13 Nov 2023 23:20:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AE078E0002; Mon, 13 Nov 2023 23:20:37 -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 EAE1C6B028C for ; Mon, 13 Nov 2023 23:20:36 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BCD17120684 for ; Tue, 14 Nov 2023 04:20:36 +0000 (UTC) X-FDA: 81455258472.14.9F854B3 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf09.hostedemail.com (Postfix) with ESMTP id EE997140017 for ; Tue, 14 Nov 2023 04:20:34 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=LnIPmWCB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf09.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.173 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699935635; 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=ew+aEAUFKMT5ddXwYjWs+9wP5nLqtY4565XxaEvPnVw=; b=Xx6J8DS6IGx1kAR9V2q/hk+Bf/HkihUDaYAtcH9ptYp1mWAqCDC6TPJ+rMR8p8jcHHnFtr vV2sqinsEpgB/KVemt8O64WkjhJ87GUou5T8PEF7DP1Dvei/gu76J/x5xQMmQoZj2Fiej0 n1Qoy4pNZ9q4btM+7N3jZL5BrNxv34E= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=LnIPmWCB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf09.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.173 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699935635; a=rsa-sha256; cv=none; b=T4Y2NQ2l7zGE200d3hc1zh4DVPDlH4B/QpECb9bA0KbJ4wfg6vxtcqZkqBV68X1rAZLuIf hFbn8oVAlrxPQxB17zuFRvGnl/FgYpO6yhi5znZlB3nNEse49QgPKiIdhmpoHKx58MrKjD 0017TKsIgoPkN0QBF1PS8FrPBsyZUPs= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1cc2f17ab26so37872225ad.0 for ; Mon, 13 Nov 2023 20:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699935634; x=1700540434; darn=kvack.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=ew+aEAUFKMT5ddXwYjWs+9wP5nLqtY4565XxaEvPnVw=; b=LnIPmWCBWE/UqNQ8frOgnmTU+4pIcPECRBu9wQvwZY3F6iKbXW29oDs1p90ADK7qz4 4uyq9ximDu8azS+iaQ62KOtmQA8BGD/giW5pBK50CL97QXTL7Bp4w645znPvlbqWki27 +856739TaClPwfj2GPKJxiExhfi8K2DEv8NS0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699935634; x=1700540434; 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=ew+aEAUFKMT5ddXwYjWs+9wP5nLqtY4565XxaEvPnVw=; b=aC6POLHaE4Be47vFrzmQfD3Q4zUYlUl0+hc65D2A7JyUWK1IL+Us+B/b8z9XUmB/If /8wwunxC1vAZLA+jzqXT3EXEDdkqj/+kUrckLWKZpTFNey7reDJZfwX7j3Lmxf/BDbvz 2vbSJzsMrC24n/IAk9LEwuMSW2CKzV82L9KNDsLpNsH2gSkR72EWjvIMd3I4tYVNquSE SN+ohayCLXXkiLm4x54wVf1FX2GOh4TaQJFzbAAtJX8RGMU2ilHHvzQserDT3E+vSVVp 6B3tTQ+8W4XpHbYXI61Syz0OYzH21+ik7KKTxww0a/XCRc5FSQkDp0mPPOKueIdqUUl/ uKtA== X-Gm-Message-State: AOJu0Yw91qRRslEhOqb9hWDAmBqcrxxEqFD+Wh/o9GPZDrzdhQO3YOft kDHX/sEllBEr+A4p+PZJPVE2RQ== X-Google-Smtp-Source: AGHT+IEEuR9OHz0h/+qyQyKe+kSZOUz74iG8+oSzIWHLFYokTNJRmRlv4PFje7Gdb+90MtEYK337Ug== X-Received: by 2002:a17:903:260b:b0:1ce:171d:2795 with SMTP id jd11-20020a170903260b00b001ce171d2795mr1129493plb.65.1699935633849; Mon, 13 Nov 2023 20:20:33 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id c2-20020a170902d90200b001cc3875e658sm4792216plz.303.2023.11.13.20.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 20:20:33 -0800 (PST) Date: Mon, 13 Nov 2023 20:20:32 -0800 From: Kees Cook To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Andrew Morton , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , kasan-dev@googlegroups.com, cgroups@vger.kernel.org Subject: Re: [PATCH 05/20] cpu/hotplug: remove CPUHP_SLAB_PREPARE hooks Message-ID: <202311132020.5A4B63D@keescook> References: <20231113191340.17482-22-vbabka@suse.cz> <20231113191340.17482-27-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231113191340.17482-27-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EE997140017 X-Stat-Signature: gcrzhs77qqnwqzobpqbddsfsdg331a75 X-HE-Tag: 1699935634-828868 X-HE-Meta: U2FsdGVkX1/FtGggYJb1Hd2MM0STUfIdy0KL7TwrnFVBs/AelLseRNodOBqTgJ+zHULV6vQgZskjJl7bloV/qfUE2Rd4HeZPD3YT3hQZQ9YYzhksLBAho13LdbJV2EHTo5iE/8mDWy4ueJ6/LqqHJK/fVKERDPJD5vYFV8T4LhxyR9CL5YP0geKPF4I4AAXEmZsC1C8RqDMkFvy6+joJkP/ap7NcqOkcgCp20vExvJOPdZJQTCODk7MYOyzIKE2gzKFlaDPR4fKRB8aJU3Kb9V0+LBucbLbq/5ccEkn93TE7tL7soecP/8aU+sxFWH8Mv6gyTUiRSfPvRpyNnkHrjFZRusNW/pWCXXUrbJuawpHVTfHWe5mGue3/dY5Xgnrp0aMNqcR1RUOate7EqCr/jpj6EZJgpt/ROJY0uyyiajzu1+3+TyCPvkroagoXQNF5hQTsv+tlusJsMVp820+1Rs5D2PVL48OYoTzuY/OlcqjFbJCsVSIGg5DYTJfloopLCROa5D0fmbJNPFRQGYNog94mptSFHQc2OhaD9KBFMSksbdBUEq8HsTUWGGN/8+/+cnNKLrNlovXz8CW3EXEc2NwjA5TTwdQCq4UY5xY+qpgV1p0jySGUdDb7BqpnxYsbpxXnYL0nmXlwl4LUV3J+ShLYTuMb48F2Z90req3Sspb4hKkDD033ilxPMgAJUsna1se5E7PGZ2UesUzrcjBV/2pojkHHFu/FqDFMgXt1hf9pXfid+8SYi29ujxYKUe3HShxMatke6YuMvq8q15UXGZQ+J8tmljG/8cFy3ShBrOP63x+VNUQt/QBfgMIOMUhjxow3lWVdYveH3w5fzbUcwhor8VY236L2/NP8FPspr/ce4NxGQ975OaWMaoarTsx4mZEH7JYADScYXi9QQGu1M+3oA5rHuv/R330fh5oT9NofhGXRWq3bPGIPv876bxzYmuU12b2CptS6KqtC6K+ sYST1GJa fSFFt3p/5+dWtWPGxxAdpURHibHjNdPdI7Re/6WAXh3be9J4mzUVxGgq86l/7v5/7iI/0EhYRUme0dJKNJl8Eg2lm3QBIHhhRUz7uq+USZgOqvqSZjuQ636uwXC80u4Zb2SDkGKpBXdAuVN5LjE5bjtiL7H8yQoJfGqJR6ZTjqac1RMec3RJYOP5f3ROlqcBQCpevb28cAjPWBUXeYiUTtwniw/uD0857aS2uNnGCmeD0pvWUjtnonEYCcdm/Q0/Ry4VD6wrDmk4zFC77+48ODBkXXUEo3LMfC0gO3iwkqM01LU2k4N7NbKsIEOKJsTdVUpB05uspy708Vef8HdmySg+9hN4HH3yuK2lUym0AnxOHbWOPIZVyX4le3+ix+z5r22vg3Rm/FGfFZjfhiNUbtV9H+Y8K/HB9O6I4/mlYXhGCDxkuec2+07p5x/0q0L5HUCsSoIrGPBMgOqJbTPNnkAP7BpbbhtNcMxwC 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: On Mon, Nov 13, 2023 at 08:13:46PM +0100, Vlastimil Babka wrote: > The CPUHP_SLAB_PREPARE hooks are only used by SLAB which is removed. > SLUB defines them as NULL, so we can remove those altogether. > > Signed-off-by: Vlastimil Babka > --- > include/linux/slab.h | 8 -------- > kernel/cpu.c | 5 ----- > 2 files changed, 13 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index d6d6ffeeb9a2..34e43cddc520 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -788,12 +788,4 @@ size_t kmalloc_size_roundup(size_t size); > > void __init kmem_cache_init_late(void); > > -#if defined(CONFIG_SMP) && defined(CONFIG_SLAB) > -int slab_prepare_cpu(unsigned int cpu); > -int slab_dead_cpu(unsigned int cpu); > -#else > -#define slab_prepare_cpu NULL > -#define slab_dead_cpu NULL > -#endif > - > #endif /* _LINUX_SLAB_H */ > diff --git a/kernel/cpu.c b/kernel/cpu.c > index 9e4c6780adde..530b026d95a1 100644 > --- a/kernel/cpu.c > +++ b/kernel/cpu.c > @@ -2125,11 +2125,6 @@ static struct cpuhp_step cpuhp_hp_states[] = { > .startup.single = relay_prepare_cpu, > .teardown.single = NULL, > }, > - [CPUHP_SLAB_PREPARE] = { > - .name = "slab:prepare", > - .startup.single = slab_prepare_cpu, > - .teardown.single = slab_dead_cpu, > - }, > [CPUHP_RCUTREE_PREP] = { > .name = "RCU/tree:prepare", > .startup.single = rcutree_prepare_cpu, Should CPUHP_SLAB_PREPARE be removed from the enum too? -- Kees Cook