[68/78] kasan: don't round_up too much

Message ID	20201218220510.q8idAv5xN%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Y0WR=FW=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC4C523B7E Date: Fri, 18 Dec 2020 14:05:10 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, andreyknvl@google.com, aryabinin@virtuozzo.com, Branislav.Rankov@arm.com, catalin.marinas@arm.com, dvyukov@google.com, elver@google.com, eugenis@google.com, glider@google.com, gor@linux.ibm.com, kevin.brodsky@arm.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, vincenzo.frascino@arm.com, will.deacon@arm.com Subject: [patch 68/78] kasan: don't round_up too much Message-ID: <20201218220510.q8idAv5xN%akpm@linux-foundation.org> In-Reply-To: <20201218140046.497484741326828e5b5d46ec@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[01/78] mm/memcg: bail early from swap accounting if memcg disabled \| expand [01/78] mm/memcg: bail early from swap accounting if memcg disabled [02/78] mm/memcg: warning on !memcg after readahead page charged [03/78] mm/memcg: remove unused definitions [04/78] mm, kvm: account kvm_vcpu_mmap to kmemcg [05/78] mm/memcontrol:rewrite mem_cgroup_page_lruvec() [06/78] epoll: check for events when removing a timed out thread from the wait queue [07/78] epoll: simplify signal handling [08/78] epoll: pull fatal signal checks into ep_send_events() [09/78] epoll: move eavail next to the list_empty_careful check [10/78] epoll: simplify and optimize busy loop logic [11/78] epoll: pull all code between fetch_events and send_event into the loop [12/78] epoll: replace gotos with a proper loop [13/78] epoll: eliminate unnecessary lock for zero timeout [14/78] kasan: drop unnecessary GPL text from comment headers [15/78] kasan: KASAN_VMALLOC depends on KASAN_GENERIC [16/78] kasan: group vmalloc code [17/78] kasan: shadow declarations only for software modes [18/78] kasan: rename (un)poison_shadow to (un)poison_range [19/78] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* [20/78] kasan: only build init.c for software modes [21/78] kasan: split out shadow.c from common.c [22/78] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE [23/78] kasan: rename report and tags files [24/78] kasan: don't duplicate config dependencies [25/78] kasan: hide invalid free check implementation [26/78] kasan: decode stack frame only with KASAN_STACK_ENABLE [27/78] kasan, arm64: only init shadow for software modes [28/78] kasan, arm64: only use kasan_depth for software modes [29/78] kasan, arm64: move initialization message [30/78] kasan, arm64: rename kasan_init_tags and mark as __init [31/78] kasan: rename addr_has_shadow to addr_has_metadata [32/78] kasan: rename print_shadow_for_address to print_memory_metadata [33/78] kasan: rename SHADOW layout macros to META [34/78] kasan: separate metadata_fetch_row for each mode [35/78] kasan: introduce CONFIG_KASAN_HW_TAGS [36/78] arm64: enable armv8.5-a asm-arch option [37/78] arm64: mte: add in-kernel MTE helpers [38/78] arm64: mte: reset the page tag in page->flags [39/78] arm64: mte: add in-kernel tag fault handler [40/78] arm64: kasan: allow enabling in-kernel MTE [41/78] arm64: mte: convert gcr_user into an exclude mask [42/78] arm64: mte: switch GCR_EL1 in kernel entry and exit [43/78] kasan, mm: untag page address in free_reserved_area [44/78] arm64: kasan: align allocations for HW_TAGS [45/78] arm64: kasan: add arch layer for memory tagging helpers [46/78] kasan: define KASAN_GRANULE_SIZE for HW_TAGS [47/78] kasan, x86, s390: update undef CONFIG_KASAN [48/78] kasan, arm64: expand CONFIG_KASAN checks [49/78] kasan, arm64: implement HW_TAGS runtime [50/78] kasan, arm64: print report from tag fault handler [51/78] kasan, mm: reset tags when accessing metadata [52/78] kasan, arm64: enable CONFIG_KASAN_HW_TAGS [53/78] kasan: add documentation for hardware tag-based mode [54/78] kselftest/arm64: check GCR_EL1 after context switch [55/78] kasan: simplify quarantine_put call site [56/78] kasan: rename get_alloc/free_info [57/78] kasan: introduce set_alloc_info [58/78] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK [59/78] kasan: allow VMAP_STACK for HW_TAGS mode [60/78] kasan: remove __kasan_unpoison_stack [61/78] kasan: inline kasan_reset_tag for tag-based modes [62/78] kasan: inline random_tag for HW_TAGS [63/78] kasan: open-code kasan_unpoison_slab [64/78] kasan: inline (un)poison_range and check_invalid_free [65/78] kasan: add and integrate kasan boot parameters [66/78] kasan, mm: check kasan_enabled in annotations [67/78] kasan, mm: rename kasan_poison_kfree [68/78] kasan: don't round_up too much [69/78] kasan: simplify assign_tag and set_tag calls [70/78] kasan: clarify comment in __kasan_kfree_large [71/78] kasan: sanitize objects when metadata doesn't fit [72/78] kasan, mm: allow cache merging with no metadata [73/78] kasan: update documentation [74/78] mm/Kconfig: fix spelling mistake "whats" -> "what's" [75/78] epoll: convert internal api to timespec64 [76/78] epoll: add syscall epoll_pwait2 [77/78] epoll: wire up syscall epoll_pwait2 [78/78] selftests/filesystems: expand epoll with epoll_pwait2

