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=-18.9 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_AGENT_SANE_1,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 8BB1BC4727E for ; Thu, 1 Oct 2020 17:49:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1EC6B20759 for ; Thu, 1 Oct 2020 17:49:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GQIN6Bic" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EC6B20759 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 731C290001C; Thu, 1 Oct 2020 13:49:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DFD9900003; Thu, 1 Oct 2020 13:49:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D0BC90001C; Thu, 1 Oct 2020 13:49:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id 27FE4900003 for ; Thu, 1 Oct 2020 13:49:00 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C0234180AD811 for ; Thu, 1 Oct 2020 17:48:59 +0000 (UTC) X-FDA: 77324092398.25.salt90_260230f2719d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 9CD471804E3A1 for ; Thu, 1 Oct 2020 17:48:59 +0000 (UTC) X-HE-Tag: salt90_260230f2719d X-Filterd-Recvd-Size: 7408 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 17:48:58 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id m6so6818705wrn.0 for ; Thu, 01 Oct 2020 10:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=jxWceFBJemERUVJXLpe5M4H3KWrtmYrogpYMra7Mtm0=; b=GQIN6BicP4OClk7wJaA8cFCNYhEDhUzoKei/bEj4NOdqsD0reNrtLvUpWv65sqOKEa 7X8NwQm5ArcLJxyPf0Q+kYSrlZ8niYaCUe2skLkrvt7fgh52yFsCml94CqWZkNkf73p2 1qZgr19pIDutjUSOifXzmoZkgGfJgEmd4d13V49qZFqyIBUVS1MrdMrrzzqavpjrRMyR kMTHjegSoOsjuFH2c/xz0wpF3urnMh7EDOsjB1ohFgdkL7NWO/14iL4qDjfEd480cy0/ zzeazIDAn+VG/Wz+99CQPLuwnUPq3foaYxABWXuQ7A5rSjsYkdb87L6dmVoT1qayyzrn Va+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=jxWceFBJemERUVJXLpe5M4H3KWrtmYrogpYMra7Mtm0=; b=AHL5fHMU1QVXPCr8TyFJOYPAXgrN8XggoK+rvx26cCP3VF7VxDTucIJbYN4BnaVR5g UPhk9HV0kIducIp0mcVCXta+VQiMXmW8yVtGJFMS8ejnw84jFn2a5f1qwsQp0lggkDqr sEVYUhijpJidLDGoq5LfnhXY0g+jCvdYJJn5dCFm9jG3ffSanX41FwNeB0Lp9qcydcDa tAADo7vBAC7tsK2EINW6/WC5xIYmg5K/ygFHripYAdiw++8xEBkBuQz1HBZm5TTtn7Xz EVOq+/kINs0xqeTW4ESRi9Z1McipxEIMRb54W8/pGVOOvyeQIvw7wdtzw1qgnd3X4ZxF JOEQ== X-Gm-Message-State: AOAM530lAI0xpH7tHfyy0bcEX012GZ4JR+wFZliihHEoZpGUhxT3f0uL 1PoXSJFb+vmW8+dv6Z5UWKxwLw== X-Google-Smtp-Source: ABdhPJw0CxrIMWSohPctixufME9pzCUW6uA4XtaXT94EQt7SLLifwCJj9Nh9P+FikfnoOomO9lQBJQ== X-Received: by 2002:adf:9b8b:: with SMTP id d11mr11001000wrc.71.1601574537863; Thu, 01 Oct 2020 10:48:57 -0700 (PDT) Received: from elver.google.com ([100.105.32.75]) by smtp.gmail.com with ESMTPSA id u66sm6396017wme.1.2020.10.01.10.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 10:48:56 -0700 (PDT) Date: Thu, 1 Oct 2020 19:48:51 +0200 From: elver@google.com To: Andrey Konovalov Cc: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com, Andrey Ryabinin , Alexander Potapenko , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 19/39] kasan: rename SHADOW layout macros to META Message-ID: <20201001174851.GO4162920@elver.google.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.5 (2020-06-23) 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 Fri, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov wrote: > 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 > --- > 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 67aa30b45805..13b27675a696 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -31,11 +31,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_BLOCK) > -#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; > > @@ -238,7 +238,7 @@ static void print_address_description(void *addr, u8 tag) > > static bool row_is_guilty(const void *row, const void *guilty) > { > - return (row <= guilty) && (guilty < row + SHADOW_BYTES_PER_ROW); > + return (row <= guilty) && (guilty < row + META_BYTES_PER_ROW); > } > > static int shadow_pointer_offset(const void *row, const void *shadow) > @@ -247,7 +247,7 @@ static int shadow_pointer_offset(const void *row, const 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) > @@ -257,15 +257,15 @@ static void print_memory_metadata(const void *addr) > const void *shadow_row; > > shadow_row = (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 = -SHADOW_ROWS_AROUND_ADDR; i <= SHADOW_ROWS_AROUND_ADDR; i++) { > + for (i = -META_ROWS_AROUND_ADDR; i <= META_ROWS_AROUND_ADDR; i++) { > const void *kaddr = 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 == 0) ? ">%px: " : " %px: ", kaddr); > @@ -274,17 +274,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 += SHADOW_BYTES_PER_ROW; > + shadow_row += META_BYTES_PER_ROW; > } > } > > -- > 2.28.0.681.g6f77f65b4e-goog >