From patchwork Tue Feb 20 16:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 203694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp533175dyc; Tue, 20 Feb 2024 08:59:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVVpr2rAfGT5jkxBGnmB8bCYisBxUystDYfCy2QaioRK2+5LtOt8J6BPSJh/ep30JN80lRnc/jLSyTOSOhKBB1i5QlZaA== X-Google-Smtp-Source: AGHT+IEdoiLO0niDLeamCzhaAfCavi0870Z/IsZzwUBRZWKGfBItaYDJUrw5U7kdyuD45tBkwxZl X-Received: by 2002:ad4:4ee6:0:b0:68f:333d:a67d with SMTP id dv6-20020ad44ee6000000b0068f333da67dmr3715070qvb.19.1708448379679; Tue, 20 Feb 2024 08:59:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708448379; cv=pass; d=google.com; s=arc-20160816; b=PdnyPBP6XzFc+EE5Qrdw0/JgpJuRp6gxwCwYhXMBDfvhicUVGNfeHbuO81Z5XziiM4 g6Jf9Yd2AOs9kBbBoB88alNhbZeAbnZIVfuipzwUDPw0Tuy1Azd+RrmHDvmLwVF+GDO/ IZ+oh/E2oVf6/oZHM9yud8/qqytAjO258xc1HL28MxUJFjDr0Y/vK2eZfoga+g2m39Sg +0CYtUFb7XUtEqnc/Cbor6rZaDwDUsHM1PSedKn6ZsrjQcKydhfm9TztaoFfKgxX60Td HmXbfZBSM84ctxBU9DFIiAe0zCUZPw8eZc7h01jeFUIvPZK9FCI9ETgAdlLtX/iFQ+Ei plxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature:dkim-signature:dkim-signature :dkim-signature; bh=c4OC2yNSKLqgnXzwwPex64d+kZgeSX8gpLykWcl/SKw=; fh=H+kigXjdCOVpCxcHPaVg6SgkIx4KR669HTfmciEICLo=; b=lhj3rZKAg/2MhUt6b75CpQb+ZImY/6/M0+2vBx/I+1ODcjsdNIKefjn0qlPWGmQn2U eB2hXyeUgJW1ByeJ+6O7XOSd0apzwdf2CPT4FWLmkm44aUYIF+gN/ZuLzwz+tSEbwSNq +zwfXlyDo15t+WAVqmLXh1XYxctAt+Qib8JI7PHWUC2lisLjP3rkv2E6KcWt/xr+lKG1 y1ZX9do85llSJxL+4pz7zwNijmOOHG18lQmpfThJ9eAYUkpwdrP194JF1RTcuzqw6e5E cpE50kdUtlMveNLfsYwWaaVte1wX7f8+Qlt2bOA3egZOA1lxAFKfYtuTPqpxoCvx26Ub 9KbQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=RjcBobBc; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=RjcBobBc; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.cz dkim=pass dkdomain=suse.cz dkim=pass dkdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73392-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73392-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id d8-20020a05621421c800b0068f7e322364si3601128qvh.176.2024.02.20.08.59.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 08:59:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73392-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=RjcBobBc; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=RjcBobBc; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.cz dkim=pass dkdomain=suse.cz dkim=pass dkdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73392-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73392-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 6BC081C22839 for ; Tue, 20 Feb 2024 16:59:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1E7FF77640; Tue, 20 Feb 2024 16:58:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="RjcBobBc"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="JwFYRXTq"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="RjcBobBc"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="JwFYRXTq" Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C6CE76905 for ; Tue, 20 Feb 2024 16:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448328; cv=none; b=V0CkvpTJfxIGYlXPcXfZUPb2k+i9yK8+6dEI+aypQml1ONSpJs8Cp/iIsb6/sRUvQ7BxCVB5rN+Iy42cZ6abJHGSjVDJEpHzahAHNL+bNnSYmVp+tIEBvdxNXM2IHqF/xG/bmRYhoyVzU3I12zprOH/bygGvf94YesvduAaYC5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448328; c=relaxed/simple; bh=OddJ5DHeDgks/i1mqhLaA/c2lRjGQhZqtVTweHMQxDw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qJbpJlIgHFDNm515cFcW/kWm0ypkoYUh9TkaN2hgeHoAXZFVSfG9fceUhJTUel+qjotWef7BE7ejxrFXc1HJllThfVKUkji3y5MvqcAwRg88xc3W++0o+trR5bn4RbLn9C0gYjshVamONZMGa/I5j4afKTLDHbdZjuXC5bPxMUI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=RjcBobBc; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=JwFYRXTq; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=RjcBobBc; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=JwFYRXTq; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 411FC21FBD; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4OC2yNSKLqgnXzwwPex64d+kZgeSX8gpLykWcl/SKw=; b=RjcBobBcQec/R6BNYj9LVtWzct1RqrXs1Hh50ZzAqswNqAlsoooklOUijnTxlI1nWX3Dco vuH3FfKT6Qa+8jU56MYk0OjiBEuJ4EPlTADsYBwQBRR3tlkxiEuAvZVOq++BoGa7z3lyWR aoDDvqQfuzptU51eGvOW8ET9m4xcNHo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4OC2yNSKLqgnXzwwPex64d+kZgeSX8gpLykWcl/SKw=; b=JwFYRXTqoVvqzk23AIOLXuMzXVHV47mrjeIz+Xwiw3CpIAK0JVphGsnYKwgXL6bz1pSKYM u8JpMqFaG3AeHuDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4OC2yNSKLqgnXzwwPex64d+kZgeSX8gpLykWcl/SKw=; b=RjcBobBcQec/R6BNYj9LVtWzct1RqrXs1Hh50ZzAqswNqAlsoooklOUijnTxlI1nWX3Dco vuH3FfKT6Qa+8jU56MYk0OjiBEuJ4EPlTADsYBwQBRR3tlkxiEuAvZVOq++BoGa7z3lyWR aoDDvqQfuzptU51eGvOW8ET9m4xcNHo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4OC2yNSKLqgnXzwwPex64d+kZgeSX8gpLykWcl/SKw=; b=JwFYRXTqoVvqzk23AIOLXuMzXVHV47mrjeIz+Xwiw3CpIAK0JVphGsnYKwgXL6bz1pSKYM u8JpMqFaG3AeHuDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1915E13A93; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GJHYBUXa1GVKXQAAD6G6ig (envelope-from ); Tue, 20 Feb 2024 16:58:45 +0000 From: Vlastimil Babka Date: Tue, 20 Feb 2024 17:58:25 +0100 Subject: [PATCH 1/3] mm, slab: deprecate SLAB_MEM_SPREAD flag Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240220-slab-cleanup-flags-v1-1-e657e373944a@suse.cz> References: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> In-Reply-To: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino Cc: Zheng Yejian , Xiongwei Song , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Vlastimil Babka , Steven Rostedt X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1731; i=vbabka@suse.cz; h=from:subject:message-id; bh=OddJ5DHeDgks/i1mqhLaA/c2lRjGQhZqtVTweHMQxDw=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBl1No9wmY1D3tW/Cy64eGuViYQaGuyi/p0I9ZML 1aOynVc32uJATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCZdTaPQAKCRC74LB10kWI mgcCB/9ah3oEc1eVnw/8rJfS4V2CrkLLtkwjbxIk0QO1Y0hJK6fdAYScMioTiqBbFz2fYneiEib unIEdHVvpl+axQ6ErHTm8ti5I3TyU4MWWs83wr4c2KDwr6M1dl/PvpBvMynOrlEipojbhKdzBUG M7r0KCDPswYFY/bWZNDMSglmuV4rdwkzWpAlBnmUSK1ARpf/CL/dLuc8EoPraztYVvBTuVl7/sS yeaXUhG1SHr+j+ewEl+8Ng27ejIu7HOiappS80WyxN0awRxddapuB+uGZB7Oe88F1qMmz88+5/T Zwh17MejM5IUm/PPb+QCsLgpmJBon11M/C4qFpCzuDCoY2ct X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 Authentication-Results: smtp-out1.suse.de; none X-Spam-Level: X-Spam-Score: -3.81 X-Spamd-Result: default: False [-3.81 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BAYES_HAM(-0.01)[46.40%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_RATELIMIT(0.00)[to_ip_from(RLqdadssyy1w6u3twx3pq4jyny)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_TWELVE(0.00)[20]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FREEMAIL_TO(0.00)[linux.com,kernel.org,google.com,lge.com,linux-foundation.org,linux.dev,gmail.com,arm.com]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Spam-Flag: NO X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791437968119590710 X-GMAIL-MSGID: 1791437968119590710 The SLAB_MEM_SPREAD flag used to be implemented in SLAB, which was removed. SLUB instead relies on the page allocator's NUMA policies. Change the flag's value to 0 to free up the value it had, and mark it for full removal once all users are gone. Reported-by: Steven Rostedt Closes: https://lore.kernel.org/all/20240131172027.10f64405@gandalf.local.home/ Signed-off-by: Vlastimil Babka Tested-by: Xiongwei Song Reviewed-by: Xiongwei Song Reviewed-by: Chengming Zhou Reviewed-by: Roman Gushchin --- include/linux/slab.h | 5 +++-- mm/slab.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index b5f5ee8308d0..6252f44115c2 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -96,8 +96,6 @@ */ /* Defer freeing slabs to RCU */ #define SLAB_TYPESAFE_BY_RCU ((slab_flags_t __force)0x00080000U) -/* Spread some memory over cpuset */ -#define SLAB_MEM_SPREAD ((slab_flags_t __force)0x00100000U) /* Trace allocations and frees */ #define SLAB_TRACE ((slab_flags_t __force)0x00200000U) @@ -164,6 +162,9 @@ #endif #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */ +/* Obsolete unused flag, to be removed */ +#define SLAB_MEM_SPREAD 0 + /* * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests. * diff --git a/mm/slab.h b/mm/slab.h index 54deeb0428c6..f4534eefb35d 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -469,7 +469,6 @@ static inline bool is_kmalloc_cache(struct kmem_cache *s) SLAB_STORE_USER | \ SLAB_TRACE | \ SLAB_CONSISTENCY_CHECKS | \ - SLAB_MEM_SPREAD | \ SLAB_NOLEAKTRACE | \ SLAB_RECLAIM_ACCOUNT | \ SLAB_TEMPORARY | \ From patchwork Tue Feb 20 16:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 203695 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp533330dyc; Tue, 20 Feb 2024 08:59:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWAxHDzPj/aiMKwC6vfiztirnk2Tzf8FzT6Pe7O//ioGOkiI8sMEp/Ypp6cZTKn2Y4MO2KDBmRRu16Rqo5DJZOH1bTQaQ== X-Google-Smtp-Source: AGHT+IFO3BZ0AcpYHxDDmh2EEZgPJ/bmxx8s9Uj14fvp2c6ge6h5/GqMv+SFLGhQgRWXxH0y2rRX X-Received: by 2002:a05:620a:98a:b0:785:db45:248b with SMTP id x10-20020a05620a098a00b00785db45248bmr28879625qkx.9.1708448394669; Tue, 20 Feb 2024 08:59:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708448394; cv=pass; d=google.com; s=arc-20160816; b=PjEIqS1R49xnV/UnKsokn8EJFdrp97u5CQDs0NU+vtVkfawyipWFmkqeds8ZCyiEln seHpplsRRSuoohCapPlvwQ+goLcX1ycLP+l9ZPLuathoDbKzuxegeG8DT11fwbCoJ9Sg wTE6/3v8v8dxBm571eQgV6HJHN04RW3zn1lOu4GuUPjT5X1q9T2eca5AqKd/bz7Ee6Vt u2MgKi4P3DLtT9hEjnfiHErfjwMNpY+rPsdY8aqhBuCRKpzN6xJ6jcS6xteAZR2SGQ9o A9APh/ElgPFMXduKjGTkWg9lIeghVEIypRk+u371f/Rl2sNtS8UAFT9AtlTl6ujrOWR2 00xw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature:dkim-signature:dkim-signature :dkim-signature; bh=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; fh=iiw6AxRn834Rp3X3mGFcQcmYTlAscmlxQxZZCAoI+ts=; b=m9RDNoYWQPB8PLfHZtEo9KWFkxybWfdCndndo2Rvgu2dkXYOAFPp+jaIh6qG3fcDKI Lqhyx+PTwUaiF31rZ8f98VCmM+xYEbk1l1QF+9vENHiM+tBwM/01OL8ogv/WI7AWjs86 9PSTEGVR+YwWbP9he4dAQTjG/s0agRiB0UEJ0uaUXtmrnTd1MaRCj3S4ChW+OMlBqvTV t1rkg7ytM9Pn7iWZL6pIdB2VNOhmJsdyOotR3hYJCeryC72KQSP1vy+WCOYjGeQtxZdu N4chg1i9SpwhtQMKeCqG4WixJXTSP18kTNexYo9TdC0FriuVydULYPRzNNvJYcbFGia9 0BhQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=uUF45UK4; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=uUF45UK4; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.cz dkim=pass dkdomain=suse.cz dkim=pass dkdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73395-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73395-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y6-20020a05620a44c600b007876b5f3ff7si4904532qkp.385.2024.02.20.08.59.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 08:59:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73395-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=uUF45UK4; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=uUF45UK4; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; arc=pass (i=1 spf=pass spfdomain=suse.cz dkim=pass dkdomain=suse.cz dkim=pass dkdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73395-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73395-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 67DA51C23D5E for ; Tue, 20 Feb 2024 16:59:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 810EB779F0; Tue, 20 Feb 2024 16:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="uUF45UK4"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="OFqlH8t9"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="uUF45UK4"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="OFqlH8t9" Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 473A676906 for ; Tue, 20 Feb 2024 16:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448330; cv=none; b=FYjTzrJGuIEDM+uCopIZVxkBZSfCMnlyciMzvhlshcvvnsgsYY+yzxGRULy7a4lXMeQl5dfzfWXvUEE901MWkSU8w14okwoS/l70A1MVxfDpLu1QzAwBmfPJvhZJICU/AJTHIypF1M3vDWfbKf+HZ4XueWGvA6084hpwJTorK4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448330; c=relaxed/simple; bh=QNJRHlmDrZynn1U8943ItQzMzlmVSA/ls2WuKXFCGgI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y8N++RrlOfKBvQHWKluli6LiXCDym9L8EYQe4PTxE2BVzI1HcyVUOuwU2avNctIsNiOYoVF6NdBvgs4EKU85NzpGq41cC8unuGJ0msUASwIrASbPqC2jY13oLfb3WUho5jQ4o8UjxXkuvUhhKLzGnRhRD8FiUqxr3+I97eOhs1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=uUF45UK4; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=OFqlH8t9; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=uUF45UK4; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=OFqlH8t9; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5A1831F8AB; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=uUF45UK4Gg0LF+iJE/VcP7egXwqgT9qiIRxcdAKOPbnKBMHr5e0Kc6KbsY0AADOvwtoseX 8bqbKM62R19Io+mgv3AC8zKACBOnh+ucIdm9sKv734diu8FSMMcfBXmAZx8zgeRmnp+3AC kBzONf6JMFdnjZAp4mpKVa3NNCfjdjY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=OFqlH8t9pKEKJdK2N0I8c7Lb3NLXdlRGvN6eB+34GXU9VHPADtBLvFszaOhIkIU4LDVOTV 3ivEka8pFYPbwLBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=uUF45UK4Gg0LF+iJE/VcP7egXwqgT9qiIRxcdAKOPbnKBMHr5e0Kc6KbsY0AADOvwtoseX 8bqbKM62R19Io+mgv3AC8zKACBOnh+ucIdm9sKv734diu8FSMMcfBXmAZx8zgeRmnp+3AC kBzONf6JMFdnjZAp4mpKVa3NNCfjdjY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=OFqlH8t9pKEKJdK2N0I8c7Lb3NLXdlRGvN6eB+34GXU9VHPADtBLvFszaOhIkIU4LDVOTV 3ivEka8pFYPbwLBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3A49B13A94; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SA77DUXa1GVKXQAAD6G6ig (envelope-from ); Tue, 20 Feb 2024 16:58:45 +0000 From: Vlastimil Babka Date: Tue, 20 Feb 2024 17:58:26 +0100 Subject: [PATCH 2/3] mm, slab: use an enum to define SLAB_ cache creation flags Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240220-slab-cleanup-flags-v1-2-e657e373944a@suse.cz> References: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> In-Reply-To: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino Cc: Zheng Yejian , Xiongwei Song , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Vlastimil Babka X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6508; i=vbabka@suse.cz; h=from:subject:message-id; bh=QNJRHlmDrZynn1U8943ItQzMzlmVSA/ls2WuKXFCGgI=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBl1No/ygsO500Ssb9XAkmAz2HhpQIKGfJtG4YPQ qOlBzr+WcWJATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCZdTaPwAKCRC74LB10kWI mr1zCACerO93/YH+0xXf3hmj9+Ly4RkBTkbOhSmsHedvITBcHdJXKdDsWBSKDvHBhaBrbYG/yw4 ETY87JH94vda42AmV7XJhgJazaGSBZrOXYqc7+p6AXMPbIakyeejJaZC3auz5lG1smlQTfkCyzw UguX8Eka+Rs2SfLGYJnTUeWJPVbI1IV3yoymNc2ee2+E53VoW8WEHLnfawSrp9nF54jEEM9kL5r 3RrsKEiI2lbguKI8+3HzLF+PPT5Ufm46y2zTqlcQkchaGnx/pL3wvZRKgiUrvKXLxjXnlsvx83f X+J/gmD8lECXksKyAhTcae7i21y5P2kZEg7iHI6844Z8mnqI X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [-5.60 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; R_RATELIMIT(0.00)[to_ip_from(RLqdadssyy1w6u3twx3pq4jyny)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[19]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FREEMAIL_TO(0.00)[linux.com,kernel.org,google.com,lge.com,linux-foundation.org,linux.dev,gmail.com,arm.com]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -5.60 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791437983959444586 X-GMAIL-MSGID: 1791437983959444586 The values of SLAB_ cache creation flagsare defined by hand, which is tedious and error-prone. Use an enum to assign the bit number and a __SF_BIT() macro to #define the final flags. This renumbers the flag values, which is OK as they are only used internally. Signed-off-by: Vlastimil Babka Tested-by: Xiongwei Song Reviewed-by: Xiongwei Song Reviewed-by: Chengming Zhou Reviewed-by: Roman Gushchin --- include/linux/slab.h | 81 ++++++++++++++++++++++++++++++++++++++-------------- mm/slub.c | 6 ++-- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 6252f44115c2..f893a132dd5a 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -21,29 +21,68 @@ #include #include +enum _slab_flag_bits { + _SLAB_CONSISTENCY_CHECKS, + _SLAB_RED_ZONE, + _SLAB_POISON, + _SLAB_KMALLOC, + _SLAB_HWCACHE_ALIGN, + _SLAB_CACHE_DMA, + _SLAB_CACHE_DMA32, + _SLAB_STORE_USER, + _SLAB_PANIC, + _SLAB_TYPESAFE_BY_RCU, + _SLAB_TRACE, +#ifdef CONFIG_DEBUG_OBJECTS + _SLAB_DEBUG_OBJECTS, +#endif + _SLAB_NOLEAKTRACE, + _SLAB_NO_MERGE, +#ifdef CONFIG_FAILSLAB + _SLAB_FAILSLAB, +#endif +#ifdef CONFIG_MEMCG_KMEM + _SLAB_ACCOUNT, +#endif +#ifdef CONFIG_KASAN_GENERIC + _SLAB_KASAN, +#endif + _SLAB_NO_USER_FLAGS, +#ifdef CONFIG_KFENCE + _SLAB_SKIP_KFENCE, +#endif +#ifndef CONFIG_SLUB_TINY + _SLAB_RECLAIM_ACCOUNT, +#endif + _SLAB_OBJECT_POISON, + _SLAB_CMPXCHG_DOUBLE, + _SLAB_FLAGS_LAST_BIT +}; + +#define __SF_BIT(nr) ((slab_flags_t __force)(1U << (nr))) /* * Flags to pass to kmem_cache_create(). * The ones marked DEBUG need CONFIG_SLUB_DEBUG enabled, otherwise are no-op */ /* DEBUG: Perform (expensive) checks on alloc/free */ -#define SLAB_CONSISTENCY_CHECKS ((slab_flags_t __force)0x00000100U) +#define SLAB_CONSISTENCY_CHECKS __SF_BIT(_SLAB_CONSISTENCY_CHECKS) /* DEBUG: Red zone objs in a cache */ -#define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400U) +#define SLAB_RED_ZONE __SF_BIT(_SLAB_RED_ZONE) /* DEBUG: Poison objects */ -#define SLAB_POISON ((slab_flags_t __force)0x00000800U) +#define SLAB_POISON __SF_BIT(_SLAB_POISON) /* Indicate a kmalloc slab */ -#define SLAB_KMALLOC ((slab_flags_t __force)0x00001000U) +#define SLAB_KMALLOC __SF_BIT(_SLAB_KMALLOC) /* Align objs on cache lines */ -#define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U) +#define SLAB_HWCACHE_ALIGN __SF_BIT(_SLAB_HWCACHE_ALIGN) /* Use GFP_DMA memory */ -#define SLAB_CACHE_DMA ((slab_flags_t __force)0x00004000U) +#define SLAB_CACHE_DMA __SF_BIT(_SLAB_CACHE_DMA) /* Use GFP_DMA32 memory */ -#define SLAB_CACHE_DMA32 ((slab_flags_t __force)0x00008000U) +#define SLAB_CACHE_DMA32 __SF_BIT(_SLAB_CACHE_DMA32) /* DEBUG: Store the last owner for bug hunting */ -#define SLAB_STORE_USER ((slab_flags_t __force)0x00010000U) +#define SLAB_STORE_USER __SF_BIT(_SLAB_STORE_USER) /* Panic if kmem_cache_create() fails */ -#define SLAB_PANIC ((slab_flags_t __force)0x00040000U) +#define SLAB_PANIC __SF_BIT(_SLAB_PANIC) /* * SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS! * @@ -95,19 +134,19 @@ * Note that SLAB_TYPESAFE_BY_RCU was originally named SLAB_DESTROY_BY_RCU. */ /* Defer freeing slabs to RCU */ -#define SLAB_TYPESAFE_BY_RCU ((slab_flags_t __force)0x00080000U) +#define SLAB_TYPESAFE_BY_RCU __SF_BIT(_SLAB_TYPESAFE_BY_RCU) /* Trace allocations and frees */ -#define SLAB_TRACE ((slab_flags_t __force)0x00200000U) +#define SLAB_TRACE __SF_BIT(_SLAB_TRACE) /* Flag to prevent checks on free */ #ifdef CONFIG_DEBUG_OBJECTS -# define SLAB_DEBUG_OBJECTS ((slab_flags_t __force)0x00400000U) +# define SLAB_DEBUG_OBJECTS __SF_BIT(_SLAB_DEBUG_OBJECTS) #else # define SLAB_DEBUG_OBJECTS 0 #endif /* Avoid kmemleak tracing */ -#define SLAB_NOLEAKTRACE ((slab_flags_t __force)0x00800000U) +#define SLAB_NOLEAKTRACE __SF_BIT(_SLAB_NOLEAKTRACE) /* * Prevent merging with compatible kmem caches. This flag should be used @@ -119,23 +158,23 @@ * - performance critical caches, should be very rare and consulted with slab * maintainers, and not used together with CONFIG_SLUB_TINY */ -#define SLAB_NO_MERGE ((slab_flags_t __force)0x01000000U) +#define SLAB_NO_MERGE __SF_BIT(_SLAB_NO_MERGE) /* Fault injection mark */ #ifdef CONFIG_FAILSLAB -# define SLAB_FAILSLAB ((slab_flags_t __force)0x02000000U) +# define SLAB_FAILSLAB __SF_BIT(_SLAB_FAILSLAB) #else # define SLAB_FAILSLAB 0 #endif /* Account to memcg */ #ifdef CONFIG_MEMCG_KMEM -# define SLAB_ACCOUNT ((slab_flags_t __force)0x04000000U) +# define SLAB_ACCOUNT __SF_BIT(_SLAB_ACCOUNT) #else # define SLAB_ACCOUNT 0 #endif #ifdef CONFIG_KASAN_GENERIC -#define SLAB_KASAN ((slab_flags_t __force)0x08000000U) +#define SLAB_KASAN __SF_BIT(_SLAB_KASAN) #else #define SLAB_KASAN 0 #endif @@ -145,10 +184,10 @@ * Intended for caches created for self-tests so they have only flags * specified in the code and other flags are ignored. */ -#define SLAB_NO_USER_FLAGS ((slab_flags_t __force)0x10000000U) +#define SLAB_NO_USER_FLAGS __SF_BIT(_SLAB_NO_USER_FLAGS) #ifdef CONFIG_KFENCE -#define SLAB_SKIP_KFENCE ((slab_flags_t __force)0x20000000U) +#define SLAB_SKIP_KFENCE __SF_BIT(_SLAB_SKIP_KFENCE) #else #define SLAB_SKIP_KFENCE 0 #endif @@ -156,9 +195,9 @@ /* The following flags affect the page allocator grouping pages by mobility */ /* Objects are reclaimable */ #ifndef CONFIG_SLUB_TINY -#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000U) +#define SLAB_RECLAIM_ACCOUNT __SF_BIT(_SLAB_RECLAIM_ACCOUNT) #else -#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0) +#define SLAB_RECLAIM_ACCOUNT 0 #endif #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */ diff --git a/mm/slub.c b/mm/slub.c index 2ef88bbf56a3..a93c5a17cbbb 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -306,13 +306,13 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s) /* Internal SLUB flags */ /* Poison object */ -#define __OBJECT_POISON ((slab_flags_t __force)0x80000000U) +#define __OBJECT_POISON __SF_BIT(_SLAB_OBJECT_POISON) /* Use cmpxchg_double */ #ifdef system_has_freelist_aba -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0x40000000U) +#define __CMPXCHG_DOUBLE __SF_BIT(_SLAB_CMPXCHG_DOUBLE) #else -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0U) +#define __CMPXCHG_DOUBLE 0 #endif /* From patchwork Tue Feb 20 16:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 203693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp533052dyc; Tue, 20 Feb 2024 08:59:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVEuqw1BVah4EkYFdfISINv0hqd7m7k+ZV30xGLNSJwidn9aNhb8zEjChJnGrjIh7FR2OoJJFmMYZPU4kzO/+q4jCc0gg== X-Google-Smtp-Source: AGHT+IHq+NjkHKkGphun16+WJNnHrqcUVSnf5dDQu4uWbg5Yhmn6X3JABXsZwu1vjQBTV1PaI8eO X-Received: by 2002:a17:906:355b:b0:a3f:1139:13bc with SMTP id s27-20020a170906355b00b00a3f113913bcmr1333598eja.74.1708448364524; Tue, 20 Feb 2024 08:59:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708448364; cv=pass; d=google.com; s=arc-20160816; b=oayeGXQDw8vfgEcjV+O6q+NuohObwW80OL/7hAzN8cw0g7u6K0/eBJe/EZiy2AgHke muI/NTezXeyZWxI0Yems4GiQf474vpFRGjVx9NvMUUz75hO7zHAnKCgOxa2O7RxDTSrj CXQgv8JZjZtsAZTR6l2Ved3VCGw71Ri1GbU2nhdalm5o0QzfDzBLo2s9el/n/CJImYob t07YcX/aPIxj5tF9sVpdyJn0F79qviVr4o1yS72lp5iZ2l7x+uq3Mj3IR7i6vE9mzvM3 ubXogaGAyoLSTNSzyQW8THsQfVjUeYIBCZZPvn1OZK6LjyHZXpM0vl02iRnZ3NKXgQMK dtig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from; bh=bDwZLyEk1WMILC8wJ4ZtAG5w+ulImAgRHCRAxEjy7QI=; fh=iiw6AxRn834Rp3X3mGFcQcmYTlAscmlxQxZZCAoI+ts=; b=JTVrq3li6kVowWqJucAkWC0ydDTiNTeXnU8M0+yEjQPMx2zqpyydnbCWRtOHmCpmc1 +QkdY2X8XKeQgHFx1dEkEAI939zfbDKjKhlBlkWgHVulntjcAwqdh5Ecb3EnFPoWJKra DJI7bzrwkSPSQQ/xLcshbG8ZytGMuP7PRcLXFul31QrtGQ5TZRdMW02X2aWzVOLWuCzK dv/u+V6niz/k/F81iMaOG43zLejoVGYQ2yfJeOHNHB+bQb690YF797KDTnn4zTPprPe+ x6FhB9h0p3zzrNaQlmkapov1FKu1qLtq3xa5LAwKzC4d+LdEzr5nh9Rcn/3WjgBtNjMz McVg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73393-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73393-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id g27-20020a170906395b00b00a3ba6fe0848si3516391eje.765.2024.02.20.08.59.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 08:59:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73393-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=suse.cz); spf=pass (google.com: domain of linux-kernel+bounces-73393-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73393-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id F32641F22174 for ; Tue, 20 Feb 2024 16:59:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CC53B76C9B; Tue, 20 Feb 2024 16:58:50 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5358076907 for ; Tue, 20 Feb 2024 16:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448329; cv=none; b=M0hTwUImmOUAAZ0aLwv1YBq7jJY9pWzLX7Gm62oBmJdz7CLmSOIFizo9/Xu92joRWXORXUj5OFBY6vGmTI5SKC7/95Nx1Au/ttnENBuOu4B9lAGZFtX6rZ46Zpj1KWg0DPURiJC0V00HBuNw4yEdDwIFL5elzYz6XgnLiy5UFbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448329; c=relaxed/simple; bh=8dSL5GfjNj31WZBzU1RArK2AdDIYjJIAED64yK7aPeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r7OsfIc3nOYVJybjtR46mboT3r4FWCSDZKuOw68iSqxXEix4zSS4wKBqyYxK1Mx+bDB5vhIn1BPQ+EcNDM+MX2APfgVDCJwJbmFqzX/0yovXJ65llPA28ey6Idl73HUBDRE5cdK59s5MCWyEHgghqtNE/pGe5QrDJ94vmq6OtE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7BAC91F8AC; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 578FD139D0; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CEsVFUXa1GVKXQAAD6G6ig (envelope-from ); Tue, 20 Feb 2024 16:58:45 +0000 From: Vlastimil Babka Date: Tue, 20 Feb 2024 17:58:27 +0100 Subject: [PATCH 3/3] mm, slab, kasan: replace kasan_never_merge() with SLAB_NO_MERGE Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240220-slab-cleanup-flags-v1-3-e657e373944a@suse.cz> References: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> In-Reply-To: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino Cc: Zheng Yejian , Xiongwei Song , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Vlastimil Babka X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3299; i=vbabka@suse.cz; h=from:subject:message-id; bh=8dSL5GfjNj31WZBzU1RArK2AdDIYjJIAED64yK7aPeY=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBl1NpC+Ron5uAKKATthXFJII/xHLgqduJBWbRQt JULEgGEAwCJATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCZdTaQgAKCRC74LB10kWI mt6zB/9ix1+cbRLwfxeQ4PhmyOPOXIy8AuaLRA62hsETFxjPOeumiQBXsvdbnzwsuTrbTPtKCkZ d9K8yRw2rpCG80loeAT/9uGKYzkw3j1XJrIDpXnpsp8/Jtb8zF38E0za2jDekAKVKziUs+xQQ1c VGAgxP7oyKW/Scrkzja41qVLuoQIjHK0k+XLXLFgkgs+iCPInGvRs4Nw50YuoG4okbZHICuchYX EJ07EGSqae4vCKCv3jipCwptC1gLJZ1gNSnfYu6Xla4IZmsWsXnVgCegTbcY8e9LdmySCBYecUL 5FttxJXT+6E5QTHUN3Tw59fKT1yFq1PkGQFvhgv0TDslB5er X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 X-Spam-Level: Authentication-Results: smtp-out2.suse.de; none X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; TAGGED_RCPT(0.00)[]; REPLY(-4.00)[] X-Spam-Score: -4.00 X-Rspamd-Queue-Id: 7BAC91F8AC X-Spam-Flag: NO X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791437951922205160 X-GMAIL-MSGID: 1791437951922205160 The SLAB_KASAN flag prevents merging of caches in some configurations, which is handled in a rather complicated way via kasan_never_merge(). Since we now have a generic SLAB_NO_MERGE flag, we can instead use it for KASAN caches in addition to SLAB_KASAN in those configurations, and simplify the SLAB_NEVER_MERGE handling. Signed-off-by: Vlastimil Babka Tested-by: Xiongwei Song Reviewed-by: Chengming Zhou Reviewed-by: Andrey Konovalov --- include/linux/kasan.h | 6 ------ mm/kasan/generic.c | 16 ++++------------ mm/slab_common.c | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index dbb06d789e74..70d6a8f6e25d 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -429,7 +429,6 @@ struct kasan_cache { }; size_t kasan_metadata_size(struct kmem_cache *cache, bool in_object); -slab_flags_t kasan_never_merge(void); void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, slab_flags_t *flags); @@ -446,11 +445,6 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache, { return 0; } -/* And thus nothing prevents cache merging. */ -static inline slab_flags_t kasan_never_merge(void) -{ - return 0; -} /* And no cache-related metadata initialization is required. */ static inline void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index df6627f62402..d8b78d273b9f 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -334,14 +334,6 @@ DEFINE_ASAN_SET_SHADOW(f3); DEFINE_ASAN_SET_SHADOW(f5); DEFINE_ASAN_SET_SHADOW(f8); -/* Only allow cache merging when no per-object metadata is present. */ -slab_flags_t kasan_never_merge(void) -{ - if (!kasan_requires_meta()) - return 0; - return SLAB_KASAN; -} - /* * Adaptive redzone policy taken from the userspace AddressSanitizer runtime. * For larger allocations larger redzones are used. @@ -372,13 +364,13 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, /* * SLAB_KASAN is used to mark caches that are sanitized by KASAN * and that thus have per-object metadata. - * Currently this flag is used in two places: + * Currently this flag is used in one place: * 1. In slab_ksize() to account for per-object metadata when * calculating the size of the accessible memory within the object. - * 2. In slab_common.c via kasan_never_merge() to prevent merging of - * caches with per-object metadata. + * Additionally, we use SLAB_NO_MERGE to prevent merging of caches + * with per-object metadata. */ - *flags |= SLAB_KASAN; + *flags |= SLAB_KASAN | SLAB_NO_MERGE; ok_size = *size; diff --git a/mm/slab_common.c b/mm/slab_common.c index 238293b1dbe1..7cfa2f1ce655 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -50,7 +50,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, */ #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ - SLAB_FAILSLAB | SLAB_NO_MERGE | kasan_never_merge()) + SLAB_FAILSLAB | SLAB_NO_MERGE) #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ SLAB_CACHE_DMA32 | SLAB_ACCOUNT)