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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEA7CC43464 for ; Fri, 18 Sep 2020 08:04:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2FC8921481 for ; Fri, 18 Sep 2020 08:04:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PZk5MVq7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FC8921481 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 874FA6B0055; Fri, 18 Sep 2020 04:04:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8257C6B005A; Fri, 18 Sep 2020 04:04:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6ED216B005C; Fri, 18 Sep 2020 04:04:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0166.hostedemail.com [216.40.44.166]) by kanga.kvack.org (Postfix) with ESMTP id 4FDF06B0055 for ; Fri, 18 Sep 2020 04:04:19 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0E02012D5 for ; Fri, 18 Sep 2020 08:04:19 +0000 (UTC) X-FDA: 77275444638.09.head23_1b1380527129 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id E4AB1180AD81D for ; Fri, 18 Sep 2020 08:04:18 +0000 (UTC) X-HE-Tag: head23_1b1380527129 X-Filterd-Recvd-Size: 22033 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 18 Sep 2020 08:04:18 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id a17so4626484wrn.6 for ; Fri, 18 Sep 2020 01:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=sN6WRoJbr99xIOpz0jJ0Fxcd65Efp6vGcy18bVZTF7Y=; b=PZk5MVq76PLb8voUjCoMzWs1XoGAO4ZR887R7Cg/2rnSwE/SL1XhtlKCPq0pHBebvU AATshxx4m63RPPaLKbwcuf7QmnlquoaPOzyY5l4QguAWt+Z/37pBOhMeN1vgfhVC/RZC 7FArP7g8OJ/5iu2UGvFqpsZgUW8LHuRuh2G5i4YSbizCeD5qwzOJw3sih4+d6Q/T/b4j wQ+FiOBLnG/byVFS5KzTPaSRAKxJflAJgR8XSw6Bn9e6jjww5+7MqNSHpz55GMeX8oXy 7PDe9TUZMHpTYt9Bim/jB1KNI41IXQKKEnvxw+p7K9K4Ww9UYPs7QzFJStR38HrVGmrT qRPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=sN6WRoJbr99xIOpz0jJ0Fxcd65Efp6vGcy18bVZTF7Y=; b=dtJUd0ZXtQjopMYFKs8imHbkbixq/IbkOt0WTirmGRpRcPM/mlm39IEEx/8dfchX41 pfMsSLgix9Aew4fGpt83oAYVMaG86I3OOtmIMwO4e4SGFFJLVClbndzlBqI+cYz6zAd7 p6n6ePChAnG9R6HtLzNytlLI5KX/h4jYS4lMkHM+9JMxdL8i+fYBkPLuR2CVsOoNTMf4 RWBnX4VnAbaSqXmsr70OxU+M9yeJaSekaIZga2IPCxyf6QG1XQWgZcHuaYKaKbIS/5i5 z1alfTFSC2RxjdO7nTMYl5oN9F77B4RUHbIv5RS9Vk5MT2EqtgsYA0NXvTIrPD8AaNIK Bf0A== X-Gm-Message-State: AOAM532oFAM55r/CpjfckdqyOu7n2+08HQJ811bqeEC/CY4lobRTiVcI a3rZXr7n9WMXG5n6SUgWUWFsjfFiw254DV3QoynQnA== X-Google-Smtp-Source: ABdhPJzHAMDajviQ9mONFnxn+IlAqn5XzYVWfQcO/oFLSPbcSbkEX0G2yKHTsoqXKmDxliOnnbFPKA+ldsGsNwKI2Aw= X-Received: by 2002:adf:e312:: with SMTP id b18mr14018593wrj.372.1600416256553; Fri, 18 Sep 2020 01:04:16 -0700 (PDT) MIME-Version: 1.0 References: <0d1862fec200eec644bbf0e2d5969fb94d2e923e.1600204505.git.andreyknvl@google.com> In-Reply-To: <0d1862fec200eec644bbf0e2d5969fb94d2e923e.1600204505.git.andreyknvl@google.com> From: Alexander Potapenko Date: Fri, 18 Sep 2020 10:04:05 +0200 Message-ID: Subject: Re: [PATCH v2 05/37] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* To: Andrey Konovalov Cc: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 Tue, Sep 15, 2020 at 11:16 PM Andrey Konovalov w= rote: > > This is a preparatory commit for the upcoming addition of a new hardware > tag-based (MTE-based) KASAN mode. > > The new mode won't be using shadow memory, but will still use the concept > of memory granules. KASAN documentation doesn't seem to explain this concept anywhere (I also checked the "kasan: add documentation for hardware tag-based mode" patch), looks like it's only mentioned in MTE documentation. Could you please elaborate on what we consider a granule in each of KASAN m= odes? > Rename KASAN_SHADOW_SCALE_SIZE to KASAN_GRANULE_SIZE, > and KASAN_SHADOW_MASK to KASAN_GRANULE_MASK. > > Also use MASK when used as a mask, otherwise use SIZE. > > No functional changes. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino > --- > Change-Id: Iac733e2248aa9d29f6fc425d8946ba07cca73ecf > --- > Documentation/dev-tools/kasan.rst | 2 +- > lib/test_kasan.c | 2 +- > mm/kasan/common.c | 39 ++++++++++++++++--------------- > mm/kasan/generic.c | 14 +++++------ > mm/kasan/generic_report.c | 8 +++---- > mm/kasan/init.c | 8 +++---- > mm/kasan/kasan.h | 4 ++-- > mm/kasan/report.c | 10 ++++---- > mm/kasan/tags_report.c | 2 +- > 9 files changed, 45 insertions(+), 44 deletions(-) > > diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/= kasan.rst > index 38fd5681fade..a3030fc6afe5 100644 > --- a/Documentation/dev-tools/kasan.rst > +++ b/Documentation/dev-tools/kasan.rst > @@ -264,7 +264,7 @@ Most mappings in vmalloc space are small, requiring l= ess than a full > page of shadow space. Allocating a full shadow page per mapping would > therefore be wasteful. Furthermore, to ensure that different mappings > use different shadow pages, mappings would have to be aligned to > -``KASAN_SHADOW_SCALE_SIZE * PAGE_SIZE``. > +``KASAN_GRANULE_SIZE * PAGE_SIZE``. > > Instead, we share backing space across multiple mappings. We allocate > a backing page when a mapping in vmalloc space uses a particular page > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index 53e953bb1d1d..ddd0b80f24a1 100644 > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@ -25,7 +25,7 @@ > > #include "../mm/kasan/kasan.h" > > -#define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_SHADOW= _SCALE_SIZE) > +#define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANUL= E_SIZE) > > /* > * We assign some test results to these globals to make sure the tests > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 65933b27df81..c9daf2c33651 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -111,7 +111,7 @@ void *memcpy(void *dest, const void *src, size_t len) > > /* > * Poisons the shadow memory for 'size' bytes starting from 'addr'. > - * Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE. > + * Memory addresses should be aligned to KASAN_GRANULE_SIZE. > */ > void kasan_poison_memory(const void *address, size_t size, u8 value) > { > @@ -143,13 +143,13 @@ void kasan_unpoison_memory(const void *address, siz= e_t size) > > kasan_poison_memory(address, size, tag); > > - if (size & KASAN_SHADOW_MASK) { > + if (size & KASAN_GRANULE_MASK) { > u8 *shadow =3D (u8 *)kasan_mem_to_shadow(address + size); > > if (IS_ENABLED(CONFIG_KASAN_SW_TAGS)) > *shadow =3D tag; > else > - *shadow =3D size & KASAN_SHADOW_MASK; > + *shadow =3D size & KASAN_GRANULE_MASK; > } > } > > @@ -301,7 +301,7 @@ void kasan_unpoison_object_data(struct kmem_cache *ca= che, void *object) > void kasan_poison_object_data(struct kmem_cache *cache, void *object) > { > kasan_poison_memory(object, > - round_up(cache->object_size, KASAN_SHADOW_SCALE_S= IZE), > + round_up(cache->object_size, KASAN_GRANULE_SIZE), > KASAN_KMALLOC_REDZONE); > } > > @@ -373,7 +373,7 @@ static inline bool shadow_invalid(u8 tag, s8 shadow_b= yte) > { > if (IS_ENABLED(CONFIG_KASAN_GENERIC)) > return shadow_byte < 0 || > - shadow_byte >=3D KASAN_SHADOW_SCALE_SIZE; > + shadow_byte >=3D KASAN_GRANULE_SIZE; > > /* else CONFIG_KASAN_SW_TAGS: */ > if ((u8)shadow_byte =3D=3D KASAN_TAG_INVALID) > @@ -412,7 +412,7 @@ static bool __kasan_slab_free(struct kmem_cache *cach= e, void *object, > return true; > } > > - rounded_up_size =3D round_up(cache->object_size, KASAN_SHADOW_SCA= LE_SIZE); > + rounded_up_size =3D round_up(cache->object_size, KASAN_GRANULE_SI= ZE); > kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE); > > if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) || > @@ -445,9 +445,9 @@ static void *__kasan_kmalloc(struct kmem_cache *cache= , const void *object, > return NULL; > > redzone_start =3D round_up((unsigned long)(object + size), > - KASAN_SHADOW_SCALE_SIZE); > + KASAN_GRANULE_SIZE); > redzone_end =3D round_up((unsigned long)object + cache->object_si= ze, > - KASAN_SHADOW_SCALE_SIZE); > + KASAN_GRANULE_SIZE); > > if (IS_ENABLED(CONFIG_KASAN_SW_TAGS)) > tag =3D assign_tag(cache, object, false, keep_tag); > @@ -491,7 +491,7 @@ void * __must_check kasan_kmalloc_large(const void *p= tr, size_t size, > > page =3D virt_to_page(ptr); > redzone_start =3D round_up((unsigned long)(ptr + size), > - KASAN_SHADOW_SCALE_SIZE); > + KASAN_GRANULE_SIZE); > redzone_end =3D (unsigned long)ptr + page_size(page); > > kasan_unpoison_memory(ptr, size); > @@ -589,8 +589,8 @@ static int __meminit kasan_mem_notifier(struct notifi= er_block *nb, > shadow_size =3D nr_shadow_pages << PAGE_SHIFT; > shadow_end =3D shadow_start + shadow_size; > > - if (WARN_ON(mem_data->nr_pages % KASAN_SHADOW_SCALE_SIZE) || > - WARN_ON(start_kaddr % (KASAN_SHADOW_SCALE_SIZE << PAGE_SH= IFT))) > + if (WARN_ON(mem_data->nr_pages % KASAN_GRANULE_SIZE) || > + WARN_ON(start_kaddr % (KASAN_GRANULE_SIZE << PAGE_SHIFT))= ) > return NOTIFY_BAD; > > switch (action) { > @@ -748,7 +748,7 @@ void kasan_poison_vmalloc(const void *start, unsigned= long size) > if (!is_vmalloc_or_module_addr(start)) > return; > > - size =3D round_up(size, KASAN_SHADOW_SCALE_SIZE); > + size =3D round_up(size, KASAN_GRANULE_SIZE); > kasan_poison_memory(start, size, KASAN_VMALLOC_INVALID); > } > > @@ -861,22 +861,22 @@ void kasan_release_vmalloc(unsigned long start, uns= igned long end, > unsigned long region_start, region_end; > unsigned long size; > > - region_start =3D ALIGN(start, PAGE_SIZE * KASAN_SHADOW_SCALE_SIZE= ); > - region_end =3D ALIGN_DOWN(end, PAGE_SIZE * KASAN_SHADOW_SCALE_SIZ= E); > + region_start =3D ALIGN(start, PAGE_SIZE * KASAN_GRANULE_SIZE); > + region_end =3D ALIGN_DOWN(end, PAGE_SIZE * KASAN_GRANULE_SIZE); > > free_region_start =3D ALIGN(free_region_start, > - PAGE_SIZE * KASAN_SHADOW_SCALE_SIZE); > + PAGE_SIZE * KASAN_GRANULE_SIZE); > > if (start !=3D region_start && > free_region_start < region_start) > - region_start -=3D PAGE_SIZE * KASAN_SHADOW_SCALE_SIZE; > + region_start -=3D PAGE_SIZE * KASAN_GRANULE_SIZE; > > free_region_end =3D ALIGN_DOWN(free_region_end, > - PAGE_SIZE * KASAN_SHADOW_SCALE_SIZE)= ; > + PAGE_SIZE * KASAN_GRANULE_SIZE); > > if (end !=3D region_end && > free_region_end > region_end) > - region_end +=3D PAGE_SIZE * KASAN_SHADOW_SCALE_SIZE; > + region_end +=3D PAGE_SIZE * KASAN_GRANULE_SIZE; > > shadow_start =3D kasan_mem_to_shadow((void *)region_start); > shadow_end =3D kasan_mem_to_shadow((void *)region_end); > @@ -902,7 +902,8 @@ int kasan_module_alloc(void *addr, size_t size) > unsigned long shadow_start; > > shadow_start =3D (unsigned long)kasan_mem_to_shadow(addr); > - scaled_size =3D (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_= SHIFT; > + scaled_size =3D (size + KASAN_GRANULE_SIZE - 1) >> > + KASAN_SHADOW_SCALE_SHIFT; > shadow_size =3D round_up(scaled_size, PAGE_SIZE); > > if (WARN_ON(!PAGE_ALIGNED(shadow_start))) > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 4b5f905198d8..f6d68aa9872f 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -51,7 +51,7 @@ static __always_inline bool memory_is_poisoned_1(unsign= ed long addr) > s8 shadow_value =3D *(s8 *)kasan_mem_to_shadow((void *)addr); > > if (unlikely(shadow_value)) { > - s8 last_accessible_byte =3D addr & KASAN_SHADOW_MASK; > + s8 last_accessible_byte =3D addr & KASAN_GRANULE_MASK; > return unlikely(last_accessible_byte >=3D shadow_value); > } > > @@ -67,7 +67,7 @@ static __always_inline bool memory_is_poisoned_2_4_8(un= signed long addr, > * Access crosses 8(shadow size)-byte boundary. Such access maps > * into 2 shadow bytes, so we need to check them both. > */ > - if (unlikely(((addr + size - 1) & KASAN_SHADOW_MASK) < size - 1)) > + if (unlikely(((addr + size - 1) & KASAN_GRANULE_MASK) < size - 1)= ) > return *shadow_addr || memory_is_poisoned_1(addr + size -= 1); > > return memory_is_poisoned_1(addr + size - 1); > @@ -78,7 +78,7 @@ static __always_inline bool memory_is_poisoned_16(unsig= ned long addr) > u16 *shadow_addr =3D (u16 *)kasan_mem_to_shadow((void *)addr); > > /* Unaligned 16-bytes access maps into 3 shadow bytes. */ > - if (unlikely(!IS_ALIGNED(addr, KASAN_SHADOW_SCALE_SIZE))) > + if (unlikely(!IS_ALIGNED(addr, KASAN_GRANULE_SIZE))) > return *shadow_addr || memory_is_poisoned_1(addr + 15); > > return *shadow_addr; > @@ -139,7 +139,7 @@ static __always_inline bool memory_is_poisoned_n(unsi= gned long addr, > s8 *last_shadow =3D (s8 *)kasan_mem_to_shadow((void *)las= t_byte); > > if (unlikely(ret !=3D (unsigned long)last_shadow || > - ((long)(last_byte & KASAN_SHADOW_MASK) >=3D *last= _shadow))) > + ((long)(last_byte & KASAN_GRANULE_MASK) >=3D *las= t_shadow))) > return true; > } > return false; > @@ -205,7 +205,7 @@ void kasan_cache_shutdown(struct kmem_cache *cache) > > static void register_global(struct kasan_global *global) > { > - size_t aligned_size =3D round_up(global->size, KASAN_SHADOW_SCALE= _SIZE); > + size_t aligned_size =3D round_up(global->size, KASAN_GRANULE_SIZE= ); > > kasan_unpoison_memory(global->beg, global->size); > > @@ -279,10 +279,10 @@ EXPORT_SYMBOL(__asan_handle_no_return); > /* Emitted by compiler to poison alloca()ed objects. */ > void __asan_alloca_poison(unsigned long addr, size_t size) > { > - size_t rounded_up_size =3D round_up(size, KASAN_SHADOW_SCALE_SIZE= ); > + size_t rounded_up_size =3D round_up(size, KASAN_GRANULE_SIZE); > size_t padding_size =3D round_up(size, KASAN_ALLOCA_REDZONE_SIZE)= - > rounded_up_size; > - size_t rounded_down_size =3D round_down(size, KASAN_SHADOW_SCALE_= SIZE); > + size_t rounded_down_size =3D round_down(size, KASAN_GRANULE_SIZE)= ; > > const void *left_redzone =3D (const void *)(addr - > KASAN_ALLOCA_REDZONE_SIZE); > diff --git a/mm/kasan/generic_report.c b/mm/kasan/generic_report.c > index a38c7a9e192a..4dce1633b082 100644 > --- a/mm/kasan/generic_report.c > +++ b/mm/kasan/generic_report.c > @@ -39,7 +39,7 @@ void *find_first_bad_addr(void *addr, size_t size) > void *p =3D addr; > > while (p < addr + size && !(*(u8 *)kasan_mem_to_shadow(p))) > - p +=3D KASAN_SHADOW_SCALE_SIZE; > + p +=3D KASAN_GRANULE_SIZE; > return p; > } > > @@ -51,14 +51,14 @@ static const char *get_shadow_bug_type(struct kasan_a= ccess_info *info) > shadow_addr =3D (u8 *)kasan_mem_to_shadow(info->first_bad_addr); > > /* > - * If shadow byte value is in [0, KASAN_SHADOW_SCALE_SIZE) we can= look > + * If shadow byte value is in [0, KASAN_GRANULE_SIZE) we can look > * at the next shadow byte to determine the type of the bad acces= s. > */ > - if (*shadow_addr > 0 && *shadow_addr <=3D KASAN_SHADOW_SCALE_SIZE= - 1) > + if (*shadow_addr > 0 && *shadow_addr <=3D KASAN_GRANULE_SIZE - 1) > shadow_addr++; > > switch (*shadow_addr) { > - case 0 ... KASAN_SHADOW_SCALE_SIZE - 1: > + case 0 ... KASAN_GRANULE_SIZE - 1: > /* > * In theory it's still possible to see these shadow valu= es > * due to a data race in the kernel code. > diff --git a/mm/kasan/init.c b/mm/kasan/init.c > index fe6be0be1f76..754b641c83c7 100644 > --- a/mm/kasan/init.c > +++ b/mm/kasan/init.c > @@ -447,8 +447,8 @@ void kasan_remove_zero_shadow(void *start, unsigned l= ong size) > end =3D addr + (size >> KASAN_SHADOW_SCALE_SHIFT); > > if (WARN_ON((unsigned long)start % > - (KASAN_SHADOW_SCALE_SIZE * PAGE_SIZE)) || > - WARN_ON(size % (KASAN_SHADOW_SCALE_SIZE * PAGE_SIZE))) > + (KASAN_GRANULE_SIZE * PAGE_SIZE)) || > + WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE))) > return; > > for (; addr < end; addr =3D next) { > @@ -482,8 +482,8 @@ int kasan_add_zero_shadow(void *start, unsigned long = size) > shadow_end =3D shadow_start + (size >> KASAN_SHADOW_SCALE_SHIFT); > > if (WARN_ON((unsigned long)start % > - (KASAN_SHADOW_SCALE_SIZE * PAGE_SIZE)) || > - WARN_ON(size % (KASAN_SHADOW_SCALE_SIZE * PAGE_SIZE))) > + (KASAN_GRANULE_SIZE * PAGE_SIZE)) || > + WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE))) > return -EINVAL; > > ret =3D kasan_populate_early_shadow(shadow_start, shadow_end); > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 03450d3b31f7..c31e2c739301 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -5,8 +5,8 @@ > #include > #include > > -#define KASAN_SHADOW_SCALE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) > -#define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) > +#define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) > +#define KASAN_GRANULE_MASK (KASAN_GRANULE_SIZE - 1) > > #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ > #define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */ > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 4f49fa6cd1aa..7c025d792e2f 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -317,24 +317,24 @@ static bool __must_check get_address_stack_frame_in= fo(const void *addr, > return false; > > aligned_addr =3D round_down((unsigned long)addr, sizeof(long)); > - mem_ptr =3D round_down(aligned_addr, KASAN_SHADOW_SCALE_SIZE); > + mem_ptr =3D round_down(aligned_addr, KASAN_GRANULE_SIZE); > shadow_ptr =3D kasan_mem_to_shadow((void *)aligned_addr); > shadow_bottom =3D kasan_mem_to_shadow(end_of_stack(current)); > > while (shadow_ptr >=3D shadow_bottom && *shadow_ptr !=3D KASAN_ST= ACK_LEFT) { > shadow_ptr--; > - mem_ptr -=3D KASAN_SHADOW_SCALE_SIZE; > + mem_ptr -=3D KASAN_GRANULE_SIZE; > } > > while (shadow_ptr >=3D shadow_bottom && *shadow_ptr =3D=3D KASAN_= STACK_LEFT) { > shadow_ptr--; > - mem_ptr -=3D KASAN_SHADOW_SCALE_SIZE; > + mem_ptr -=3D KASAN_GRANULE_SIZE; > } > > if (shadow_ptr < shadow_bottom) > return false; > > - frame =3D (const unsigned long *)(mem_ptr + KASAN_SHADOW_SCALE_SI= ZE); > + frame =3D (const unsigned long *)(mem_ptr + KASAN_GRANULE_SIZE); > if (frame[0] !=3D KASAN_CURRENT_STACK_FRAME_MAGIC) { > pr_err("KASAN internal error: frame info validation faile= d; invalid marker: %lu\n", > frame[0]); > @@ -572,6 +572,6 @@ void kasan_non_canonical_hook(unsigned long addr) > else > bug_type =3D "maybe wild-memory-access"; > pr_alert("KASAN: %s in range [0x%016lx-0x%016lx]\n", bug_type, > - orig_addr, orig_addr + KASAN_SHADOW_MASK); > + orig_addr, orig_addr + KASAN_GRANULE_SIZE - 1); > } > #endif > diff --git a/mm/kasan/tags_report.c b/mm/kasan/tags_report.c > index bee43717d6f0..6ddb55676a7c 100644 > --- a/mm/kasan/tags_report.c > +++ b/mm/kasan/tags_report.c > @@ -81,7 +81,7 @@ void *find_first_bad_addr(void *addr, size_t size) > void *end =3D p + size; > > while (p < end && tag =3D=3D *(u8 *)kasan_mem_to_shadow(p)) > - p +=3D KASAN_SHADOW_SCALE_SIZE; > + p +=3D KASAN_GRANULE_SIZE; > return p; > } > > -- > 2.28.0.618.gf4bc123cb7-goog > --=20 Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Stra=C3=9Fe, 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg