| Message ID | 20221214231718.1002194-1-mcgrof@kernel.org |
|---|---|
| State | Accepted |
| Commit | b74d7bb7ca2412ab37bab782591573b5f265872b |
| Headers | show |
| Series | kbuild: Modify default INSTALL_MOD_DIR from extra to updates | expand |
Luis Chamberlain wrote: > The default INSTALL_MOD_DIR of using the /lib/modules/$(uname -r)/extra > directory for external modules assumes distributions will have something > like /etc/depmod.d/dist.conf with: > > search updates extra built-in > > However, only some Red Hat release have and use the extra stuff for > years now. Meanwhile, the depmod.c tool in kmod has *forever* used > the "updates" directory as part of the search path by default *if* > your distribution does not have any depmod.d configuration. > > If you compile and install an external module today, even upstream > kernel mock drivers (tools/testing/cxl) the modules_install target > will pick up the new drivers but will not allow override of drivers > from updates to override built-in ones. > > Since module-init-tools was deprecated over 11 years ago and now kmod > has since its inception used the "updates" directory as part of its > default search path to allow overrides, and since the "extra" stuff > was in practice only used by Red Hat stuff, use the more distro > agnostic override path "updates" to allow external modules to > also override proper production kernel modules. > > This would allow mocking drivers tools to not have to muck with > depmod.d config files or assume that your distro will have extra > on a configuration file over built-in. > > With today's default you end up actually *crashing* Linux when > trying to load cxl_test with the default "extra" [0] directory being > used. This fixes that and allows other mocking drivers to do > less work. > > [0] https://lkml.kernel.org/r/20221209062919.1096779-1-mcgrof@kernel.org > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Thanks for digging into the history here Luis! Acked-by: Dan Williams <dan.j.williams@intel.com>
On Wed 14 Dec 2022 15:17:18 GMT, Luis Chamberlain wrote: > The default INSTALL_MOD_DIR of using the /lib/modules/$(uname -r)/extra > directory for external modules assumes distributions will have something > like /etc/depmod.d/dist.conf with: > > search updates extra built-in > > However, only some Red Hat release have and use the extra stuff for > years now. Meanwhile, the depmod.c tool in kmod has *forever* used > the "updates" directory as part of the search path by default *if* > your distribution does not have any depmod.d configuration. > > If you compile and install an external module today, even upstream > kernel mock drivers (tools/testing/cxl) the modules_install target > will pick up the new drivers but will not allow override of drivers > from updates to override built-in ones. > > Since module-init-tools was deprecated over 11 years ago and now kmod > has since its inception used the "updates" directory as part of its > default search path to allow overrides, and since the "extra" stuff > was in practice only used by Red Hat stuff, use the more distro > agnostic override path "updates" to allow external modules to > also override proper production kernel modules. > > This would allow mocking drivers tools to not have to muck with > depmod.d config files or assume that your distro will have extra > on a configuration file over built-in. > > With today's default you end up actually *crashing* Linux when > trying to load cxl_test with the default "extra" [0] directory being > used. This fixes that and allows other mocking drivers to do > less work. > > [0] https://lkml.kernel.org/r/20221209062919.1096779-1-mcgrof@kernel.org > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > --- > scripts/Makefile.modinst | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
On Fri, Dec 16, 2022 at 05:08:53AM +0100, Nicolas Schier wrote:
> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
I've queued this onto modules-next.
Luis
On Thu, Jan 5, 2023 at 4:25 AM Luis Chamberlain <mcgrof@kernel.org> wrote: > > On Fri, Dec 16, 2022 at 05:08:53AM +0100, Nicolas Schier wrote: > > Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> > > I've queued this onto modules-next. > > Luis Acked-by: Masahiro Yamada <masahiroy@kernel.org>
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 509d424dbbd2..c12ae5c108d4 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -14,7 +14,7 @@ modules := $(sort $(call read-file, $(MODORDER))) ifeq ($(KBUILD_EXTMOD),) dst := $(MODLIB)/kernel else -INSTALL_MOD_DIR ?= extra +INSTALL_MOD_DIR ?= updates dst := $(MODLIB)/$(INSTALL_MOD_DIR) endif
The default INSTALL_MOD_DIR of using the /lib/modules/$(uname -r)/extra directory for external modules assumes distributions will have something like /etc/depmod.d/dist.conf with: search updates extra built-in However, only some Red Hat release have and use the extra stuff for years now. Meanwhile, the depmod.c tool in kmod has *forever* used the "updates" directory as part of the search path by default *if* your distribution does not have any depmod.d configuration. If you compile and install an external module today, even upstream kernel mock drivers (tools/testing/cxl) the modules_install target will pick up the new drivers but will not allow override of drivers from updates to override built-in ones. Since module-init-tools was deprecated over 11 years ago and now kmod has since its inception used the "updates" directory as part of its default search path to allow overrides, and since the "extra" stuff was in practice only used by Red Hat stuff, use the more distro agnostic override path "updates" to allow external modules to also override proper production kernel modules. This would allow mocking drivers tools to not have to muck with depmod.d config files or assume that your distro will have extra on a configuration file over built-in. With today's default you end up actually *crashing* Linux when trying to load cxl_test with the default "extra" [0] directory being used. This fixes that and allows other mocking drivers to do less work. [0] https://lkml.kernel.org/r/20221209062919.1096779-1-mcgrof@kernel.org Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- scripts/Makefile.modinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)