From patchwork Wed Nov 4 23:18:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11883175 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=-12.7 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, URIBL_BLOCKED,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 5CAE0C00A89 for ; Thu, 5 Nov 2020 04:35:04 +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 DE5232083B for ; Thu, 5 Nov 2020 04:35:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="L9oUtqtk"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="p/X3TzAx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="HMlGt5Zq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE5232083B 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=Es8dyR8jp7VG4y2PijpILm6qt0acs66x26qUyqcFcvM=; b=L9oUtqtksSL4DGkVETOeyKhWU 5SqQsyqxJVxleOmfKEvm8BSdudjpUsKFLHZ0q6QTUpitaSb6VxKLuquggbEBo0fUsjsoM1XVRAiy3 SBWw9xn1BKtlLwo73+/110zqqlZpHnWt5Yg5iPkHkdYx6ZEMXVhihMQZRxp6wItT9cbZz53PK48Mq 0/BowR7LCmblgOzcM8a/hVooHvI+XwMmbizj1m/X+tp2xKbeMfRFCvNQlRnEBu+3StPuzd1sXz82A drdUniDvXqWpv8Ip2l9xiT92yK+g3F7HcZIFkQQdHpviEzAa0LGjgLokTqjB2CJsLNE12A8M/J8Y+ yAzkheiNA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaWyd-0003AP-QU; Thu, 05 Nov 2020 04:34:23 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaW5J-00016k-RD for linux-arm-kernel@merlin.infradead.org; Thu, 05 Nov 2020 03:37:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=m4Rd6JEchDCdHagjRChT+nQsGKSwHG57Cfn+FHFZG50=; b=p/X3TzAxxHddbRVeQ8Fr1y81yn KgoDDQC7PouNKgLkQduA4FL5LOsrp6siY55R/t833eBanUSM5rSt3WSc8pqynVglC+GPD4qn9Ll5A 0JYFm2gEBVqv8M6CAVvEK642Ku3MJRE8ai/3EscIG8XeBRsGfUVvpvS99Zss3QA4INhh4JeNCOpuG SWdfPYaRceDi4iizjRLg5vtr6Jl9RcqEVjpccPqCVfUzKwqY/ecNjZZJ1fpfCR9LyZ8BaGyqBd6N8 YXGWYJIAnoM7r1DOLFZlJ3HajfTgLhExpvd8T13p7CFuDrX69wXjwrAatkmlyVYxsyyO1dMN0KMzL M4iXQsQw==; Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaS4y-0003yj-Ne for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 23:20:39 +0000 Received: by mail-qv1-xf49.google.com with SMTP id a1so6734qvj.3 for ; Wed, 04 Nov 2020 15:20:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=m4Rd6JEchDCdHagjRChT+nQsGKSwHG57Cfn+FHFZG50=; b=HMlGt5ZqnSiNBvIh5bwZVolMGMfVTi7ELGS8vTm7KSH2BIfWEHL3AEmTfbJjq48SsM akUQuVQpcOZLReg3iUKqkoC0QuY5/TkpoKmv7/fmGPvSNRWVWVMLm2q3RzUU7RJxgrVS D/Y/6L/nMZUkKBLVPRO3WRQM2HtiVTZawvInIKx/RNMdgixQMbQqv1yz2uOpiQB9qzqK DuL8B2eHCUbwPLRSJzlGS/4wQq+MlnFabB75xkwConsdwKmm9kA2yG2Fu3+B1O+vAs9i UBMeGmcfY40E2KaecbfD0JciuHtChHkqSnB9XThlcyo8J7wZP65XrLS5f1qbEKcNp922 7kPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=m4Rd6JEchDCdHagjRChT+nQsGKSwHG57Cfn+FHFZG50=; b=VA2PJGVsHXEmhzj8bO4iyFd6dpXrucV3ePHlm8IufSTs3wgdWg/020Aq7GznK5/A93 X8HYGIx1ThubB3l2NbS2o9Y5FJJr2GSd5XnxxEL4xFhlksvHE6ntIKsiibgaV+3Zk20b WBVQptO2AFbbakolohU6TBYqnuO33sSnsQEW2RxEvNKEjDcLE2bxp+l3hdZAmEKzqXha oOosOj3KjNj0k0brjVQRgbuurKAyCj6cWQKoqqi3Cv4RuFR9CuwFWquekVcRXj622kFF gqLgbx33iBUOjE7Rh0SutW5YrHRjJ6CPgQ8cUs+ihsAxxCyn1kAYB4Sv5q5cIk7La64w pWmg== X-Gm-Message-State: AOAM5308Zql0UI9zAM/W6A6+LYxR847lYHkHod1UZp1wQ1N61moeo6BO 8cpKuB2OiEcXdO9z2utcysAX1d+jZ2nUxuyy X-Google-Smtp-Source: ABdhPJyd5HqqqtZolYywu7sBTqxmYBCrDpWY9xQKZ5Br/36r9jAXsxLGx1pZMYa/+oPNpftRrbVrOW1uae6XIFZ7 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:fd4c:: with SMTP id j12mr428967qvs.22.1604531972889; Wed, 04 Nov 2020 15:19:32 -0800 (PST) Date: Thu, 5 Nov 2020 00:18:26 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v8 11/43] kasan: rename report and tags files From: Andrey Konovalov To: Catalin Marinas X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_232036_905019_5F6523D9 X-CRM114-Status: GOOD ( 10.37 ) 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: linux-arm-kernel@lists.infradead.org, Marco Elver , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename generic_report.c to report_generic.c and tags_report.c to report_sw_tags.c, as their content is more relevant to report.c file. Also rename tags.c to sw_tags.c to better reflect that this file contains code for software tag-based mode. No functional changes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: If77d21f655d52ef3e58c4c37fd6621a07f505f18 --- mm/kasan/Makefile | 16 ++++++++-------- mm/kasan/report.c | 2 +- mm/kasan/{generic_report.c => report_generic.c} | 0 mm/kasan/{tags_report.c => report_sw_tags.c} | 0 mm/kasan/{tags.c => sw_tags.c} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename mm/kasan/{generic_report.c => report_generic.c} (100%) rename mm/kasan/{tags_report.c => report_sw_tags.c} (100%) rename mm/kasan/{tags.c => sw_tags.c} (100%) diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile index 7cc1031e1ef8..f1d68a34f3c9 100644 --- a/mm/kasan/Makefile +++ b/mm/kasan/Makefile @@ -6,13 +6,13 @@ KCOV_INSTRUMENT := n # Disable ftrace to avoid recursion. CFLAGS_REMOVE_common.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_generic.o = $(CC_FLAGS_FTRACE) -CFLAGS_REMOVE_generic_report.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_quarantine.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_report.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_report_generic.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_report_sw_tags.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_shadow.o = $(CC_FLAGS_FTRACE) -CFLAGS_REMOVE_tags.o = $(CC_FLAGS_FTRACE) -CFLAGS_REMOVE_tags_report.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_sw_tags.o = $(CC_FLAGS_FTRACE) # Function splitter causes unnecessary splits in __asan_load1/__asan_store1 # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533 @@ -23,14 +23,14 @@ CC_FLAGS_KASAN_RUNTIME += -DDISABLE_BRANCH_PROFILING CFLAGS_common.o := $(CC_FLAGS_KASAN_RUNTIME) CFLAGS_generic.o := $(CC_FLAGS_KASAN_RUNTIME) -CFLAGS_generic_report.o := $(CC_FLAGS_KASAN_RUNTIME) CFLAGS_init.o := $(CC_FLAGS_KASAN_RUNTIME) CFLAGS_quarantine.o := $(CC_FLAGS_KASAN_RUNTIME) CFLAGS_report.o := $(CC_FLAGS_KASAN_RUNTIME) +CFLAGS_report_generic.o := $(CC_FLAGS_KASAN_RUNTIME) +CFLAGS_report_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) CFLAGS_shadow.o := $(CC_FLAGS_KASAN_RUNTIME) -CFLAGS_tags.o := $(CC_FLAGS_KASAN_RUNTIME) -CFLAGS_tags_report.o := $(CC_FLAGS_KASAN_RUNTIME) +CFLAGS_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) obj-$(CONFIG_KASAN) := common.o report.o -obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o generic_report.o shadow.o quarantine.o -obj-$(CONFIG_KASAN_SW_TAGS) += init.o shadow.o tags.o tags_report.o +obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o +obj-$(CONFIG_KASAN_SW_TAGS) += init.o report_sw_tags.o shadow.o sw_tags.o diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 7b8dcb799a78..fff0c7befbfe 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * This file contains common generic and tag-based KASAN error reporting code. + * This file contains common KASAN error reporting code. * * Copyright (c) 2014 Samsung Electronics Co., Ltd. * Author: Andrey Ryabinin diff --git a/mm/kasan/generic_report.c b/mm/kasan/report_generic.c similarity index 100% rename from mm/kasan/generic_report.c rename to mm/kasan/report_generic.c diff --git a/mm/kasan/tags_report.c b/mm/kasan/report_sw_tags.c similarity index 100% rename from mm/kasan/tags_report.c rename to mm/kasan/report_sw_tags.c diff --git a/mm/kasan/tags.c b/mm/kasan/sw_tags.c similarity index 100% rename from mm/kasan/tags.c rename to mm/kasan/sw_tags.c