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 A3C63C61D85 for ; Tue, 21 Nov 2023 16:47:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45D856B04B2; Tue, 21 Nov 2023 11:47:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E5CC6B04B1; Tue, 21 Nov 2023 11:47:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AE6A6B04B2; Tue, 21 Nov 2023 11:47:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 144C96B04B0 for ; Tue, 21 Nov 2023 11:47:18 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E19BB40A9C for ; Tue, 21 Nov 2023 16:47:17 +0000 (UTC) X-FDA: 81482541714.19.DD3C841 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by imf12.hostedemail.com (Postfix) with ESMTP id 1BBC54000A for ; Tue, 21 Nov 2023 16:47:15 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QC8kUKs+; spf=pass (imf12.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.215.180 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700585236; a=rsa-sha256; cv=none; b=7dmfSEMe+P1Larw+UkwQPquxKMFG+z1O7ExpKtZCJ86f5OLt5sTiqkK8sy+2jNXSikCL6I nA+tTGVCzuhoGCR/BfGLeNTURfTeTmovkK4voJzHSc4vhqHHq4YiGhLcgOHrUTcWnb/A74 tPlPq2t5/kl+R3p4UhqxJ9zz+wLajvk= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QC8kUKs+; spf=pass (imf12.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.215.180 as permitted sender) smtp.mailfrom=andreyknvl@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=1700585236; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4pN2u4fGcywnuJpGPzQlph9Q+P1Toihu44zlYs+cFFQ=; b=NGsUs4NfSBBDi/ajpjTfJgSD1UUOMcON2RAtI4h262NMdiZXk2A9LvUXPmtW4/1aPN/dwN powr20FhznR364cvO/aMUCNogjHwQbAJufKGrfOXaTFXbOwwxpdMnbb3Y7Ioi7iY3LzUlw c1U/mf2qbyuLd3eWev9RgqdwcWvIo50= Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5bd33a450fdso4525004a12.0 for ; Tue, 21 Nov 2023 08:47:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700585235; x=1701190035; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=4pN2u4fGcywnuJpGPzQlph9Q+P1Toihu44zlYs+cFFQ=; b=QC8kUKs+x7M94Kk9lgFsrSns7bhNdX+HWf3HUOkiPaFOrmt0Y9Mdo6wsqZYLEiQwXu egAW1rdgOXQLErF1hp0g2hzdsbOcCF04TzWmZkhBnQJRXsYHXbbziiPUGepXSkFdzQ5n 5MbSMKf6WTTm2CfYatAcUiNzfo03tZ/JOCajmujdqVWSbCDl0Qd8PzuhXnr7Sf6P682U xCMiYz7ksLEOtBy964axEzfCx/qVHk0pJpXwCQ4lqNWZDfHdGDFPbYSbC0ZuT75S4zu3 jh4EDjNgsPd6CRIZeh8nTYNtJRWvvKDTWb2t5VHfvG78T4MEi7pys0ahLR1KeLjq0VXY uZmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700585235; x=1701190035; h=content-transfer-encoding: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=4pN2u4fGcywnuJpGPzQlph9Q+P1Toihu44zlYs+cFFQ=; b=WKuT6gjnNmaLtEd+QarrzaaVMxGxUEt9tQZ8TCC3P9IKLwElhfFs3rFAz0hzszqUwr Feyqv4mOrUfcDq8MOIoNIGCm1vO+z8x3AIxVkXv4YYp1qoWvTBcNTD0gt6nH3EtZl0Sj bQHelaOAQQuNFPdIH95uHtQ41d2lz0XhgjVtKOL1PcvHsLNIM55nRLs3Z/9zNF8iimcE QBtLjx704QjTMo2iJ+4jwR/d2Esu1dQBthg7o+kQhsm0Tcz5CkNkxP6reLAeLAsoBseo mbTrKDYhOMFL8KBspXdeSNl5dyt/lfFmQ8Mf9Cj9YxTM5Kt6Jv8Tpz2GsyBSdBBP3uoq AdLg== X-Gm-Message-State: AOJu0YyujWJWjdFQQWo1GAog4Ezeft0DJHOp+N6NbxmUFPNtHvbuIftN EgptnJmNdC32D9v0sgaLm9CKa6ugFjzk82NxUYI= X-Google-Smtp-Source: AGHT+IEgB8wdH50KpUTsCwM7hxb8hnHbggXC75EKjN4In3uMlNFDFNmIEv3gFB7XElvbm6ezJrT/0+1/Sj7dKS+3aBM= X-Received: by 2002:a17:90a:4411:b0:280:18bd:ffe7 with SMTP id s17-20020a17090a441100b0028018bdffe7mr9875785pjg.48.1700585234819; Tue, 21 Nov 2023 08:47:14 -0800 (PST) MIME-Version: 1.0 References: <20231120-slab-remove-slab-v2-0-9c9c70177183@suse.cz> <20231120-slab-remove-slab-v2-3-9c9c70177183@suse.cz> In-Reply-To: <20231120-slab-remove-slab-v2-3-9c9c70177183@suse.cz> From: Andrey Konovalov Date: Tue, 21 Nov 2023 17:47:03 +0100 Message-ID: Subject: Re: [PATCH v2 03/21] 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 , Andrey Ryabinin , Alexander Potapenko , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1BBC54000A X-Stat-Signature: gowhnw8aho4z9bbiyhs6u4ugd8ouuw7i X-Rspam-User: X-HE-Tag: 1700585235-977544 X-HE-Meta: U2FsdGVkX1+KVsdE3D+/3w0QyqH2vQpBd/LbNKwVJdTxHfM9WvWiBX+Gz6wZ3ZLCgAcS3s5PALSekoMoyb/2dl6Lx0EKAIqDQCtLCyXh9gHrXUh3gJK1Zwr+fU0o6SX2SPGdwqYPRk0sJgfibJfdlgFw2sUxGW3KWeg0FGJ4j8aNG3MjT9CLlWLIJPblm1YQ12KA/HpLBSABcn86ogzOm9bVDRp/0n4Xj6iS6CmOiGDCe56YYr7Rluio8tUO/bJDaOFm7uqNsEx92epJrfayx+9VjFpMLTqo+qICY4rjI1LWW9zQUQ7sutZgyOPMXeyHoVFSlG6pkE/a7YqMIzIuGOgc9rW3Zh++SF8BfenEVK6V+68aFPp1nSFGXscNnyuzOEToAoZwCAtCW/391MLCLsWQ1Im8IO69UJfaepKBrE17tSPgML2ObXIhH4OW6gAjilFblW+WJtIcGua31tEqyfh4nrbl4eQpgSQTwQyjz+Yp1xuEnj3ynuZtgFthK6y8VSvD9IKcVcmZlhhCGsCg51jBZuFsjC6yHzbhEeGu21IFwkeSq26r5J1btqD+5MVSNl3wTHOi+6LoDlRnS80I0qeMSyjWQ/0BcAek6u8KeawGhCHSpfiq8aMf1IqAzZmCxcHoCocLPnbe1dcAa7qd35dVDFniogjWA+XoRTWf3H5pHZWXFUZK4ETaZJVfPEPl/wUTgqCUuKfbI7SoKPMzVE2euOosJA/62efG58EL3hnwQub5ngAqx3BZ2vrIxXsxhc4YXp/6QTNnTD01oWtaRVouXlC4sEkZoFSsKq2L6rbqDQob7jzy/N3gA8ahN+4mBGiwavE6MHN2uqVcRaqh2OLMjGFs/KDpPQiRkBGBLH2GyM3qAqtwuJ9glj9Z7kf+8v5ZyrWFDjQjwnTkYpMI5AIzvucucQ00ejMMyFNQNols4X4k5QpLDuHquBtv0L3x7eMGaost7NuL+koQziZ 1qUx0qSl 3SeclXIxrsUql2asgMGgr08jMgpvA6aT5klTI/LG1m0hEYECxkV4m70cy7SmLD78IdwdXdVBs+IKRrOq+i35kskPBOHG++bNwDqZ7WC2TDHxdQnPX/Eze3bVeEfasvhPFyRo3E6tkFRMX2OljieCqxzMEVqC/W7cOF4iQzbsICA/acpuLEsQjKW3Xi+CBQl6nppwMohD6HWv+IaapIuX8ETB3fKV3TVXm2ivQ/m3vpv/bt7TuK45P0ucHPZbu6KNNhY7rBQvEqukBiaEh6veLzWbq598oKn7B3SoN8ZzoI36b52BGJUbHWcQUUqjU5OGttsPfEX05jzdRHIE5y4eABmo2yCEJh9bLtCTzu77jbKAUisA6nacFzLBTeObSEMyPcmaXXa/QtOKQWzBB0yBPdt+u/NniP6j0uzkhrXX5ZUuwroDv53e5ywLpAMNDzZcJN+qTgyd4Hs/uZyDaVkBV7oqgq0QcjxWjrkRKdXgCTti5/GdyEdgo0iUJb9yP5WDmDGbi5zahizoNopDyTaOo6L+pZk0uRnvHu9oBZBMOSdWnjMqe9+bdEKVfrX1aFyIpU1jzcBJI9kIY5FE= 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 7:34=E2=80=AFPM Vlastimil Babka wr= ote: > > 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 *c= ache, 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 free= list > - * 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 ot= her > - * 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 *cach= e, > 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 *)obje= ct); > -#else > /* > - * For SLUB assign a random tag during slab creation, otherwise r= euse > + * 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, str= uct kmem_cache *cache) > { > void *object =3D qlink_to_object(qlink, cache); > struct kasan_free_meta *meta =3D kasan_get_free_meta(cache, objec= t); > - 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, stru= ct kmem_cache *cache) > *(u8 *)kasan_mem_to_shadow(object) =3D 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 *cach= e) > > -- > 2.42.1 > Reviewed-by: Andrey Konovalov Very nice to see SLAB-induced complexity being gone :) Thank you!