From patchwork Mon Nov 13 19:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 164610 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1420048vqg; Mon, 13 Nov 2023 11:14:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUJGuR09CDc/1HfyW1vHMli/42m6M1wapCpOn+2x+0kyqEqqJLpUszn4j6maUf9Rg2R5es X-Received: by 2002:a05:6808:2081:b0:3ae:18c0:dd8e with SMTP id s1-20020a056808208100b003ae18c0dd8emr11537098oiw.27.1699902899274; Mon, 13 Nov 2023 11:14:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699902899; cv=none; d=google.com; s=arc-20160816; b=MFbBtmTRjPRI2sItRhh8yk+J2dQwttdxZxNCE36ydFiIXFHBNfYRKEItfLA1WLyBup sxFNA0d+lSpeKyOmc0tsMVGUjKUWrzjbKEvddcEPJaF43L5cbOxUOJP3pjT6a8A+Zkw6 AfPMAedmsK0fA9kOqGpumOUMxVETPmbWBj7fBN/znVuqK2011zNRf4RNzcvo/vhQfz6p PzHRshmcPB+gHe6tx1tV2vGJ38ct1Nci9yCQDcy0oYDx9pGC6rXnsMF1Pi5Uokt/1Kju 96DtS8S4LeL9pTuktR0cewzxq7PuH7RTpwEX+LuVbNv+7+axVVRnYpFMIocx10o3taoz RyMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=0Pl3hBxZTqS7t6wbtH0Om8A7aicbQgQuPXay4H9gSiM=; fh=RPAmrUlnQQdc1FhCirEqyhGh/OnPyRxUfAdj7ygPMx4=; b=O1l/T0C6fef6xzLc+Lpp7MzBi2VZp8v/jzMuMqpUxeJLOxqgMlzvHNc+rQqJ+9MsN2 x8JW28bEl5CslyJltdT8Qup5Z1U8SP33+n6o4gRDO59XIEc759sYwVwkFnIyhIu6QNFk C9pWLjrWP1ewRybGf8FoWO/ImWQXp6ste2DMNSBHa0vyQAgM7fgVC0UwJYJdrCqsI5M5 xanMnCOoxkLPckgjE9VXCrd6w5CnwnEqEG4tXkfBqkNVhCPISoDC4nHv80aiYcmr6uor JFdnmMkVmBGFKDw5Hdv0//fedutF5lgQW8RNdZtMrYjO9dsQ0/5YYiyFpnhIra3VCT26 lwuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=X1zStBcu; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id e69-20020a636948000000b005bda018db99si5860265pgc.451.2023.11.13.11.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:14:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=X1zStBcu; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 667B88028FCD; Mon, 13 Nov 2023 11:14:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232112AbjKMTOj (ORCPT + 30 others); Mon, 13 Nov 2023 14:14:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231840AbjKMTOT (ORCPT ); Mon, 13 Nov 2023 14:14:19 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE7D11727; Mon, 13 Nov 2023 11:14:14 -0800 (PST) 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 37E401F88D; Mon, 13 Nov 2023 19:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1699902853; 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=0Pl3hBxZTqS7t6wbtH0Om8A7aicbQgQuPXay4H9gSiM=; b=X1zStBcucLDp7WpLf93CvypzJkg224MuMGfGMtRudRFzgQHf18v/tbV1wyz1utEH4Kx9ur 5teIxEU6gfdFQSp3bqY6arFrcdOdBAZsHhrOLN9IkEWofP509kx075uiTpHKfdsSP1f/ei OFSLSHBOTKxRVbmTKpn0mOziI7DX8vY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1699902853; 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=0Pl3hBxZTqS7t6wbtH0Om8A7aicbQgQuPXay4H9gSiM=; b=7Ue2H1I0sTX6CLyuq/0bLGA2DY+hI6S3LLF/VGrteCc7gKBnRxO0qsOahDmsdbPnwvPhcw zEwQvnlEhvqMysCg== 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 DCED513907; Mon, 13 Nov 2023 19:14:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OPcxNYR1UmVFOgAAMHmgww (envelope-from ); Mon, 13 Nov 2023 19:14:12 +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 11/20] mm/slab: consolidate includes in the internal mm/slab.h Date: Mon, 13 Nov 2023 20:13:52 +0100 Message-ID: <20231113191340.17482-33-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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 11:14:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782477382697027077 X-GMAIL-MSGID: 1782477382697027077 The #include's are scattered at several places of the file, but it does not seem this is needed to prevent any include loops (anymore?) so consolidate them at the top. Also move the misplaced kmem_cache_init() declaration away from the top. Signed-off-by: Vlastimil Babka --- mm/slab.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 6e76216ac74e..c278f8b15251 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -1,10 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef MM_SLAB_H #define MM_SLAB_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + /* * Internal slab definitions */ -void __init kmem_cache_init(void); #ifdef CONFIG_64BIT # ifdef system_has_cmpxchg128 @@ -209,11 +221,6 @@ static inline size_t slab_size(const struct slab *slab) return PAGE_SIZE << slab_order(slab); } -#include -#include -#include -#include - #ifdef CONFIG_SLUB_CPU_PARTIAL #define slub_percpu_partial(c) ((c)->partial) @@ -346,14 +353,6 @@ static inline int objs_per_slab(const struct kmem_cache *cache, return slab->objects; } -#include -#include -#include -#include -#include -#include -#include - /* * State of the slab allocator. * @@ -404,6 +403,7 @@ gfp_t kmalloc_fix_flags(gfp_t flags); /* Functions provided by the slab allocators */ int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags); +void __init kmem_cache_init(void); void __init new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags); extern void create_boot_cache(struct kmem_cache *, const char *name,