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 B0979C433EF for ; Wed, 6 Apr 2022 08:17:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47ABB6B0073; Wed, 6 Apr 2022 04:17:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42A996B0074; Wed, 6 Apr 2022 04:17:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F13E6B0075; Wed, 6 Apr 2022 04:17:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0234.hostedemail.com [216.40.44.234]) by kanga.kvack.org (Postfix) with ESMTP id 20B6D6B0073 for ; Wed, 6 Apr 2022 04:17:38 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id CC152183D71E7 for ; Wed, 6 Apr 2022 08:17:27 +0000 (UTC) X-FDA: 79325749734.29.CED93EF Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf04.hostedemail.com (Postfix) with ESMTP id 2751540045 for ; Wed, 6 Apr 2022 08:17:26 +0000 (UTC) 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-out1.suse.de (Postfix) with ESMTPS id A9BD721112; Wed, 6 Apr 2022 08:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1649233045; 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=RKm+GOFV2KYB1BWAybSZADN/gRKWeQ4IXAiDDhhnw68=; b=sY3BkZwLPAUkLJtqY+L/1RcmOtn31BW698NBWNBUNKqRGbl0tgh7fqxCtDIRUKhnyKAfsa hwwnyJ+SvWpLIxIq+PThW7S0I5mckdnRxvqa7MBYfe4NqiDcE8S7eYn9BSeqSwk7X+2z8P 3U2gHJIXas57+nj1JLss+k9hZ3t2LPY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1649233045; 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=RKm+GOFV2KYB1BWAybSZADN/gRKWeQ4IXAiDDhhnw68=; b=xk9cHyuTxTAUUX/cvh4IJhJBTgkZk8PzEyKPDiqUtkbrpQNEjiwOQhnEO4DJnlmVHbr8dY al9mrhbXtwBpWiDA== 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 8354B13A8E; Wed, 6 Apr 2022 08:17:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id bUhXH5VMTWK4YgAAMHmgww (envelope-from ); Wed, 06 Apr 2022 08:17:25 +0000 Message-ID: Date: Wed, 6 Apr 2022 10:17:25 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v2] mm/slub, kunit: Make slub_kunit unaffected by user specified flags Content-Language: en-US To: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: linux-mm@kvack.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Oliver Glitta References: From: Vlastimil Babka In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2751540045 X-Rspam-User: Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=sY3BkZwL; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=xk9cHyuT; dmarc=none; spf=pass (imf04.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Stat-Signature: ubewwk7brhh5gqzoirdt6ax4iipbsipp X-HE-Tag: 1649233046-279164 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: On 4/6/22 08:00, Hyeonggon Yoo wrote: > slub_kunit does not expect other debugging flags to be set when running > tests. When SLAB_RED_ZONE flag is set globally, test fails because the > flag affects number of errors reported. > > To make slub_kunit unaffected by user specified debugging flags, > introduce SLAB_NO_USER_FLAGS to ignore them. With this flag, only flags > specified in the code are used and others are ignored. > > Suggested-by: Vlastimil Babka > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Thanks, applied. > --- > include/linux/slab.h | 7 +++++++ > lib/slub_kunit.c | 10 +++++----- > mm/slab.h | 5 +++-- > mm/slub.c | 3 +++ > 4 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 373b3ef99f4e..11ceddcae9f4 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -112,6 +112,13 @@ > #define SLAB_KASAN 0 > #endif > > +/* > + * Ignore user specified debugging flags. > + * 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) > + > /* The following flags affect the page allocator grouping pages by mobility */ > /* Objects are reclaimable */ > #define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000U) > diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c > index 8662dc6cb509..7a0564d7cb7a 100644 > --- a/lib/slub_kunit.c > +++ b/lib/slub_kunit.c > @@ -12,7 +12,7 @@ static int slab_errors; > static void test_clobber_zone(struct kunit *test) > { > struct kmem_cache *s = kmem_cache_create("TestSlub_RZ_alloc", 64, 0, > - SLAB_RED_ZONE, NULL); > + SLAB_RED_ZONE|SLAB_NO_USER_FLAGS, NULL); > u8 *p = kmem_cache_alloc(s, GFP_KERNEL); > > kasan_disable_current(); > @@ -30,7 +30,7 @@ static void test_clobber_zone(struct kunit *test) > static void test_next_pointer(struct kunit *test) > { > struct kmem_cache *s = kmem_cache_create("TestSlub_next_ptr_free", 64, 0, > - SLAB_POISON, NULL); > + SLAB_POISON|SLAB_NO_USER_FLAGS, NULL); > u8 *p = kmem_cache_alloc(s, GFP_KERNEL); > unsigned long tmp; > unsigned long *ptr_addr; > @@ -75,7 +75,7 @@ static void test_next_pointer(struct kunit *test) > static void test_first_word(struct kunit *test) > { > struct kmem_cache *s = kmem_cache_create("TestSlub_1th_word_free", 64, 0, > - SLAB_POISON, NULL); > + SLAB_POISON|SLAB_NO_USER_FLAGS, NULL); > u8 *p = kmem_cache_alloc(s, GFP_KERNEL); > > kmem_cache_free(s, p); > @@ -90,7 +90,7 @@ static void test_first_word(struct kunit *test) > static void test_clobber_50th_byte(struct kunit *test) > { > struct kmem_cache *s = kmem_cache_create("TestSlub_50th_word_free", 64, 0, > - SLAB_POISON, NULL); > + SLAB_POISON|SLAB_NO_USER_FLAGS, NULL); > u8 *p = kmem_cache_alloc(s, GFP_KERNEL); > > kmem_cache_free(s, p); > @@ -106,7 +106,7 @@ static void test_clobber_50th_byte(struct kunit *test) > static void test_clobber_redzone_free(struct kunit *test) > { > struct kmem_cache *s = kmem_cache_create("TestSlub_RZ_free", 64, 0, > - SLAB_RED_ZONE, NULL); > + SLAB_RED_ZONE|SLAB_NO_USER_FLAGS, NULL); > u8 *p = kmem_cache_alloc(s, GFP_KERNEL); > > kasan_disable_current(); > diff --git a/mm/slab.h b/mm/slab.h > index fd7ae2024897..f7d018100994 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -331,7 +331,7 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, > SLAB_ACCOUNT) > #elif defined(CONFIG_SLUB) > #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE | SLAB_RECLAIM_ACCOUNT | \ > - SLAB_TEMPORARY | SLAB_ACCOUNT) > + SLAB_TEMPORARY | SLAB_ACCOUNT | SLAB_NO_USER_FLAGS) > #else > #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE) > #endif > @@ -350,7 +350,8 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, > SLAB_NOLEAKTRACE | \ > SLAB_RECLAIM_ACCOUNT | \ > SLAB_TEMPORARY | \ > - SLAB_ACCOUNT) > + SLAB_ACCOUNT | \ > + SLAB_NO_USER_FLAGS) > > bool __kmem_cache_empty(struct kmem_cache *); > int __kmem_cache_shutdown(struct kmem_cache *); > diff --git a/mm/slub.c b/mm/slub.c > index 74d92aa4a3a2..4c78f5919356 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1584,6 +1584,9 @@ slab_flags_t kmem_cache_flags(unsigned int object_size, > slab_flags_t block_flags; > slab_flags_t slub_debug_local = slub_debug; > > + if (flags & SLAB_NO_USER_FLAGS) > + return flags; > + > /* > * If the slab cache is for debugging (e.g. kmemleak) then > * don't store user (stack trace) information by default,