From patchwork Mon Nov 13 19:13:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13454359 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 16ACAC07524 for ; Mon, 13 Nov 2023 19:14:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44E896B025F; Mon, 13 Nov 2023 14:14:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE3C86B026A; Mon, 13 Nov 2023 14:14:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9DBC6B0266; Mon, 13 Nov 2023 14:14:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9DE216B0260 for ; Mon, 13 Nov 2023 14:14:14 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 66F6EB5989 for ; Mon, 13 Nov 2023 19:14:14 +0000 (UTC) X-FDA: 81453881628.04.E808229 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf30.hostedemail.com (Postfix) with ESMTP id 6E44A80020 for ; Mon, 13 Nov 2023 19:14:12 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aPJLjdUI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Cs8sRMut; dmarc=none; spf=pass (imf30.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699902852; a=rsa-sha256; cv=none; b=oEnIuPMkCwdhV/B+JFlY5FfsZE9VKWceV3UFuUjfgUywLQtvgNwTajSJgBq/YpFMafpQvO Bsvg0G+1pc4cvIZnwBo+YZawBUda22wVnYwbTrKphcQtVFe4H29Oz2t+rekZE9PUyA5Bkt jKjux3XZQuv8o57Yx5216z62DhMaY/0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aPJLjdUI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Cs8sRMut; dmarc=none; spf=pass (imf30.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699902852; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UZpP3yTw5ZZBFa2ECQqDZfpxxgpcXUank5jkC+X3eYo=; b=RvbGoOuJLSf5Kh2ajEv9RvmLifeJqUW6G+nJz4VXPROS8yhS029i4X58sCtAJ7QuIiXm9R RVwZpwjZzX5i9Y97CeOIwJfMKS952J3HDLDvuOzmu4jV8f37uEzia0Tz+/TS+QFds+KjHY HQMXiT2sBiVC+Sk4YqubFWiBHQx7zRM= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 116C31F85D; Mon, 13 Nov 2023 19:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1699902851; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZpP3yTw5ZZBFa2ECQqDZfpxxgpcXUank5jkC+X3eYo=; b=aPJLjdUI8hKVcvhpJwk5gEbY624MQiQFCDOYdgBwSCjd41pCB1KETdbV2uRpmIDNKx233o 0mqz3dSDh0+f1jgHWQFD/k9MWDWW6jJ1beMZl5N0JzcgmTTx1yOFBC1QJ+Vjea6Yfgc6Th 45+Vv1z+SdDlZ/rbg37SCItabUbCC1U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1699902851; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZpP3yTw5ZZBFa2ECQqDZfpxxgpcXUank5jkC+X3eYo=; b=Cs8sRMut++fgm4qFb0T1IW1oy5KIMJWGr5+E9MhgTZbWKEv7hsN8c7F9GoQrGWIhgi9Yw8 6/UkVL069in7bCAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B52FB13907; Mon, 13 Nov 2023 19:14:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cOyQK4J1UmVFOgAAMHmgww (envelope-from ); Mon, 13 Nov 2023 19:14:10 +0000 From: Vlastimil Babka To: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim Cc: 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 , Kees Cook , kasan-dev@googlegroups.com, cgroups@vger.kernel.org, Vlastimil Babka Subject: [PATCH 05/20] cpu/hotplug: remove CPUHP_SLAB_PREPARE hooks Date: Mon, 13 Nov 2023 20:13:46 +0100 Message-ID: <20231113191340.17482-27-vbabka@suse.cz> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231113191340.17482-22-vbabka@suse.cz> References: <20231113191340.17482-22-vbabka@suse.cz> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6E44A80020 X-Stat-Signature: 7mmhcy65bb3nm4pje3k118d3fer6yb7m X-HE-Tag: 1699902852-945230 X-HE-Meta: U2FsdGVkX18Rx+6knJRYNvmkfF8gJ72bOhYyMlsP2teTq3JbpaLLEpifA2a5jYnWNvWIn4sSnZuJyTI3ta+m0I/fLGS7SolGwJmfRFJgGQaOuqbEn52bX+GamTJGpoIquBXNaGKi87FzTTdVU9dM1VSm6fjCtrFi9sQdT25+HNe7TutKeMyFqPOg924uuiwkDLX3N0ateO7KKQpRC+VWX0mtIvrObPu1JIABk7vE1XcK7zRuUxMZBFMP7Udn7AyDz9T/VSOS2U7jk+ezvBlgiIZvolaAE9JMfv78hSpfBhdAofa2TTrkFDWVeU0Pkyffs5EEOXAilrkk+pSQIcj3vSDreAihnZQXXl5p8eY68Bb+C7yrgcV5UL23Aynw5qmYiaGPAd9En7fNhqALHZz8P+bkJydzcy+kmr7jn1HyZ2HtZw5ztYNjiimiiCiAIpp2FKO/s7kVotlEYHTATO1joZVRRExRlnCuQiYscJWneOv+MevTjRfKokXZK7kV8ILJzd+CJRwgaowFnEJTH7c2InVXuKrmMiBnLujL5rYQRN9AOWcBLeXqcB4l+mhsYcyTdflPFMSsT1S6HYAf2T7npd6lDfFrgyjXt7KqNefz/ppfzmOK5O3gn7ibSgIw5klbNO4sY8GxCXa8S6iZOBBDxzcKHobDomo84iNLETI9Q31mxx4bRZNKGoGGwMzXLYADhAMTjACo8J0lAV0JOVLLlgCqQW+cqwqo0aym+8odH9nqGLN7YSnhWKUsLz7EKYzm9hnKMC40L/4/ZJmA1ZCUBeZCiIaoOP5EO2Tf06EoauIDopswxcV2uMep1VYn5vsVhcE6i2AkcZrj2vl5hXJCDC0K50O/4jqd5wnSJH/+VNw1XFgTTI8iCegz1hWX/bdTyyu6UR/SskTkIMJRpfU5hkNmbW5sTxODQBoNyw8PzjINRBQRCjqB0CW8FmsZFV+4H+lKr1ZDbCnu+LJ9CtL r5KmlR1o 3ad/+/vJc0O623uHfw+Lx5Hu8/3arbQKKmIJVH2f0/zKz6v3gKkmDVM3wha9Z2qCW0szHS8FBEJDJL7X9MiaeXCcHm33i2oReJS8k0ayMZpJ4HRIfPfVi+/Pp+nfxxv1P4NaUlmjU+RZERIOSPbA2uDVpQyUcye5TzPxDO345fjpQK8LJ5tMxRqJ2e8Jb7dhgeC3OxNJphpzaDgFWfs4I7ywOhfy95DZWjIrGuSMQVbQwjLP5cknLvdM1uR2UcyRmJZ7YBje4YyKTnvQ/Y0kRrjBfk8FwYy3MVNks5zp11IW+RJlzou6K/xtkbA== 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: 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,