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 C085FC433EF for ; Thu, 2 Dec 2021 17:17:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 56F316B0074; Thu, 2 Dec 2021 12:17:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F6AE6B0075; Thu, 2 Dec 2021 12:17:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 399116B0078; Thu, 2 Dec 2021 12:17:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0119.hostedemail.com [216.40.44.119]) by kanga.kvack.org (Postfix) with ESMTP id 27A566B0074 for ; Thu, 2 Dec 2021 12:17:13 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id E39577BFAB for ; Thu, 2 Dec 2021 17:17:02 +0000 (UTC) X-FDA: 78873509484.09.862F207 Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by imf25.hostedemail.com (Postfix) with ESMTP id 1C106B000183 for ; Thu, 2 Dec 2021 17:17:01 +0000 (UTC) Received: by mail-io1-f45.google.com with SMTP id z26so319256iod.10 for ; Thu, 02 Dec 2021 09:17:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+VlhgbxZ//E40UP4VkdcPEO+gAtVu81nLcN2Mja4zCg=; b=bFNdUTFdD5CLP1AwJJxSMNZCemGCcULNG698QNBmuwVGp7Qf8GZ8RZGN2zU87oOFkI 6q5Sj0JKEbwSg11xlUx3uOwVOBR/GTvV/m5u8IVfF3ZX7hrxotk7Ua+Of3HVKAepdvIC Hyg1+sIQyay4nl99RcvuGkrU/uhLqI154Ugd1s+CApVybU9nUke3uhpeArp/2xoagaTw o/fFXmGeZmTbQAcFoqvk4u5iXIt7d3C6Lz1xmhJM6f5QlgCu3CgXmNv4T3KImDY1usH8 y+c9ps/lWNVfo1aWYuNjcjbKZjvwXad/4xA7jdN5ZWbAB+q0xI6KN2IKQqBJ0IjAyi19 AqLQ== 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=+VlhgbxZ//E40UP4VkdcPEO+gAtVu81nLcN2Mja4zCg=; b=zkuiF5uCUaR5bGpvJY9YEx8MDZXqiGTrQSglzJWITZeI8ZLOwgKsz+jUC2qnYZuPZY Bv3yq6nqEkBCktoVzfranMmQt8LhQYenDFtWPaJ/3meV/Ofk1MfhJ8x7GDL7azbc35iu 00zq/TZMKEr8ZrVcZim3VYnhSL4/lRtSFiMeyPmO2Atvaiyh34EUY6dzwjLJ5tWOEdvF OGa3G4x0GtavCib2PC1k+qpYyeMd8d3b8Rz5xuNE79rPsUZZKmwYF8LFWgdDAYzPcvWm ojyjyLAUfLAkvG9mUWgqhRsVuGUKkWf5e8g1j4PFH9/7XT9g/7vBgvnZG7vIV1Mndpti UoMg== X-Gm-Message-State: AOAM532aBUPlmhIZsDAs1Csx8kndzjFqiP9P4wCtXB9YmX61qqRGoFyh ZIWT39ASF9osbjRA3aAvjMmQM/llSXX0eNRW6jc= X-Google-Smtp-Source: ABdhPJydA1mzNUhebu5OALLOvHpRmcfmiwARln4ZX7nS8dVN5tbslnmENTCu+IwHzPPU81xo35McyQw8sZjsSiRItWg= X-Received: by 2002:a5e:d502:: with SMTP id e2mr17468976iom.118.1638465421406; Thu, 02 Dec 2021 09:17:01 -0800 (PST) MIME-Version: 1.0 References: <20211201181510.18784-1-vbabka@suse.cz> <20211201181510.18784-26-vbabka@suse.cz> In-Reply-To: <20211201181510.18784-26-vbabka@suse.cz> From: Andrey Konovalov Date: Thu, 2 Dec 2021 18:16:50 +0100 Message-ID: Subject: Re: [PATCH v2 25/33] mm/kasan: Convert to struct folio and struct slab To: Vlastimil Babka Cc: Matthew Wilcox , Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg , Linux Memory Management List , Andrew Morton , patches@lists.linux.dev, Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1C106B000183 X-Stat-Signature: ewu43k4wzng4yksh7mdimzu5cso43hp1 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bFNdUTFd; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.166.45 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com X-HE-Tag: 1638465421-518803 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 Wed, Dec 1, 2021 at 7:15 PM Vlastimil Babka wrote: > > From: "Matthew Wilcox (Oracle)" > > KASAN accesses some slab related struct page fields so we need to convert it > to struct slab. Some places are a bit simplified thanks to kasan_addr_to_slab() > encapsulating the PageSlab flag check through virt_to_slab(). > When resolving object address to either a real slab or a large kmalloc, use > struct folio as the intermediate type for testing the slab flag to avoid > unnecessary implicit compound_head(). > > [ vbabka@suse.cz: use struct folio, adjust to differences in previous patches ] > > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Vlastimil Babka > Cc: Andrey Ryabinin > Cc: Alexander Potapenko > Cc: Andrey Konovalov > Cc: Dmitry Vyukov > Cc: > --- > include/linux/kasan.h | 9 +++++---- > mm/kasan/common.c | 23 +++++++++++++---------- > mm/kasan/generic.c | 8 ++++---- > mm/kasan/kasan.h | 1 + > mm/kasan/quarantine.c | 2 +- > mm/kasan/report.c | 13 +++++++++++-- > mm/kasan/report_tags.c | 10 +++++----- > mm/slab.c | 2 +- > mm/slub.c | 2 +- > 9 files changed, 42 insertions(+), 28 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index d8783b682669..fb78108d694e 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -9,6 +9,7 @@ > > struct kmem_cache; > struct page; > +struct slab; > struct vm_struct; > struct task_struct; > > @@ -193,11 +194,11 @@ static __always_inline size_t kasan_metadata_size(struct kmem_cache *cache) > return 0; > } > > -void __kasan_poison_slab(struct page *page); > -static __always_inline void kasan_poison_slab(struct page *page) > +void __kasan_poison_slab(struct slab *slab); > +static __always_inline void kasan_poison_slab(struct slab *slab) > { > if (kasan_enabled()) > - __kasan_poison_slab(page); > + __kasan_poison_slab(slab); > } > > void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object); > @@ -322,7 +323,7 @@ static inline void kasan_cache_create(struct kmem_cache *cache, > slab_flags_t *flags) {} > static inline void kasan_cache_create_kmalloc(struct kmem_cache *cache) {} > static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > -static inline void kasan_poison_slab(struct page *page) {} > +static inline void kasan_poison_slab(struct slab *slab) {} > static inline void kasan_unpoison_object_data(struct kmem_cache *cache, > void *object) {} > static inline void kasan_poison_object_data(struct kmem_cache *cache, > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 6a1cd2d38bff..7c06db78a76c 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -247,8 +247,9 @@ struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, > } > #endif > > -void __kasan_poison_slab(struct page *page) > +void __kasan_poison_slab(struct slab *slab) > { > + struct page *page = slab_page(slab); > unsigned long i; > > for (i = 0; i < compound_nr(page); i++) > @@ -401,9 +402,9 @@ void __kasan_kfree_large(void *ptr, unsigned long ip) > > void __kasan_slab_free_mempool(void *ptr, unsigned long ip) > { > - struct page *page; > + struct folio *folio; > > - page = virt_to_head_page(ptr); > + folio = virt_to_folio(ptr); > > /* > * Even though this function is only called for kmem_cache_alloc and > @@ -411,12 +412,14 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip) > * !PageSlab() when the size provided to kmalloc is larger than > * KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc. > */ > - if (unlikely(!PageSlab(page))) { > + if (unlikely(!folio_test_slab(folio))) { > if (____kasan_kfree_large(ptr, ip)) > return; > - kasan_poison(ptr, page_size(page), KASAN_FREE_PAGE, false); > + kasan_poison(ptr, folio_size(folio), KASAN_FREE_PAGE, false); > } else { > - ____kasan_slab_free(page->slab_cache, ptr, ip, false, false); > + struct slab *slab = folio_slab(folio); > + > + ____kasan_slab_free(slab->slab_cache, ptr, ip, false, false); > } > } > > @@ -560,7 +563,7 @@ void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, > > void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flags) > { > - struct page *page; > + struct slab *slab; > > if (unlikely(object == ZERO_SIZE_PTR)) > return (void *)object; > @@ -572,13 +575,13 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag > */ > kasan_unpoison(object, size, false); > > - page = virt_to_head_page(object); > + slab = virt_to_slab(object); > > /* Piggy-back on kmalloc() instrumentation to poison the redzone. */ > - if (unlikely(!PageSlab(page))) > + if (unlikely(!slab)) > return __kasan_kmalloc_large(object, size, flags); > else > - return ____kasan_kmalloc(page->slab_cache, object, size, flags); > + return ____kasan_kmalloc(slab->slab_cache, object, size, flags); > } > > bool __kasan_check_byte(const void *address, unsigned long ip) > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 5d0b79416c4e..a25ad4090615 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -330,16 +330,16 @@ DEFINE_ASAN_SET_SHADOW(f8); > > static void __kasan_record_aux_stack(void *addr, bool can_alloc) > { > - struct page *page = kasan_addr_to_page(addr); > + struct slab *slab = kasan_addr_to_slab(addr); > struct kmem_cache *cache; > struct kasan_alloc_meta *alloc_meta; > void *object; > > - if (is_kfence_address(addr) || !(page && PageSlab(page))) > + if (is_kfence_address(addr) || !slab) > return; > > - cache = page->slab_cache; > - object = nearest_obj(cache, page_slab(page), addr); > + cache = slab->slab_cache; > + object = nearest_obj(cache, slab, addr); > alloc_meta = kasan_get_alloc_meta(cache, object); > if (!alloc_meta) > return; > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index aebd8df86a1f..c17fa8d26ffe 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -265,6 +265,7 @@ bool kasan_report(unsigned long addr, size_t size, > void kasan_report_invalid_free(void *object, unsigned long ip); > > struct page *kasan_addr_to_page(const void *addr); > +struct slab *kasan_addr_to_slab(const void *addr); > > depot_stack_handle_t kasan_save_stack(gfp_t flags, bool can_alloc); > void kasan_set_track(struct kasan_track *track, gfp_t flags); > diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c > index d8ccff4c1275..587da8995f2d 100644 > --- a/mm/kasan/quarantine.c > +++ b/mm/kasan/quarantine.c > @@ -117,7 +117,7 @@ static unsigned long quarantine_batch_size; > > static struct kmem_cache *qlink_to_cache(struct qlist_node *qlink) > { > - return virt_to_head_page(qlink)->slab_cache; > + return virt_to_slab(qlink)->slab_cache; > } > > static void *qlink_to_object(struct qlist_node *qlink, struct kmem_cache *cache) > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index e00999dc6499..3ad9624dcc56 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -150,6 +150,14 @@ struct page *kasan_addr_to_page(const void *addr) > return NULL; > } > > +struct slab *kasan_addr_to_slab(const void *addr) > +{ > + if ((addr >= (void *)PAGE_OFFSET) && > + (addr < high_memory)) > + return virt_to_slab(addr); > + return NULL; > +} > + > static void describe_object_addr(struct kmem_cache *cache, void *object, > const void *addr) > { > @@ -248,8 +256,9 @@ static void print_address_description(void *addr, u8 tag) > pr_err("\n"); > > if (page && PageSlab(page)) { > - struct kmem_cache *cache = page->slab_cache; > - void *object = nearest_obj(cache, page_slab(page), addr); > + struct slab *slab = page_slab(page); > + struct kmem_cache *cache = slab->slab_cache; > + void *object = nearest_obj(cache, slab, addr); > > describe_object(cache, object, addr, tag); > } > diff --git a/mm/kasan/report_tags.c b/mm/kasan/report_tags.c > index 06c21dd77493..1b41de88c53e 100644 > --- a/mm/kasan/report_tags.c > +++ b/mm/kasan/report_tags.c > @@ -12,7 +12,7 @@ const char *kasan_get_bug_type(struct kasan_access_info *info) > #ifdef CONFIG_KASAN_TAGS_IDENTIFY > struct kasan_alloc_meta *alloc_meta; > struct kmem_cache *cache; > - struct page *page; > + struct slab *slab; > const void *addr; > void *object; > u8 tag; > @@ -20,10 +20,10 @@ const char *kasan_get_bug_type(struct kasan_access_info *info) > > tag = get_tag(info->access_addr); > addr = kasan_reset_tag(info->access_addr); > - page = kasan_addr_to_page(addr); > - if (page && PageSlab(page)) { > - cache = page->slab_cache; > - object = nearest_obj(cache, page_slab(page), (void *)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) { > diff --git a/mm/slab.c b/mm/slab.c > index 785fffd527fe..fed55fa1b7d0 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -2605,7 +2605,7 @@ static struct slab *cache_grow_begin(struct kmem_cache *cachep, > * page_address() in the latter returns a non-tagged pointer, > * as it should be for slab pages. > */ > - kasan_poison_slab(slab_page(slab)); > + kasan_poison_slab(slab); > > /* Get slab management. */ > freelist = alloc_slabmgmt(cachep, slab, offset, > diff --git a/mm/slub.c b/mm/slub.c > index 61aaaa662c5e..58f0d499a293 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1961,7 +1961,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) > > slab->slab_cache = s; > > - kasan_poison_slab(slab_page(slab)); > + kasan_poison_slab(slab); > > start = slab_address(slab); > > -- > 2.33.1 > Reviewed-by: Andrey Konovalov Great job with the overall struct page refactoring! Thanks!