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 04C3AC55ABD for ; Wed, 11 Nov 2020 15:22:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3928C20729 for ; Wed, 11 Nov 2020 15:22:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZsqrL7Uq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3928C20729 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 565266B0074; Wed, 11 Nov 2020 10:22:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 53C836B0075; Wed, 11 Nov 2020 10:22:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 404796B0078; Wed, 11 Nov 2020 10:22:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0033.hostedemail.com [216.40.44.33]) by kanga.kvack.org (Postfix) with ESMTP id 1416F6B0074 for ; Wed, 11 Nov 2020 10:22:19 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A2E2F3625 for ; Wed, 11 Nov 2020 15:22:18 +0000 (UTC) X-FDA: 77472503556.26.humor91_4f11e75272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 8A9C91804B647 for ; Wed, 11 Nov 2020 15:22:18 +0000 (UTC) X-HE-Tag: humor91_4f11e75272fe X-Filterd-Recvd-Size: 11195 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 15:22:17 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id 3so1518032qtx.3 for ; Wed, 11 Nov 2020 07:22:17 -0800 (PST) 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=qP4CSavCKNiU1+9udAKKC5xpzE+JMfMUoD8Vn5vSarA=; b=ZsqrL7UqboEVbmwb1xfP06XCTlfvvfqvOkGZL4UzWJZASDhQmvtBWdxbAYU6VsanQc PlSlhZDLGl1/w0TznIjmS0cegGpqDKu0U52bznh1/bCnTCDpV74hSoRkJGm98IlTnULw B/C8QeyZhA5qo6aq0PPIeisRzfDKYfi9sedlUw34GniGn4ivh9hv9MftjMPtMjVseSCY JMIT8sQqyEpCgEaG4l1j5+eoj9dJLct0Y2xbzKEpImLdM4aieKVuqs/IlxKBB727CLuP Cyvg5sLq6dcV1AmeZZlswu8M+AbUl/hP7LA7VhevaMQCxDYvAF/pfK5RyfSXg6n2qJ2S My3Q== 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=qP4CSavCKNiU1+9udAKKC5xpzE+JMfMUoD8Vn5vSarA=; b=BndSED3ikrb2HacSwrZ/2kiS2scWPQ2+gkwAkU0bZ24VHqCB/TlbOiPaewAVWGuwO0 3j08omVLSSi/jGC0OtlrZn6AEAx4ClERcUIe0U+LDxLZzz/HRr3EiAyGlmim4R+BYrXj yQd2DcAH0p3Nav8fji/0jxLzcrgqr8hoNzJWZizucbDuGdcYM6PWNLlzcaVsfBYE8vqj 6cxFB172+RtyPAL83xThW7wGWd4kfFj9aKLUdOWkIz/eA+EKf/f5uhzU5fHQSg91etq9 sQbTNt9NAt5goLbLCJOpKSNUPIIfho41tWUW0ZDJZiIWntByNevpo/AfP40NlWnGfV90 5iEg== X-Gm-Message-State: AOAM531mOnztl2qH9sOEKAqUSfQ3vBjUNEBovKPNo+7IuZna9wc95x0x 4n+J6fDoSBv+Ju5e226D/Ipgo4U5ThDi6t+nALvEDw== X-Google-Smtp-Source: ABdhPJxiZxZyN0qQpD9W+/3tNiuAMbdabEcibaJ3sZTL/vTnOOPC8H4lZkBzg8XTxfiFAOjkwABI+I7VhIzvt8sfJjs= X-Received: by 2002:ac8:5c85:: with SMTP id r5mr19151032qta.8.1605108137054; Wed, 11 Nov 2020 07:22:17 -0800 (PST) MIME-Version: 1.0 References: <560e04850b62da4fd69caa92b4ce3bebf275ea59.1605046192.git.andreyknvl@google.com> In-Reply-To: <560e04850b62da4fd69caa92b4ce3bebf275ea59.1605046192.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 11 Nov 2020 16:22:05 +0100 Message-ID: Subject: Re: [PATCH v9 23/44] kasan: separate metadata_fetch_row for each mode To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , 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, Nov 10, 2020 at 11:12 PM Andrey Konovalov w= rote: > > This is a preparatory commit for the upcoming addition of a new hardware > tag-based (MTE-based) KASAN mode. > > Rework print_memory_metadata() to make it agnostic with regard to the > way metadata is stored. Allow providing a separate metadata_fetch_row() > implementation for each KASAN mode. Hardware tag-based KASAN will provide > its own implementation that doesn't use shadow memory. > > No functional changes for software modes. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino > Reviewed-by: Marco Elver > --- > Change-Id: I5b0ed1d079ea776e620beca6a529a861e7dced95 > --- > mm/kasan/kasan.h | 8 ++++++ > mm/kasan/report.c | 56 +++++++++++++++++++-------------------- > mm/kasan/report_generic.c | 5 ++++ > mm/kasan/report_sw_tags.c | 5 ++++ > 4 files changed, 45 insertions(+), 29 deletions(-) > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index f9366dfd94c9..b5b00bff358f 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -57,6 +57,13 @@ > #define KASAN_ABI_VERSION 1 > #endif > > +/* Metadata layout customization. */ > +#define META_BYTES_PER_BLOCK 1 > +#define META_BLOCKS_PER_ROW 16 > +#define META_BYTES_PER_ROW (META_BLOCKS_PER_ROW * META_BYTES_PER_BLOCK) > +#define META_MEM_BYTES_PER_ROW (META_BYTES_PER_ROW * KASAN_GRANULE_SIZE) > +#define META_ROWS_AROUND_ADDR 2 > + > struct kasan_access_info { > const void *access_addr; > const void *first_bad_addr; > @@ -168,6 +175,7 @@ bool check_invalid_free(void *addr); > > void *find_first_bad_addr(void *addr, size_t size); > const char *get_bug_type(struct kasan_access_info *info); > +void metadata_fetch_row(char *buffer, void *row); > > #if defined(CONFIG_KASAN_GENERIC) && CONFIG_KASAN_STACK > void print_address_stack_frame(const void *addr); > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 8c588588c88f..8afc1a6ab202 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -33,12 +33,6 @@ > #include "kasan.h" > #include "../slab.h" > > -/* Metadata layout customization. */ > -#define META_BYTES_PER_BLOCK 1 > -#define META_BLOCKS_PER_ROW 16 > -#define META_BYTES_PER_ROW (META_BLOCKS_PER_ROW * META_BYTES_PER_BLOCK) > -#define META_ROWS_AROUND_ADDR 2 > - > static unsigned long kasan_flags; > > #define KASAN_BIT_REPORTED 0 > @@ -238,55 +232,59 @@ static void print_address_description(void *addr, u= 8 tag) > print_address_stack_frame(addr); > } > > -static bool row_is_guilty(const void *row, const void *guilty) > +static bool meta_row_is_guilty(const void *row, const void *addr) > { > - return (row <=3D guilty) && (guilty < row + META_BYTES_PER_ROW); > + return (row <=3D addr) && (addr < row + META_MEM_BYTES_PER_ROW); > } > > -static int shadow_pointer_offset(const void *row, const void *shadow) > +static int meta_pointer_offset(const void *row, const void *addr) > { > - /* The length of ">ff00ff00ff00ff00: " is > - * 3 + (BITS_PER_LONG/8)*2 chars. > + /* > + * Memory state around the buggy address: > + * ff00ff00ff00ff00: 00 00 00 05 fe fe fe fe fe fe fe fe fe fe f= e fe > + * ... > + * > + * The length of ">ff00ff00ff00ff00: " is > + * 3 + (BITS_PER_LONG / 8) * 2 chars. > + * The length of each granule metadata is 2 bytes > + * plus 1 byte for space. > */ > - return 3 + (BITS_PER_LONG/8)*2 + (shadow - row)*2 + > - (shadow - row) / META_BYTES_PER_BLOCK + 1; > + return 3 + (BITS_PER_LONG / 8) * 2 + > + (addr - row) / KASAN_GRANULE_SIZE * 3 + 1; > } > > static void print_memory_metadata(const void *addr) > { > int i; > - const void *shadow =3D kasan_mem_to_shadow(addr); > - const void *shadow_row; > + void *row; > > - shadow_row =3D (void *)round_down((unsigned long)shadow, > - META_BYTES_PER_ROW) > - - META_ROWS_AROUND_ADDR * META_BYTES_PER_ROW; > + row =3D (void *)round_down((unsigned long)addr, META_MEM_BYTES_PE= R_ROW) > + - META_ROWS_AROUND_ADDR * META_MEM_BYTES_PER_ROW; > > pr_err("Memory state around the buggy address:\n"); > > for (i =3D -META_ROWS_AROUND_ADDR; i <=3D META_ROWS_AROUND_ADDR; = i++) { > - const void *kaddr =3D kasan_shadow_to_mem(shadow_row); > - char buffer[4 + (BITS_PER_LONG/8)*2]; > - char shadow_buf[META_BYTES_PER_ROW]; > + char buffer[4 + (BITS_PER_LONG / 8) * 2]; > + char metadata[META_BYTES_PER_ROW]; > > snprintf(buffer, sizeof(buffer), > - (i =3D=3D 0) ? ">%px: " : " %px: ", kaddr); > + (i =3D=3D 0) ? ">%px: " : " %px: ", row); > + > /* > * We should not pass a shadow pointer to generic > * function, because generic functions may try to > * access kasan mapping for the passed address. > */ > - memcpy(shadow_buf, shadow_row, META_BYTES_PER_ROW); > + metadata_fetch_row(&metadata[0], row); > + > print_hex_dump(KERN_ERR, buffer, > DUMP_PREFIX_NONE, META_BYTES_PER_ROW, 1, > - shadow_buf, META_BYTES_PER_ROW, 0); > + metadata, META_BYTES_PER_ROW, 0); > > - if (row_is_guilty(shadow_row, shadow)) > - pr_err("%*c\n", > - shadow_pointer_offset(shadow_row, shadow)= , > - '^'); > + if (meta_row_is_guilty(row, addr)) > + pr_err("%*c\n", meta_pointer_offset(row, addr), '= ^'); > > - shadow_row +=3D META_BYTES_PER_ROW; > + row +=3D META_MEM_BYTES_PER_ROW; > } > } > > diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c > index 16ed550850e9..8a9c889872da 100644 > --- a/mm/kasan/report_generic.c > +++ b/mm/kasan/report_generic.c > @@ -123,6 +123,11 @@ const char *get_bug_type(struct kasan_access_info *i= nfo) > return get_wild_bug_type(info); > } > > +void metadata_fetch_row(char *buffer, void *row) > +{ > + memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW); I think it is important to use __memcpy() instead of memcpy() in KASAN runtime to avoid calling instrumented code. > +} > + > #if CONFIG_KASAN_STACK > static bool __must_check tokenize_frame_descr(const char **frame_descr, > char *token, size_t max_tok= _len, > diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c > index c87d5a343b4e..add2dfe6169c 100644 > --- a/mm/kasan/report_sw_tags.c > +++ b/mm/kasan/report_sw_tags.c > @@ -80,6 +80,11 @@ void *find_first_bad_addr(void *addr, size_t size) > return p; > } > > +void metadata_fetch_row(char *buffer, void *row) > +{ > + memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW); Ditto. > +} > + > void print_tags(u8 addr_tag, const void *addr) > { > u8 *shadow =3D (u8 *)kasan_mem_to_shadow(addr); > -- > 2.29.2.222.g5d2a92d10f8-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