udev: remove userspace firmware loading support
This commit is contained in:
parent
ec15977a3c
commit
be2ea723b1
12
Makefile.am
12
Makefile.am
|
@ -3284,18 +3284,6 @@ libudev_core_la_LIBADD = \
|
||||||
$(BLKID_LIBS) \
|
$(BLKID_LIBS) \
|
||||||
$(KMOD_LIBS)
|
$(KMOD_LIBS)
|
||||||
|
|
||||||
libudev_core_la_CPPFLAGS = \
|
|
||||||
$(AM_CPPFLAGS) \
|
|
||||||
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
|
|
||||||
|
|
||||||
if ENABLE_FIRMWARE
|
|
||||||
libudev_core_la_SOURCES += \
|
|
||||||
src/udev/udev-builtin-firmware.c
|
|
||||||
|
|
||||||
dist_udevrules_DATA += \
|
|
||||||
rules/50-firmware.rules
|
|
||||||
endif
|
|
||||||
|
|
||||||
if HAVE_KMOD
|
if HAVE_KMOD
|
||||||
libudev_core_la_SOURCES += \
|
libudev_core_la_SOURCES += \
|
||||||
src/udev/udev-builtin-kmod.c
|
src/udev/udev-builtin-kmod.c
|
||||||
|
|
9
README
9
README
|
@ -37,8 +37,7 @@ LICENSE:
|
||||||
- except src/udev/* which is (currently still) GPLv2, GPLv2+
|
- except src/udev/* which is (currently still) GPLv2, GPLv2+
|
||||||
|
|
||||||
REQUIREMENTS:
|
REQUIREMENTS:
|
||||||
Linux kernel >= 3.0
|
Linux kernel >= 3.7
|
||||||
Linux kernel >= 3.3 for loop device partition support features with nspawn
|
|
||||||
Linux kernel >= 3.8 for Smack support
|
Linux kernel >= 3.8 for Smack support
|
||||||
|
|
||||||
Kernel Config Options:
|
Kernel Config Options:
|
||||||
|
@ -53,14 +52,14 @@ REQUIREMENTS:
|
||||||
CONFIG_PROC_FS
|
CONFIG_PROC_FS
|
||||||
CONFIG_FHANDLE (libudev, mount and bind mount handling)
|
CONFIG_FHANDLE (libudev, mount and bind mount handling)
|
||||||
|
|
||||||
Udev will fail to work with the legacy layout:
|
udev will fail to work with the legacy sysfs layout:
|
||||||
CONFIG_SYSFS_DEPRECATED=n
|
CONFIG_SYSFS_DEPRECATED=n
|
||||||
|
|
||||||
Legacy hotplug slows down the system and confuses udev:
|
Legacy hotplug slows down the system and confuses udev:
|
||||||
CONFIG_UEVENT_HELPER_PATH=""
|
CONFIG_UEVENT_HELPER_PATH=""
|
||||||
|
|
||||||
Userspace firmware loading is deprecated, will go away, and
|
Userspace firmware loading is not supported and should
|
||||||
sometimes causes problems:
|
be disabled in the kernel:
|
||||||
CONFIG_FW_LOADER_USER_HELPER=n
|
CONFIG_FW_LOADER_USER_HELPER=n
|
||||||
|
|
||||||
Some udev rules and virtualization detection relies on it:
|
Some udev rules and virtualization detection relies on it:
|
||||||
|
|
1
TODO
1
TODO
|
@ -547,7 +547,6 @@ Features:
|
||||||
* ExecOnFailure=/usr/bin/foo
|
* ExecOnFailure=/usr/bin/foo
|
||||||
|
|
||||||
* udev:
|
* udev:
|
||||||
- remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
|
|
||||||
- move to LGPL
|
- move to LGPL
|
||||||
- kill scsi_id
|
- kill scsi_id
|
||||||
- add trigger --subsystem-match=usb/usb_device device
|
- add trigger --subsystem-match=usb/usb_device device
|
||||||
|
|
20
configure.ac
20
configure.ac
|
@ -1153,25 +1153,6 @@ if test "x$enable_myhostname" != "xno"; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
|
AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
AC_ARG_WITH(firmware-path,
|
|
||||||
AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
|
|
||||||
[Firmware search path (default="")]),
|
|
||||||
[], [with_firmware_path=""])
|
|
||||||
OLD_IFS=$IFS
|
|
||||||
IFS=:
|
|
||||||
for i in $with_firmware_path; do
|
|
||||||
if test "x${FIRMWARE_PATH}" = "x"; then
|
|
||||||
FIRMWARE_PATH="\\\"${i}/\\\""
|
|
||||||
else
|
|
||||||
FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS=$OLD_IFS
|
|
||||||
AC_SUBST(FIRMWARE_PATH)
|
|
||||||
AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
|
|
||||||
AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
AC_ARG_ENABLE([gudev],
|
AC_ARG_ENABLE([gudev],
|
||||||
AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
|
AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
|
||||||
|
@ -1409,7 +1390,6 @@ AC_MSG_RESULT([
|
||||||
Build Python: ${PYTHON}
|
Build Python: ${PYTHON}
|
||||||
Installation Python: ${PYTHON_BINARY}
|
Installation Python: ${PYTHON_BINARY}
|
||||||
sphinx binary: ${SPHINX_BUILD}
|
sphinx binary: ${SPHINX_BUILD}
|
||||||
firmware path: ${FIRMWARE_PATH}
|
|
||||||
PAM modules dir: ${with_pamlibdir}
|
PAM modules dir: ${with_pamlibdir}
|
||||||
PAM configuration dir: ${with_pamconfdir}
|
PAM configuration dir: ${with_pamconfdir}
|
||||||
D-Bus policy dir: ${with_dbuspolicydir}
|
D-Bus policy dir: ${with_dbuspolicydir}
|
||||||
|
|
|
@ -1,154 +0,0 @@
|
||||||
/*
|
|
||||||
* firmware - Kernel firmware loader
|
|
||||||
*
|
|
||||||
* Copyright (C) 2009 Piter Punk <piterpunk@slackware.com>
|
|
||||||
* Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details:*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <getopt.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <sys/utsname.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
|
|
||||||
static bool set_loading(struct udev *udev, char *loadpath, const char *state) {
|
|
||||||
FILE *ldfile;
|
|
||||||
|
|
||||||
ldfile = fopen(loadpath, "we");
|
|
||||||
if (ldfile == NULL) {
|
|
||||||
log_error("error: can not open '%s'", loadpath);
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
fprintf(ldfile, "%s\n", state);
|
|
||||||
fclose(ldfile);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) {
|
|
||||||
char *buf;
|
|
||||||
FILE *fsource = NULL, *ftarget = NULL;
|
|
||||||
bool ret = false;
|
|
||||||
|
|
||||||
buf = malloc(size);
|
|
||||||
if (buf == NULL) {
|
|
||||||
log_error("No memory available to load firmware file");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
log_debug("writing '%s' (%zi) to '%s'", source, size, target);
|
|
||||||
|
|
||||||
fsource = fopen(source, "re");
|
|
||||||
if (fsource == NULL)
|
|
||||||
goto exit;
|
|
||||||
ftarget = fopen(target, "we");
|
|
||||||
if (ftarget == NULL)
|
|
||||||
goto exit;
|
|
||||||
if (fread(buf, size, 1, fsource) != 1)
|
|
||||||
goto exit;
|
|
||||||
if (fwrite(buf, size, 1, ftarget) == 1)
|
|
||||||
ret = true;
|
|
||||||
exit:
|
|
||||||
if (ftarget != NULL)
|
|
||||||
fclose(ftarget);
|
|
||||||
if (fsource != NULL)
|
|
||||||
fclose(fsource);
|
|
||||||
free(buf);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], bool test) {
|
|
||||||
struct udev *udev = udev_device_get_udev(dev);
|
|
||||||
static const char *searchpath[] = { FIRMWARE_PATH };
|
|
||||||
char loadpath[UTIL_PATH_SIZE];
|
|
||||||
char datapath[UTIL_PATH_SIZE];
|
|
||||||
char fwpath[UTIL_PATH_SIZE];
|
|
||||||
const char *firmware;
|
|
||||||
FILE *fwfile = NULL;
|
|
||||||
struct utsname kernel;
|
|
||||||
struct stat statbuf;
|
|
||||||
unsigned int i;
|
|
||||||
int rc = EXIT_SUCCESS;
|
|
||||||
|
|
||||||
firmware = udev_device_get_property_value(dev, "FIRMWARE");
|
|
||||||
if (firmware == NULL) {
|
|
||||||
log_error("firmware parameter missing");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* lookup firmware file */
|
|
||||||
uname(&kernel);
|
|
||||||
for (i = 0; i < ELEMENTSOF(searchpath); i++) {
|
|
||||||
strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL);
|
|
||||||
fwfile = fopen(fwpath, "re");
|
|
||||||
if (fwfile != NULL)
|
|
||||||
break;
|
|
||||||
|
|
||||||
strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL);
|
|
||||||
fwfile = fopen(fwpath, "re");
|
|
||||||
if (fwfile != NULL)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL);
|
|
||||||
|
|
||||||
if (fwfile == NULL) {
|
|
||||||
log_debug("did not find firmware file '%s'", firmware);
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
/*
|
|
||||||
* Do not cancel the request in the initrd, the real root might have
|
|
||||||
* the firmware file and the 'coldplug' run in the real root will find
|
|
||||||
* this pending request and fulfill or cancel it.
|
|
||||||
* */
|
|
||||||
if (!in_initrd())
|
|
||||||
set_loading(udev, loadpath, "-1");
|
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) {
|
|
||||||
if (!in_initrd())
|
|
||||||
set_loading(udev, loadpath, "-1");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!set_loading(udev, loadpath, "1"))
|
|
||||||
goto exit;
|
|
||||||
|
|
||||||
strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL);
|
|
||||||
if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {
|
|
||||||
log_error("error sending firmware '%s' to device", firmware);
|
|
||||||
set_loading(udev, loadpath, "-1");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
goto exit;
|
|
||||||
};
|
|
||||||
|
|
||||||
set_loading(udev, loadpath, "0");
|
|
||||||
exit:
|
|
||||||
if (fwfile)
|
|
||||||
fclose(fwfile);
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
const struct udev_builtin udev_builtin_firmware = {
|
|
||||||
.name = "firmware",
|
|
||||||
.cmd = builtin_firmware,
|
|
||||||
.help = "kernel firmware loader",
|
|
||||||
.run_once = true,
|
|
||||||
};
|
|
|
@ -34,9 +34,6 @@ static const struct udev_builtin *builtins[] = {
|
||||||
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
|
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
|
||||||
#endif
|
#endif
|
||||||
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
|
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
|
|
||||||
#endif
|
|
||||||
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
|
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
|
||||||
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
|
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
|
||||||
[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
|
[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
|
||||||
|
|
|
@ -141,9 +141,6 @@ enum udev_builtin_cmd {
|
||||||
UDEV_BUILTIN_BLKID,
|
UDEV_BUILTIN_BLKID,
|
||||||
#endif
|
#endif
|
||||||
UDEV_BUILTIN_BTRFS,
|
UDEV_BUILTIN_BTRFS,
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
UDEV_BUILTIN_FIRMWARE,
|
|
||||||
#endif
|
|
||||||
UDEV_BUILTIN_HWDB,
|
UDEV_BUILTIN_HWDB,
|
||||||
UDEV_BUILTIN_INPUT_ID,
|
UDEV_BUILTIN_INPUT_ID,
|
||||||
UDEV_BUILTIN_KEYBOARD,
|
UDEV_BUILTIN_KEYBOARD,
|
||||||
|
@ -172,9 +169,6 @@ struct udev_builtin {
|
||||||
extern const struct udev_builtin udev_builtin_blkid;
|
extern const struct udev_builtin udev_builtin_blkid;
|
||||||
#endif
|
#endif
|
||||||
extern const struct udev_builtin udev_builtin_btrfs;
|
extern const struct udev_builtin udev_builtin_btrfs;
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
extern const struct udev_builtin udev_builtin_firmware;
|
|
||||||
#endif
|
|
||||||
extern const struct udev_builtin udev_builtin_hwdb;
|
extern const struct udev_builtin udev_builtin_hwdb;
|
||||||
extern const struct udev_builtin udev_builtin_input_id;
|
extern const struct udev_builtin udev_builtin_input_id;
|
||||||
extern const struct udev_builtin udev_builtin_keyboard;
|
extern const struct udev_builtin udev_builtin_keyboard;
|
||||||
|
|
|
@ -100,9 +100,6 @@ struct event {
|
||||||
dev_t devnum;
|
dev_t devnum;
|
||||||
int ifindex;
|
int ifindex;
|
||||||
bool is_block;
|
bool is_block;
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
bool nodelay;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline struct event *node_to_event(struct udev_list_node *node) {
|
static inline struct event *node_to_event(struct udev_list_node *node) {
|
||||||
|
@ -458,10 +455,6 @@ static int event_queue_insert(struct udev_device *dev) {
|
||||||
event->devnum = udev_device_get_devnum(dev);
|
event->devnum = udev_device_get_devnum(dev);
|
||||||
event->is_block = streq("block", udev_device_get_subsystem(dev));
|
event->is_block = streq("block", udev_device_get_subsystem(dev));
|
||||||
event->ifindex = udev_device_get_ifindex(dev);
|
event->ifindex = udev_device_get_ifindex(dev);
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
if (streq(udev_device_get_subsystem(dev), "firmware"))
|
|
||||||
event->nodelay = true;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
|
log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
|
||||||
udev_device_get_action(dev), udev_device_get_subsystem(dev));
|
udev_device_get_action(dev), udev_device_get_subsystem(dev));
|
||||||
|
@ -538,12 +531,6 @@ static bool is_devpath_busy(struct event *event) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_FIRMWARE
|
|
||||||
/* allow to bypass the dependency tracking */
|
|
||||||
if (event->nodelay)
|
|
||||||
continue;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* parent device event found */
|
/* parent device event found */
|
||||||
if (event->devpath[common] == '/') {
|
if (event->devpath[common] == '/') {
|
||||||
event->delaying_seqnum = loop_event->seqnum;
|
event->delaying_seqnum = loop_event->seqnum;
|
||||||
|
|
Loading…
Reference in New Issue