Re: [PATCH v3 10/39] kasan: rename report and tags files

elver
2020-10-01T17:36:44Z

On Fri, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov wrote:
> 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 <andreyknvl@google.com>
> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>

Reviewed-by: Marco Elver <elver@google.com>

> ---
> 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 fc487ba83931..5961dbfba080 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 <ryabinin.a.a@gmail.com>
> 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
> --
> 2.28.0.681.g6f77f65b4e-goog
>