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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 0398AC433E1 for ; Fri, 14 Aug 2020 17:33:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C316820768 for ; Fri, 14 Aug 2020 17:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lJKLOnJb"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ttJgaF/P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C316820768 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MX7hEoy6hzpAn3KRupuzvhSIIczSomx/DIeUOGMxpUg=; b=lJKLOnJbxh0MlNGfynPM48thP RtGP1HPANCVsXDvoBwAEbeRb3HQAEX2GFslPMhyfLiVfnNvRfrPkHrUSldxt4oWpl0o8VyMNhfaZo MZ+GYETASq0O3dje6+5+inxvWoNpy2i6qgm/Jpms/B/ZQ5hQDiPuc/Qglwx4hWKjKAae/oKdV31hi GVesnpkhdCOUq0DQn5aRQ59iFus+DxIbmRitMb5myVQFN7DgnR9NMfJuq+fC+Cbya+uWYvYzgePDk OwZsRHzrGI+/yv+Eb1h0Dlkg8hgU9DWeFpQQNxfJd3iFwfCc40GLHWe9Va5kSD3E3TQtIoM+tRwx0 hwN7TqICA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6dXW-0004un-Sv; Fri, 14 Aug 2020 17:30:50 +0000 Received: from mail-qt1-x849.google.com ([2607:f8b0:4864:20::849]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6dUu-0003UZ-Nl for linux-arm-kernel@lists.infradead.org; Fri, 14 Aug 2020 17:28:16 +0000 Received: by mail-qt1-x849.google.com with SMTP id p22so7479391qtp.9 for ; Fri, 14 Aug 2020 10:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mCvcC3dYzcxUwc7C0YdRc21YWrhNGjweNe7or4+XlWk=; b=ttJgaF/P3U2oSow7UH8ZHinJK2ntN4CM0o6Ekay4TdHMFd56qT409NSuHPVxrA56h5 SwXrB1xrCWdP52W4WZBRr965mtYnjn35Tq0Gk+EDG2xRUJh7Qkf8IOrv5UwqSrTyRycJ yOAI7dF0zkRvPzw7R+QqT3nFkoY6nHFsEvLDjKUWzuQ60iwzyjXpi81rT5mbx+IxoO59 cw1EVMXw38/5FbII9vnx0nbFNeMtDT6YvbT8UruueGBDnQgnUiTFPgh6nxKfXM+y6VPv u4t+f7POCw97KRCE1yAOFsd1oZBYpDjj95G4NO9SE/RMMvbP5+NciohmFzjEY48S68Ut lJPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mCvcC3dYzcxUwc7C0YdRc21YWrhNGjweNe7or4+XlWk=; b=idUnMygDfrRol95wF1HrZaTfWPAiIXjV3OolD5kWVhcKAKvoF8MHwzyacH78pBo3xw V9EFvun2ZoXTa+OgAPD0Jpe0Obdux/W+VtLBT1Tux/+HRzlO2pGMpnAEwO3sT7YllbSR mdQX25pbbklCx/J7mNSR7ypvW4IO9dzxYkDZFbOEadvsHrngDEzoO+mUaCot9J2lLT2b po/xUWgAC9iSCF0cWUt8EWqy2zj8NmiRFENmdFNy3a4VIHcYymufHC20JTn5DGyepFo5 iOvh7UQWjY2pdOZTeUrR4HBeKGRMXLk0Dh7mITSYW046GQzNKT1KVALgFGNpC3HfBQAf 6NGQ== X-Gm-Message-State: AOAM531vxF016MuV8XBUbA9WQ7FLRjI7Al+tf+vjUUqIXFjXJko2FP+w CcziS8NiWPu3Z1VHnKldvxEL/dXzmJgZare8 X-Google-Smtp-Source: ABdhPJwyr1exuUZ/fVZL/EhW5aHt3/m30xzb8gPM63f7667oSE8rNBHS3hr4bCvgKG+YQTcF8zeI8ppWiSbBiHwW X-Received: by 2002:ad4:4ea7:: with SMTP id ed7mr3716612qvb.8.1597426084066; Fri, 14 Aug 2020 10:28:04 -0700 (PDT) Date: Fri, 14 Aug 2020 19:26:59 +0200 In-Reply-To: Message-Id: <1142e2ec61dfc863a4ec5b92b60c97120957ec80.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 17/35] kasan: rename SHADOW layout macros to META From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200814_132809_056766_D6196415 X-CRM114-Status: GOOD ( 13.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 2cce7c9beea3..6306673e7062 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -36,11 +36,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; @@ -243,7 +243,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) @@ -252,7 +252,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) @@ -262,15 +262,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); @@ -279,17 +279,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.220.ged08abb693-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel