All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Dmitry Vyukov <dvyukov@google.com>,
	Alexander Potapenko <glider@google.com>,
	Marco Elver <elver@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Evgenii Stepanov <eugenis@google.com>,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Branislav Rankov <Branislav.Rankov@arm.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	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 03/20] kasan: introduce set_alloc_info
Date: Tue, 10 Nov 2020 23:20:07 +0100	[thread overview]
Message-ID: <5302e6d48429465259bd0868a7dc357290a2e8a5.1605046662.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1605046662.git.andreyknvl@google.com>

Add set_alloc_info() helper and move kasan_set_track() into it. This will
simplify the code for one of the upcoming changes.

No functional changes.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Link: https://linux-review.googlesource.com/id/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a
---
 mm/kasan/common.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 8fd04415d8f4..a880e5a547ed 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -318,6 +318,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip)
 	return __kasan_slab_free(cache, object, ip, true);
 }
 
+static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
+{
+	kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags);
+}
+
 static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object,
 				size_t size, gfp_t flags, bool keep_tag)
 {
@@ -345,7 +350,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object,
 		KASAN_KMALLOC_REDZONE);
 
 	if (cache->flags & SLAB_KASAN)
-		kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags);
+		set_alloc_info(cache, (void *)object, flags);
 
 	return set_tag(object, tag);
 }
-- 
2.29.2.222.g5d2a92d10f8-goog


WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com>
To: Dmitry Vyukov <dvyukov@google.com>,
	Alexander Potapenko <glider@google.com>,
	Marco Elver <elver@google.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>,
	Catalin Marinas <catalin.marinas@arm.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 Konovalov <andreyknvl@google.com>,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Evgenii Stepanov <eugenis@google.com>
Subject: [PATCH v2 03/20] kasan: introduce set_alloc_info
Date: Tue, 10 Nov 2020 23:20:07 +0100	[thread overview]
Message-ID: <5302e6d48429465259bd0868a7dc357290a2e8a5.1605046662.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1605046662.git.andreyknvl@google.com>

Add set_alloc_info() helper and move kasan_set_track() into it. This will
simplify the code for one of the upcoming changes.

No functional changes.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Link: https://linux-review.googlesource.com/id/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a
---
 mm/kasan/common.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 8fd04415d8f4..a880e5a547ed 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -318,6 +318,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip)
 	return __kasan_slab_free(cache, object, ip, true);
 }
 
+static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
+{
+	kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags);
+}
+
 static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object,
 				size_t size, gfp_t flags, bool keep_tag)
 {
@@ -345,7 +350,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object,
 		KASAN_KMALLOC_REDZONE);
 
 	if (cache->flags & SLAB_KASAN)
-		kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags);
+		set_alloc_info(cache, (void *)object, flags);
 
 	return set_tag(object, tag);
 }
-- 
2.29.2.222.g5d2a92d10f8-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-10 22:20 UTC|newest]

