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 50A03C4167B for ; Tue, 5 Dec 2023 04:27:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8F246B0078; Mon, 4 Dec 2023 23:27:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3F4A6B007E; Mon, 4 Dec 2023 23:27:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B06FB6B0092; Mon, 4 Dec 2023 23:27:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A0F5A6B0078 for ; Mon, 4 Dec 2023 23:27:19 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7644B140576 for ; Tue, 5 Dec 2023 04:27:19 +0000 (UTC) X-FDA: 81531480198.22.AD9FCB5 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf12.hostedemail.com (Postfix) with ESMTP id 8E27040004 for ; Tue, 5 Dec 2023 04:27:17 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nnfVXQ8L; spf=pass (imf12.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701750437; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ECB8bTrkothGumH+K2V0Img+vaTChlA6bV4xhaiY7v4=; b=ARR0F/ofPxVTz5ltK8GGPIZoSQjcyacfGQlEehlR3iCWKM6asqlS4Ee1gT86lB9/FU1YoN yztI/mh6luPsNJmr7P83aAq93rx5RVVwPdyer2NITCINTwm9WL4h2SE5BSgAnAgUnF0jny ZCIYJ9neMiNP+BoEHSFZGy1Q0yx4yHE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nnfVXQ8L; spf=pass (imf12.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701750437; a=rsa-sha256; cv=none; b=66MHX+OU/QSYCx5k9Oz535arvM2wc9pVyE8GLMBy4NpPJAEDgPjPNxkMcXXJF4QLUZThIY ahdFKdO8nrJtNOUdLLZvAZEaxCgPhpf2k4DeQyopJQ+4giYQy7zqysQ8LWjKYm0V7CF1xF 73mr0gtNL8pLUk9Co6yMn4wljwmtLX4= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d098b87eeeso16129435ad.0 for ; Mon, 04 Dec 2023 20:27:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701750436; x=1702355236; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ECB8bTrkothGumH+K2V0Img+vaTChlA6bV4xhaiY7v4=; b=nnfVXQ8LMZ6QMjCpvF4Bzs8lkJnDDn0bxQu/J+ZAYkrEnCfV9KumiTfZCDkUxtPpID YdYPryw7+3gQSxtmCj/f3/hilkQZ8BzegAW3Nmw0DuOFTwtJ9Pt8B6pcHn9rAfMKkSP7 olPWdWxLbsC2Xj6+fsbVTOrAMtuWnP6A93h1kMCpKket+G31JG1iK9C+Oi3q9pf4SjQ3 bDD8kRbFBj0DEhenM4oMkwlwk7YB8SqamcDJ/nosLezMjaxCYLJDMATyjdViSgx67e+n unILKeHVY8qYGlYP47wmzCSel+dmqNnD4SsG3ugFYTHR4WEy2pwa3PmMVZJTNb+ggOS8 dygQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701750436; x=1702355236; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ECB8bTrkothGumH+K2V0Img+vaTChlA6bV4xhaiY7v4=; b=CC7+eig7hQEpZ+wLypXOPgoRZBu8uBz1bo0dU5w8k0GEDIgnYwWeH7VaNqb+oYI6Pu WChdRqPuQPe9m+gW5xdcmrmSz1opKpQyHrO9FZ5qOD5H9gvDrZ7QdwhOOAWArSgjhN14 CbxFwa1yFpGX5wi2ndKT7pUQpeseoru/vEmO54t6MhMw1W1yNehZYxAzQSOuFlvwj53m ldxdqkXEkEJ7u6ZRGpKbMFpzk7Srgzrpt1ov/cVSML4p8HHAEz7+hd0s5fIman71D0ot rPO92OXJMFlulIOye5EAxrVcJpS8DvdlFmGs207Eyn6hocfOY044SNwIYIy+gal+QdcH 8Zbg== X-Gm-Message-State: AOJu0YwT1mcQ4ET/ig5lAbvxT93x82r3dAi6/8Wwn7VAjNxMe0tna3q3 LTYohk1MbltR+uiKkUc76xQ= X-Google-Smtp-Source: AGHT+IGQVjAMROauTKmnu7ClBNGKjAep0qlnJ/ZUCDBqOMhEU2u2uILx5djML1VjxL2tnJ6QPtGYaw== X-Received: by 2002:a17:903:1109:b0:1d0:6ffd:9e10 with SMTP id n9-20020a170903110900b001d06ffd9e10mr5482369plh.98.1701750436129; Mon, 04 Dec 2023 20:27:16 -0800 (PST) Received: from localhost.localdomain ([1.245.180.67]) by smtp.gmail.com with ESMTPSA id u9-20020a17090341c900b001d087d2c42fsm3831273ple.24.2023.12.04.20.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 20:27:15 -0800 (PST) Date: Tue, 5 Dec 2023 13:26:52 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Andrew Morton , Roman Gushchin , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2 03/21] KASAN: remove code paths guarded by CONFIG_SLAB Message-ID: References: <20231120-slab-remove-slab-v2-0-9c9c70177183@suse.cz> <20231120-slab-remove-slab-v2-3-9c9c70177183@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231120-slab-remove-slab-v2-3-9c9c70177183@suse.cz> X-Rspamd-Queue-Id: 8E27040004 X-Rspam-User: X-Stat-Signature: dw9fuud6o9baspm45wm54jh66ace78yd X-Rspamd-Server: rspam01 X-HE-Tag: 1701750437-164472 X-HE-Meta: U2FsdGVkX1/WbdHdxQTjyNn1XacotEzqi7vdVp+PzggkXOuRaaR0sBuplLcBNrXyEDbFH9CzIEZ5sM5ia9d3tZxcByUbmpysfUJYrLaeZjLN9pzAclK/pOSDEOS9iWLFseEe2tGIS4tuL4MFLEORfBvmi+qGCer9PNg13/eA6l5+bkjr78Li900JfJqZq7zzTPHGiGDDEL1JbjZ4HoLjY8jOK7SE8T8NpfjFZH+vJhysj9wNRgTlAVIaJ3J0S6PXbHNM6u1pe7jk2fzsMWd7XIHRmDZjjrnmfENnnpsl5uuQDjNmxSC1y/WaqNAtYLz4AY2Wd0kz8Pm7bmZRjdDNGwX4S6UjnI8OYcY4kce8DUfgRXXLsLlrSdmbsaRb+D90AEHD4k37MFOxrYv2nhcHpXPwuzEycsB/qBDmHRThcDm4tmblMSpwjmWyn0CmsmNRi1P6HOsJI3zs8VC19zd4Q9lpt4ZCqqp3cxr31CDU8ZDRs9UW501vIERDIUdJ2oBbs/MGl+8fF/RghUoSj2VoaqLAUiu6MH4Wx24yaoF3qtVEMSUWR8ZW8vBmbhbjccTz4G5usPA8njs/krfvkruPSOIWdvXyf9a7bhnyufN1G1FoShdnxC12IYxLjw6K3DVmoEa+U+Zn5ib7iNF7CEwstq56rW9/BYIL1XJdEhbYkuMXOFmB7V3mpZZcaP/gnVeWlfL+gP8SNhMaChsja250FbphsKAYB3/YaDkAlAURpyPtFLHExsRS+CcGmDvbNqB0I5O5TmbFV5l/Zjop+iRvIOXmcA3bQVA8HWEcddEWipSHPvwiwDUNFyoo3+/n2lLjD46uwfyb3/1TlT3UiACzat2pupTzl8BWr004d7Me30jl6DUb11ZYEaQEy+hq6xv625F2UK/EfLPWI+SdG3I46FRw8G9bHgnucBzWI7Yef4RqSZsUG7kpZbVLfEdtoj/EmceBygHsrk//A221Y37 1ZzH//RO IIZd7mGd25bSlN7ZEF7ip9b8wRffFKbQfu2JMekVg+gqzl+ya3zohKxiK8hXQ6+tAL2Phq78OIwOY35Rgg4WPBTNHhghBEw09LnnFlxdygYa+5Q3d0pOr7VRmQWxwpmGSpVKDiSWJBhCowB04TayGwwbHxB7AIYGt293PuTmEqDLSUa9vu0HtYWVnfzciFnjZVjXyhlW6RglLT8G5V2ski6Ha+FcZMAEdPLIOjMF/BuM5QO6HPGKvENOojMHP/3cGrDkPKz90cESX1cMQbouh7aZJggmVDplNCNka5MfRjyCPyEGBY4aLsap/NfvdCKdHlM5zbE3o9GcadNEGUy0ce1LAOf3dPFJxbQUEXHEnIJx/cJN1EHbn7MVIjgtNrVIRA/ysLGpmyiS3KxyVmqOyFZn6YMuW2wvFIdTARU741NQJH8Ex7EBxoVpwy61h6bN9G+TBXY7/LymJl+GP/4nAikpoayD6ySoGBq6KmRbqqhG6G+3eAviNEeCOoszfdz2tiFGbUQ1uvGqD2NYuZwZU7eyMBEH+23biCGO2FBju1n+FXr6y+91D9RaJPNH8chbPbCNDsdk2uh0yiwQc1HXLfBMtcMfVc2LAhODXwxiv8I0MAmouOFOExlZiovmveuJ3wAkrtcLREuQ5AWQ= 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: On Mon, Nov 20, 2023 at 07:34:14PM +0100, Vlastimil Babka wrote: > With SLAB removed and SLUB the only remaining allocator, we can clean up > some code that was depending on the choice. > > Reviewed-by: Kees Cook > Reviewed-by: Marco Elver > Signed-off-by: Vlastimil Babka > --- > mm/kasan/common.c | 13 ++----------- > mm/kasan/kasan.h | 3 +-- > mm/kasan/quarantine.c | 7 ------- > 3 files changed, 3 insertions(+), 20 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 256930da578a..5d95219e69d7 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -153,10 +153,6 @@ void __kasan_poison_object_data(struct kmem_cache *cache, void *object) > * 2. A cache might be SLAB_TYPESAFE_BY_RCU, which means objects can be > * accessed after being freed. We preassign tags for objects in these > * caches as well. > - * 3. For SLAB allocator we can't preassign tags randomly since the freelist > - * is stored as an array of indexes instead of a linked list. Assign tags > - * based on objects indexes, so that objects that are next to each other > - * get different tags. > */ > static inline u8 assign_tag(struct kmem_cache *cache, > const void *object, bool init) > @@ -171,17 +167,12 @@ static inline u8 assign_tag(struct kmem_cache *cache, > if (!cache->ctor && !(cache->flags & SLAB_TYPESAFE_BY_RCU)) > return init ? KASAN_TAG_KERNEL : kasan_random_tag(); > > - /* For caches that either have a constructor or SLAB_TYPESAFE_BY_RCU: */ > -#ifdef CONFIG_SLAB > - /* For SLAB assign tags based on the object index in the freelist. */ > - return (u8)obj_to_index(cache, virt_to_slab(object), (void *)object); > -#else > /* > - * For SLUB assign a random tag during slab creation, otherwise reuse > + * For caches that either have a constructor or SLAB_TYPESAFE_BY_RCU, > + * assign a random tag during slab creation, otherwise reuse > * the already assigned tag. > */ > return init ? kasan_random_tag() : get_tag(object); > -#endif > } > > void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 8b06bab5c406..eef50233640a 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -373,8 +373,7 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags); > void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags); > void kasan_save_free_info(struct kmem_cache *cache, void *object); > > -#if defined(CONFIG_KASAN_GENERIC) && \ > - (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) > +#ifdef CONFIG_KASAN_GENERIC > bool kasan_quarantine_put(struct kmem_cache *cache, void *object); > void kasan_quarantine_reduce(void); > void kasan_quarantine_remove_cache(struct kmem_cache *cache); > diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c > index ca4529156735..138c57b836f2 100644 > --- a/mm/kasan/quarantine.c > +++ b/mm/kasan/quarantine.c > @@ -144,10 +144,6 @@ static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache) > { > void *object = qlink_to_object(qlink, cache); > struct kasan_free_meta *meta = kasan_get_free_meta(cache, object); > - unsigned long flags; > - > - if (IS_ENABLED(CONFIG_SLAB)) > - local_irq_save(flags); > > /* > * If init_on_free is enabled and KASAN's free metadata is stored in > @@ -166,9 +162,6 @@ static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache) > *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREE; > > ___cache_free(cache, object, _THIS_IP_); > - > - if (IS_ENABLED(CONFIG_SLAB)) > - local_irq_restore(flags); > } > > static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache) Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > -- > 2.42.1 > >