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 6EC7BC64EC4 for ; Fri, 10 Mar 2023 10:32:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F9A16B0078; Fri, 10 Mar 2023 05:32:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5071B6B007B; Fri, 10 Mar 2023 05:32:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3ACC26B007E; Fri, 10 Mar 2023 05:32:19 -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 1E7C86B007B for ; Fri, 10 Mar 2023 05:32:19 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id ED2EE1611D9 for ; Fri, 10 Mar 2023 10:32:18 +0000 (UTC) X-FDA: 80552623956.15.625BBC4 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf21.hostedemail.com (Postfix) with ESMTP id 085141C001A for ; Fri, 10 Mar 2023 10:32:15 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="jM/aSqo5"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=ZxQ4ujXv; spf=pass (imf21.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678444336; 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=wKAQjtPeEdruvdiu+k5gGLS8R7rVo9ZpEqr34/mOg1w=; b=Qdl06N5UQ5btycrN/nOD7CqciX1kq/bV/L9N0UtDcnks1D79knB3qYqAFbcBPYhZHukOoU rRqI/kH3L84NKV3TOY8NbGoIzpxsHXoeqi8s4tuyjk5iunonB1mh1jUyDckJt80DskfNX1 0l5D7k0xPQD1jIX9zY79c3En6JgTywg= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="jM/aSqo5"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=ZxQ4ujXv; spf=pass (imf21.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678444336; a=rsa-sha256; cv=none; b=pizaGx00xPzb0cotk5kC69ZzHi/PeAe4R1NNemVPq0c5QhGyGj3NHhLFPYXaf+r6d5/rm0 iO5CnZHg2BElWVzTrJij0Kfyg3pi/je5L5FLN9qvzxsDzTqIJnmlcEDCnCO803i6fqO+30 vTAeF1ZsBcVLM3ZJ0AF8AwokDUFNDFA= 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 C680520654; Fri, 10 Mar 2023 10:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1678444334; 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=wKAQjtPeEdruvdiu+k5gGLS8R7rVo9ZpEqr34/mOg1w=; b=jM/aSqo5eeEsG1bbB+HEHDUxiDbo5qCgxkS1lMdG/LTijo7v609GwIH6wOGPK5ENW25w5B aLm6T/mGGqOwcuE9DxA+GKqD2ccwar2W9/NBSOeEe5sv4m5mnrq+A1XLnPFkk6V8+rT26N 0xdaTOXfF4GxqANU4uwlYiu8VUgjyOs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1678444334; 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=wKAQjtPeEdruvdiu+k5gGLS8R7rVo9ZpEqr34/mOg1w=; b=ZxQ4ujXvWDQr+knM1ffeWycdMvA+7Hpc5bwayOqfox5fa6vKydvQWhBrjfL8vVJIsvKsYZ ruYlhz5R2udyovCQ== 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 89A8813592; Fri, 10 Mar 2023 10:32:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UIQAIS4HC2SsXQAAMHmgww (envelope-from ); Fri, 10 Mar 2023 10:32:14 +0000 From: Vlastimil Babka To: Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , Andrew Morton , linux-mm@kvack.org, rcu@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, netdev@vger.kernel.org, linux-doc@vger.kernel.org, Vlastimil Babka , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH 2/7] net: skbuff: remove SLOB-specific ifdefs Date: Fri, 10 Mar 2023 11:32:04 +0100 Message-Id: <20230310103210.22372-3-vbabka@suse.cz> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103210.22372-1-vbabka@suse.cz> References: <20230310103210.22372-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 085141C001A X-Stat-Signature: p4cmcud54sdmopu1sibej3w1z1we7zwb X-Rspam-User: X-HE-Tag: 1678444335-208639 X-HE-Meta: U2FsdGVkX1/2mKOxvMcRH8+wQaJ1cDDjG7HePUzQROa86DMdC+H0GW4D6dh526u5MPi0O+NKHE8B8tXJZrRr8HD3QXhYQ22dPa+H1X9xDz1p0Qn6S7TM6h02Atar1vxGHUIW/cAZbFOzxKiCsfGR4Ci63wsv62WOD4hK++B5A9SsxAPfgz7D5MP7n95ayiAKGBXoyK7MI9GzStyZ9GOHVMZZ0qXBGI/Te27yDM+5pxYaelHGfa0mJ4CJrIumuqv6QpLSV9Rn3zvmF95axp2sXv9pegR9dlkY6JjTQ0jM/ll2eIAOxrrStdIM0s7LaXPXq6agdwDM5tRmqZbMraKO4uz9C/7e0f0wPTvKJ/hFtPmG6TmsQsssIuUulNsN+B/ltVjewRU9pbRj2tmrWl4IN2SfEX3i3u/BD5qwxQuVs/csHjMe6lc9GfrxmZh4ByEEyssfhJNfzxaYc+yp3Rhtesv+LlbnNbRLV99OBavKpoHjWrVGWrDiL1bbpdDnWajXJ/9cGt8nqIjFYQYuAYYc+RRGJc1uNo1KCR4lGK72kmlncaCDHoVeNayrMtp8Rys112MblfG4Pm1wnZSjRmSPpv2AhG1J4sCfRR5nNsbR00tkulsrSDqZeb0Zc8Txb8y/k58gXLejq97MZoqpHJsrHA+FAy8e+/mcxsLdbCIDh8BCHcRwq8eedRuSpciL+m8cTcUmFajIAYre+5eYUaIQhvZdHsl8ixEN4ZhqTfcKRApczBa3DL/f6NvBTNLFduTpvWttvJe2oOx6vHvXy3X8G+bVYtmXKvgXgq5T0DBVlzoyu7We0h8dx6/w5pfhoNAXB1HDb+hF5rjrFJXkaS2yproRwi6lAYqR1edH6CVG0zqGjNlF62QemnEm+vrgKcZ4kbdyG0ULw2uzT10pEkuUR+ErhpaKIdeszXOpmjWdLDx2/HPVOXLZ+tOt4fjf31us7rTr5uN5eEOyQh2ELkZ V07gpm/a 4WK7KeaXp2F2k0aW0zyONuHCHbLj+cmL45QxM4zLz62KZzvNBDIAQkl1R/IkO+9rfZObANHMuaKmdAp/UgDzj6d5IJ+B9o+v8FKp/SltzGdqWk55um0TsYSIDC3N9nFNixR99Fgs4qgk8kZdiOzioffOyhlfj57mcgBY1t2SDifOsktLrop2dilvOXahEy0VMR7Nnv+Dt4+hxHvVHrtH596c2zFcaVxDuf5lJEpNtR+Nkhti+QGlHEvx4tJX7574iid/iax46AwZEdD4xDzSyGfp3ni8hWIEPvPctgq3EMlvrlQdJBmRgdDlRV57EfVOJdymWcsAGCL76qNGMfONA5eH7pKdlWSswAiJ9ZfEorvU5tb8sp+0wQgAxJsYjGChu/v1Y6bSUvyXsZKmh+k2NKZUzUxc1SL/H5CigbWptgBjTT1zzYFnGloV3Dg== 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: As the comment for HAVE_SKB_SMALL_HEAD_CACHE says: > skb_small_head_cache and related code is only supported > for CONFIG_SLAB and CONFIG_SLUB. > As soon as SLOB is removed from the kernel, we can clean up this. With CONFIG_SLOB removed, remove HAVE_SKB_SMALL_HEAD_CACHE and make all code that it guards unconditional. Signed-off-by: Vlastimil Babka Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni --- net/core/skbuff.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index eb7d33b41e71..8bba4e91d0d5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -90,15 +90,6 @@ static struct kmem_cache *skbuff_fclone_cache __ro_after_init; static struct kmem_cache *skbuff_ext_cache __ro_after_init; #endif -/* skb_small_head_cache and related code is only supported - * for CONFIG_SLAB and CONFIG_SLUB. - * As soon as SLOB is removed from the kernel, we can clean up this. - */ -#if !defined(CONFIG_SLOB) -# define HAVE_SKB_SMALL_HEAD_CACHE 1 -#endif - -#ifdef HAVE_SKB_SMALL_HEAD_CACHE static struct kmem_cache *skb_small_head_cache __ro_after_init; #define SKB_SMALL_HEAD_SIZE SKB_HEAD_ALIGN(MAX_TCP_HEADER) @@ -115,7 +106,6 @@ static struct kmem_cache *skb_small_head_cache __ro_after_init; #define SKB_SMALL_HEAD_HEADROOM \ SKB_WITH_OVERHEAD(SKB_SMALL_HEAD_CACHE_SIZE) -#endif /* HAVE_SKB_SMALL_HEAD_CACHE */ int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS; EXPORT_SYMBOL(sysctl_max_skb_frags); @@ -514,7 +504,6 @@ static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node, void *obj; obj_size = SKB_HEAD_ALIGN(*size); -#ifdef HAVE_SKB_SMALL_HEAD_CACHE if (obj_size <= SKB_SMALL_HEAD_CACHE_SIZE && !(flags & KMALLOC_NOT_NORMAL_BITS)) { @@ -530,7 +519,6 @@ static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node, goto out; } } -#endif *size = obj_size = kmalloc_size_roundup(obj_size); /* * Try a regular allocation, when that fails and we're not entitled @@ -852,11 +840,9 @@ static bool skb_pp_recycle(struct sk_buff *skb, void *data) static void skb_kfree_head(void *head, unsigned int end_offset) { -#ifdef HAVE_SKB_SMALL_HEAD_CACHE if (end_offset == SKB_SMALL_HEAD_HEADROOM) kmem_cache_free(skb_small_head_cache, head); else -#endif kfree(head); } @@ -4692,7 +4678,6 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); -#ifdef HAVE_SKB_SMALL_HEAD_CACHE /* usercopy should only access first SKB_SMALL_HEAD_HEADROOM bytes. * struct skb_shared_info is located at the end of skb->head, * and should not be copied to/from user. @@ -4704,7 +4689,6 @@ void __init skb_init(void) 0, SKB_SMALL_HEAD_HEADROOM, NULL); -#endif skb_extensions_init(); } -- 2.39.2