Message ID

20201218220510.q8idAv5xN%akpm@linux-foundation.org (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC4C523B7E
Date: Fri, 18 Dec 2020 14:05:10 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: akpm@linux-foundation.org, andreyknvl@google.com,
 aryabinin@virtuozzo.com, Branislav.Rankov@arm.com,
 catalin.marinas@arm.com, dvyukov@google.com, elver@google.com,
 eugenis@google.com, glider@google.com, gor@linux.ibm.com,
 kevin.brodsky@arm.com, linux-mm@kvack.org, mm-commits@vger.kernel.org,
 torvalds@linux-foundation.org, vincenzo.frascino@arm.com,
 will.deacon@arm.com
Subject: [patch 68/78] kasan: don't round_up too much
Message-ID: <20201218220510.q8idAv5xN%akpm@linux-foundation.org>
In-Reply-To: <20201218140046.497484741326828e5b5d46ec@linux-foundation.org>
User-Agent: s-nail v14.8.16
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

[01/78] mm/memcg: bail early from swap accounting if memcg disabled | expand

Commit Message

Andrew Morton Dec. 18, 2020, 10:05 p.m. UTC

From: Andrey Konovalov <andreyknvl@google.com>
Subject: kasan: don't round_up too much

For hardware tag-based mode kasan_poison_memory() already rounds up the
size. Do the same for software modes and remove round_up() from the common
code.

Link: https://lkml.kernel.org/r/47b232474f1f89dc072aeda0fa58daa6efade377.1606162397.git.andreyknvl@google.com
Link: https://linux-review.googlesource.com/id/Ib397128fac6eba874008662b4964d65352db4aa4
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/kasan/common.c |    8 ++------
 mm/kasan/shadow.c |    1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

--- a/mm/kasan/common.c~kasan-dont-round_up-too-much
+++ a/mm/kasan/common.c
@@ -213,9 +213,7 @@  void __kasan_unpoison_object_data(struct
 
 void __kasan_poison_object_data(struct kmem_cache *cache, void *object)
 {
-	poison_range(object,
-			round_up(cache->object_size, KASAN_GRANULE_SIZE),
-			KASAN_KMALLOC_REDZONE);
+	poison_range(object, cache->object_size, KASAN_KMALLOC_REDZONE);
 }
 
 /*
@@ -288,7 +286,6 @@  static bool ____kasan_slab_free(struct k
 {
 	u8 tag;
 	void *tagged_object;
-	unsigned long rounded_up_size;
 
 	tag = get_tag(object);
 	tagged_object = object;
@@ -309,8 +306,7 @@  static bool ____kasan_slab_free(struct k
 		return true;
 	}
 
-	rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE);
-	poison_range(object, rounded_up_size, KASAN_KMALLOC_FREE);
+	poison_range(object, cache->object_size, KASAN_KMALLOC_FREE);
 
 	if (!kasan_stack_collection_enabled())
 		return false;
--- a/mm/kasan/shadow.c~kasan-dont-round_up-too-much
+++ a/mm/kasan/shadow.c
@@ -83,6 +83,7 @@  void poison_range(const void *address, s
 	 * addresses to this function.
 	 */
 	address = kasan_reset_tag(address);
+	size = round_up(size, KASAN_GRANULE_SIZE);
 
 	/* Skip KFENCE memory if called explicitly outside of sl*b. */
 	if (is_kfence_address(address))

[68/78] kasan: don't round_up too much

Commit Message

Patch