Thread overview: 166+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-10 22:20 [PATCH v2 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-10 22:20 ` Andrey Konovalov
2020-11-10 22:20 ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 01/20] kasan: simplify quarantine_put call site Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:08   ` Marco Elver
2020-11-11 16:08     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 02/20] kasan: rename get_alloc/free_info Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:09   ` Marco Elver
2020-11-11 16:09     ` Marco Elver
2020-11-10 22:20 ` Andrey Konovalov [this message]
2020-11-10 22:20   ` [PATCH v2 03/20] kasan: introduce set_alloc_info Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:10   ` Marco Elver
2020-11-11 16:10     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 04/20] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:13   ` Marco Elver
2020-11-11 16:13     ` Marco Elver
2020-11-12  9:51   ` Catalin Marinas
2020-11-12  9:51     ` Catalin Marinas
2020-11-12 19:38     ` Andrey Konovalov
2020-11-12 19:38       ` Andrey Konovalov
2020-11-12 19:38       ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 05/20] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:20   ` Marco Elver
2020-11-11 16:20     ` Marco Elver
2020-11-12  0:24     ` Andrey Konovalov
2020-11-12  0:24       ` Andrey Konovalov
2020-11-12  0:24       ` Andrey Konovalov
2020-11-12 10:31   ` Catalin Marinas
2020-11-12 10:31     ` Catalin Marinas
2020-11-10 22:20 ` [PATCH v2 06/20] kasan: remove __kasan_unpoison_stack Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:42   ` Marco Elver
2020-11-11 16:42     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 07/20] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:54   ` Marco Elver
2020-11-11 16:54     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 08/20] kasan: inline random_tag for HW_TAGS Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 17:02   ` Marco Elver
2020-11-11 17:02     ` Marco Elver
2020-11-12  0:21     ` Andrey Konovalov
2020-11-12  0:21       ` Andrey Konovalov
2020-11-12  0:21       ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 09/20] kasan: inline kasan_poison_memory and check_invalid_free Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 17:50   ` Marco Elver
2020-11-11 17:50     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 10/20] kasan: inline and rename kasan_unpoison_memory Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 17:49   ` Marco Elver
2020-11-11 17:49     ` Marco Elver
2020-11-12 19:45     ` Andrey Konovalov
2020-11-12 19:45       ` Andrey Konovalov
2020-11-12 19:45       ` Andrey Konovalov
2020-11-12 19:52       ` Marco Elver
2020-11-12 19:52         ` Marco Elver
2020-11-12 19:52         ` Marco Elver
2020-11-12 20:54         ` Andrey Konovalov
2020-11-12 20:54           ` Andrey Konovalov
2020-11-12 20:54           ` Andrey Konovalov
2020-11-12 22:20           ` Marco Elver
2020-11-12 22:20             ` Marco Elver
2020-11-12 22:20             ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 11/20] kasan: add and integrate kasan boot parameters Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 18:29   ` Marco Elver
2020-11-11 18:29     ` Marco Elver
2020-11-12 19:51     ` Andrey Konovalov
2020-11-12 19:51       ` Andrey Konovalov
2020-11-12 19:51       ` Andrey Konovalov
2020-11-12 11:35   ` Catalin Marinas
2020-11-12 11:35     ` Catalin Marinas
2020-11-12 11:53     ` Marco Elver
2020-11-12 11:53       ` Marco Elver
2020-11-12 11:53       ` Marco Elver
2020-11-12 12:54       ` Catalin Marinas
2020-11-12 12:54         ` Catalin Marinas
2020-11-12 19:52         ` Andrey Konovalov
2020-11-12 19:52           ` Andrey Konovalov
2020-11-12 19:52           ` Andrey Konovalov
2020-11-13 17:52   ` Marco Elver
2020-11-13 17:52     ` Marco Elver
2020-11-13 17:55     ` Marco Elver
2020-11-13 17:55       ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 12/20] kasan, mm: check kasan_enabled in annotations Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 14:48   ` Marco Elver
2020-11-11 14:48     ` Marco Elver
2020-11-11 14:48     ` Marco Elver
2020-11-12  0:36     ` Andrey Konovalov
2020-11-12  0:36       ` Andrey Konovalov
2020-11-12  0:36       ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 13/20] kasan: simplify kasan_poison_kfree Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 18:42   ` Marco Elver
2020-11-11 18:42     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 14/20] kasan, mm: rename kasan_poison_kfree Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 18:53   ` Marco Elver
2020-11-11 18:53     ` Marco Elver
2020-11-12  1:05     ` Andrey Konovalov
2020-11-12  1:05       ` Andrey Konovalov
2020-11-12  1:05       ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 15/20] kasan: don't round_up too much Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 19:08   ` Marco Elver
2020-11-11 19:08     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 16/20] kasan: simplify assign_tag and set_tag calls Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 19:17   ` Marco Elver
2020-11-11 19:17     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 17/20] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 19:18   ` Marco Elver
2020-11-11 19:18     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 18/20] kasan: clean up metadata allocation and usage Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 23:06   ` Marco Elver
2020-11-11 23:06     ` Marco Elver
2020-11-12 20:11     ` Andrey Konovalov
2020-11-12 20:11       ` Andrey Konovalov
2020-11-12 20:11       ` Andrey Konovalov
2020-11-10 22:20 ` [PATCH v2 19/20] kasan, mm: allow cache merging with no metadata Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 15:13   ` Marco Elver
2020-11-11 15:13     ` Marco Elver
2020-11-12 23:00     ` Andrey Konovalov
2020-11-12 23:00       ` Andrey Konovalov
2020-11-12 23:00       ` Andrey Konovalov
2020-11-11 23:27   ` Marco Elver
2020-11-11 23:27     ` Marco Elver
2020-11-10 22:20 ` [PATCH v2 20/20] kasan: update documentation Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-10 22:20   ` Andrey Konovalov
2020-11-11 16:03   ` Marco Elver
2020-11-11 16:03     ` Marco Elver
2020-11-12  0:51     ` Andrey Konovalov
2020-11-12  0:51       ` Andrey Konovalov
2020-11-12  0:51       ` Andrey Konovalov
2020-11-10 22:24 ` [PATCH v2 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-10 22:24   ` Andrey Konovalov
2020-11-10 22:24   ` 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=5302e6d48429465259bd0868a7dc357290a2e8a5.1605046662.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=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: link
Be 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.