From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Will Deacon <will.deacon@arm.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Peter Collingbourne <pcc@google.com>, Evgenii Stepanov <eugenis@google.com>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v2 04/12] kasan: clean up setting free info in kasan_slab_free Date: Fri, 5 Feb 2021 16:39:05 +0100 [thread overview] Message-ID: <ece9cd2cca38dd3797c6cd1756e30a2e40b0d451.1612538932.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1612538932.git.andreyknvl@google.com> Put kasan_stack_collection_enabled() check and kasan_set_free_info() calls next to each other. The way this was previously implemented was a minor optimization that relied of the the fact that kasan_stack_collection_enabled() is always true for generic KASAN. The confusion that this brings outweights saving a few instructions. Reviewed-by: Marco Elver <elver@google.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- mm/kasan/common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index f2a6bae13053..da24b144d46c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -350,13 +350,11 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, kasan_poison(object, cache->object_size, KASAN_KMALLOC_FREE); - if (!kasan_stack_collection_enabled()) - return false; - if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine)) return false; - kasan_set_free_info(cache, object, tag); + if (kasan_stack_collection_enabled()) + kasan_set_free_info(cache, object, tag); return kasan_quarantine_put(cache, object); } -- 2.30.0.365.g02bc693789-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Branislav Rankov <Branislav.Rankov@arm.com>, Andrey Konovalov <andreyknvl@google.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Ryabinin <aryabinin@virtuozzo.com>, Peter Collingbourne <pcc@google.com>, Evgenii Stepanov <eugenis@google.com> Subject: [PATCH v2 04/12] kasan: clean up setting free info in kasan_slab_free Date: Fri, 5 Feb 2021 16:39:05 +0100 [thread overview] Message-ID: <ece9cd2cca38dd3797c6cd1756e30a2e40b0d451.1612538932.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1612538932.git.andreyknvl@google.com> Put kasan_stack_collection_enabled() check and kasan_set_free_info() calls next to each other. The way this was previously implemented was a minor optimization that relied of the the fact that kasan_stack_collection_enabled() is always true for generic KASAN. The confusion that this brings outweights saving a few instructions. Reviewed-by: Marco Elver <elver@google.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- mm/kasan/common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index f2a6bae13053..da24b144d46c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -350,13 +350,11 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, kasan_poison(object, cache->object_size, KASAN_KMALLOC_FREE); - if (!kasan_stack_collection_enabled()) - return false; - if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine)) return false; - kasan_set_free_info(cache, object, tag); + if (kasan_stack_collection_enabled()) + kasan_set_free_info(cache, object, tag); return kasan_quarantine_put(cache, object); } -- 2.30.0.365.g02bc693789-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-05 23:14 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-05 15:39 [PATCH v2 00/12] kasan: optimizations and fixes for HW_TAGS Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 01/12] kasan, mm: don't save alloc stacks twice Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 02/12] kasan, mm: optimize kmalloc poisoning Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 03/12] kasan: optimize large " Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov [this message] 2021-02-05 15:39 ` [PATCH v2 04/12] kasan: clean up setting free info in kasan_slab_free Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 05/12] kasan: unify large kfree checks Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 06/12] kasan: rework krealloc tests Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 07/12] kasan, mm: fail krealloc on freed objects Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 08/12] kasan, mm: optimize krealloc poisoning Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 09/12] kasan: ensure poisoning size alignment Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 10/12] arm64: kasan: simplify and inline MTE functions Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 11/12] kasan: inline HW_TAGS helper functions Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` [PATCH v2 12/12] arm64: kasan: export MTE symbols for KASAN tests Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-05 15:39 ` Andrey Konovalov 2021-02-08 17:42 ` Christoph Hellwig 2021-02-08 17:42 ` Christoph Hellwig 2021-02-09 15:18 ` Andrey Konovalov 2021-02-09 15:18 ` Andrey Konovalov 2021-02-09 15:18 ` Andrey Konovalov 2021-02-05 16:25 ` [PATCH v2 00/12] kasan: optimizations and fixes for HW_TAGS Andrey Konovalov 2021-02-05 16:25 ` Andrey Konovalov 2021-02-05 16:25 ` Andrey Konovalov 2021-02-05 16:53 ` Andrey Konovalov 2021-02-05 16:53 ` Andrey Konovalov 2021-02-05 16:53 ` Andrey Konovalov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ece9cd2cca38dd3797c6cd1756e30a2e40b0d451.1612538932.git.andreyknvl@google.com \ --to=andreyknvl@google.com \ --cc=Branislav.Rankov@arm.com \ --cc=akpm@linux-foundation.org \ --cc=aryabinin@virtuozzo.com \ --cc=catalin.marinas@arm.com \ --cc=dvyukov@google.com \ --cc=elver@google.com \ --cc=eugenis@google.com \ --cc=glider@google.com \ --cc=kasan-dev@googlegroups.com \ --cc=kevin.brodsky@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=pcc@google.com \ --cc=vincenzo.frascino@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.