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=unavailable 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 2F456C5517A for ; Wed, 11 Nov 2020 15:19:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 90A91206B5 for ; Wed, 11 Nov 2020 15:19:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gyKbCHEv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90A91206B5 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 8284F6B0070; Wed, 11 Nov 2020 10:19:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B18A6B0073; Wed, 11 Nov 2020 10:19:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 652686B0074; Wed, 11 Nov 2020 10:19:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id 34C7A6B0070 for ; Wed, 11 Nov 2020 10:19:02 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D07398249980 for ; Wed, 11 Nov 2020 15:19:01 +0000 (UTC) X-FDA: 77472495282.13.ray48_5c01aea272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id D9D8718140B89 for ; Wed, 11 Nov 2020 15:18:56 +0000 (UTC) X-HE-Tag: ray48_5c01aea272fe X-Filterd-Recvd-Size: 8080 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 15:18:56 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id v11so1465697qtq.12 for ; Wed, 11 Nov 2020 07:18:56 -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=3XxacOuX3QMvhk3diut0JoyxopS0EmCY/QAdadNPdVM=; b=gyKbCHEvMSsk8Irp2rXztZu1dowW4d7MJeILveQ2vZu+MGAuBTlLZZfmurmnsW0dq6 Pz0stgrwWryX/EpsrWfAjlwofnpJz2zHTUwDOHUKOlKICRUt2SylO8mh3Ey8Saa19sgK wHd2/ZjLoWBU89By2001w9A8SlfNuPkoE+eE3vGcr8QrRlaPMNzcUhEYVvgjHPL/C0Y2 33zdC9PFn1cQEL4CUAcHpbkIkvzTqAAS5r/+2oav9jUkzts6lpKmozQzOJ6G/JZTWrDz HRUm03gTixCRn89R0tWszQYcUPyHSTU+wHyyBrGL5DyRPyIrwyWTrB8B+poDKe7fiFzY Pkcw== 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=3XxacOuX3QMvhk3diut0JoyxopS0EmCY/QAdadNPdVM=; b=DeuGLv/wS/3aVHTbxAW6lm/v5M7FuiM1Dg7aUdyFBGbJBDgQLX2WPhlmI2zbBPOCke cn41IVmbphpVp9fs5b3329H/mLNlI6xn14FqRSQxuXvZRmSBhlt4fybCa3IVsNrikk6S JwYMvciF2N22MEpQWrFlKTuWZ6v9sKIZ6pvTj+w/nhbgleZFOlSpCXXucaVi7AwpuoOb Ymr0q5/Zh8++hBrW0Z44+s/36DzJjdAa+i7UR5qM57JMc3/yAp0u6PQs/mcuikVOXDfz rPwfovHTzC0HhMqk+o+o/SUvCM3toefbQLEE/vaHim9/4q63VXpGCew43RkJFsez8qVc GMXg== X-Gm-Message-State: AOAM531Mt0WPpCZGLCcEUsmPkKYKShtqF7CQFhIrfCMqiyLEFnKdGj3b AHURD5SFUMeJ1bKt4Ix4XmR2zbNaD+/j1zqJek/fAQ== X-Google-Smtp-Source: ABdhPJzzTtpZKzryIB5iY91wMMpoKoaRlpfD/zhQ3TLmjx6u5ZGI+L4GdfLl8xeG2FfGSbieam7/2814RlEfmz8oxvg= X-Received: by 2002:ac8:5c85:: with SMTP id r5mr19136944qta.8.1605107935487; Wed, 11 Nov 2020 07:18:55 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Alexander Potapenko Date: Wed, 11 Nov 2020 16:18:43 +0100 Message-ID: Subject: Re: [PATCH v9 22/44] kasan: rename SHADOW layout macros to META 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.000004, 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. > > Hardware tag-based KASAN won't be using shadow memory, but will reuse > these macros. Rename "SHADOW" to implementation-neutral "META". > > No functional changes. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino > Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko > --- > Change-Id: Id2d836bf43b401bce1221cc06e745185f17b1cc > --- > mm/kasan/report.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index 594bad2a3a5e..8c588588c88f 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -33,11 +33,11 @@ > #include "kasan.h" > #include "../slab.h" > > -/* Shadow layout customization. */ > -#define SHADOW_BYTES_PER_BLOCK 1 > -#define SHADOW_BLOCKS_PER_ROW 16 > -#define SHADOW_BYTES_PER_ROW (SHADOW_BLOCKS_PER_ROW * SHADOW_BYTES_PER_B= LOCK) > -#define SHADOW_ROWS_AROUND_ADDR 2 > +/* 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; > > @@ -240,7 +240,7 @@ static void print_address_description(void *addr, u8 = tag) > > static bool row_is_guilty(const void *row, const void *guilty) > { > - return (row <=3D guilty) && (guilty < row + SHADOW_BYTES_PER_ROW)= ; > + return (row <=3D guilty) && (guilty < row + META_BYTES_PER_ROW); > } > > static int shadow_pointer_offset(const void *row, const void *shadow) > @@ -249,7 +249,7 @@ static int shadow_pointer_offset(const void *row, con= st void *shadow) > * 3 + (BITS_PER_LONG/8)*2 chars. > */ > return 3 + (BITS_PER_LONG/8)*2 + (shadow - row)*2 + > - (shadow - row) / SHADOW_BYTES_PER_BLOCK + 1; > + (shadow - row) / META_BYTES_PER_BLOCK + 1; > } > > static void print_memory_metadata(const void *addr) > @@ -259,15 +259,15 @@ static void print_memory_metadata(const void *addr) > const void *shadow_row; > > shadow_row =3D (void *)round_down((unsigned long)shadow, > - SHADOW_BYTES_PER_ROW) > - - SHADOW_ROWS_AROUND_ADDR * SHADOW_BYTES_PER_ROW; > + META_BYTES_PER_ROW) > + - META_ROWS_AROUND_ADDR * META_BYTES_PER_ROW; > > pr_err("Memory state around the buggy address:\n"); > > - for (i =3D -SHADOW_ROWS_AROUND_ADDR; i <=3D SHADOW_ROWS_AROUND_AD= DR; i++) { > + 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[SHADOW_BYTES_PER_ROW]; > + char shadow_buf[META_BYTES_PER_ROW]; > > snprintf(buffer, sizeof(buffer), > (i =3D=3D 0) ? ">%px: " : " %px: ", kaddr); > @@ -276,17 +276,17 @@ static void print_memory_metadata(const void *addr) > * function, because generic functions may try to > * access kasan mapping for the passed address. > */ > - memcpy(shadow_buf, shadow_row, SHADOW_BYTES_PER_ROW); > + memcpy(shadow_buf, shadow_row, META_BYTES_PER_ROW); > print_hex_dump(KERN_ERR, buffer, > - DUMP_PREFIX_NONE, SHADOW_BYTES_PER_ROW, 1, > - shadow_buf, SHADOW_BYTES_PER_ROW, 0); > + DUMP_PREFIX_NONE, META_BYTES_PER_ROW, 1, > + shadow_buf, META_BYTES_PER_ROW, 0); > > if (row_is_guilty(shadow_row, shadow)) > pr_err("%*c\n", > shadow_pointer_offset(shadow_row, shadow)= , > '^'); > > - shadow_row +=3D SHADOW_BYTES_PER_ROW; > + shadow_row +=3D META_BYTES_PER_ROW; > } > } > > -- > 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