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 B72CFC4167D for ; Tue, 14 Nov 2023 12:01:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31A596B02CB; Tue, 14 Nov 2023 07:01:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A31F6B02CD; Tue, 14 Nov 2023 07:01:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 144636B02CE; Tue, 14 Nov 2023 07:01:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F284B6B02CB for ; Tue, 14 Nov 2023 07:01:31 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C0BFD80A4A for ; Tue, 14 Nov 2023 12:01:31 +0000 (UTC) X-FDA: 81456419982.25.B4E8240 Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) by imf16.hostedemail.com (Postfix) with ESMTP id 4F4D4180031 for ; Tue, 14 Nov 2023 12:01:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=0WTIVBsF; spf=pass (imf16.hostedemail.com: domain of elver@google.com designates 209.85.221.181 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699963288; 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=w+cNKD/DZD2lkmgn//C/a4VZOCUEay1a0fxR4tTnP1Y=; b=Cd+hJnaf4bzwbJI9DElaKkFl51X0UitFsVvyXkGGqMZqmdJGD/+0I7kqS+wIZ4EEAmTKSl LbW1piVsgy2fCAA3+dHk02CcnVjTiOrQIIhetEmsOn+ibdo0JDIH6DlXmncKBjt1gK8c1S HYDAVFEq3ocmEXc4Q2HTcZ0GAcQk04A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699963288; a=rsa-sha256; cv=none; b=A0Lz9j+ZYYeAeIbDf4F3sUe5uFm1aCEic2EakdHR8Keeb8uvlKxdUNmth7INcEMAgiXvy/ eHOy2BU97DyFr6J2GQ3zbUUCbMUqYDggFtyhkXdb7kpiUk14O7e/WggoXCDjF1bR/VPAhj qLMFv+8RtJALAnNbfXh+itNWoFSiC1c= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=0WTIVBsF; spf=pass (imf16.hostedemail.com: domain of elver@google.com designates 209.85.221.181 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-vk1-f181.google.com with SMTP id 71dfb90a1353d-4ac28bd2857so2534418e0c.0 for ; Tue, 14 Nov 2023 04:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699963287; x=1700568087; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=w+cNKD/DZD2lkmgn//C/a4VZOCUEay1a0fxR4tTnP1Y=; b=0WTIVBsFi0Q8IDqjbAnXwJjRIzIXWg+rvKXn6RGa3jKpyEC/WPpx6xMHtxwxyDo38r /AeFbtQFFKVQ17fPfYmgodwcWT9Q5Ls5yq6+h9E8rlC/26Ib6Xs3ebhu/bdNTah2Wyad TTvmf7+++R7cKlXFJ431lISatBDz/7FwwdUCjZSlNRsyO83e4NBl3qejPwts337atzVO sBuJGL8nwVxzUVCG7L0HO1/VYDYnTu4IEm8/lnfm9kINezdVNz7CmMlLqUFwDpLO9+Xk JLCcAEYSJzT03wMjtjSB1W9wkrKRCcSY8h2qfjPzvUVJ/VCtl7oF4sLlaxbtEhOvUwGF DXOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699963287; x=1700568087; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w+cNKD/DZD2lkmgn//C/a4VZOCUEay1a0fxR4tTnP1Y=; b=OpJztH8Mlq/GM6GMs3HMe/xQp/Ia2IKvlNNQH6hMEDRCfr2Dw9jWqTE63fjKX+K8OG 8nTau4tWPgY659qDj3UtWN4Ezj9mXVoA/L2BRcrZWDHejKh15IUKXbvMnOVRCyu1aaVV CUdNsOyFE6GaBqp35nrR4soEkqauogbORmfZKg2WEJ6kXz49HfADnaQA2l7HbwWayP8h DZB+v8QFVfJXjOILYkOXiuqw4ZwnXsIIzknFMp3XdoE2noF7OTXfpLyMPFr0L1Gdzmw/ IhE4Bqh5hovmH+PuXZpH8EnLcqwGDW4/eJsJHdb4IO/DQbDeJ1wMmw1bw2/CG3ywgsVm 5Y9A== X-Gm-Message-State: AOJu0YzWKjEQWlmIv1h69K19/J9PuFmEGiZuuAC+bPwxmN35nafOKhTx qPaX61BgzOzjpZn8cbSAbrId01ktgHa90LseFLmitQ== X-Google-Smtp-Source: AGHT+IGdPTgrNucIG+Lo6vRM+7FUzSZPC0zMXelLtqwy0mDzkjNg/l2YT2+nTW9YrVKzffzwqrRySMvvW/+/It1UJuA= X-Received: by 2002:a05:6122:1689:b0:4ac:593b:e9f4 with SMTP id 9-20020a056122168900b004ac593be9f4mr9715321vkl.9.1699963287127; Tue, 14 Nov 2023 04:01:27 -0800 (PST) MIME-Version: 1.0 References: <20231113191340.17482-22-vbabka@suse.cz> <20231113191340.17482-24-vbabka@suse.cz> In-Reply-To: <20231113191340.17482-24-vbabka@suse.cz> From: Marco Elver Date: Tue, 14 Nov 2023 13:00:00 +0100 Message-ID: Subject: Re: [PATCH 02/20] KASAN: remove code paths guarded by CONFIG_SLAB To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , 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 , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , kasan-dev@googlegroups.com, cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4F4D4180031 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: cq99w4e8ohe1sr144jp7hb9zniskathy X-HE-Tag: 1699963288-589571 X-HE-Meta: U2FsdGVkX18W0T5KCLah38SbpQVe6ADBEluv0P54N09DJqRcQUkIgtnJD0UPU7dhHcZyPIGGBa7cvtRkEMr5MR/v67aa11wDaVHfggq0mAOy6CpxzF1VeD38aRiloNpYZGyO8rPyNp7+o+RxVX3PxOxYBzaKS4DNAMHPmfrgyBa1/ucskSSgEVhHJ+t/tlUp1CzUNMTVVo3/1LgB7tegnwKmnbtedkBXhC0Z7f1Ut0OTdy9WWggGsQLPKrSJI/r9R5QgH/Kl6+6r8fdAnrxO0lpG0m29C9sUVgt7Bwlf8GmckMgs2j9pwY8bwQo0+buJvPHlXbcLABJIiPnpoIwIPGNNH3gROTCHp6e8tyPo6EVJOM6xl81own8yahB20xVMnyQKoC/q/jVLmYnbeaRf/uAFvLYQru14KVXssnlT1hyxbO61krKuGqxOzmzprFDOkBB7GLpnwJvEFQY9v2PyJ+dsFdgR7KNkyPSke4nOrtOQztU9/njN7a5zqrGVHhqlbqY1EL0fRjHXHIlsDerU3TGnIRhfBlMsqNwOklKvBPS1zHaQ7Nxnukdy9Hwt7SUx/Yq/2LDENe75KxAXjIlbu/AGQzYMrNDUEjxf+kGZCAR5F58gWQT8o5h9EzpaiDzOhFHQll0lf88IJVuXKDmg4WSLDAfFHlMOzI6nM7A9bNHuFVq5l9vHj9Zh9hyMVvcER/oEsU1G75oTzlwwh3CGnl8NZcg2C2DgPpAJ87omJFKds+KZ0v4DL/hY57uO4eOJSIZff+ErrizfIBo9yGm+tFW8VOOzHiqDLKzRDEzhmlDGmc7+5Kb7J7ind2ceS7dfjaAKDn0C3wRDPFr0V71BVCi/M/YyEthzu3z+daVSFLHzpEbrOSg5HHpxMF3z9SQwCtiJI9KsUh+c83wd4re5gESUneUhA3heetSy5fgvV6LkLdxHSRxbeeyzltQvZlAoZf7IJFMhLt1s9MFvzUn gnueHL+9 Bm4u0RgQmD77wbFiVp15dJeWJsOtixWlbW07WAQ3rwunr3/CvGnfbFBIl+hou5F/WQBC/5E0V2AFhUyLgImCDd18y3u7v6DV4RZw1ZJ/oCPlypZxDHJQGu3hmqQ2Xba0E3wEzUhU6DwXH0rOQavw0p16fIsEw+fF4hrn2iiVdDo7KxnhMN3BKDmYbOiCFd96CR8XJhZ7CZQ/rqAtqVXNueYdAd/2fMsROuS27T+oPb4P1l3S0RdNxHqf/4fNRBZY2GhY7HFOQ5jipEPYb7BTICcdKiasZkBTQj22SlnFswtwV8gjddlPvAeN3BnU8VY5U1KWyKNzlw6Tfsa915FF+ftXWDkEW/eSY6LYkQf1WRe24voXh/Eylr5PjKw== 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, 13 Nov 2023 at 20:14, Vlastimil Babka wrote: > > With SLAB removed and SLUB the only remaining allocator, we can clean up > some code that was depending on the choice. > > Signed-off-by: Vlastimil Babka Reviewed-by: Marco Elver > --- > 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) > -- > 2.42.1 >