Re: [PATCH v8 01/13] module: Move all into module/

From: Allen <allen.lkml@gmail.com>
To: Aaron Tomlin <atomlin@redhat.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
	christophe.leroy@csgroup.eu, Christoph Lameter <cl@linux.com>,
	Petr Mladek <pmladek@suse.com>, Miroslav Benes <mbenes@suse.cz>,
	Andrew Morton <akpm@linux-foundation.org>,
	jeyu@kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-modules@vger.kernel.org, void@manifault.com,
	atomlin@atomlin.com, Joe Perches <joe@perches.com>,
	msuchanek@suse.de, oleksandr@natalenko.name
Subject: Re: [PATCH v8 01/13] module: Move all into module/
Date: Tue, 22 Feb 2022 12:00:26 -0800	[thread overview]
Message-ID: <CAOMdWSJDG6CYD8ie38gYWSxGO6vcogpE57MPUrLWYj==pDjOMw@mail.gmail.com> (raw)
In-Reply-To: <20220222141303.1392190-2-atomlin@redhat.com>

 I did some testing on x86/ARM, no regressions.
Looks good so far. Will run it for little longer.

Thanks.

On Tue, Feb 22, 2022 at 6:13 AM Aaron Tomlin <atomlin@redhat.com> wrote:
>
> No functional changes.
>
> This patch moves all module related code into a separate directory,
> modifies each file name and creates a new Makefile. Note: this effort
> is in preparation to refactor core module code.
>
> Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
> ---
>  MAINTAINERS                                         |  2 +-
>  kernel/Makefile                                     |  5 +----
>  kernel/module/Makefile                              | 12 ++++++++++++
>  kernel/{module_decompress.c => module/decompress.c} |  2 +-
>  kernel/{module-internal.h => module/internal.h}     |  0
>  kernel/{module.c => module/main.c}                  |  2 +-
>  kernel/{module_signing.c => module/signing.c}       |  2 +-
>  7 files changed, 17 insertions(+), 8 deletions(-)
>  create mode 100644 kernel/module/Makefile
>  rename kernel/{module_decompress.c => module/decompress.c} (99%)
>  rename kernel/{module-internal.h => module/internal.h} (100%)
>  rename kernel/{module.c => module/main.c} (99%)
>  rename kernel/{module_signing.c => module/signing.c} (97%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index bd86ed9fbc79..463bdb829db4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13012,7 +13012,7 @@ L:      linux-kernel@vger.kernel.org
>  S:     Maintained
>  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
>  F:     include/linux/module.h
> -F:     kernel/module.c
> +F:     kernel/module/
>
>  MONOLITHIC POWER SYSTEM PMIC DRIVER
>  M:     Saravanan Sekar <sravanhome@gmail.com>
> diff --git a/kernel/Makefile b/kernel/Makefile
> index 56f4ee97f328..717075b65deb 100644
> --- a/kernel/Makefile
> +++ b/kernel/Makefile
> @@ -29,7 +29,6 @@ KCOV_INSTRUMENT_softirq.o := n
>  KCSAN_SANITIZE_softirq.o = n
>  # These are called from save_stack_trace() on slub debug path,
>  # and produce insane amounts of uninteresting coverage.
> -KCOV_INSTRUMENT_module.o := n
>  KCOV_INSTRUMENT_extable.o := n
>  KCOV_INSTRUMENT_stacktrace.o := n
>  # Don't self-instrument.
> @@ -53,6 +52,7 @@ obj-y += rcu/
>  obj-y += livepatch/
>  obj-y += dma/
>  obj-y += entry/
> +obj-$(CONFIG_MODULES) += module/
>
>  obj-$(CONFIG_KCMP) += kcmp.o
>  obj-$(CONFIG_FREEZER) += freezer.o
> @@ -66,9 +66,6 @@ ifneq ($(CONFIG_SMP),y)
>  obj-y += up.o
>  endif
>  obj-$(CONFIG_UID16) += uid16.o
> -obj-$(CONFIG_MODULES) += module.o
> -obj-$(CONFIG_MODULE_DECOMPRESS) += module_decompress.o
> -obj-$(CONFIG_MODULE_SIG) += module_signing.o
>  obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o
>  obj-$(CONFIG_KALLSYMS) += kallsyms.o
>  obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
> diff --git a/kernel/module/Makefile b/kernel/module/Makefile
> new file mode 100644
> index 000000000000..cdd5c61b8c7f
> --- /dev/null
> +++ b/kernel/module/Makefile
> @@ -0,0 +1,12 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Makefile for linux kernel module support
> +#
> +
> +# These are called from save_stack_trace() on slub debug path,
> +# and produce insane amounts of uninteresting coverage.
> +KCOV_INSTRUMENT_module.o := n
> +
> +obj-y += main.o
> +obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
> +obj-$(CONFIG_MODULE_SIG) += signing.o
> diff --git a/kernel/module_decompress.c b/kernel/module/decompress.c
> similarity index 99%
> rename from kernel/module_decompress.c
> rename to kernel/module/decompress.c
> index ffef98a20320..d14d6443225a 100644
> --- a/kernel/module_decompress.c
> +++ b/kernel/module/decompress.c
> @@ -12,7 +12,7 @@
>  #include <linux/sysfs.h>
>  #include <linux/vmalloc.h>
>
> -#include "module-internal.h"
> +#include "internal.h"
>
>  static int module_extend_max_pages(struct load_info *info, unsigned int extent)
>  {
> diff --git a/kernel/module-internal.h b/kernel/module/internal.h
> similarity index 100%
> rename from kernel/module-internal.h
> rename to kernel/module/internal.h
> diff --git a/kernel/module.c b/kernel/module/main.c
> similarity index 99%
> rename from kernel/module.c
> rename to kernel/module/main.c
> index 46a5c2ed1928..34a2b0cf3c3e 100644
> --- a/kernel/module.c
> +++ b/kernel/module/main.c
> @@ -58,7 +58,7 @@
>  #include <linux/dynamic_debug.h>
>  #include <linux/audit.h>
>  #include <uapi/linux/module.h>
> -#include "module-internal.h"
> +#include "internal.h"
>
>  #define CREATE_TRACE_POINTS
>  #include <trace/events/module.h>
> diff --git a/kernel/module_signing.c b/kernel/module/signing.c
> similarity index 97%
> rename from kernel/module_signing.c
> rename to kernel/module/signing.c
> index 8723ae70ea1f..8aeb6d2ee94b 100644
> --- a/kernel/module_signing.c
> +++ b/kernel/module/signing.c
> @@ -12,7 +12,7 @@
>  #include <linux/string.h>
>  #include <linux/verification.h>
>  #include <crypto/public_key.h>
> -#include "module-internal.h"
> +#include "internal.h"
>
>  /*
>   * Verify the signature on a module.
> --
> 2.34.1
>

-- 
       - Allen