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 75A76C43334 for ; Mon, 20 Jun 2022 13:40:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F36516B0078; Mon, 20 Jun 2022 09:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE5BC8E0002; Mon, 20 Jun 2022 09:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DAF4E8E0001; Mon, 20 Jun 2022 09:40:19 -0400 (EDT) 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 CAB336B0078 for ; Mon, 20 Jun 2022 09:40:19 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id A47CD80D44 for ; Mon, 20 Jun 2022 13:40:19 +0000 (UTC) X-FDA: 79598723358.21.851EDA1 Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by imf09.hostedemail.com (Postfix) with ESMTP id 4CD9214001B for ; Mon, 20 Jun 2022 13:40:19 +0000 (UTC) Received: by mail-yb1-f171.google.com with SMTP id p69so7339450ybc.5 for ; Mon, 20 Jun 2022 06:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mK//W8+alc6U2SRanqIfp5lLUuphqu6jqWQbXvYHju8=; b=rcNec0L28V59argJ+4p78OWpEUVBF0h7njQetuVutBS53hvZWQKuzmt27ET9pS9ZcD 9W1NCt25xnDieQfUEJaCxfsUE+wDQc2j/ZVAkFFY1tOOvi56apy0D5bSbLc6YRBjhND+ WXw8va9EmAT242Oc5aOd+xvJNOeDK3Ls9XR4f4JEPy/M8KwJ3Ixk+GPihpS+yao7ZrpK d+FCNGpT1F5fsc0bP4aNn4sEbNn7EYi8i9hlGVfYdZN7Y/Rp9GXqsRIWah+YLJE6Cpl7 YGkz8sHY9Bdx1biY29nZLKLgEBCM8nXyoEiUvAU4O2XYc+N7qEwomZ/KHikBYMtnMeCM NToQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mK//W8+alc6U2SRanqIfp5lLUuphqu6jqWQbXvYHju8=; b=dAymmU4Jn2FKS47tiLUBS1Ywu3Qm85gFeYIndqsepgNtCGqI9c/XHwPT68QUS+dp8r WUcSEnXJ9YzaS9NB88eRVOwUSUmh/rY2K/5pysP7xY4T1iQ5ieUOqYar7js+Ry61QRqE ly1RFU8ru/2Y3wAhlSSuWTkOK7mRWlzYRmFFYv6VMNY8uxjfxwdiQ8MOE9wY+dtdGUO/ UJ1RusfLO/YyxeRQtr815LtkTkzo91AXP0L7UQw5q+9lo2sRe2AhzXo1QAcr6zab1a0X Nm/VI5MQE/eOKXlqcQh98m9WulQk4iIHu2J2sQsD2pqLUNTucYVDUVrqDjOfhlFM4XQE 3k8w== X-Gm-Message-State: AJIora8kF6kE31q9O1iEM9JdVjrBCjiA5yz9QIdytdjfdHlhFU8kHg2M 8jzRet6taaqqrmJaiwp/FfGNusHvwCdad8el+ig8mw== X-Google-Smtp-Source: AGRyM1u5HCt/E7YgbS4siTPjLChUt+KSYx6/jJ6HdGxCqmwqm/xwrh1hHxSTeT9pme5VcWkg9UjNJjUl3vG1LSDPFUs= X-Received: by 2002:a25:bfc8:0:b0:664:a5a8:d518 with SMTP id q8-20020a25bfc8000000b00664a5a8d518mr25666775ybm.625.1655732418326; Mon, 20 Jun 2022 06:40:18 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Marco Elver Date: Mon, 20 Jun 2022 15:39:42 +0200 Message-ID: Subject: Re: [PATCH 05/32] kasan: drop CONFIG_KASAN_TAGS_IDENTIFY To: andrey.konovalov@linux.dev Cc: Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Peter Collingbourne , Evgenii Stepanov , Florian Mayer , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655732419; 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=mK//W8+alc6U2SRanqIfp5lLUuphqu6jqWQbXvYHju8=; b=OpMlyriyUSNg9lQpqiLkwaxWipa4ZzVc0EZ7CGsID0426oH4mvGZOais8pb7oAzuXcBs6c ir3pQarx0xe0GXe/NDD+q2oyinn7bVyizyqVUo6yOiG0wSIY+qyeISeJNs7VKXCBNBLitw h5vNRm5c/dJpHxkdGo9zyTYNmN7sx54= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655732419; a=rsa-sha256; cv=none; b=Tbsm+J+aD9KqWvDi/DgAUle1Ab2atPSGMwy1w7jj/79AHFau4/lzr0dd9+3fVmJwtXk1Tk g06Ck09MNwgix3lOvidHIp2GCS2C2bSnqjJdSElAxc0KdN2FD7s0O8sP7LEkxfFugvc3he tWTekY1fSwU/6cGX2szaQrvy6f0R7j4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rcNec0L2; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of elver@google.com designates 209.85.219.171 as permitted sender) smtp.mailfrom=elver@google.com Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rcNec0L2; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of elver@google.com designates 209.85.219.171 as permitted sender) smtp.mailfrom=elver@google.com X-Rspamd-Server: rspam12 X-Rspam-User: X-Stat-Signature: w7qqi6faittumrsr18px3qcpj6nc53h5 X-Rspamd-Queue-Id: 4CD9214001B X-HE-Tag: 1655732419-387425 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 Mon, 13 Jun 2022 at 22:15, wrote: > > From: Andrey Konovalov > > Drop CONFIG_KASAN_TAGS_IDENTIFY and related code to simplify making > changes to the reporting code. > > The dropped functionality will be restored in the following patches in > this series. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > lib/Kconfig.kasan | 8 -------- > mm/kasan/kasan.h | 12 +----------- > mm/kasan/report_tags.c | 28 ---------------------------- > mm/kasan/tags.c | 21 ++------------------- > 4 files changed, 3 insertions(+), 66 deletions(-) > > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index f0973da583e0..ca09b1cf8ee9 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -167,14 +167,6 @@ config KASAN_STACK > as well, as it adds inline-style instrumentation that is run > unconditionally. > > -config KASAN_TAGS_IDENTIFY > - bool "Memory corruption type identification" > - depends on KASAN_SW_TAGS || KASAN_HW_TAGS > - help > - Enables best-effort identification of the bug types (use-after-free > - or out-of-bounds) at the cost of increased memory consumption. > - Only applicable for the tag-based KASAN modes. > - > config KASAN_VMALLOC > bool "Check accesses to vmalloc allocations" > depends on HAVE_ARCH_KASAN_VMALLOC > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 610057e651d2..aa6b43936f8d 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -168,23 +168,13 @@ struct kasan_track { > depot_stack_handle_t stack; > }; > > -#if defined(CONFIG_KASAN_TAGS_IDENTIFY) && defined(CONFIG_KASAN_SW_TAGS) > -#define KASAN_NR_FREE_STACKS 5 > -#else > -#define KASAN_NR_FREE_STACKS 1 > -#endif > - > struct kasan_alloc_meta { > struct kasan_track alloc_track; > /* Generic mode stores free track in kasan_free_meta. */ > #ifdef CONFIG_KASAN_GENERIC > depot_stack_handle_t aux_stack[2]; > #else > - struct kasan_track free_track[KASAN_NR_FREE_STACKS]; > -#endif > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - u8 free_pointer_tag[KASAN_NR_FREE_STACKS]; > - u8 free_track_idx; > + struct kasan_track free_track; > #endif > }; > > diff --git a/mm/kasan/report_tags.c b/mm/kasan/report_tags.c > index e25d2166e813..35cf3cae4aa4 100644 > --- a/mm/kasan/report_tags.c > +++ b/mm/kasan/report_tags.c > @@ -5,37 +5,9 @@ > */ > > #include "kasan.h" > -#include "../slab.h" > > const char *kasan_get_bug_type(struct kasan_report_info *info) > { > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - struct kasan_alloc_meta *alloc_meta; > - struct kmem_cache *cache; > - struct slab *slab; > - const void *addr; > - void *object; > - u8 tag; > - int i; > - > - tag = get_tag(info->access_addr); > - addr = kasan_reset_tag(info->access_addr); > - slab = kasan_addr_to_slab(addr); > - if (slab) { > - cache = slab->slab_cache; > - object = nearest_obj(cache, slab, (void *)addr); > - alloc_meta = kasan_get_alloc_meta(cache, object); > - > - if (alloc_meta) { > - for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > - if (alloc_meta->free_pointer_tag[i] == tag) > - return "use-after-free"; > - } > - } > - return "out-of-bounds"; > - } > -#endif > - > /* > * If access_size is a negative number, then it has reason to be > * defined as out-of-bounds bug type. > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > index 1ba3c8399f72..e0e5de8ce834 100644 > --- a/mm/kasan/tags.c > +++ b/mm/kasan/tags.c > @@ -30,39 +30,22 @@ void kasan_save_free_info(struct kmem_cache *cache, > void *object, u8 tag) > { > struct kasan_alloc_meta *alloc_meta; > - u8 idx = 0; > > alloc_meta = kasan_get_alloc_meta(cache, object); > if (!alloc_meta) > return; > > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - idx = alloc_meta->free_track_idx; > - alloc_meta->free_pointer_tag[idx] = tag; > - alloc_meta->free_track_idx = (idx + 1) % KASAN_NR_FREE_STACKS; > -#endif > - > - kasan_set_track(&alloc_meta->free_track[idx], GFP_NOWAIT); > + kasan_set_track(&alloc_meta->free_track, GFP_NOWAIT); > } > > struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, > void *object, u8 tag) > { > struct kasan_alloc_meta *alloc_meta; > - int i = 0; > > alloc_meta = kasan_get_alloc_meta(cache, object); > if (!alloc_meta) > return NULL; > > -#ifdef CONFIG_KASAN_TAGS_IDENTIFY > - for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { > - if (alloc_meta->free_pointer_tag[i] == tag) > - break; > - } > - if (i == KASAN_NR_FREE_STACKS) > - i = alloc_meta->free_track_idx; > -#endif > - > - return &alloc_meta->free_track[i]; > + return &alloc_meta->free_track; > } > -- > 2.25.1 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/cfc1744f4a5eb6f50eddee53238af1a2fb4e8583.1655150842.git.andreyknvl%40google.com.