[0/3] Fix kmod_load_resources without modules.builtin.modinfo

Message ID	20201218160209.4037174-1-lucas.demarchi@intel.com (mailing list archive)
Headers	show Return-Path: <linux-modules-owner@kernel.org> IronPort-SDR: ljjcXG0zod81apt4tauW9DX4B8zr8thE7w6bBeFLYOqn4TY3CTlant90UN/Y4iGu8J64B6G6/O JNKBajbBzszg== IronPort-SDR: OlyXUo/8i35jXi78+mxFModY5PRRNSYKb8hNKFD7LiCrRUcwDyVWCH/hQlTUMnWOvMMZhxjNVG zua1AByt7ptQ== From: Lucas De Marchi <lucas.demarchi@intel.com> To: linux-modules@vger.kernel.org Cc: Joe Buehler <aspam@cox.net>, Yauheni Kaliuta <yauheni.kaliuta@redhat.com> Subject: [PATCH 0/3] Fix kmod_load_resources without modules.builtin.modinfo Date: Fri, 18 Dec 2020 08:02:06 -0800 Message-Id: <20201218160209.4037174-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Fix kmod_load_resources without modules.builtin.modinfo \| expand [0/3] Fix kmod_load_resources without modules.builtin.modinfo [1/3] depmod: unconditionally write builtin.alias.bin [2/3] shared: fix UNIQ definition [3/3] testsuite: add test for empty modules.builtin.aliases.bin

Message ID

20201218160209.4037174-1-lucas.demarchi@intel.com (mailing list archive)

Headers

IronPort-SDR: 
 ljjcXG0zod81apt4tauW9DX4B8zr8thE7w6bBeFLYOqn4TY3CTlant90UN/Y4iGu8J64B6G6/O
 JNKBajbBzszg==
IronPort-SDR: 
 OlyXUo/8i35jXi78+mxFModY5PRRNSYKb8hNKFD7LiCrRUcwDyVWCH/hQlTUMnWOvMMZhxjNVG
 zua1AByt7ptQ==
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: linux-modules@vger.kernel.org
Cc: Joe Buehler <aspam@cox.net>,
        Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Subject: [PATCH 0/3] Fix kmod_load_resources without modules.builtin.modinfo
Date: Fri, 18 Dec 2020 08:02:06 -0800
Message-Id: <20201218160209.4037174-1-lucas.demarchi@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Fix kmod_load_resources without modules.builtin.modinfo | expand

Message

Lucas De Marchi Dec. 18, 2020, 4:02 p.m. UTC

When there isn't a modules.builtin.modinfo from the kernel, depmod
should not generate and 0-sized modules.builtin.alias.bin file. It
should rather be an empty index.

Lucas De Marchi (3):
  depmod: unconditionally write builtin.alias.bin
  shared: fix UNIQ definition
  testsuite: add test for empty modules.builtin.aliases.bin

 shared/macro.h                                     |   7 +++++--
 .../lib/modules/5.6.0/modules.alias                |   1 +
 .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin              |   1 +
 .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
 .../lib/modules/5.6.0/modules.dep                  |   0
 .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.devname              |   1 +
 .../lib/modules/5.6.0/modules.softdep              |   1 +
 .../lib/modules/5.6.0/modules.symbols              |   1 +
 .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
 testsuite/test-init.c                              |   9 ++++++++-
 testsuite/testsuite.h                              |   2 +-
 tools/depmod.c                                     |  10 ++++++----
 15 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin

Comments

Lucas De Marchi Dec. 28, 2020, 1:04 a.m. UTC | #1

Applied

Lucas De Marchi

On Fri, Dec 18, 2020 at 8:08 AM Lucas De Marchi
<lucas.demarchi@intel.com> wrote:
>
> When there isn't a modules.builtin.modinfo from the kernel, depmod
> should not generate and 0-sized modules.builtin.alias.bin file. It
> should rather be an empty index.
>
> Lucas De Marchi (3):
>   depmod: unconditionally write builtin.alias.bin
>   shared: fix UNIQ definition
>   testsuite: add test for empty modules.builtin.aliases.bin
>
>  shared/macro.h                                     |   7 +++++--
>  .../lib/modules/5.6.0/modules.alias                |   1 +
>  .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
>  .../lib/modules/5.6.0/modules.builtin              |   1 +
>  .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
>  .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
>  .../lib/modules/5.6.0/modules.dep                  |   0
>  .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
>  .../lib/modules/5.6.0/modules.devname              |   1 +
>  .../lib/modules/5.6.0/modules.softdep              |   1 +
>  .../lib/modules/5.6.0/modules.symbols              |   1 +
>  .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
>  testsuite/test-init.c                              |   9 ++++++++-
>  testsuite/testsuite.h                              |   2 +-
>  tools/depmod.c                                     |  10 ++++++----
>  15 files changed, 25 insertions(+), 8 deletions(-)
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
>  create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin
>
> --
> 2.29.2
>